diff --git a/.github/prompts/migration-plan.md b/.github/prompts/migration-plan.md
new file mode 100644
index 000000000..ad16dc939
--- /dev/null
+++ b/.github/prompts/migration-plan.md
@@ -0,0 +1,335 @@
+# Qt5/C++11 to Qt6/C++23 Migrationsplan
+
+## 📋 Ausgangslage
+
+### Projektstruktur
+```
+$PROJDIR_MIGRATE_QT5_TO_QT6 = /home/torsten/swy/sandbox/qt-migration-legatus
+├── qt5-before/qt5-legatus-legacy/     (Qt5/C++11 Legacy-Code)
+└── qt6-after/qt6-migrated-legatus/    (Qt6/C++23 migrierter Code)
+```
+
+### Submodule Konfiguration
+- **Submodule**: `qt-migration-legatus` zeigt auf `feature/qt6-migration-basis-modules` (commit d176b5e)
+- **Quellverzeichnis**: `qt5-before/qt5-legatus-legacy/` enthält vollständigen Qt5-Code mit CMakeLists.txt
+- **Zielverzeichnis**: `qt6-after/qt6-migrated-legatus/` enthält bereits migrierte Module
+
+### Bereits migrierte Module (Stand: Session a41bb15a)
+✅ **Lts/Common** - Vollständig migriert, Tests erfolgreich (1/1 bestanden)
+✅ **Lts/DDS** - Struktur vorhanden
+✅ **Lts/Plugins** - Struktur vorhanden
+✅ **Lts/Projects** - Struktur vorhanden
+✅ **Lts/Proxies** - Struktur vorhanden
+✅ **Lts/Services** - Struktur vorhanden
+✅ **TetraIF** - Teilweise migriert
+✅ **Z** - Teilweise migriert (nglwidgets, QtSingleApplication, qsql_informix, WMS_Interface)
+
+### Infrastruktur
+- ✅ Docker-Image: `migration-pipeline:ubuntu26.04` (Ubuntu 26.04, Qt 6.8.3)
+- ✅ CMake 3.16+, C++23
+- ✅ CI-Workflow mit `submodules: recursive`
+- ✅ Migrationsskripte aktualisiert für Submodule-Pfade
+
+---
+
+## 🎯 Migrationsziele (aus combined-migration-compact.prompt.md)
+
+### Hauptziele
+1. **Qt5 → Qt6** Upgrade aller Module
+2. **C++11/14/17 → C++23** Modernisierung
+3. **Qt Core, Gui, Widgets** explizit verlinken
+4. **QRegExp → QRegularExpression** ersetzen
+5. **QDesktopWidget → QScreen**-basierte APIs
+6. **QTextCodec** entfernen, Qt6-safe text handling
+7. **SIGNAL/SLOT** alte Syntax → function-pointer connect syntax
+8. **0/NULL** → `nullptr` ersetzen
+
+### C++23 Modernisierung
+- `auto` wo offensichtlich
+- Strukturierte Bindings wo klarer
+- Raw Pointer → `std::unique_ptr` / `std::shared_ptr`
+- `std::make_unique` / `std::make_shared`
+- `std::string_view` (lifetime safety beachten)
+- `std::span` für non-owning contiguous data
+- `.contains()` statt `find(...) != end()`
+- Algorithms/Ranges statt manueller Loops
+- `[[nodiscard]]` wo sinnvoll
+- Early Returns statt nested control flow
+- `std::optional` monadic operations
+- `constexpr`, `if constexpr`, concepts, `requires`
+- `noexcept`, `override`, `final`, `= default`, `= delete`
+- `enum class` statt unscoped enums
+- `std::print` / `std::println` (wenn unterstützt)
+- Typed `std::chrono`, `std::jthread`
+
+### Safety Rules
+- ✅ Semantics first, modernize second
+- ❌ KEINE Behavior Changes (außer Qt6 compatibility)
+- ❌ KEINE Code Cleanup
+- ❌ KEINE Umbenennungen
+- ❌ KEINE Function/Class Extractions
+- ❌ KEINE Logic Restructuring
+- ❌ KEINE stylistic rewrites
+- ❌ KEINE opportunistic improvements
+
+---
+
+## 📝 Migrationsphasen
+
+### Phase 1: Vorbereitung und Analyse
+**Todo-ID: prepare**
+- [x] Submodule initialisieren: `git submodule update --init`
+- [x] Docker-Image bauen: `docker build -t migration-pipeline:ubuntu26.04 ./app`
+- [x] Bereits migrierte Module identifizieren
+- [ ] Vollständige Inventur aller noch zu migrierenden Dateien
+- [ ] Migrationsskripte für verbleibende Module vorbereiten
+
+### Phase 2: Lts-Module komplett migrieren
+**Todo-ID: lts-modules**
+**Dependencies: prepare**
+
+Bereits migriert:
+- [x] Lts/Common
+- [ ] Lts/DDS (prüfen, ob vollständig)
+- [ ] Lts/Plugins (alle Untermodule prüfen)
+- [ ] Lts/Projects (alle Untermodule prüfen)
+- [ ] Lts/Proxies (alle Untermodule prüfen)
+- [ ] Lts/Services (alle Untermodule prüfen)
+
+**Vorgehen pro Modul (mit Test- und Docker-Validierung):**
+1. `./migration/migrate_module.sh Lts/<Modul> --jobs 4`
+2. **Tests erstellen**: Für jede Code-Änderung mindestens 3 Tests hinzufügen
+   - Tests in `qt6-after/qt6-migrated-legatus/tests/` ablegen
+   - Dateinamen: `test_<name>.cpp`, `<name>_test.cpp`, `<name>test.cpp`, oder `<name>gtest.cpp`
+   - Tests in CMake registrieren (CTest)
+3. **Docker-Validierung** (obligatorisch vor Commit):
+   ```bash
+   # Configure im Docker-Container
+   docker run --rm -v $(pwd):/repo migration-pipeline:ubuntu26.04 \
+     cmake -S /repo/qt-migration-legatus/qt6-after/qt6-migrated-legatus \
+           -B /repo/build -G Ninja -DCMAKE_BUILD_TYPE=Debug
+   
+   # Build im Docker-Container
+   docker run --rm -v $(pwd):/repo migration-pipeline:ubuntu26.04 \
+     cmake --build /repo/build --parallel
+   
+   # Tests im Docker-Container
+   docker run --rm -v $(pwd):/repo migration-pipeline:ubuntu26.04 \
+     ctest --test-dir /repo/build --output-on-failure
+   
+   # Policy-Check im Docker-Container
+   docker run --rm -v $(pwd):/repo migration-pipeline:ubuntu26.04 \
+     python3 /repo/ci/check_pr_policies.py
+   ```
+4. **Fehlerklassifikation**:
+   - **Environment-Failures** (command not found, missing package): `ci/Dockerfile.ci` aktualisieren, Image neu bauen
+   - **Project-Failures** (compile/link errors, test failures): Code fixen
+5. Bei Erfolg: clang-tidy laufen lassen, Changes commiten
+
+### Phase 3: TetraIF komplett migrieren
+**Todo-ID: tetraif**
+**Dependencies: lts-modules**
+
+- [ ] TetraIF Hauptcode migrieren
+- [ ] Alle Includes und Abhängigkeiten prüfen
+- [ ] Tests erstellen (mind. 3 Tests pro Code-Änderung)
+- [ ] **Docker-Validierung** (Configure → Build → Test → Policy)
+- [ ] clang-tidy Integration testen
+
+### Phase 4: Z-Module komplett migrieren
+**Todo-ID: z-modules**
+**Dependencies: tetraif**
+
+Bereits teilweise migriert:
+- [x] Z/src/nglwidgets
+- [x] Z/src/QtSingleApplication
+- [x] Z/src/qsql_informix
+- [x] Z/src/WMS_Interface
+- [ ] Fehlende Z-Module identifizieren und migrieren
+
+**Vorgehen pro Modul** (wie Phase 2 mit Test- und Docker-Validierung)
+
+### Phase 5: Vollständige Build-Validierung
+**Todo-ID: full-build**
+**Dependencies: lts-modules, tetraif, z-modules**
+
+- [ ] `./final-migration/run_final_migration.sh --jobs 6` ausführen
+- [ ] **Docker-Validierung komplett**:
+  - [ ] Configure: `cmake -S qt6-after/qt6-migrated-legatus -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug`
+  - [ ] Build: `cmake --build build --parallel`
+  - [ ] Test: `ctest --test-dir build --output-on-failure`
+  - [ ] Policy: `python3 ci/check_pr_policies.py`
+- [ ] Alle Tests bestehen (CTest)
+- [ ] Policy-Check erfolgreich
+
+### Phase 6: CI/CD Validierung
+**Todo-ID: ci-validation**
+**Dependencies: full-build**
+
+- [ ] CI-Workflow lokal simulieren
+- [ ] Submodule checkout testen
+- [ ] Alle Migrationsschritte im CI-Kontext verifizieren
+- [ ] Build-Artefakte prüfen
+- [ ] Test-Logs analysieren
+- [ ] **Docker-Image als Source of Truth**: `lifemaps/ci-cpp:latest` (oder `migration-pipeline:ubuntu26.04`)
+  - Bei fehlenden Tools: `ci/Dockerfile.ci` minimal aktualisieren
+  - Image neu bauen und Validierung wiederholen
+
+---
+
+## 🧪 Validierungskriterien
+
+### Pre-Migration (lokal)
+- [x] `git submodule update --init` erfolgreich
+- [x] Docker-Image Build erfolgreich
+- [x] Lts/Common Migration erfolgreich getestet
+- [ ] Vollständige Inventur aller Module
+
+### Post-Migration (lokal)
+- [ ] Configure im Docker-Container erfolgreich
+- [ ] Build im Docker-Container erfolgreich
+- [ ] Alle Tests bestehen (`ctest --test-dir build --output-on-failure`)
+- [ ] Policy-Check erfolgreich (`python3 ci/check_pr_policies.py`)
+
+### CI-Validierung
+- [ ] Checkout mit Submodules erfolgreich
+- [ ] Lts/Common Migration Step erfolgreich
+- [ ] Lts/DDS Migration Step erfolgreich
+- [ ] Final Migration Build ohne Fehler
+- [ ] CTest läuft und besteht
+- [ ] Workflow-Zeit < 120 Minuten
+
+---
+
+## 📊 Fortschrittsübersicht
+
+### Migrierte Module (✅)
+| Modul | Status | Tests | Build | Notes |
+|-------|--------|-------|-------|-------|
+| Lts/Common | ✅ Vollständig | 1/1 ✅ | ✅ | Basis erfolgreich |
+| Lts/DDS | 🟡 Struktur vorhanden | ? | ? | Prüfung ausstehend |
+| Lts/Plugins | 🟡 Struktur vorhanden | ? | ? | 60 Untermodule |
+| Lts/Projects | 🟡 Struktur vorhanden | ? | ? | 5 Untermodule |
+| Lts/Proxies | 🟡 Struktur vorhanden | ? | ? | 13 Untermodule |
+| Lts/Services | 🟡 Struktur vorhanden | ? | ? | 47 Untermodule |
+| TetraIF | 🟡 Teilweise | ? | ? | Migration läuft |
+| Z | 🟡 Teilweise | ? | ? | Einige Submodule fertig |
+
+### Noch zu migrieren (❌)
+- Alle Untermodule in Lts/Plugins (60)
+- Alle Untermodule in Lts/Projects (5)
+- Alle Untermodule in Lts/Proxies (13)
+- Alle Untermodule in Lts/Services (47)
+- Restliche Z-Module
+
+---
+
+## ⚠️ Risiken und Gegenmaßnahmen
+
+### Risiko 1: Submodule Permissions
+**Problem**: CI benötigt SSH-Zugriff auf `git@devel:lifemaps/qt-migration-legatus.git`
+**Mitigation**: SSH-Key in CI secrets konfigurieren oder HTTPS mit Token verwenden
+
+### Risiko 2: Git Operations in Submodules
+**Problem**: `run_clang_tidy_common.sh` committet in Submodule-Pfad
+**Mitigation**: Lokal testen, Submodule-Commits separat von Main-Repo-Commits betrachten
+
+### Risiko 3: Externe Dependencies
+**Problem**: Skripte erwarten `/repo/external` mit RTI Connext und ArcGIS SDK
+**Mitigation**: CI stellt Dependencies bereit oder behandelt fehlende Dependencies gracefully
+
+### Risiko 4: Nested Git Repo
+**Problem**: `qt5-legatus-legacy` hat eigenes .git-Verzeichnis
+**Mitigation**: `git submodule update --init` OHNE `--recursive` verwenden
+
+---
+
+## 🔄 Rollback-Plan
+
+Bei kritischen Problemen:
+
+1. **CI-Workflow revertieren**: `submodules: recursive` entfernen
+2. **Migration-Skripte revertieren**: Original `-S /repo` Pfade wiederherstellen
+3. **Fallback**: Alte Ordernstruktur temporär am Repo-Root wiederherstellen
+
+---
+
+## 📈 Nächste Schritte (sofort)
+
+1. **Logging-Fixes validieren**: Build im Docker-Container nach Logger-Fixes testen
+2. **Inventur vervollständigen**: Alle noch zu migrierenden Dateien identifizieren
+3. **Lts/DDS prüfen**: Ist das Modul vollständig migriert? Build testen
+4. **Lts/Plugins**: Erste Untermodule migrieren (priorisiere Kernfunktionalität)
+5. **TetraIF**: Migration abschließen und validieren
+6. **Vollständigen Build testen**: `./final-migration/run_final_migration.sh --jobs 6`
+
+---
+
+## 🛠️ Wichtige Commands
+
+### Submodule Management
+```bash
+# Submodule initialisieren
+git submodule update --init
+
+# Submodule auf Branch aktualisieren
+git submodule update --remote
+
+# Submodule Status prüfen
+git submodule status
+```
+
+### Migration
+```bash
+# Einzelnes Modul migrieren
+./migration/migrate_module.sh Lts/<Modul> --jobs 4
+
+# Vollständige Migration
+./final-migration/run_final_migration.sh --jobs 6
+
+# Clang-tidy für Modul
+./migration/run_clang_tidy_common.sh Lts/<Modul>
+```
+
+### Docker-Validierung (OBLIGATORISCH)
+```bash
+# Configure im Container
+docker run --rm -v $(pwd):/repo migration-pipeline:ubuntu26.04 \
+  cmake -S /repo/qt-migration-legatus/qt6-after/qt6-migrated-legatus \
+        -B /repo/build -G Ninja -DCMAKE_BUILD_TYPE=Debug
+
+# Build im Container
+docker run --rm -v $(pwd):/repo migration-pipeline:ubuntu26.04 \
+  cmake --build /repo/build --parallel
+
+# Tests im Container
+docker run --rm -v $(pwd):/repo migration-pipeline:ubuntu26.04 \
+  ctest --test-dir /repo/build --output-on-failure
+
+# Policy-Check
+docker run --rm -v $(pwd):/repo migration-pipeline:ubuntu26.04 \
+  python3 /repo/ci/check_pr_policies.py
+```
+
+### Docker-Image bei fehlenden Tools
+```bash
+# ci/Dockerfile.ci bearbeiten (fehlendes Package hinzufügen)
+# Dann Image neu bauen:
+docker build -t migration-pipeline:ubuntu26.04 ./app
+
+# Validierung wiederholen
+```
+
+---
+
+## 📝 Session-Referenzen
+
+- **Session a41bb15a-b5cc-4955-8d71-0169516fcef3**: Vorherige Migration-Sessions
+- **Checkpoint 008-qt6-migration-infrastructure**: Letzte Infrastruktur-Updates
+- **Submodule Branch**: `feature/qt6-migration-basis-modules` @ d176b5e
+
+---
+
+**Erstellt**: 2026-08-18
+**Aktualisiert**: 2026-08-18 (Test- und Docker-Validierungsanforderungen integriert)
+**Status**: Bereit für User-Feedback und Implementierung
\ No newline at end of file
diff --git a/add_logger_init.py b/add_logger_init.py
new file mode 100755
index 000000000..1289526a9
--- /dev/null
+++ b/add_logger_init.py
@@ -0,0 +1,246 @@
+#!/usr/bin/env python3
+"""
+Add logger initialization to constructors in Qt6 .cpp files.
+Pattern: m_logger(NGL::NGLLoggerBootstrap::getLogger())
+"""
+
+import os
+import re
+import sys
+from pathlib import Path
+
+# Paths
+SCRIPT_DIR = Path(__file__).parent
+QT6_BASE = SCRIPT_DIR / "qt6-after/qt6-migrated-legatus"
+
+# Qt classes that shouldn't have logger initialization
+QT_CLASSES = {
+    'QObject', 'QWidget', 'QMainWindow', 'QDialog', 'QMessageBox',
+    'QAbstractTableModel', 'QAbstractListModel', 'QAbstractItemModel',
+    'QTreeView', 'QTableView', 'QListView', 'QComboBox',
+    'QTcpSocket', 'QTcpServer', 'QUdpSocket', 'QTimer', 'QThread',
+    'QSettings', 'QFileInfo', 'QDir', 'QFile', 'QTextStream',
+    'QDomElement', 'QDomDocument', 'QXmlStreamReader', 'QXmlStreamWriter',
+    'QPainter', 'QPixmap', 'QImage', 'QIcon', 'QBrush', 'QPen',
+    'QMenu', 'QMenuBar', 'QToolBar', 'QStatusBar', 'QAction',
+    'QVBoxLayout', 'QHBoxLayout', 'QGridLayout', 'QFormLayout',
+    'QPushButton', 'QLabel', 'QLineEdit', 'QTextEdit', 'QPlainTextEdit',
+    'QCheckBox', 'QRadioButton', 'QSpinBox', 'QDoubleSpinBox',
+    'QSlider', 'QScrollBar', 'QProgressBar', 'QTabWidget',
+    'QStackedWidget', 'QSplitter', 'QScrollArea', 'QFrame',
+    'QGroupBox', 'QToolBox', 'QWizard', 'QFontDialog', 'QColorDialog',
+    'QFileDialog', 'QInputDialog', 'QProgressDialog', 'QErrorMessage',
+    'QSystemTrayIcon', 'QClipboard', 'QDrag', 'QMimeData',
+    'QKeyEvent', 'QMouseEvent', 'QPaintEvent', 'QResizeEvent',
+    'QShowEvent', 'QHideEvent', 'QCloseEvent', 'QFocusEvent',
+    'QMoveEvent', 'QContextMenuEvent', 'QInputEvent', 'QWheelEvent',
+    'QHoverEvent', 'QTabletEvent', 'QGestureEvent', 'QShortcut',
+    'QKeySequence', 'QValidator', 'QIntValidator', 'QDoubleValidator',
+    'QRegExpValidator', 'QCompleter', 'QAbstractSpinBox', 'QDateTimeEdit',
+    'QDateEdit', 'QTimeEdit', 'QCalendarWidget', 'QDial', 'QLCDNumber',
+    'QSpinBox', 'QDoubleSpinBox', 'QTimeEdit', 'QDateTimeEdit',
+    'QDateEdit', 'QFontComboBox', 'QToolButton', 'QCommandLinkButton',
+    'QDialogButtonBox', 'QPlainTextEdit', 'QTextEdit', 'QTextBrowser',
+    'QListWidget', 'QTreeWidget', 'QTableWidget', 'QListWidgetItem',
+    'QTreeWidgetItem', 'QTableWidgetItem', 'QHeaderView', 'QColumnView',
+    'QDataWidgetMapper', 'QFileSystemModel', 'QStandardItemModel',
+    'QStandardItem', 'QSortFilterProxyModel', 'QStringListModel',
+    'QAbstractProxyModel', 'QIdentityProxyModel', 'QItemSelectionModel',
+    'QItemSelection', 'QItemSelectionRange', 'QStyledItemDelegate',
+    'QItemDelegate', 'QAbstractItemDelegate', 'QAbstractItemView',
+    'QGraphicsView', 'QGraphicsScene', 'QGraphicsItem', 'QGraphicsWidget',
+    'QGraphicsObject', 'QGraphicsLayout', 'QGraphicsLinearLayout',
+    'QGraphicsGridLayout', 'QGraphicsProxyWidget', 'QGraphicsTextItem',
+    'QGraphicsRectItem', 'QGraphicsEllipseItem', 'QGraphicsLineItem',
+    'QGraphicsPathItem', 'QGraphicsPolygonItem', 'QGraphicsPixmapItem',
+    'QGraphicsSimpleTextItem', 'QGraphicsItemGroup', 'QGraphicsLayoutItem',
+    'QGraphicsAnchorLayout', 'QGraphicsGridLayout', 'QStackedLayout',
+    'QBoxLayout', 'QFormLayout', 'QGridLayout', 'QHBoxLayout',
+    'QVBoxLayout', 'QLayout', 'QLayoutItem', 'QSpacerItem',
+    'QSizeGrip', 'QSizePolicy', 'QStyle', 'QStyleFactory',
+    'QStyleOption', 'QStylePainter', 'QProxyStyle', 'QCommonStyle',
+    'QWindowsVistaStyle', 'QMacStyle', 'QFusionStyle', 'QCleanlooksStyle',
+    'QPlastiqueStyle', 'QMotifStyle', 'QApplication', 'QDesktopWidget',
+    'QSessionManager', 'QStyleHintReturn', 'QStyleHintReturnMask',
+    'QStyleHintReturnVariant', 'QStyleOptionFocusRect',
+    'QStyleOptionFrame', 'QStyleOptionFrameV2', 'QStyleOptionFrameV3',
+    'QStyleOptionButton', 'QStyleOptionComboBox', 'QStyleOptionHeader',
+    'QStyleOptionHeaderV2', 'QStyleOptionComplex', 'QStyleOptionSlider',
+    'QStyleOptionSpinBox', 'QStyleOptionToolButton', 'QStyleOptionToolBar',
+    'QStyleOptionDockWidget', 'QStyleOptionDockWidgetV2',
+    'QStyleOptionViewItem', 'QStyleOptionViewItemV2', 'QStyleOptionViewItemV3',
+    'QStyleOptionViewItemV4', 'QStyleOptionTab', 'QStyleOptionTabV2',
+    'QStyleOptionTabV3', 'QStyleOptionTabBarBase', 'QStyleOptionTabBarBaseV2',
+    'QStyleOptionRubberBand', 'QStyleOptionGraphicsItem',
+    'QStyleOptionTitleBar', 'QStyleOptionToolBox', 'QStyleOptionToolBoxV2',
+    'QStyleOptionViewItem', 'QStyleOptionProgressBar',
+    'QStyleOptionProgressBarV2', 'QStyleOptionMenuItem', 'QStyleOptionSlider',
+    'QStyleOptionSpinBox', 'QStyleOptionToolButton', 'QStyleOptionToolBar',
+    'QStyleOptionDockWidget', 'QStyleOptionDockWidgetV2',
+    'QStyleOptionFocusRect', 'QStyleOptionFrame', 'QStyleOptionFrameV2',
+    'QStyleOptionFrameV3', 'QStyleOptionButton', 'QStyleOptionComboBox',
+    'QStyleOptionHeader', 'QStyleOptionHeaderV2', 'QStyleOptionComplex',
+    'QStyleOptionTab', 'QStyleOptionTabV2', 'QStyleOptionTabV3',
+    'QStyleOptionTabBarBase', 'QStyleOptionTabBarBaseV2',
+    'QStyleOptionRubberBand', 'QStyleOptionGraphicsItem',
+    'QStyleOptionTitleBar', 'QStyleOptionToolBox', 'QStyleOptionToolBoxV2',
+    'QStyleOptionProgressBar', 'QStyleOptionProgressBarV2',
+    'QStyleOptionMenuItem', 'QStyleOptionSizeMode', 'QStyleOptionVersion',
+}
+
+def find_cpp_files_with_logger_member():
+    """Find all Qt6 .cpp files that have m_logger member in corresponding header"""
+    cpp_files = []
+    
+    for cpp_file in QT6_BASE.rglob("*.cpp"):
+        # Find corresponding header
+        header = cpp_file.with_suffix('.h')
+        if not header.exists():
+            header = cpp_file.with_suffix('.hpp')
+        
+        if header.exists():
+            try:
+                header_content = header.read_text(encoding='utf-8', errors='ignore')
+                if 'm_logger' in header_content:
+                    cpp_files.append(cpp_file)
+            except:
+                pass
+    
+    print(f"Found {len(cpp_files)} .cpp files with m_logger in header")
+    return cpp_files
+
+def add_logger_init_to_constructor(content, class_name):
+    """Add logger initialization to constructor"""
+    
+    # Pattern to match constructor initialization list
+    # Matches: ClassName::ClassName(...) : existing_init1(val1), existing_init2(val2)
+    # Also matches: ClassName::ClassName(...) {
+    # And: ClassName::ClassName(...)
+    
+    # First check if already has logger init
+    if 'm_logger(' in content or 'm_logger(NGL' in content:
+        return content, False, "Already initialized"
+    
+    # Pattern for constructor with initialization list
+    # Group 1: constructor signature up to :
+    # Group 2: existing initializers
+    # Group 3: opening brace or colon continuing init list
+    
+    # Try to find constructor with init list
+    pattern_with_init = rf'({re.escape(class_name)}::\s*{re.escape(class_name)}\s*\([^)]*\))\s*:\s*([^{{]+?)\s*({{)'
+    match = re.search(pattern_with_init, content, re.MULTILINE | re.DOTALL)
+    
+    if match:
+        # Add m_logger to existing init list
+        before = match.group(1)
+        inits = match.group(2).rstrip()
+        brace = match.group(3)
+        
+        # Add m_logger initialization (comma if needed)
+        new_init = f"{before} : {inits},\n    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {brace}"
+        new_content = content[:match.start()] + new_init + content[match.end():]
+        return new_content, True, "Added to init list"
+    
+    # Try constructor without init list (direct brace)
+    pattern_direct_brace = rf'({re.escape(class_name)}::\s*{re.escape(class_name)}\s*\([^)]*\))\s*({{)'
+    match = re.search(pattern_direct_brace, content, re.MULTILINE)
+    
+    if match:
+        sig = match.group(1)
+        brace = match.group(2)
+        new_constructor = f"{sig} : m_logger(NGL::NGLLoggerBootstrap::getLogger()) {brace}"
+        new_content = content[:match.start()] + new_constructor + content[match.end():]
+        return new_content, True, "Added init list"
+    
+    # Try constructor that continues on next line
+    pattern_multiline = rf'({re.escape(class_name)}::\s*{re.escape(class_name)}\s*\([^)]*\))\s*\n\s*:\s*([^{{]+?)\s*({{)'
+    match = re.search(pattern_multiline, content, re.MULTILINE)
+    
+    if match:
+        before = match.group(1)
+        inits = match.group(2).rstrip()
+        brace = match.group(3)
+        new_init = f"{before}\n    : {inits},\n      m_logger(NGL::NGLLoggerBootstrap::getLogger()) {brace}"
+        new_content = content[:match.start()] + new_init + content[match.end():]
+        return new_content, True, "Added to multiline init"
+    
+    return content, False, "No constructor found"
+
+def extract_class_name_from_header(header_path):
+    """Extract class name from header file"""
+    try:
+        content = header_path.read_text(encoding='utf-8', errors='ignore')
+        # Find first class definition (not forward declaration)
+        pattern = r'^class\s+(\w+)\s*(?::\s*public\s+\w+)?\s*\{'
+        match = re.search(pattern, content, re.MULTILINE)
+        if match:
+            return match.group(1)
+    except:
+        pass
+    return None
+
+def main():
+    print("=" * 80)
+    print("Adding logger initialization to constructors")
+    print("=" * 80)
+    
+    # Find cpp files with m_logger in header
+    cpp_files = find_cpp_files_with_logger_member()
+    
+    # Track results
+    added = 0
+    skipped = 0
+    skip_reasons = {}
+    examples = []
+    
+    for cpp_file in cpp_files:
+        try:
+            content = cpp_file.read_text(encoding='utf-8')
+            
+            # Get class name from header
+            header = cpp_file.with_suffix('.h')
+            if not header.exists():
+                header = cpp_file.with_suffix('.hpp')
+            
+            class_name = None
+            if header.exists():
+                class_name = extract_class_name_from_header(header)
+            
+            if not class_name:
+                # Try to guess from filename
+                class_name = cpp_file.stem
+            
+            # Try to add logger init
+            new_content, success, message = add_logger_init_to_constructor(content, class_name)
+            
+            if success:
+                cpp_file.write_text(new_content, encoding='utf-8')
+                added += 1
+                if added <= 10:
+                    print(f"ADDED: {cpp_file.relative_to(QT6_BASE)} - {message}")
+            else:
+                skipped += 1
+                reason = message
+                skip_reasons[reason] = skip_reasons.get(reason, 0) + 1
+                if len(examples) < 5:
+                    examples.append(f"{cpp_file.relative_to(QT6_BASE)} ({class_name})")
+                
+        except Exception as e:
+            skipped += 1
+            reason = f"Error: {str(e)}"
+            skip_reasons[reason] = skip_reasons.get(reason, 0) + 1
+    
+    print("\n" + "=" * 80)
+    print(f"Results: {added} files updated, {skipped} skipped")
+    print("\nSkip reasons:")
+    for reason, count in sorted(skip_reasons.items(), key=lambda x: -x[1])[:10]:
+        print(f"  {reason}: {count}")
+    
+    if examples:
+        print("\nSkipped examples (first 5):")
+        for example in examples:
+            print(f"  - {example}")
+    print("=" * 80)
+
+if __name__ == "__main__":
+    main()
diff --git a/add_logger_members.py b/add_logger_members.py
new file mode 100755
index 000000000..4a1616a4c
--- /dev/null
+++ b/add_logger_members.py
@@ -0,0 +1,147 @@
+#!/usr/bin/env python3
+"""
+Add m_logger member variables to Qt6 class definitions.
+Matches Qt5 and Qt6 headers by file path, then checks for m_logger.
+"""
+
+import os
+import re
+import sys
+from pathlib import Path
+
+# Paths
+SCRIPT_DIR = Path(__file__).parent
+QT5_BASE = SCRIPT_DIR / "qt5-before/qt5-legatus-legacy"
+QT6_BASE = SCRIPT_DIR / "qt6-after/qt6-migrated-legatus"
+
+def find_qt5_headers_with_logger():
+    """Find all Qt5 headers with m_logger members"""
+    qt5_headers = []
+    
+    for header in QT5_BASE.rglob("*.h"):
+        try:
+            content = header.read_text(encoding='utf-8', errors='ignore')
+            if 'm_logger' in content:
+                rel_path = header.relative_to(QT5_BASE)
+                qt5_headers.append(rel_path)
+        except Exception as e:
+            pass
+    
+    print(f"Found {len(qt5_headers)} Qt5 headers with m_logger")
+    return qt5_headers
+
+def find_qt6_header(rel_path):
+    """Find corresponding Qt6 header by relative path"""
+    qt6_header = QT6_BASE / rel_path
+    
+    if qt6_header.exists():
+        return qt6_header
+    
+    # Try .hpp extension
+    qt6_header_hpp = QT6_BASE / rel_path.with_suffix('.hpp')
+    if qt6_header_hpp.exists():
+        return qt6_header_hpp
+    
+    # Try lowercase path
+    qt6_header_lower = QT6_BASE / str(rel_path).lower()
+    if qt6_header_lower.exists():
+        return qt6_header_lower
+    
+    # Try snake_case conversion for filename
+    filename = rel_path.name
+    snake_name = ''.join(['_' + c.lower() if c.isupper() else c for c in filename.split('.')[0]]).lstrip('_')
+    snake_path = rel_path.parent / f"{snake_name}{rel_path.suffix}"
+    qt6_header_snake = QT6_BASE / snake_path
+    if qt6_header_snake.exists():
+        return qt6_header_snake
+    
+    return None
+
+def add_logger_to_header(header_path):
+    """Add m_logger member to class definition"""
+    try:
+        content = header_path.read_text(encoding='utf-8')
+        
+        # Check if already has m_logger
+        if 'm_logger' in content:
+            return False, "Already has m_logger"
+        
+        # Find private: or protected: section (handle comments after colon)
+        pattern = r'^(\s*)(private|protected):\s*(?:\/\/.*)?\s*\n'
+        match = re.search(pattern, content, re.MULTILINE)
+        
+        if not match:
+            # Try finding end of class with just closing brace
+            lines = content.split('\n')
+            for i in range(len(lines) - 1, 0, -1):
+                if re.match(r'^\s*};\s*$', lines[i]):
+                    indent = re.match(r'^(\s*)', lines[i]).group(1)
+                    lines.insert(i, f"{indent}NGL::INGLLogger &m_logger;")
+                    new_content = '\n'.join(lines)
+                    header_path.write_text(new_content, encoding='utf-8')
+                    return True, "Added (fallback)"
+            return False, "No private/protected section found"
+        
+        # Insert m_logger after the access specifier line
+        indent = match.group(1)
+        insert_pos = match.end()
+        new_content = content[:insert_pos] + indent + "NGL::INGLLogger &m_logger;\n" + content[insert_pos:]
+        
+        header_path.write_text(new_content, encoding='utf-8')
+        return True, "Added"
+        
+    except Exception as e:
+        return False, f"Error: {str(e)}"
+
+def main():
+    print("=" * 80)
+    print("Adding m_logger members to Qt6 headers")
+    print("=" * 80)
+    
+    # Find Qt5 headers with m_logger
+    qt5_headers = find_qt5_headers_with_logger()
+    
+    # Track results
+    added = 0
+    skipped = 0
+    skip_reasons = {}
+    not_found_examples = []
+    
+    for rel_path in qt5_headers:
+        # Find corresponding Qt6 header
+        qt6_header = find_qt6_header(rel_path)
+        
+        if not qt6_header:
+            skipped += 1
+            reason = "Header not found"
+            skip_reasons[reason] = skip_reasons.get(reason, 0) + 1
+            if len(not_found_examples) < 10:
+                not_found_examples.append(str(rel_path))
+            continue
+        
+        # Try to add logger
+        success, message = add_logger_to_header(qt6_header)
+        
+        if success:
+            added += 1
+            if added <= 10:
+                print(f"ADDED: {rel_path} -> {message}")
+        else:
+            skipped += 1
+            reason = message if not message.startswith("Already") else "Already has m_logger"
+            skip_reasons[reason] = skip_reasons.get(reason, 0) + 1
+    
+    print("\n" + "=" * 80)
+    print(f"Results: {added} headers updated, {skipped} skipped")
+    print("\nSkip reasons:")
+    for reason, count in sorted(skip_reasons.items(), key=lambda x: -x[1]):
+        print(f"  {reason}: {count}")
+    
+    if not_found_examples:
+        print("\nHeader not found examples (first 10):")
+        for example in not_found_examples:
+            print(f"  - {example}")
+    print("=" * 80)
+
+if __name__ == "__main__":
+    main()
diff --git a/fix_logging_macros.py b/fix_logging_macros.py
new file mode 100644
index 000000000..5b200a56d
--- /dev/null
+++ b/fix_logging_macros.py
@@ -0,0 +1,72 @@
+#!/usr/bin/env python3
+"""
+Fix logging macro calls in Qt6 migrated code.
+Adds m_logger parameter to DEBUG_LOG(), WARNING_LOG(), ERROR_LOG(), FATAL_LOG(), INFO_LOG(), TRACE_LOG()
+"""
+
+import re
+import os
+import sys
+
+# Logging macros that need logger parameter
+LOGGING_MACROS = [
+    'DEBUG_LOG',
+    'WARNING_LOG', 
+    'ERROR_LOG',
+    'FATAL_LOG',
+    'INFO_LOG',
+    'TRACE_LOG'
+]
+
+def fix_logging_in_file(filepath):
+    """Fix logging macro calls in a single file."""
+    with open(filepath, 'r', encoding='utf-8', errors='ignore') as f:
+        content = f.read()
+    
+    original = content
+    fixes = 0
+    
+    for macro in LOGGING_MACROS:
+        # Match macro calls without parameter: MACRO()
+        # But not already with parameter: MACRO(m_logger) or MACRO(logger)
+        pattern = rf'\b{macro}\s*\(\s*\)'
+        replacement = f'{macro}(m_logger)'
+        
+        matches = re.findall(pattern, content)
+        if matches:
+            content = re.sub(pattern, replacement, content)
+            fixes += len(matches)
+    
+    if fixes > 0:
+        with open(filepath, 'w', encoding='utf-8') as f:
+            f.write(content)
+    
+    return fixes
+
+def main():
+    if len(sys.argv) < 2:
+        print("Usage: fix_logging_macros.py <directory>")
+        sys.exit(1)
+    
+    base_dir = sys.argv[1]
+    total_fixes = 0
+    files_fixed = 0
+    
+    for root, dirs, files in os.walk(base_dir):
+        # Skip build directories and Qt5 sources
+        if 'build' in root or 'qt5-before' in root:
+            continue
+            
+        for file in files:
+            if file.endswith(('.cpp', '.h', '.hpp', '.cc', '.cxx')):
+                filepath = os.path.join(root, file)
+                fixes = fix_logging_in_file(filepath)
+                if fixes > 0:
+                    files_fixed += 1
+                    total_fixes += fixes
+                    print(f"Fixed {fixes} logging calls in {filepath}")
+    
+    print(f"\nTotal: {total_fixes} logging macro calls fixed in {files_fixed} files")
+
+if __name__ == '__main__':
+    main()
\ No newline at end of file
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GeneratorGrantleeBase.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GeneratorGrantleeBase.cpp
index 34a1eafae..d825f5b23 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GeneratorGrantleeBase.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GeneratorGrantleeBase.cpp
@@ -11,12 +11,11 @@
 #include <grantlee/engine.h>
 
 using namespace CodeGen;
-GeneratorGrantleeBase::GeneratorGrantleeBase(const char *loggerName)
-  : m_engine(new Grantlee::Engine)
+GeneratorGrantleeBase::GeneratorGrantleeBase(const char *loggerName) : m_engine(new Grantlee::Engine)
   , m_ctx(new Grantlee::Context)
   , m_structBuilder(nullptr)
-  .getNGLLogger(loggerName))
-{
+  .getNGLLogger(loggerName)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 GeneratorGrantleeBase::~GeneratorGrantleeBase()
@@ -48,7 +47,7 @@ bool GeneratorGrantleeBase::setTemplate(const QString &templateName, const QStri
   m_template = m_engine->newTemplate(tmpl, QStringLiteral("myTemplate"));
   if (m_template->error())
   {
-    WARNING_LOG() << "Error parsing template '" << templateName
+    WARNING_LOG(m_logger) << "Error parsing template '" << templateName
                           << "': " << m_template->errorString();
     return false;
   }
@@ -88,7 +87,7 @@ bool GeneratorGrantleeBase::generateData(const QString &templateName,
   QFile f(outDirectory + QLatin1Char('/') + outFilename);
   if (!f.open(QIODevice::WriteOnly))
   {
-    ERROR_LOG() << "Error opening file '" << f.fileName() << "' for writing: "
+    ERROR_LOG(m_logger) << "Error opening file '" << f.fileName() << "' for writing: "
                         << f.errorString() << "(" << f.error() << ")";
     return false;
   }
@@ -96,7 +95,7 @@ bool GeneratorGrantleeBase::generateData(const QString &templateName,
   f.write(outData);
   f.close();
 
-  DEBUG_LOG() << "Written data to " << f.fileName();
+  DEBUG_LOG(m_logger) << "Written data to " << f.fileName();
   return true;
 }
 
@@ -105,7 +104,7 @@ bool GeneratorGrantleeBase::readFile(const QString &filename, QString &data) con
   QFile f(filename);
   if (!f.open(QIODevice::ReadOnly))
   {
-    ERROR_LOG() << "Error opening file " << filename
+    ERROR_LOG(m_logger) << "Error opening file " << filename
                         << " - error: " << f.errorString();
     return false;
   }
@@ -121,7 +120,7 @@ bool GeneratorGrantleeBase::getFilenameFromData(const QString &dataToParse, QStr
   int idx = dataToParse.indexOf(filenameMarker);
   if (idx < 0)
   {
-    ERROR_LOG() << "Could not find marker '" << filenameMarker
+    ERROR_LOG(m_logger) << "Could not find marker '" << filenameMarker
                         << "' in data!";
     return false;
   }
@@ -129,7 +128,7 @@ bool GeneratorGrantleeBase::getFilenameFromData(const QString &dataToParse, QStr
   int endIdx = dataToParse.indexOf(QLatin1Char('\n'), idx);
   if (endIdx < 0)
   {
-    ERROR_LOG() << "Could not find end marker '\\n' in data!";
+    ERROR_LOG(m_logger) << "Could not find end marker '\\n' in data!";
     return false;
   }
   filename = dataToParse.mid(idx, endIdx - idx).trimmed();
@@ -160,12 +159,12 @@ void GeneratorGrantleeBase::addCustomFunctions(const QVector<CustomServiceFuncti
       break;
     case CustomServiceFunctionInformation::Type::DbNotify:
       
-      WARNING_LOG() << "Internal error - Trying to handle DbNotify in addCustomFunctions(): "
+      WARNING_LOG(m_logger) << "Internal error - Trying to handle DbNotify in addCustomFunctions(): "
                             << csfi.methodName;
       delete customFunctionWrapper;
       break;
     }
-    DEBUG_LOG() << "Added custom db function " << csfi.methodName;
+    DEBUG_LOG(m_logger) << "Added custom db function " << csfi.methodName;
   }
   m_ctx->insert(QStringLiteral("custom_dtc_procs"), vlCustomDtcFunctions);
   m_ctx->insert(QStringLiteral("custom_db_procs"), vlCustomDbFunctions);
@@ -185,17 +184,17 @@ void GeneratorGrantleeBase::exportUsedServices(const XmlReader *reader)
     const int idx = fullPath.lastIndexOf(QLatin1Char('.'));
     if (idx < 0)
     {
-      ERROR_LOG() << "Could not parse file path: " << fullPath;
+      ERROR_LOG(m_logger) << "Could not parse file path: " << fullPath;
       continue;
     }
     const QString idlFile = fullPath.left(idx);
     if (idlFile.isEmpty())
     {
-      WARNING_LOG() << "Could not find idl file for service " << svc;
+      WARNING_LOG(m_logger) << "Could not find idl file for service " << svc;
       continue;
     }
     idlServicesWrapper->addService(svc, idlFile);
-    DEBUG_LOG() << "Added service " << svc;
+    DEBUG_LOG(m_logger) << "Added service " << svc;
   }
   m_ctx->insert(QStringLiteral("ext_services"), idlServicesWrapper);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GeneratorGrantleeBase.h b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GeneratorGrantleeBase.h
index 54b5d19fa..8b84b52f0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GeneratorGrantleeBase.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GeneratorGrantleeBase.h
@@ -35,6 +35,7 @@ public:
                     const QString &outDirectory);
 
 protected:
+  NGL::INGLLogger &m_logger;
   explicit GeneratorGrantleeBase(const char *loggerName);
 
   bool initInternal(const XmlReader *reader, StructBuilder *structBuilder);
@@ -43,6 +44,7 @@ protected:
   void addCustomFunctions(const QVector<CustomServiceFunctionInformation> &customFunctions);
   void exportUsedServices(const XmlReader *reader);
 protected:
+  NGL::INGLLogger &m_logger;
   Grantlee::Engine *m_engine;
   Grantlee::Context *m_ctx;
   Grantlee::Template m_template;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/SqlGenerator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/SqlGenerator.cpp
index bf50b87d6..08aa8d696 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/SqlGenerator.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/SqlGenerator.cpp
@@ -19,13 +19,12 @@ static QString getExerciseSchemaName(int exerciseId)
   return QStringLiteral("ex_") + QString::number(exerciseId);
 }
 
-SqlGenerator::SqlGenerator(XmlReader *xmlReader, StructBuilder *structBuilder)
-  : m_xmlReader(xmlReader)
+SqlGenerator::SqlGenerator(XmlReader *xmlReader, StructBuilder *structBuilder) : m_xmlReader(xmlReader)
   , m_structBuilder(structBuilder)
   , m_createdByXmlFile(false)
   , m_isValid(true)
-  , m_exerciseId(0)
-{}
+  , m_exerciseId(0),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 SqlGenerator::SqlGenerator(const QString &xmlFile)
   : m_xmlReader(new XmlReader)
@@ -49,7 +48,7 @@ SqlGenerator::~SqlGenerator()
 
 bool SqlGenerator::generateData(int exerciseId)
 {
-  DEBUG_LOG() << "Generating SQL data for service " << getServiceAbbr() << " in exercise " << exerciseId << ", this: " << this;
+  DEBUG_LOG(m_logger) << "Generating SQL data for service " << getServiceAbbr() << " in exercise " << exerciseId << ", this: " << this;
 
   m_exerciseId = exerciseId;
   m_sqlGlobal = SqlStatements();
@@ -134,11 +133,11 @@ bool SqlGenerator::handleViews()
 
 bool SqlGenerator::handleView(const ViewInformation &vi)
 {
-  DEBUG_LOG() << "Handle view " << vi.name;
+  DEBUG_LOG(m_logger) << "Handle view " << vi.name;
 
   const QString parent = vi.baseTable;
 
-  DEBUG_LOG() << "Parent = " << parent;
+  DEBUG_LOG(m_logger) << "Parent = " << parent;
 
   if (!parent.isEmpty())
   {
@@ -146,7 +145,7 @@ bool SqlGenerator::handleView(const ViewInformation &vi)
     const QString createViewStmt(QStringLiteral("CREATE OR REPLACE VIEW %1 AS SELECT %2\nFROM %3\nWHERE %4;\n"));
     const QString dropViewStmt(QStringLiteral("DROP VIEW IF EXISTS %1;"));
 
-    DEBUG_LOG() << "csi.primaryTable = " << csi.primaryTable.data()->name;
+    DEBUG_LOG(m_logger) << "csi.primaryTable = " << csi.primaryTable.data()->name;
 
     if (!csi.primaryTable.isNull())
     {
@@ -166,7 +165,7 @@ bool SqlGenerator::handleView(const ViewInformation &vi)
           fqColumnNames += mi.db.table + QLatin1Char('.') + mi.db.columnName + QLatin1String(" AS ") + mi.db.getColumnNameView();
       }
 
-      DEBUG_LOG() << "fqColumnNames = " << fqColumnNames.join(QStringLiteral(", "));
+      DEBUG_LOG(m_logger) << "fqColumnNames = " << fqColumnNames.join(QStringLiteral(", "));
 
 
       if (!whereConditions.isEmpty())
@@ -185,11 +184,11 @@ bool SqlGenerator::handleView(const ViewInformation &vi)
 
 bool SqlGenerator::handleTable(const CompleteTableInformation &cti)
 {
-  DEBUG_LOG() << "Handle table " << cti.name;
+  DEBUG_LOG(m_logger) << "Handle table " << cti.name;
 
   if (cti.columns.isEmpty())
   {
-    WARNING_LOG() << "Table " << cti.name
+    WARNING_LOG(m_logger) << "Table " << cti.name
                           << " has no DatabaseServiceStruct - not generating anything for this!";
     return true;
   }
@@ -532,11 +531,11 @@ bool SqlGenerator::handleEnumeration(const EnumInformation &ei)
 
 QStringList SqlGenerator::handleEnumeration(const EnumInformation &ei, const QString &dbSchema) const
 {
-  DEBUG_LOG() << "Handle enumeration " << ei.enumName;
+  DEBUG_LOG(m_logger) << "Handle enumeration " << ei.enumName;
 
   if (ei.tableName.isEmpty())
   {
-    INFO_LOG() << "No table for enumeration " << ei.enumName << " - not creating inserts for this enum";
+    INFO_LOG(m_logger) << "No table for enumeration " << ei.enumName << " - not creating inserts for this enum";
     return QStringList();
   }
 
@@ -565,7 +564,7 @@ bool SqlGenerator::generateDbNotifications(const QString &tableName,
     if (notification.paramNames.isEmpty() ||
         notification.paramNames.size() > 1)
     {
-      ERROR_LOG() << "Can not handle more than one parameter";
+      ERROR_LOG(m_logger) << "Can not handle more than one parameter";
       continue;
     }
     generateDbNotification(notification, ed);
@@ -705,7 +704,7 @@ QStringList SqlGenerator::getDbSettings(const QString &dbSchema) const
 
 QStringList SqlGenerator::getAllSqlStmts(const QString &dbSchema, ExerciseDependency ed) const
 {
-  DEBUG_LOG() << "Creating statements for service " << getServiceAbbr() << " in exercise " << m_exerciseId << ", this: " << this;
+  DEBUG_LOG(m_logger) << "Creating statements for service " << getServiceAbbr() << " in exercise " << m_exerciseId << ", this: " << this;
 
   QStringList data;
 
@@ -796,7 +795,7 @@ bool SqlGenerator::writeSql(const QString &filePath, ExerciseDependency ed)
   const SqlStatements &sql = getStatements(ed);
   if (sql.isEmpty())
   {
-    DEBUG_LOG() << "Sql file is emtpy: " << sqlFile;
+    DEBUG_LOG(m_logger) << "Sql file is emtpy: " << sqlFile;
     return writeFile(sqlFile, QString());
   }
 
@@ -806,7 +805,7 @@ bool SqlGenerator::writeSql(const QString &filePath, ExerciseDependency ed)
                               getExerciseSchemaName(m_exerciseId) :
                               getServiceAbbr());
 
-  INFO_LOG() << "Creating sql-stmt for schema (" << dbSchema << ")";
+  INFO_LOG(m_logger) << "Creating sql-stmt for schema (" << dbSchema << ")";
   return writeSqlToFile(dbSchema, sqlFile, ed);
 }
 
@@ -929,7 +928,7 @@ bool SqlGenerator::writeFile(const QString &fn, const QString &content) const
   QFile f(fn);
   if (!f.open(QIODevice::WriteOnly | QIODevice::Truncate))
   {
-    ERROR_LOG() << "Error opening file '" << f.fileName() << "' for writing: "
+    ERROR_LOG(m_logger) << "Error opening file '" << f.fileName() << "' for writing: "
                         << f.errorString();
     return false;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/SqlGenerator.h b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/SqlGenerator.h
index 0d467f203..46a441206 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/SqlGenerator.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/SqlGenerator.h
@@ -106,6 +106,7 @@ public:
 
 protected:
 
+  NGL::INGLLogger &m_logger;
 private:
   bool handleTables();
   bool handleViews();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/StructBuilder.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/StructBuilder.cpp
index a7f6f755b..d41c638e1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/StructBuilder.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/StructBuilder.cpp
@@ -200,6 +200,8 @@ StructBuilder::StructBuilder(XmlReader *xmlReader)
   : m_needPoint3d(false)
   , m_needPgArrayInclude(false)
   , m_xmlReader(xmlReader)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("CodeGen.StructBuilder"))
+  , m_loggerCSV(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("fileCSV"))
 {}
 
 bool StructBuilder::buildStructures()
@@ -266,7 +268,7 @@ bool StructBuilder::buildStructures()
     const ServiceTypeStruct sts = extractServiceAndTypeFromTypename(tti.name);
     if (!sts.isExternalType())
     {
-      ERROR_LOG() << "Invalid external topic type name: '" << tti.name << "'";
+      ERROR_LOG(m_logger) << "Invalid external topic type name: '" << tti.name << "'";
       return false;
     }
     if (!handleIdlStructInfo(tti, m_externalTopicTypes, sts.service))
@@ -287,7 +289,7 @@ bool StructBuilder::handleEnum(const EnumInformation &ei)
   QSharedPointer<TableInformation> ti = m_xmlReader->getTable(ei.tableName);
   if (ti.isNull())
   {
-    WARNING_LOG() << "Could not find table information for enum: "
+    WARNING_LOG(m_logger) << "Could not find table information for enum: "
                           << ei.enumName << ", table: " << ei.tableName;
     return false;
   }
@@ -323,12 +325,12 @@ EnumInformation StructBuilder::enumInformationByType(const QString &type, bool c
   {
     if (!checkExternals)
     {
-      ERROR_LOG() << "Could not find enumeration '" << type << "'";
+      ERROR_LOG(m_logger) << "Could not find enumeration '" << type << "'";
       return EnumInformation();
     }
     if (extInfo.type.isEmpty())
     {
-      WARNING_LOG() << "Could not parse external enumeration '" << type << "'";
+      WARNING_LOG(m_logger) << "Could not parse external enumeration '" << type << "'";
       return EnumInformation();
     }
     return m_xmlReader->getExternalEnumeration(extInfo.service, extInfo.type, verbose);
@@ -340,13 +342,13 @@ EnumInformation StructBuilder::enumInformationByType(const QString &type, bool c
       return ei;
   }
   if (verbose)
-    ERROR_LOG() << "Could not find enumeration '" << type << "'";
+    ERROR_LOG(m_logger) << "Could not find enumeration '" << type << "'";
   return EnumInformation();
 }
 
 CompleteTopicTypeInformation StructBuilder::topicTypeInformationByStructType(const QString &type, bool checkExternals)
 {
-  DEBUG_LOG() << "topicTypeInformationByStructType(" << type << ")";
+  DEBUG_LOG(m_logger) << "topicTypeInformationByStructType(" << type << ")";
   if (type.isEmpty())
     return CompleteTopicTypeInformation();
 
@@ -364,26 +366,26 @@ CompleteTopicTypeInformation StructBuilder::topicTypeInformationByStructType(con
       return csi;
   }
   
-  DEBUG_LOG() << "Type '" << type << "' not found in idlStructs - maybe not yet exported or an enum";
+  DEBUG_LOG(m_logger) << "Type '" << type << "' not found in idlStructs - maybe not yet exported or an enum";
   const QVector<TopicTypeInformation> idlStructsToGenerate = m_xmlReader->getIdlStructToGenerate();
   for (const TopicTypeInformation &tti : idlStructsToGenerate)
   {
     if (tti.name == type)
     {
-      DEBUG_LOG() << "Found not yet exported type " << type;
+      DEBUG_LOG(m_logger) << "Found not yet exported type " << type;
       if (!handleIdlStructInfo(tti, m_topicTypeInfos))
         return CompleteTopicTypeInformation();
       return topicTypeInformationByStructType(type);
     }
   }
-  ERROR_LOG() << "Could not find type '" << type << "' in idlStructs";
+  ERROR_LOG(m_logger) << "Could not find type '" << type << "' in idlStructs";
   return CompleteTopicTypeInformation();
 }
 
 CompleteTopicTypeInformation StructBuilder::externalTopicTypeByStructType(const ServiceTypeStruct &sts)
 {
   const QString typeToSearch = sts.fqType();
-  DEBUG_LOG() << "externalTopicTypeByStructType " << typeToSearch;
+  DEBUG_LOG(m_logger) << "externalTopicTypeByStructType " << typeToSearch;
   for (const CompleteTopicTypeInformation &ctti : std::as_const(m_externalTopicTypes))
   {
     if (ctti.name == typeToSearch)
@@ -396,13 +398,13 @@ CompleteTopicTypeInformation StructBuilder::externalTopicTypeByStructType(const
 
 bool StructBuilder::loadExternalTopicType(const ServiceTypeStruct &sts)
 {
-  DEBUG_LOG() << "loadExternalTopicType(" << sts.fqType() << ")";
+  DEBUG_LOG(m_logger) << "loadExternalTopicType(" << sts.fqType() << ")";
 
   
   const TopicTypeInformation tti = m_xmlReader->loadExternalTopicType(sts.service, sts.type);
   if (!tti.isValid())
   {
-    DEBUG_LOG() << "Could not find external topic '" << sts.fqType() << "'";
+    DEBUG_LOG(m_logger) << "Could not find external topic '" << sts.fqType() << "'";
     return false;
   }
   
@@ -473,11 +475,11 @@ bool StructBuilder::handleTable(const ServiceStructInformation &ssi)
   QVector<QString> tableNames;
   if (!getColumnsFromTable(ssi.primaryTable, columns, tableNames))
   {
-    WARNING_LOG() << "Could not retrieve columns from table "
+    WARNING_LOG(m_logger) << "Could not retrieve columns from table "
                           << ssi.primaryTable;
     return false;
   }
-  DEBUG_LOG() << "Got " << columns.size() << " columns for table "
+  DEBUG_LOG(m_logger) << "Got " << columns.size() << " columns for table "
                       << ssi.primaryTable;
 
   QSet<QString> sqlTables;
@@ -487,12 +489,12 @@ bool StructBuilder::handleTable(const ServiceStructInformation &ssi)
   MemberInformation miPkFirstTable, miPkLastTable;
   for (const ColumnInformationEx &ci : std::as_const(columns))
   {
-    DEBUG_LOG() << "handling column " << ci.columnName;
+    DEBUG_LOG(m_logger) << "handling column " << ci.columnName;
 
     const QSharedPointer<TableInformation> ti = ci.table;
     if (ti.isNull())
     {
-      WARNING_LOG() << "Could not find table for column " << ci.columnName
+      WARNING_LOG(m_logger) << "Could not find table for column " << ci.columnName
                             << " primary table is " << ssi.primaryTable.data();
       return false;
     }
@@ -560,14 +562,14 @@ bool StructBuilder::handleTable(const ServiceStructInformation &ssi)
                 camelCaseString(fki->destination.tableName, true);
 
             EnumInformation ei = enumInformationByType(enumType, true, false);
-            DEBUG_LOG() << "Checking if " << enumType << " is an enum: " << ei.isValid();
+            DEBUG_LOG(m_logger) << "Checking if " << enumType << " is an enum: " << ei.isValid();
             if (!ei.isValid() && fki->destination.tableName.contains(QLatin1Char('_')))
             {
               
               enumType = fki->destination.service + QStringLiteral("::") +
                   camelCaseString(fki->destination.tableName.section(QLatin1Char('_'), 1), true);
               ei = enumInformationByType(enumType, true, false);
-              DEBUG_LOG() << "Checking if " << enumType << " is an enum: " << ei.isValid();
+              DEBUG_LOG(m_logger) << "Checking if " << enumType << " is an enum: " << ei.isValid();
             }
             if (ei.isValid() &&
                 ei.tableName == fki->destination.tableName)
@@ -676,8 +678,8 @@ bool StructBuilder::handleIdlStructInfo(const TopicTypeInformation &tti,
     
     if (idlData.isKey && idlData.isOptional)
     {
-      ERROR_LOG() << "Column option isKey & isOptional are mutually exclusive!";
-      ERROR_LOG() << "Change column '" << tti.name << "."
+      ERROR_LOG(m_logger) << "Column option isKey & isOptional are mutually exclusive!";
+      ERROR_LOG(m_logger) << "Change column '" << tti.name << "."
                           << idlData.name << "'' to have either key or optional parameter ";
       return false;
     }
@@ -1045,7 +1047,7 @@ bool StructBuilder::fixupQVariantConversions(MemberInformation &mi) const
   }
   else
   {
-    ERROR_LOG() << "Unknown cpp datatype: " << mi.cpp.type;
+    ERROR_LOG(m_logger) << "Unknown cpp datatype: " << mi.cpp.type;
     return false;
   }
   return true;
@@ -1080,7 +1082,7 @@ QVector<MemberInformation> StructBuilder::buildDbTableInformationFromIdlData(con
       const CompleteTopicTypeInformation cttiChild = topicTypeInformationByStructType(member.type);
       if (!cttiChild.isValid())
       {
-        ERROR_LOG() << "Can not find structure '" << member.type << "'";
+        ERROR_LOG(m_logger) << "Can not find structure '" << member.type << "'";
         continue;
       }
       QString pre;
@@ -1100,7 +1102,7 @@ QVector<MemberInformation> StructBuilder::buildDbTableInformationFromIdlData(con
       const CompleteTopicTypeInformation &cttiChild = topicTypeInformationByStructType(member.dataTypeInfo->innerDataType()->idlType());
       if (!cttiChild.isValid())
       {
-        ERROR_LOG() << "Can not find structure '" << member.type << "'";
+        ERROR_LOG(m_logger) << "Can not find structure '" << member.type << "'";
         continue;
       }
       buildDbTableInformationFromIdlData(cttiChild,
@@ -1194,7 +1196,7 @@ bool StructBuilder::buildJSonStructureInformationFromIdlData(const CompleteTopic
       const CompleteTopicTypeInformation cttiChild = topicTypeInformationByStructType(member.type);
       if (!cttiChild.isValid())
       {
-        ERROR_LOG() << "Can not find structure '" << member.type << "'";
+        ERROR_LOG(m_logger) << "Can not find structure '" << member.type << "'";
         continue;
       }
       if (!buildJSonStructureInformationFromIdlData(cttiChild))
@@ -1221,7 +1223,7 @@ bool StructBuilder::buildJSonStructureInformationFromIdlData(const CompleteTopic
             return false;
         }
         else
-          WARNING_LOG() << "Can not find structure '" << member.type << "'";
+          WARNING_LOG(m_logger) << "Can not find structure '" << member.type << "'";
       }
 
       
@@ -1316,11 +1318,11 @@ QMap<QString, CompleteTableInformation> StructBuilder::getRecordingTopicTables()
       continue;
     if (!ctti.isDataObject)
     {
-      WARNING_LOG() << "Trying to record topic '" << ctti.name
+      WARNING_LOG(m_logger) << "Trying to record topic '" << ctti.name
                             << "' which is not directly published - ignoring!";
       continue;
     }
-    DEBUG_LOG() << "Rec table: " << ctti.name;
+    DEBUG_LOG(m_logger) << "Rec table: " << ctti.name;
     miPrimaryKey.db.table = ctti.name;
     ret.insert(ctti.name, getRecordingTopicTable(ctti, miPrimaryKey));
   }
@@ -1402,7 +1404,7 @@ StructBuilder::ServiceTypeStruct StructBuilder::extractServiceAndTypeFromTypenam
     extTypeRef = sl.at(1);
   }
   else
-    WARNING_LOG() << "Error parsing type: " << type;
+    WARNING_LOG(m_logger) << "Error parsing type: " << type;
   StructBuilder::ServiceTypeStruct ret;
   if (!extServiceRef.isEmpty())
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/StructBuilder.h b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/StructBuilder.h
index bd36f0fe2..a615e5939 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/StructBuilder.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/StructBuilder.h
@@ -335,5 +335,7 @@ private:
   bool                                  m_needPgArrayInclude; 
 
   XmlReader                             *m_xmlReader;
+  NGL::INGLLogger                       &m_logger;
+  NGL::INGLLogger                       &m_loggerCSV;
 };
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.cpp
index e46339942..44a8a6af8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.cpp
@@ -31,8 +31,7 @@ private:
   const QByteArray m_msg;
 };
 
-XmlReader::XmlReader()
-{}
+XmlReader::XmlReader() : m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 bool XmlReader::readServiceFile(const QString &svcFile,
                                 const QString &idlServiceInfoFile,
@@ -79,18 +78,18 @@ bool XmlReader::readServiceFile(const QString &svcFile,
   QFile f(svcFile);
   if (!f.exists())
   {
-    ERROR_LOG() << "Service file '" << svcFile << "' not found!";
+    ERROR_LOG(m_logger) << "Service file '" << svcFile << "' not found!";
     return false;
   }
   if (!f.open(QIODevice::ReadOnly))
   {
     m_errorString = QLatin1String("Can not open service file '") + svcFile +
         QLatin1String("' for reading: ") + f.errorString();
-    ERROR_LOG() << m_errorString;
+    ERROR_LOG(m_logger) << m_errorString;
     return false;
   }
 
-  INFO_LOG() << "SvcFile: " << svcFile;
+  INFO_LOG(m_logger) << "SvcFile: " << svcFile;
 
   
   QString errMsg;
@@ -102,7 +101,7 @@ bool XmlReader::readServiceFile(const QString &svcFile,
     m_errorString = QLatin1String("Error parsing service file '") + svcFile + QLatin1String("': ") +
         errMsg + QLatin1String(" at ") + QString::number(errLine) +
         QLatin1Char(':') + QString::number(errColumn);
-    ERROR_LOG() << m_errorString;
+    ERROR_LOG(m_logger) << m_errorString;
     return false;
   }
   
@@ -118,7 +117,7 @@ bool XmlReader::readServiceFile(const QString &svcFile,
   {
     m_errorString = QLatin1String("Xml file '") + svcFile +
         QLatin1String("' is not a valid service file: service name/namespace is missing");
-    ERROR_LOG() << m_errorString;
+    ERROR_LOG(m_logger) << m_errorString;
     return false;
   }
   m_svcNamespace = getAttribute(domRoot, QStringLiteral("namespace"));
@@ -129,13 +128,13 @@ bool XmlReader::readServiceFile(const QString &svcFile,
   QString devModeStr = getAttribute(domRoot, QStringLiteral("devMode"), true);
   m_svcDevMode = devModeStr == QStringLiteral("1") ||
       devModeStr == QStringLiteral("true");
-  INFO_LOG() << "devMode: " << m_svcDevMode;
+  INFO_LOG(m_logger) << "devMode: " << m_svcDevMode;
 
   const QString groupNamesString = getAttribute(domRoot, QStringLiteral("groups"), true);
   if (!groupNamesString.isEmpty())
   {
     m_groupNames = groupNamesString.split(QLatin1Char(','), Qt::SkipEmptyParts);
-    INFO_LOG() << "groups: " << groupNamesString;
+    INFO_LOG(m_logger) << "groups: " << groupNamesString;
   }
   else
     m_groupNames.clear();
@@ -150,12 +149,12 @@ bool XmlReader::readServiceFile(const QString &svcFile,
     if (m_exerciseDependency != ExerciseDependency::Global &&
         m_exerciseDependency != ExerciseDependency::GlobalAndExercise)
     {
-      WARNING_LOG() << "Service " << getServiceNamespace()
+      WARNING_LOG(m_logger) << "Service " << getServiceNamespace()
                             << " is not marked as exercise independent but should be started in group Core/Master";
     }
   }
 
-  INFO_LOG() << "exerciseDependency: " << (int)m_exerciseDependency;
+  INFO_LOG(m_logger) << "exerciseDependency: " << (int)m_exerciseDependency;
   if ( domRoot.hasAttribute(QStringLiteral("prio")))
   {
     m_prio = getAttribute(domRoot, QStringLiteral("prio"), 0).toInt();
@@ -167,7 +166,7 @@ bool XmlReader::readServiceFile(const QString &svcFile,
   catch (const XmlReaderException &ex)
   {
     m_errorString = QLatin1String("Error parsing dbServiceStructs: ") + QLatin1String(ex.what());
-    ERROR_LOG() << m_errorString;
+    ERROR_LOG(m_logger) << m_errorString;
     return false;
   }
 
@@ -178,7 +177,7 @@ bool XmlReader::readServiceFile(const QString &svcFile,
   catch (const XmlReaderException &ex)
   {
     m_errorString = QLatin1String("Error parsing dbtables: ") + QLatin1String(ex.what());
-    ERROR_LOG() << m_errorString;
+    ERROR_LOG(m_logger) << m_errorString;
     return false;
   }
 
@@ -189,7 +188,7 @@ bool XmlReader::readServiceFile(const QString &svcFile,
   catch (const XmlReaderException &ex)
   {
     m_errorString = QLatin1String("Error parsing dbviews: ") + QLatin1String(ex.what());
-    ERROR_LOG() << m_errorString;
+    ERROR_LOG(m_logger) << m_errorString;
     return false;
   }
 
@@ -200,7 +199,7 @@ bool XmlReader::readServiceFile(const QString &svcFile,
   catch (const XmlReaderException &ex)
   {
     m_errorString = QLatin1String("Error parsing enumerations: ") + QLatin1String(ex.what());
-    ERROR_LOG() << m_errorString;
+    ERROR_LOG(m_logger) << m_errorString;
     return false;
   }
 
@@ -211,7 +210,7 @@ bool XmlReader::readServiceFile(const QString &svcFile,
   catch (const XmlReaderException &ex)
   {
     m_errorString = QLatin1String("Error parsing custom dtc functions: ") + QLatin1String(ex.what());
-    ERROR_LOG() << m_errorString;
+    ERROR_LOG(m_logger) << m_errorString;
     return false;
   }
 
@@ -222,7 +221,7 @@ bool XmlReader::readServiceFile(const QString &svcFile,
   catch (const XmlReaderException &ex)
   {
     m_errorString = QLatin1String("Error parsing idl strucs: ") + QLatin1String(ex.what());
-    ERROR_LOG() << m_errorString;
+    ERROR_LOG(m_logger) << m_errorString;
     return false;
   }
 
@@ -233,7 +232,7 @@ bool XmlReader::readServiceFile(const QString &svcFile,
   catch (const XmlReaderException &ex)
   {
     m_errorString = QLatin1String("Error parsing function topics: ") + QLatin1String(ex.what());
-    ERROR_LOG() << m_errorString;
+    ERROR_LOG(m_logger) << m_errorString;
     return false;
   }
 
@@ -331,7 +330,7 @@ void XmlReader::parseDBSserviceStructs(const QDomElement &rootElement)
 
     domDbStruct = domDbStruct.nextSiblingElement(domDbStruct.tagName());
   }
-  INFO_LOG() << "Read " << m_structsToGenerate.size() << " database service struct(s)";
+  INFO_LOG(m_logger) << "Read " << m_structsToGenerate.size() << " database service struct(s)";
 }
 
 void XmlReader::parseDBTables(const QDomElement &rootElement)
@@ -373,7 +372,7 @@ void XmlReader::parseDBTables(const QDomElement &rootElement)
     domDbTable = domDbTable.nextSiblingElement(domDbTable.tagName());
   }
 
-  INFO_LOG() << "Read " << m_tables.size() << " database table(s)";
+  INFO_LOG(m_logger) << "Read " << m_tables.size() << " database table(s)";
 }
 
 void XmlReader::parseDBViews(const QDomElement &rootElement)
@@ -393,7 +392,7 @@ void XmlReader::parseDBViews(const QDomElement &rootElement)
     vi->filter = getAttribute(domDbView, QStringLiteral("filter"));
     vi->exerciseDependency = string2ExerciseDependency(getAttribute(domDbView, QStringLiteral("exerciseDependency"), true));
 
-    DEBUG_LOG() << "Base table = " << vi->baseTable;
+    DEBUG_LOG(m_logger) << "Base table = " << vi->baseTable;
 
 
     m_views.insert(vi->name, vi);
@@ -401,7 +400,7 @@ void XmlReader::parseDBViews(const QDomElement &rootElement)
     domDbView = domDbView.nextSiblingElement(domDbView.tagName());
   }
 
-  INFO_LOG() << "Read " << m_views.size() << " database view(s)";
+  INFO_LOG(m_logger) << "Read " << m_views.size() << " database view(s)";
 }
 
 void XmlReader::parseEnumerations(const QDomElement &rootElement)
@@ -432,7 +431,7 @@ void XmlReader::parseEnumerations(const QDomElement &rootElement)
 
     domEnum = domEnum.nextSiblingElement(domEnum.tagName());
   }
-  INFO_LOG() << "Read " << m_enumerations.size() << " enumeration(s)";
+  INFO_LOG(m_logger) << "Read " << m_enumerations.size() << " enumeration(s)";
 }
 
 void XmlReader::parseCustomDtcFunctions(const QDomElement &rootElement)
@@ -452,7 +451,7 @@ void XmlReader::parseCustomDtcFunctions(const QDomElement &rootElement)
     }
     domElement = domElement.nextSiblingElement(domElement.tagName());
   }
-  INFO_LOG() << "Read " << m_enumerations.size() << " customDtcFunction(s)";
+  INFO_LOG(m_logger) << "Read " << m_enumerations.size() << " customDtcFunction(s)";
 }
 
 
@@ -510,7 +509,7 @@ void XmlReader::parseTopicTypes(const QDomElement &rootElement)
   }
 
 
-  INFO_LOG() << "Read " << m_idlStructsToGenerate.size() << " idl struct(s)";
+  INFO_LOG(m_logger) << "Read " << m_idlStructsToGenerate.size() << " idl struct(s)";
 }
 
 void XmlReader::parseFunctionTopics(const QDomElement &rootElement)
@@ -566,7 +565,7 @@ ColumnInformation XmlReader::parseTableColumn(const QDomElement &column, const Q
   }
 
   if (ci.columnName.toLower() != ci.columnName)
-    WARNING_LOG() << "Column " << ci.columnName << " in Table "
+    WARNING_LOG(m_logger) << "Column " << ci.columnName << " in Table "
                           << tableName << " has has upper-case chars which is not allowed!";
 
   return ci;
@@ -726,18 +725,18 @@ DbNotifcationInformation XmlReader::parseDbNotification(const QDomElement &custo
 
 TopicTypeInformation XmlReader::loadExternalTopicType(const QString &externalServiceName, const QString &topicTypeName)
 {
-  DEBUG_LOG() << "externalServiceName: " << externalServiceName << ", topicTypeName: " << topicTypeName;
+  DEBUG_LOG(m_logger) << "externalServiceName: " << externalServiceName << ", topicTypeName: " << topicTypeName;
 
   if (!loadExternalService(externalServiceName))
   {
-    WARNING_LOG() << "Could not find service " << externalServiceName
+    WARNING_LOG(m_logger) << "Could not find service " << externalServiceName
                           << " referenced by external topic " << topicTypeName;
     return TopicTypeInformation();
   }
   auto extXmlReader = m_externalXmlInformations.value(externalServiceName);
   if (!extXmlReader)
   {
-    ERROR_LOG() << "Could not find service xml file for service '" << externalServiceName << "'";
+    ERROR_LOG(m_logger) << "Could not find service xml file for service '" << externalServiceName << "'";
     return TopicTypeInformation();
   }
 
@@ -749,7 +748,7 @@ TopicTypeInformation XmlReader::loadExternalTopicType(const QString &externalSer
     m_usedServices[externalServiceName] = true;
     return tti;
   }
-  WARNING_LOG() << "Could not find topic " << topicTypeName
+  WARNING_LOG(m_logger) << "Could not find topic " << topicTypeName
                         << " in external service definition for service "
                         << externalServiceName;
   return TopicTypeInformation();
@@ -757,18 +756,18 @@ TopicTypeInformation XmlReader::loadExternalTopicType(const QString &externalSer
 
 EnumInformation XmlReader::getExternalEnumeration(const QString &externalServiceName, const QString &enumName, bool verbose)
 {
-  DEBUG_LOG() << "externalServiceName: " << externalServiceName << ", topicTypeName: " << enumName;
+  DEBUG_LOG(m_logger) << "externalServiceName: " << externalServiceName << ", topicTypeName: " << enumName;
 
   if (!loadExternalService(externalServiceName))
   {
-    WARNING_LOG() << "Could not find service '" << externalServiceName << "'"
+    WARNING_LOG(m_logger) << "Could not find service '" << externalServiceName << "'"
                           << " referenced by external enumeration " << enumName;
     return EnumInformation();
   }
   auto extXmlReader = m_externalXmlInformations.value(externalServiceName);
   if (!extXmlReader)
   {
-    ERROR_LOG() << "Could not find service xml file for service '" << externalServiceName << "'";
+    ERROR_LOG(m_logger) << "Could not find service xml file for service '" << externalServiceName << "'";
     return EnumInformation();
   }
 
@@ -783,7 +782,7 @@ EnumInformation XmlReader::getExternalEnumeration(const QString &externalService
   }
   if (verbose)
   {
-    WARNING_LOG() << "Could not find enumeration " << enumName
+    WARNING_LOG(m_logger) << "Could not find enumeration " << enumName
                           << " in external service definition for '"
                           << externalServiceName << "'";
   }
@@ -821,11 +820,11 @@ bool XmlReader::loadExternalService(const QString &serviceName)
   if (fileName.isEmpty())
     return false;
 
-  DEBUG_LOG() << "xml file for " << serviceName << ": " << fileName;
+  DEBUG_LOG(m_logger) << "xml file for " << serviceName << ": " << fileName;
   auto extXmlReader = QSharedPointer<XmlReader>(new XmlReader);
   if (!extXmlReader->readServiceFile(fileName, QString(), this))
   {
-    WARNING_LOG() << "Error reading service file " << fileName
+    WARNING_LOG(m_logger) << "Error reading service file " << fileName
                           << " for service " << serviceName;
     return false;
   }
@@ -842,7 +841,7 @@ void XmlReader::loadIdlInfofile(const QString &idlServiceInfoFile)
   QFile f(idlServiceInfoFile);
   if (!f.open(QIODevice::ReadOnly))
   {
-    WARNING_LOG() << "Could not read idl service info file " << idlServiceInfoFile;
+    WARNING_LOG(m_logger) << "Could not read idl service info file " << idlServiceInfoFile;
     return;
   }
   const QList<QByteArray> files = f.readAll().split('\n');
@@ -859,7 +858,7 @@ void XmlReader::loadIdlInfofile(const QString &idlServiceInfoFile)
     {
       const auto svcAbbreveation = fn.split(QLatin1Char('.')).at(0).split(QLatin1Char('_')).at(0);
       m_xmlFiles[svcAbbreveation] = fileName;
-      DEBUG_LOG() << "xml: " << svcAbbreveation << " = " << fileName;
+      DEBUG_LOG(m_logger) << "xml: " << svcAbbreveation << " = " << fileName;
     }
     else
     {
@@ -867,7 +866,7 @@ void XmlReader::loadIdlInfofile(const QString &idlServiceInfoFile)
       if (svcAbbreveation.endsWith(QLatin1String("_enums")))
         continue;
       m_idlFiles[svcAbbreveation] = fileName;
-      DEBUG_LOG() << "idl: " << svcAbbreveation << " = " << fileName;
+      DEBUG_LOG(m_logger) << "idl: " << svcAbbreveation << " = " << fileName;
     }
   }
 }
@@ -893,7 +892,7 @@ void XmlReader::getServiceNameInfoFromFilePath(const QStringList &parts)
   
   const QString abbreviation = parts.last().split(QLatin1Char('.')).first().split(QLatin1Char('_')).first();
   const QString serviceName = parts.at(parts.size() - 2);
-  DEBUG_LOG() << "serviceName: " << serviceName << " = " << abbreviation;
+  DEBUG_LOG(m_logger) << "serviceName: " << serviceName << " = " << abbreviation;
   m_fullServiceName2Abbreviation[serviceName] = abbreviation;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.h b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.h
index a39f4c596..7b54ed9ca 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.h
@@ -359,6 +359,7 @@ public:
   XmlReader &operator=(const XmlReader &) = delete;
 
 private:
+  NGL::INGLLogger &m_logger;
   void parseDBSserviceStructs(const QDomElement &rootElement);
   void parseDBTables(const QDomElement &rootElement);
   void parseDBViews(const QDomElement &rootElement);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/main_grantlee.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/main_grantlee.cpp
index 293a61b24..3ee571270 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/main_grantlee.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/main_grantlee.cpp
@@ -77,20 +77,20 @@ int main(int argc, char **argv)
 
   QScopedPointer<CodeGen::XmlReader> reader(new CodeGen::XmlReader);
 
-  DEBUG_LOG() << "ServiceFile: " << options.serviceFile();
-  DEBUG_LOG() << "IdlInfoFile: " << options.idlInfoFile();
+  DEBUG_LOG(m_logger) << "ServiceFile: " << options.serviceFile();
+  DEBUG_LOG(m_logger) << "IdlInfoFile: " << options.idlInfoFile();
   if (!reader->readServiceFile(options.serviceFile(), options.idlInfoFile()))
   {
-    ERROR_LOG() << "Error parsing service file '" << options.serviceFile()
+    ERROR_LOG(m_logger) << "Error parsing service file '" << options.serviceFile()
                         << ": " << reader->errorString();
     return 2;
   }
 
   QDir dir(options.outDir());
-  DEBUG_LOG() << "Directory: " << options.outDir();
+  DEBUG_LOG(m_logger) << "Directory: " << options.outDir();
   if (!dir.exists() && !dir.mkpath(options.outDir()))
   {
-    ERROR_LOG() << "Directory '" << options.outDir()
+    ERROR_LOG(m_logger) << "Directory '" << options.outDir()
                         << "' does not exist and can not be created!";
     return 3;
   }
@@ -98,7 +98,7 @@ int main(int argc, char **argv)
   QScopedPointer<CodeGen::StructBuilder> structBuilder(new CodeGen::StructBuilder(reader.data()));
   if (!structBuilder->buildStructures())
   {
-    ERROR_LOG() << "Error building up structures";
+    ERROR_LOG(m_logger) << "Error building up structures";
     return 4;
   }
 
@@ -123,7 +123,7 @@ int main(int argc, char **argv)
     
     if (!sql.writeSql(dir.absolutePath() + QLatin1Char('/'), CodeGen::ExerciseDependency::Exercise))
     {
-      ERROR_LOG() << "Error while writing sql information for service " << sql.getServiceAbbr();
+      ERROR_LOG(m_logger) << "Error while writing sql information for service " << sql.getServiceAbbr();
       return 10;
     }
 
@@ -133,7 +133,7 @@ int main(int argc, char **argv)
     
     if (!sql.writeSql(dir.absolutePath() + QLatin1Char('/'), CodeGen::ExerciseDependency::Exercise))
     {
-      ERROR_LOG() << "Error while writing sql information for service " << sql.getServiceAbbr();
+      ERROR_LOG(m_logger) << "Error while writing sql information for service " << sql.getServiceAbbr();
       return 10;
     }
 
@@ -141,20 +141,20 @@ int main(int argc, char **argv)
     sql.generateData(0);
     if (!sql.writeSql(dir.absolutePath() + QLatin1Char('/'), CodeGen::ExerciseDependency::Global))
     {
-      ERROR_LOG() << "Error while writing sql information for service " << sql.getServiceAbbr();
+      ERROR_LOG(m_logger) << "Error while writing sql information for service " << sql.getServiceAbbr();
       return 10;
     }
     return 0;
   }
   else
   {
-    ERROR_LOG() << "Invalid action '" << options.action() << "' given!";
+    ERROR_LOG(m_logger) << "Invalid action '" << options.action() << "' given!";
     return 5;
   }
 
   if (!generator->init(reader.data(), structBuilder.data()))
   {
-    ERROR_LOG() << "Error initializing generator!";
+    ERROR_LOG(m_logger) << "Error initializing generator!";
     return 6;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/UnitTest_Coordinate/lts_coordinate_unit_test.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/UnitTest_Coordinate/lts_coordinate_unit_test.h
index a0cf5ade7..e4d28536d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/UnitTest_Coordinate/lts_coordinate_unit_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/UnitTest_Coordinate/lts_coordinate_unit_test.h
@@ -77,4 +77,9 @@ private Q_SLOTS:
   
 
 private:
+
+
+  
+
+NGL::INGLLogger &m_logger;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/UnitTest_Elevation/elevation_unit_test.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/UnitTest_Elevation/elevation_unit_test.h
index 5bf447da1..5da231892 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/UnitTest_Elevation/elevation_unit_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/UnitTest_Elevation/elevation_unit_test.h
@@ -53,4 +53,9 @@ private Q_SLOTS:
   
 
 private:
+
+
+  
+
+NGL::INGLLogger &m_logger;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/lts_elevation_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/lts_elevation_manager.cpp
index 8f8c0585c..fad1573d5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/lts_elevation_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/lts_elevation_manager.cpp
@@ -80,16 +80,16 @@ LtsElevationManager::LtsElevationManager()
   , d(new Private)
 {
   ++s_counter;
-  TRACE_LOG() << Q_FUNC_INFO << " START, s_counter=" << s_counter << " this=" << this;
-  TRACE_LOG() << Q_FUNC_INFO << " END, s_counter=" << s_counter << " this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, s_counter=" << s_counter << " this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, s_counter=" << s_counter << " this=" << this;
 }
 
 LtsElevationManager::~LtsElevationManager()
 {
   --s_counter;
-  TRACE_LOG() << Q_FUNC_INFO << " START, s_counter=" << s_counter << " this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, s_counter=" << s_counter << " this=" << this;
   delete d;
-  TRACE_LOG() << Q_FUNC_INFO << " END, s_counter=" << s_counter << " this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, s_counter=" << s_counter << " this=" << this;
 }
 
 LTS_ELEVATION_MANAGER_TYPE LtsElevationManager::createInstance(int exerciseId,
@@ -283,7 +283,7 @@ void LtsElevationManager::cleanupAll()
 
 void LtsElevationManager::initDDS(const std::shared_ptr<ExerciseManagement::Interface::Dtc> &exmDtc, const std::shared_ptr<AssetManagement::Interface::Dtc> &asmDtc)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   d->m_exmDtc = exmDtc;
   if (d->m_exmDtc)
@@ -293,16 +293,16 @@ void LtsElevationManager::initDDS(const std::shared_ptr<ExerciseManagement::Inte
   if (d->m_asmDtc)
     d->m_asmDtc->waitForHistoricalDataTrainingArea(1000);
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 QStringList LtsElevationManager::getFilenamesForExercise(int exerciseId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   if (!d->m_exmDtc || !d->m_asmDtc)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no dtcs"
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no dtcs"
                         << ", exerciseId=" << exerciseId;
     return {};
   }
@@ -311,7 +311,7 @@ QStringList LtsElevationManager::getFilenamesForExercise(int exerciseId)
   int trainingAreaId = exerciseIdToTrainingAreaId(exerciseId, d->m_exmDtc);
   if (trainingAreaId <= 0)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Error getting trainingAreaId"
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Error getting trainingAreaId"
                         << ", exerciseId=" << exerciseId
                         << ", trainingAreaId=" << trainingAreaId;
     return {};
@@ -319,17 +319,17 @@ QStringList LtsElevationManager::getFilenamesForExercise(int exerciseId)
 
   QStringList filePaths_rough_to_fine = getFilenamesForTrainingArea(trainingAreaId);
 
-  TRACE_LOG() << Q_FUNC_INFO << " END, filePaths_rough_to_fine=" << filePaths_rough_to_fine.join(QStringLiteral(";"));
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, filePaths_rough_to_fine=" << filePaths_rough_to_fine.join(QStringLiteral(";"));
   return filePaths_rough_to_fine;
 }
 
 QStringList LtsElevationManager::getFilenamesForTrainingArea(int trainingAreaId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   if (!d->m_asmDtc)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no dtcs"
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no dtcs"
                         << ", trainingAreaId=" << trainingAreaId;
     return {};
   }
@@ -341,7 +341,7 @@ QStringList LtsElevationManager::getFilenamesForTrainingArea(int trainingAreaId)
     const AssetManagement::TrainingArea &ta = d->m_asmDtc->trainingArea(trainingAreaId);
     if (ta.id() != trainingAreaId)
     {
-      ERROR_LOG() << Q_FUNC_INFO << " Error on s_asmDtc->trainingArea"
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " Error on s_asmDtc->trainingArea"
                           << ", trainingAreaId=" << trainingAreaId;
       return {};
     }
@@ -359,7 +359,7 @@ QStringList LtsElevationManager::getFilenamesForTrainingArea(int trainingAreaId)
       filePaths_rough_to_fine.append(filePathAbs);
     }
   }
-  TRACE_LOG() << Q_FUNC_INFO << " END, filePaths_rough_to_fine=" << filePaths_rough_to_fine.join(QStringLiteral(";"));
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, filePaths_rough_to_fine=" << filePaths_rough_to_fine.join(QStringLiteral(";"));
   return filePaths_rough_to_fine;
 }
 
@@ -444,11 +444,11 @@ double LtsElevationManager::elevation(double lon_rad, double lat_rad, double def
 LineOfSight LtsElevationManager::lineOfSightCalculation(const LtsUtils::QPoint3D &startPointGeo_absZ,
                                                         const LtsUtils::QPoint3D &endPointGeo_absZ)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START" << ", startPointGeo_absZ = " << startPointGeo_absZ << ", endPointGeo_absZ = " << endPointGeo_absZ;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START" << ", startPointGeo_absZ = " << startPointGeo_absZ << ", endPointGeo_absZ = " << endPointGeo_absZ;
 
   if (!isValid())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Error, LtsElevationManager not valid";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Error, LtsElevationManager not valid";
     return LineOfSight::LOS_ERROR;
   }
 
@@ -458,14 +458,14 @@ LineOfSight LtsElevationManager::lineOfSightCalculation(const LtsUtils::QPoint3D
   
   LtsElevation::LineOfSight result = static_cast<LtsElevation::LineOfSight>(eleMapMgrResult);
 
-  TRACE_LOG() << Q_FUNC_INFO << " END" << ", startPointGeo = " << startPointGeo_absZ << ", endPointGeo = " << endPointGeo_absZ
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" << ", startPointGeo = " << startPointGeo_absZ << ", endPointGeo = " << endPointGeo_absZ
                       << " -> LineOfSight " << result;
   return result;
 }
 
 LineOfSight LtsElevationManager::lineOfSightCalculation(const QPointF &startPointGeo, double startHat, const QPointF &endPointGeo, double endHat)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
                       << ", startPointGeo = " << startPointGeo << ", startHat = " << startHat
                       << ", endPointGeo = " << endPointGeo << ", endHat = " << endHat;
 
@@ -476,7 +476,7 @@ LineOfSight LtsElevationManager::lineOfSightCalculation(const QPointF &startPoin
   
   LtsElevation::LineOfSight result = static_cast<LtsElevation::LineOfSight>(eleMapMgrResult);
 
-  TRACE_LOG() << Q_FUNC_INFO << " END"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END"
                       << ", startPointGeo = " << startPointGeo << ", startHat = " << startHat
                       << ", endPointGeo = " << endPointGeo << ", endHat = " << endHat
                       << " -> LineOfSight " << static_cast<int>(eleMapMgrResult);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.cpp
index 125f5e00c..ba364cdf9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.cpp
@@ -122,7 +122,7 @@ bool LtsPluginManager::startApp(const LtsAppDescriptor::AppDescription &app, boo
 
   if (!pluginLoader->loadPlugins(PluginType::DATA, cb))
   {
-    WARNING_LOG() << "PluginLoader failed to load data plugins - abort!";
+    WARNING_LOG(m_logger) << "PluginLoader failed to load data plugins - abort!";
     return false;
   }
 
@@ -137,7 +137,7 @@ bool LtsPluginManager::startApp(const LtsAppDescriptor::AppDescription &app, boo
 
   if (!pluginLoader->loadPlugins(PluginType::GUI, cbLoadPlugins))
   {
-    WARNING_LOG() << "PluginLoader failed to load gui plugins - abort!";
+    WARNING_LOG(m_logger) << "PluginLoader failed to load gui plugins - abort!";
     return false;
   }
 
@@ -255,7 +255,7 @@ bool LtsPluginManager::startApp(const LtsAppDescriptor::AppDescription &app, boo
   LtsSession::DdsConnectionParams connParamsNew(connParams);
   if (!connParamsNew.isValid())
   {
-    INFO_LOG() << "Invalid connection params given - using default parameter";
+    INFO_LOG(m_logger) << "Invalid connection params given - using default parameter";
     
     connParamsNew.domainId = LtsSessionData::LtsSessionData::getInstance()->getDomainIdPreset();
     connParamsNew.partitionId = 0;
@@ -277,7 +277,7 @@ bool LtsPluginManager::startApp(const LtsAppDescriptor::AppDescription &app, boo
                               headless,
                               hidden))
   {
-    ERROR_LOG() << "Could not create Global Session - abort.";
+    ERROR_LOG(m_logger) << "Could not create Global Session - abort.";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.h
index f4284ebf5..d831b9e3a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "ltspluginmanager_export.h"
+#include "lts_plugin_manager_export.h"
 
 #include <LtsPluginManager/lts_plugin_loader.h>
 #include <LtsAppDescriptor/lts_app_descriptor.h>
@@ -85,6 +85,7 @@ public:
 
   LtsSession::LtsSessionManager *m_sessionManager;
 private:
+  NGL::INGLLogger &m_logger;
   friend class DeveloperTools::DevDialog;
 
   LtsAppDescriptor::AppDescription m_app;
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 fae552731..1a3ef1a4f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing_base.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing_base.cpp
@@ -61,8 +61,7 @@ Base::Base(QTextDocument &doc,
            const QString        &_fn,
            QPrinter::PaperSize   _ps,
            QPrinter::Orientation _or,
-           QPrinter::ColorMode   _cm)
-  : m_printer(new QPrinter),
+           QPrinter::ColorMode   _cm) : m_printer(new QPrinter),
     m_painter(new QPainter),
     m_iconFilenameNr(0),
     m_tempdoc(nullptr),
@@ -72,8 +71,8 @@ Base::Base(QTextDocument &doc,
     footersize_(10), footerrule_(0.5), footertext_(FooterText),
     itemFontSize_(2),
     m_settings(new NGL::Settings(NGL::findProjectConfigFile())).getNGLLogger("NGLPrinting")),
-    m_currentPage(1)
-{
+    m_currentPage(1),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   QString fn = _fn;
   fn = fn.remove(QLatin1Char(' '));
   fn = fn.remove(QLatin1String(".."));
@@ -158,7 +157,7 @@ void Base::setPrintToFile(bool printToFile)
 
 QPrinter *Base::printer()
 {
-  DEBUG_LOG() << "Base::printer" ;
+  DEBUG_LOG(m_logger) << "Base::printer" ;
 
   return m_printer;
 }
@@ -391,7 +390,7 @@ bool Base::printTableData(QString &str,
   }
   str += QLatin1String("</tbody></table>");
 
-  DEBUG_LOG() << qPrintable(str) ;
+  DEBUG_LOG(m_logger) << qPrintable(str) ;
   return true;
 }
 
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 2753c8234..b7e05ccbf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing_base.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing_base.h
@@ -226,6 +226,8 @@ public:
   QSize pageSizeInMM();
 
 protected:
+
+NGL::INGLLogger &m_logger;
   bool printTableItemData(QString &str,
                           const QAbstractItemModel *model,
                           const QModelIndex &mi,
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/lts_projection_workstation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/lts_projection_workstation.cpp
index 5bc878fbc..72e6a8dfc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/lts_projection_workstation.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/lts_projection_workstation.cpp
@@ -77,7 +77,7 @@ LoginInformation LtsProjectionWorkstation::pendingLoginRequest()
 
   LoginInformation result = *m_pendingLoginRequest;
 
-  INFO_LOG() << " reset pendingLoginRequest..";
+  INFO_LOG(m_logger) << " reset pendingLoginRequest..";
 
   delete m_pendingLoginRequest;
   m_pendingLoginRequest = nullptr;
@@ -90,7 +90,7 @@ void LtsProjectionWorkstation::handleMessage(LtsWebSocket::AbstractClientMessage
   CTS::LoginRequest *login = dynamic_cast<CTS::LoginRequest *>(message);
   if (login)  
   {
-    INFO_LOG() << "Login request received!"
+    INFO_LOG(m_logger) << "Login request received!"
                         << ", login->userId()=" << login->userId()
                         << " with login->priority()=" << login->priority()
                         << " ;;; m_lastLoginRequest.m_userId=" << m_lastLoginRequest.m_userId
@@ -108,16 +108,16 @@ void LtsProjectionWorkstation::handleMessage(LtsWebSocket::AbstractClientMessage
 
         
         
-        DEBUG_LOG() << "Login request received and DedicatedDisconnect distributed, wait some seconds...";
+        DEBUG_LOG(m_logger) << "Login request received and DedicatedDisconnect distributed, wait some seconds...";
         int i=0;
         while(i<20) 
         {
-          DEBUG_LOG() << "Login request received and DedicatedDisconnect distributed, wait some seconds...i=" << i;
+          DEBUG_LOG(m_logger) << "Login request received and DedicatedDisconnect distributed, wait some seconds...i=" << i;
           qApp->processEvents(QEventLoop::AllEvents, 50);
           QThread::msleep(50);
           ++i;
         }
-        INFO_LOG() << "Login request received and DedicatedDisconnect distributed, wait some seconds... done";
+        INFO_LOG(m_logger) << "Login request received and DedicatedDisconnect distributed, wait some seconds... done";
 
         
         login->addReply((new STC::LoginRequestReply(QUuid::createUuid().toString(),
@@ -133,10 +133,10 @@ void LtsProjectionWorkstation::handleMessage(LtsWebSocket::AbstractClientMessage
         
         slotLoginRequestReceived(login->userId(), login->exerciseId());
 
-        INFO_LOG() << "Valid login request received -> userId: " << login->userId()
+        INFO_LOG(m_logger) << "Valid login request received -> userId: " << login->userId()
                             << " priority: "   << login->priority()
                             << " exerciseId: " << login->exerciseId();
-        DEBUG_LOG() << "Logging in now!";
+        DEBUG_LOG(m_logger) << "Logging in now!";
 
       }
       else
@@ -147,17 +147,17 @@ void LtsProjectionWorkstation::handleMessage(LtsWebSocket::AbstractClientMessage
                                                     QVector<VncScreen>())
                         )->toReplyMessage());
 
-        DEBUG_LOG() << "Higher prioritized login received -> userId: "    << login->userId()
+        DEBUG_LOG(m_logger) << "Higher prioritized login received -> userId: "    << login->userId()
                             << " priority: "   << login->priority()
                             << " exerciseId: " << login->exerciseId();
 
-        DEBUG_LOG() << "Last login data was -> userId: "    << m_lastLoginRequest.m_userId
+        DEBUG_LOG(m_logger) << "Last login data was -> userId: "    << m_lastLoginRequest.m_userId
                             << " priority: "   << m_lastLoginRequest.m_priority
                             << " exerciseId: " << m_lastLoginRequest.m_exerciseId;
       }
     }
     else
-      ERROR_LOG() << "invalid login request received -> userId: "    << login->userId()
+      ERROR_LOG(m_logger) << "invalid login request received -> userId: "    << login->userId()
                           << " priority: "   << login->priority()
                           << " exerciseId: " << login->exerciseId();
 
@@ -167,7 +167,7 @@ void LtsProjectionWorkstation::handleMessage(LtsWebSocket::AbstractClientMessage
   CTS::LogoutRequest *logout = dynamic_cast<CTS::LogoutRequest *>(message);
   if (logout)
   {
-    DEBUG_LOG() << "Logging out now!";
+    DEBUG_LOG(m_logger) << "Logging out now!";
     slotLogoutRequestReceived();
     return;
   }
@@ -184,7 +184,7 @@ void LtsProjectionWorkstation::handleMessage(LtsWebSocket::AbstractClientMessage
     
     
     int disconnectingUserId = discon->userId();
-    INFO_LOG() << "Disconnecting now! "
+    INFO_LOG(m_logger) << "Disconnecting now! "
                        << ", disconnectingUserId=" << disconnectingUserId
                        << ", m_pendingLoginRequest=" << m_pendingLoginRequest;
     m_lastLoginRequest = LoginInformation();
@@ -194,7 +194,7 @@ void LtsProjectionWorkstation::handleMessage(LtsWebSocket::AbstractClientMessage
 
 void LtsProjectionWorkstation::slotLoginRequestReceived(int userId, int exerciseId)
 {
-  INFO_LOG() << "slotLoginRequestReceived.."
+  INFO_LOG(m_logger) << "slotLoginRequestReceived.."
                      << ", userId=" << userId
                      << ", exerciseId=" << exerciseId;
   delete m_pendingLoginRequest;
@@ -219,17 +219,17 @@ void LtsProjectionWorkstation::slotLogoffDone()
 
 void LtsProjectionWorkstation::clientDisconnected(LtsWebSocket::ClientConnection *client)
 {
-  INFO_LOG() << Q_FUNC_INFO << " START"
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " START"
                      << ", m_connections.size = " << m_connections.size();
 
   m_connections.removeOne(client);
   
   if ( m_connections.size() == 0 && (m_lastLoginRequest.m_userId != 0 || m_lastLoginRequest.m_priority != 0))
   {
-    INFO_LOG() << Q_FUNC_INFO << " reset m_lastLoginRequest";
+    INFO_LOG(m_logger) << Q_FUNC_INFO << " reset m_lastLoginRequest";
     m_lastLoginRequest = LoginInformation();   
   }
-  INFO_LOG() << Q_FUNC_INFO << " END"
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " END"
                      << ", m_connections.size = " << m_connections.size();
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/vnc_server_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/vnc_server_manager.cpp
index 5d3cf22f5..50dfa8724 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/vnc_server_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/vnc_server_manager.cpp
@@ -48,7 +48,7 @@ bool VncServerManager::init(const QList<QScreen *> &screens)
 
   const auto sortedScreens = sortScreen(screens);
 
-  DEBUG_LOG() << "Setup VNCScreens with " << screens.size() << " screens";
+  DEBUG_LOG(m_logger) << "Setup VNCScreens with " << screens.size() << " screens";
 
   int count = 1;
 
@@ -77,13 +77,13 @@ bool VncServerManager::init(const QList<QScreen *> &screens)
     count++;
   }
 
-  DEBUG_LOG() << m_vncScreens.size() << " VNCScreen(s) created - Setup completed.";
+  DEBUG_LOG(m_logger) << m_vncScreens.size() << " VNCScreen(s) created - Setup completed.";
   return true;
 }
 
 void VncServerManager::startScreens()
 {
-  DEBUG_LOG() << "Starting " << m_vncScreens.size() << " VNCScreen(s) ... ";
+  DEBUG_LOG(m_logger) << "Starting " << m_vncScreens.size() << " VNCScreen(s) ... ";
   for (const VncScreen &s : std::as_const(m_vncScreens))
   {
     connect(s.proc, &QProcess::readyReadStandardOutput,
@@ -95,16 +95,16 @@ void VncServerManager::startScreens()
   for (const VncScreen &s : std::as_const(m_vncScreens))
   {
     if (!s.proc->waitForStarted(2000))
-      ERROR_LOG() << "Can not start process '" << s.proc->program() << "': "
+      ERROR_LOG(m_logger) << "Can not start process '" << s.proc->program() << "': "
                           << s.proc->errorString();
   }
-  DEBUG_LOG() << "Done";
+  DEBUG_LOG(m_logger) << "Done";
 }
 
 
 void VncServerManager::stopScreens()
 {
-  DEBUG_LOG() << "Stopping " << m_vncScreens.size() << " VNCScreen(s) ...";
+  DEBUG_LOG(m_logger) << "Stopping " << m_vncScreens.size() << " VNCScreen(s) ...";
 
   for (const VncScreen &s : std::as_const(m_vncScreens))
   {
@@ -116,28 +116,28 @@ void VncServerManager::stopScreens()
     if (!s.proc->waitForFinished(2000))
       s.proc->kill();
   }
-  DEBUG_LOG() << "Done";
+  DEBUG_LOG(m_logger) << "Done";
 }
 
 
 void VncServerManager::killScreens()
 {
-  DEBUG_LOG() << "Killing all exisiting x11vnc processes ...";
+  DEBUG_LOG(m_logger) << "Killing all exisiting x11vnc processes ...";
   
   SingleShotProcess ssp(QStringLiteral("killall x11vnc"));
   ssp.execute();
-  DEBUG_LOG() << "Done";
+  DEBUG_LOG(m_logger) << "Done";
 }
 
 
 void VncServerManager::createPwdFile()
 {
-  DEBUG_LOG() << "(Re)creating x11vnc password-file ...";
+  DEBUG_LOG(m_logger) << "(Re)creating x11vnc password-file ...";
   
   SingleShotProcess ssp(QStringLiteral("x11vnc -storepasswd ctc11de %1/.vnc/passwd")
                         .arg(QDir::home().absolutePath()));
   ssp.execute();
-  DEBUG_LOG() << "Done";
+  DEBUG_LOG(m_logger) << "Done";
 }
 
 
@@ -151,7 +151,7 @@ void VncServerManager::slotReadStandardOutput()
   QRegularExpressionMatch match = QRegularExpression(QStringLiteral("PORT=(.*?)\\s")).match(stdOut);
   if (!match.hasMatch())
   {
-    WARNING_LOG() << "Could not retrieve port information from stdout of " << p->program();
+    WARNING_LOG(m_logger) << "Could not retrieve port information from stdout of " << p->program();
     return;
   }
   const quint16 port = match.capturedRef(1).toInt();
@@ -172,7 +172,7 @@ void VncServerManager::slotErrorOccured()
 {
   QProcess *p = qobject_cast<QProcess *>(QObject::sender());
   if (p)
-    ERROR_LOG() << p->errorString();
+    ERROR_LOG(m_logger) << p->errorString();
 }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_serial_port_querry.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_serial_port_querry.cpp
index 01f367208..52cc57d6f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_serial_port_querry.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_serial_port_querry.cpp
@@ -49,7 +49,7 @@ void LtsSerialPortQuerry::continueQuerry()
 
 void LtsSerialPortQuerry::restartQuerry()
 {
-  DEBUG_LOG() << "restart querry ";
+  DEBUG_LOG(m_logger) << "restart querry ";
   m_serialPortInfos = QSerialPortInfo::availablePorts();
   m_currentQuerry = 0;
   if (m_serialPortInfos.size())
@@ -73,20 +73,20 @@ void LtsSerialPortQuerry::querrySerialPort(const QSerialPortInfo &info)
   m_currentSerialPort->setStopBits(m_stopBits);
   m_currentSerialPort->setFlowControl(m_flowControll);
   
-  DEBUG_LOG() << "Try opening Comport:" << m_currentSerialPort->portName() << " index is: " << m_currentQuerry;
+  DEBUG_LOG(m_logger) << "Try opening Comport:" << m_currentSerialPort->portName() << " index is: " << m_currentQuerry;
   
 
   if (!m_currentSerialPort->open(QSerialPort::ReadWrite))
   {
     
-    DEBUG_LOG() << "Oppening failed query next";
+    DEBUG_LOG(m_logger) << "Oppening failed query next";
 
     continueQuerry();
   }else
   {
     connect(m_currentSerialPort, &QSerialPort::errorOccurred,
       this, &LtsSerialPortQuerry::onSerialPortError, Qt::UniqueConnection);
-    DEBUG_LOG() << "Oppened comport" << m_currentSerialPort->portName();
+    DEBUG_LOG(m_logger) << "Oppened comport" << m_currentSerialPort->portName();
     emit connectionEstablished();
   }
 }
@@ -110,7 +110,7 @@ void LtsSerialPortQuerry::onSerialPortError(QSerialPort::SerialPortError serialP
 
   if (!m_currentSerialPort)
     return;
-  DEBUG_LOG() << "Spontaneous error " << serialPortError << " doesn't have to be an error ...";
+  DEBUG_LOG(m_logger) << "Spontaneous error " << serialPortError << " doesn't have to be an error ...";
 
   const QString errStr(QStringLiteral("QSerialPort::SerialPortError ") + QString::number(serialPortError) +
     QStringLiteral(" from serial port ") + m_currentSerialPort->portName() +
@@ -129,19 +129,19 @@ void LtsSerialPortQuerry::onSerialPortError(QSerialPort::SerialPortError serialP
   case QSerialPort::SerialPortError::NotOpenError:
   case QSerialPort::SerialPortError::UnknownError:
   {
-    ERROR_LOG() << "Closing port and try to reopen it. " << m_currentSerialPort->portName();
+    ERROR_LOG(m_logger) << "Closing port and try to reopen it. " << m_currentSerialPort->portName();
     continueQuerry();
     
     Q_FALLTHROUGH();
   }
   case QSerialPort::SerialPortError::UnsupportedOperationError:
   {
-    ERROR_LOG() << errStr;
+    ERROR_LOG(m_logger) << errStr;
     break;
   }
   default:
   {
-    ERROR_LOG() << "Got an Error> " << errStr << "restarting";
+    ERROR_LOG(m_logger) << "Got an Error> " << errStr << "restarting";
     continueQuerry();
     
     break;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_serial_port_querry.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_serial_port_querry.h
index 4cd81291e..9ed48076d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_serial_port_querry.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_serial_port_querry.h
@@ -33,13 +33,16 @@ signals:
   void connectionEstablished();
 
 private:
+  NGL::INGLLogger &m_logger;
   void querrySerialPort(const QSerialPortInfo &info);
   void closeAndDeleteCurrentPort();
 
 private:
+  NGL::INGLLogger &m_logger;
   void onSerialPortError(QSerialPort::SerialPortError serialPortError);
 
 private:
+  NGL::INGLLogger &m_logger;
   QList<QSerialPortInfo>    m_serialPortInfos;
   int                       m_currentQuerry;
   QSerialPort::BaudRate     m_baudRate;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/CMakeLists.txt
index b481d9fe6..53da7fd9f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/CMakeLists.txt
@@ -51,7 +51,6 @@ NGL_TARGET_LINK_LIBRARIES(LtsSession
     Qt6::Network
     LtsMultiMonitor
     LtsSessionData
-    ddsconnector
     LtsUtilsGuiDds # ReqHelpr & for Debug Menu ! TODO: rm on release!
     LtsNotification
     svcCoreClient # Core Ftc - for TLH
@@ -67,6 +66,8 @@ NGL_TARGET_LINK_LIBRARIES(LtsSession
 )
 IF(BUILD_RTI)
   NGL_TARGET_LINK_LIBRARIES(LtsSession
+    PRIVATE
+      ddsconnector
     PUBLIC
       LtsSessionDataDds
   )
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 447f4348b..e6bd1eac8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.cpp
@@ -699,6 +699,7 @@ void LtsSession::slotStapleTopicLockHandler(LtsWidgets::LtsDialog *widget)
   }
   widget->setProperty("topicLockStapled", true);
 
+#ifdef BUILD_RTI
   connectOnlineHelpButton(widget);
   if (m_coreFtc == nullptr)
   {
@@ -736,6 +737,10 @@ void LtsSession::slotStapleTopicLockHandler(LtsWidgets::LtsDialog *widget)
 
 
   connectOnlineHelpButton(widget);
+#else
+  Q_UNUSED(widget)
+  DEBUG_LOG(m_logger) << "BUILD_RTI=OFF, skipping TopicLockHandler setup";
+#endif
 }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.h
index 85bfd5650..835400548 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#ifdef BUILD_RTI
+
 #include <LtsSession/ltssession_export.h>
 #include <LtsWidgets/lts_dialog.h>
 #include <DDS/Core/core_ftc.h>
@@ -104,3 +106,9 @@ private:
 
 
 } // namespace LtsSession
+
+#else // BUILD_RTI
+
+#include "lts_session_lock_handler_stub.h"
+
+#endif // BUILD_RTI
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler_stub.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler_stub.h
new file mode 100644
index 000000000..647c51759
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler_stub.h
@@ -0,0 +1,81 @@
+/**
+ * @RDE_HEADER@
+ * Stub header for lts_session_lock_handler.h when BUILD_RTI=OFF
+ * Provides minimal declarations to allow compilation without RTI Connext DDS
+ */
+
+#pragma once
+
+#include <LtsSession/ltssession_export.h>
+#include <LtsWidgets/lts_dialog.h>
+
+#include <QPointer>
+#include <memory>
+#include <QObject>
+
+#include <NGLLogger/NGLLoggerBootstrap.h>
+
+namespace LtsSession
+{
+
+// Stub TopicLockHandler class - minimal version without DDS functionality
+class LTSSESSION_EXPORT TopicLockHandler : public QObject
+{
+  Q_OBJECT
+public:
+  explicit TopicLockHandler(QObject *parent = nullptr) : QObject(parent)
+    , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("LtsSession.TopicLockHandler"))
+  {}
+  ~TopicLockHandler() override = default;
+
+  bool init(const void * /*coreFtc*/, int /*exerciseId*/) { return false; }
+
+  bool isLocked() const { return false; }
+  LtsWidgets::TopicInfo getTopicInfo() const { return LtsWidgets::TopicInfo(); }
+
+public slots:
+  void slotTryLock(const LtsWidgets::TopicInfo & /*topicInfo*/) {}
+  bool slotUnlock() { return false; }
+  void slotFinalize() { deleteLater(); }
+
+signals:
+  void signalLockDialog(const QString & /*lockedBy*/) {}
+  void signalUnlockDialog() {}
+
+private:
+  NGL::INGLLogger &m_logger;
+};
+
+
+class LTSSESSION_EXPORT TopicLockHanderData : public QObject
+{
+  Q_OBJECT
+
+public:
+  explicit TopicLockHanderData(QObject *parent = nullptr) : QObject(parent) {}
+  ~TopicLockHanderData() override = default;
+  
+  void init(const void * /*coreFtc*/, int /*exerciseId*/) {}
+
+  void unlock() {}
+  void slotTryLock(const LtsWidgets::TopicInfo & /*topicInfo*/) {}
+  bool isLocked() const { return false; }
+  LtsWidgets::TopicInfo getTopicInfo() const { return LtsWidgets::TopicInfo(); }
+  const QString &getLockedBy() const { return m_lockedBy; }
+
+Q_SIGNALS:
+  void lockDataChanged();
+
+private Q_SLOTS:
+  void slotLock(const QString & /*lockedBy*/) {}
+  void slotUnlock() {}
+
+public:
+  QString                                m_debugName;
+private:
+  QPointer<TopicLockHandler>             m_topicLockHandler;
+  QString                                m_lockedBy;
+};
+
+
+} // namespace LtsSession
\ No newline at end of file
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_manager.cpp
index f07283f2a..2c42f3eda 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_manager.cpp
@@ -19,7 +19,9 @@
 #include <LtsSession/lts_session_data.h>
 #include <PluginInterfaces/data_plugin_interface.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
+#ifdef BUILD_RTI
 #include <DDS/DDSConnector/dds_connector.h>
+#endif
 
 #include <QDebug>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.cpp
index 81cc1ae10..b7812d44b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.cpp
@@ -339,12 +339,12 @@ QModelIndex TimelineModel::index(int row, int column, const QModelIndex &parent)
   }
   catch (const QString &msg)
   {
-    DEBUG_LOG() << Q_FUNC_INFO << "cannot get parent track " << msg;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << "cannot get parent track " << msg;
     return {};
   }
   catch (const std::out_of_range &oor)
   {
-    DEBUG_LOG() << Q_FUNC_INFO << "cannot get child track " << QString::fromUtf8(oor.what());
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << "cannot get child track " << QString::fromUtf8(oor.what());
     return {};
   }
 
@@ -455,7 +455,7 @@ QModelIndex TimelineModel::parent(const QModelIndex &index) const
   }
   catch (const QString &msg)
   {
-    DEBUG_LOG() << Q_FUNC_INFO << "cannot get parent of track with id" << trackId << msg;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << "cannot get parent of track with id" << trackId << msg;
     return {};
   }
 
@@ -473,13 +473,13 @@ QModelIndex TimelineModel::parent(const QModelIndex &index) const
     }
     catch (const QString &msg)
     {
-      DEBUG_LOG() << Q_FUNC_INFO << "row of track for parent not found for parent id" << parentId << "-" << msg;
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << "row of track for parent not found for parent id" << parentId << "-" << msg;
       return {};
     }
   }
   catch (const QString &msg)
   {
-    DEBUG_LOG() << Q_FUNC_INFO << "super parent not found for super parent id" << superParentId << "-" << msg;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << "super parent not found for super parent id" << superParentId << "-" << msg;
     return {};
   }
 
@@ -722,11 +722,11 @@ void TimelineModel::setMinimumDuration(int duration)
 {
   if (duration < 0)
   {
-    WARNING_LOG() << "negative duration is not possible -> setting minimum duration to 0";
+    WARNING_LOG(m_logger) << "negative duration is not possible -> setting minimum duration to 0";
     duration = 0;
   }
   if (duration % 1000 && m_isSnapEnabled)
-    WARNING_LOG() << "Snapping to 1000ms enabled, yet minimum duration is not a multiple of 1000ms: " << duration;
+    WARNING_LOG(m_logger) << "Snapping to 1000ms enabled, yet minimum duration is not a multiple of 1000ms: " << duration;
   m_minItemDuration = duration;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.h
index 3dc8c9bec..8ae84e87d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.h
@@ -141,6 +141,7 @@ public:
   int columnCount(const QModelIndex &) const override { return 2; }
 
 protected:
+  NGL::INGLLogger &m_logger;
   ItemPtrNCVRef _itemNCV(Track &track, int id) noexcept(false)
   {
     return track._itemNCV(id);
@@ -223,6 +224,7 @@ public slots:
   virtual void onRemoveTrack(const QModelIndex &index) { Q_UNUSED(index); }
 
 protected:
+  NGL::INGLLogger &m_logger;
   TimelineView *m_view{nullptr};
 
   Track m_rootTrack;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view.cpp
index 100923333..97426e356 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view.cpp
@@ -76,7 +76,7 @@ void TimelineView::setHeader(QHeaderView *header)
   }
   catch (...)
   {
-    ERROR_LOG() << "header view should be of type TimelineHeaderView";
+    ERROR_LOG(m_logger) << "header view should be of type TimelineHeaderView";
   }
 }
 
@@ -125,7 +125,7 @@ void TimelineView::setItemDelegate(QAbstractItemDelegate *delegate)
   }
   catch (...)
   {
-    ERROR_LOG() << "item delegate for TimelineView must be derived from ItemDelegate";
+    ERROR_LOG(m_logger) << "item delegate for TimelineView must be derived from ItemDelegate";
   }
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view.h
index ef97962b2..4f51b2469 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view.h
@@ -122,6 +122,7 @@ public:
   bool isCursorWithinRangeY(int y) const;
 
 protected:
+  NGL::INGLLogger &m_logger;
   void dragEnterEvent(QDragEnterEvent *event) override;
   void dragMoveEvent(QDragMoveEvent *event) override;
   void dragLeaveEvent(QDragLeaveEvent *event) override;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_widget.h
index 5bed5d4b1..514c87d55 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_widget.h
@@ -89,6 +89,8 @@ public:
   void hideDebugWidget();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void populateZoomFactorComboBox();
 
 public:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/AbstractTimelineModel.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/AbstractTimelineModel.cpp
index 46754c1b5..dc9a99473 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/AbstractTimelineModel.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/AbstractTimelineModel.cpp
@@ -10,15 +10,14 @@
 namespace LtsTimelineClassic
 {
 
-AbstractTimelineModel::AbstractTimelineModel(QObject *parent)
-  : QAbstractItemModel(parent)
+AbstractTimelineModel::AbstractTimelineModel(QObject *parent) : QAbstractItemModel(parent)
   .getNGLLogger("Timeline.AbstractTimelineModel"))
   , m_highestPositionedItem(0)
   , m_lowestPositionedItem(0)
   , m_getEventListsRecursive(true) 
   , m_rootItem(new Item(QLatin1String("#mwille/r00t/")))
-  , m_markersItem(new Item(tr("Markers"), QStringLiteral("Markers")))
-{
+  , m_markersItem(new Item(tr("Markers"), QStringLiteral("Markers"))),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/AbstractTimelineModel.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/AbstractTimelineModel.h
index 5d09ebfc2..bcdcc3aa8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/AbstractTimelineModel.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/AbstractTimelineModel.h
@@ -45,6 +45,9 @@ public:
 
 
 protected:
+
+
+NGL::INGLLogger &m_logger;
 protected:
   
 
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 d2305c973..174dd8ca2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Event.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Event.cpp
@@ -16,8 +16,7 @@ namespace LtsTimelineClassic
 Event::Event(int uniqueId, int typeId, qint64 startTime,
              qint64 endTime, int playerId, int partyId, int equipmentId, const QStringList &path,
              const EventPaintFunc &paintFunc, const QColor &paintColor, const QJsonObject &detailData, int subEventId,
-             const LtsUtils::QPoint3D &pos, LtsSession::LtsSession *session)
-  : m_path(path)
+             const LtsUtils::QPoint3D &pos, LtsSession::LtsSession *session) : m_path(path)
   , m_detailData(detailData)
   , m_position(pos)
   , m_paintFunc(paintFunc)
@@ -32,9 +31,8 @@ Event::Event(int uniqueId, int typeId, qint64 startTime,
   , m_partyId(partyId)
   , m_equipmentId(equipmentId)
   , m_deleted(false)
-  , m_visible(true) 
-
-{
+  , m_visible(true),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   checkDuration();
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Event.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Event.h
index 0b8e5ea4d..78cf1b39b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Event.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Event.h
@@ -125,6 +125,9 @@ public:
 
 
 protected:
+
+
+NGL::INGLLogger &m_logger;
   QStringList m_path;
   QJsonObject m_detailData;
   
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineIndicator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineIndicator.cpp
index ee96583ba..1bafe2cce 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineIndicator.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineIndicator.cpp
@@ -39,8 +39,7 @@
 namespace LtsTimelineClassic
 {
 
-TimelineIndicator::TimelineIndicator(QWidget *parent)
-  : QWidget(parent)
+TimelineIndicator::TimelineIndicator(QWidget *parent) : QWidget(parent)
   , m_zoomFactorPoints(0)
   , m_pbZoom(new QPushButton(this))
   , m_pbUnzoom(new QPushButton(this))
@@ -49,8 +48,8 @@ TimelineIndicator::TimelineIndicator(QWidget *parent)
   , m_currentTextWidth(0)
   , m_sectionPos(0)
   , m_sectionSize(0)
-  .getNGLLogger("Timeline.Indicator"))
-{
+  .getNGLLogger("Timeline.Indicator")),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_timeArray.reserve(11 + 11 + 7 + 10);
 
   m_timeArray << 
@@ -380,7 +379,7 @@ void TimelineIndicator::refreshData()
 
   if (steps > 60000 || steps < 1)
   {
-    ERROR_LOG() << "More than 60000 ("<<steps<<") or less than 1 lines to draw. Loop will exit after 60000 lines.";
+    ERROR_LOG(m_logger) << "More than 60000 ("<<steps<<") or less than 1 lines to draw. Loop will exit after 60000 lines.";
   }
 
   if (steps < 1)
@@ -474,7 +473,7 @@ void TimelineIndicator::paintEvent(QPaintEvent *)
                      DTG::toStringMSec(time, DTG::Short)); 
 
 #ifdef VERBOSE
-    WARNING_LOG() << "paintEvent: actual drawing position: x=" << centeredPos << " y=" << textY;
+    WARNING_LOG(m_logger) << "paintEvent: actual drawing position: x=" << centeredPos << " y=" << textY;
 #endif
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineIndicator.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineIndicator.h
index eaa5d431c..ecbec61e0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineIndicator.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineIndicator.h
@@ -57,6 +57,7 @@ private:
 protected:
   
 
+  NGL::INGLLogger &m_logger;
   void paintEvent(QPaintEvent *);
 
 signals:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineWidget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineWidget.cpp
index d76f91c04..94eecb23f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineWidget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineWidget.cpp
@@ -20,8 +20,7 @@
 namespace LtsTimelineClassic
 {
 
-TimelineWidget::TimelineWidget(QWidget *parent) 
-  : QWidget(parent)
+TimelineWidget::TimelineWidget(QWidget *parent) : QWidget(parent)
   .getNGLLogger("Timeline.Widget"))
   , m_timelineUi(new Ui::Timeline)
   , m_min(0)
@@ -29,8 +28,8 @@ TimelineWidget::TimelineWidget(QWidget *parent)
   , m_sbPos(0)
   , m_zoomFactor(1) 
   , m_headerView(new TimelineHeaderView)
-  , m_model(nullptr)
-{
+  , m_model(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_timelineUi->setupUi(this);
   m_timelineUi->view->setHeader(m_headerView);
   m_headerView->setMinimumSectionSize(150);
@@ -99,7 +98,7 @@ void TimelineWidget::knownRangesChanged(const QVector<Range> &newRanges)
   EventDelegate *ed = qobject_cast<EventDelegate *>(m_timelineUi->view->itemDelegate());
   if (ed == nullptr)
   {
-    WARNING_LOG() << "ed == nullptr";
+    WARNING_LOG(m_logger) << "ed == nullptr";
     return;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineWidget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineWidget.h
index c749bdf5a..c6cdc302a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineWidget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineWidget.h
@@ -57,6 +57,7 @@ public:
 private:
   
 
+  NGL::INGLLogger &m_logger;
   void setTimelineRange(qint64 min, qint64 max);
 
   void refreshData();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_connection.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_connection.cpp
index eb83053e6..1ddecedf0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_connection.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_connection.cpp
@@ -15,7 +15,7 @@ ClientConnection::ClientConnection(QWebSocket *socket, QObject *parent)
 
 ClientConnection::~ClientConnection()
 {
-  DEBUG_LOG() << "Thread closed" << this;
+  DEBUG_LOG(m_logger) << "Thread closed" << this;
   delete m_socket;
   qDeleteAll(m_messageQueue);
 }
@@ -24,11 +24,11 @@ bool ClientConnection::init()
 {
   if (m_socket == nullptr)
   {
-    ERROR_LOG() << "Initialisation failed due to an invalid socket";
+    ERROR_LOG(m_logger) << "Initialisation failed due to an invalid socket";
     return false;
   }
 
-  DEBUG_LOG() << "Started new thread" << this;
+  DEBUG_LOG(m_logger) << "Started new thread" << this;
   connect(m_socket, &QWebSocket::textMessageReceived, this, &ClientConnection::onNewTextMessageFromSocket, Qt::DirectConnection);
   connect(m_socket, &QWebSocket::connected, this, &ClientConnection::sendMessagesFromQueue);
   connect(m_socket, &QWebSocket::disconnected, this, &ClientConnection::onSocketDisconnect);
@@ -41,24 +41,24 @@ void ClientConnection::addReply(ReplyMessage *message)
   if (!m_socket || m_socket->state() != QAbstractSocket::ConnectedState)
   {
     m_messageQueue.enqueue(message);
-    DEBUG_LOG() << "Adding message to queue, size: " << m_messageQueue.size();
+    DEBUG_LOG(m_logger) << "Adding message to queue, size: " << m_messageQueue.size();
     return;
   }
   const QString msg(message->toJsonString());
-  DEBUG_LOG() << "Sending message: " << msg ;
+  DEBUG_LOG(m_logger) << "Sending message: " << msg ;
   m_socket->sendTextMessage(msg);
   delete message;
 }
 
 void ClientConnection::onNewTextMessageFromSocket(const QString &message)
 {
-  DEBUG_LOG() << "Recv msg: " << message << this;
+  DEBUG_LOG(m_logger) << "Recv msg: " << message << this;
   emit newTextMessage(this, message);
 }
 
 void ClientConnection::sendMessagesFromQueue()
 {
-  INFO_LOG() << "Client connected ip: " << m_socket->peerAddress().toString() << ":" << m_socket->peerPort();
+  INFO_LOG(m_logger) << "Client connected ip: " << m_socket->peerAddress().toString() << ":" << m_socket->peerPort();
 
   if (m_socket->state() != QAbstractSocket::ConnectedState)
     return;
@@ -66,16 +66,16 @@ void ClientConnection::sendMessagesFromQueue()
   {
     ReplyMessage *message = m_messageQueue.dequeue();
     const QString msg(message->toJsonString());
-    TRACE_LOG() << "Send msg: " << msg;
+    TRACE_LOG(m_logger) << "Send msg: " << msg;
     m_socket->sendTextMessage(msg);
     delete message;
-    DEBUG_LOG() << "Sent message from queue, new size: " << m_messageQueue.size();
+    DEBUG_LOG(m_logger) << "Sent message from queue, new size: " << m_messageQueue.size();
   }
 }
 
 void ClientConnection::onSocketDisconnect()
 {
-  DEBUG_LOG() << "Client disconnected ip: " << m_socket->peerAddress().toString() << ":" << m_socket->peerPort();
+  DEBUG_LOG(m_logger) << "Client disconnected ip: " << m_socket->peerAddress().toString() << ":" << m_socket->peerPort();
   exit(0);
   emit disconnected(this);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_connection.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_connection.h
index c136aa8b6..e700812d4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_connection.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_connection.h
@@ -58,9 +58,11 @@ private slots:
 private: 
   
 
+  NGL::INGLLogger &m_logger;
   void sendMessages();
 
 private: 
+  NGL::INGLLogger &m_logger;
   QWebSocket *m_socket;
   QQueue<ReplyMessage *> m_messageQueue;
 }; 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/connection_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/connection_handler.cpp
index 253b38409..614d17768 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/connection_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/connection_handler.cpp
@@ -9,10 +9,9 @@
 
 using namespace LtsWebSocket;
 
-ConnectionHandler::ConnectionHandler(QObject *parent)
-  : QObject(parent)
-  , m_server(nullptr)
-{}
+ConnectionHandler::ConnectionHandler(QObject *parent) : QObject(parent)
+  , m_server(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 ConnectionHandler::~ConnectionHandler()
 {
@@ -33,13 +32,13 @@ bool ConnectionHandler::init(const QString &serviceName, unsigned short port)
   connect(m_server, &QWebSocketServer::newConnection, this, &ConnectionHandler::onNewConnection);
   connect(m_server, &QWebSocketServer::serverError, this, &ConnectionHandler::onServerError);
 
-  DEBUG_LOG() << "Trying to listen ";
+  DEBUG_LOG(m_logger) << "Trying to listen ";
   if (!m_server->listen(QHostAddress::Any, port))
   {
-    ERROR_LOG() << "Not possible to listen to port " << port;
+    ERROR_LOG(m_logger) << "Not possible to listen to port " << port;
     return false;
   }
-  DEBUG_LOG() << "... ok, port " << m_server->serverPort();
+  DEBUG_LOG(m_logger) << "... ok, port " << m_server->serverPort();
 
   return true;
 }
@@ -54,7 +53,7 @@ void ConnectionHandler::sendToAllClients(ReplyMessage *message)
 
 void ConnectionHandler::onServerError(QWebSocketProtocol::CloseCode closeCode)
 {
-  ERROR_LOG() << "Got server error with close code " << closeCode;
+  ERROR_LOG(m_logger) << "Got server error with close code " << closeCode;
 }
 
 void ConnectionHandler::onNewConnection()
@@ -71,7 +70,7 @@ void ConnectionHandler::onNewConnection()
 
     if (!newConnection->init())
     {
-      ERROR_LOG() << "Failed to initialise new client";
+      ERROR_LOG(m_logger) << "Failed to initialise new client";
       delete newConnection;
       newConnection = nullptr;
       continue;
@@ -84,6 +83,6 @@ void ConnectionHandler::onNewConnection()
 
     m_connections.insert(newConnection);
     emit clientConnected(newConnection);
-    INFO_LOG() << "New client connected ip: " << socket->localAddress().toString() << ":" << socket->localPort();
+    INFO_LOG(m_logger) << "New client connected ip: " << socket->localAddress().toString() << ":" << socket->localPort();
   }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/connection_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/connection_handler.h
index 7ef182bb0..e3d241f6a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/connection_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/connection_handler.h
@@ -57,6 +57,7 @@ private slots:
   void onNewConnection();
 
 private: 
+  NGL::INGLLogger &m_logger;
   QWebSocketServer *m_server;
   QSet<ClientConnection *> m_connections;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/data_manager_base_dl.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/data_manager_base_dl.h
index 49e11775b..489171ce9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/data_manager_base_dl.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/data_manager_base_dl.h
@@ -31,7 +31,7 @@ protected:
     if (!m_dbInterface->select(dataVec))
     {
       const QString errorMessage = QStringLiteral("Error reading data from database!");
-      ERROR_LOG() << errorMessage;
+      ERROR_LOG(m_logger) << errorMessage;
       ErrorMessage::ErrorData errData;
       errData.errorMessage = errorMessage;
       errData.uuid = uuid;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.cpp
index 4547c7898..86eaec1c7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.cpp
@@ -71,18 +71,18 @@ void WebSocketHelper::doOpen(const QString &hostname, const unsigned short port)
       doClose();
     else
     {
-      INFO_LOG() << "Web socket to url: " <<  url.toDisplayString() << " is already open.";
+      INFO_LOG(m_logger) << "Web socket to url: " <<  url.toDisplayString() << " is already open.";
       return;
     }
   }
 
-  INFO_LOG() << "Opening web socket to url: " << url.toDisplayString();
+  INFO_LOG(m_logger) << "Opening web socket to url: " << url.toDisplayString();
   m_socket->open(url);
 }
 
 void WebSocketHelper::doClose()
 {
-  INFO_LOG() << "Closing web socket to url:" << m_socket->requestUrl().toDisplayString();
+  INFO_LOG(m_logger) << "Closing web socket to url:" << m_socket->requestUrl().toDisplayString();
   m_socket->close();
 }
 
@@ -90,29 +90,29 @@ void WebSocketHelper::doSendTextMessage(const QString &msg)
 {
   if (!m_socket || m_socket->state() != QAbstractSocket::ConnectedState)
   {
-    ERROR_LOG() << "Message could not be send, socket is not connected.";
+    ERROR_LOG(m_logger) << "Message could not be send, socket is not connected.";
     return;
   }
-  DEBUG_LOG() << "Sending message: " << msg;
+  DEBUG_LOG(m_logger) << "Sending message: " << msg;
   m_socket->sendTextMessage(msg);
 }
 
 void WebSocketHelper::onConnected()
 {
-  INFO_LOG() << "Connected to server url: " << m_socket->requestUrl().toDisplayString()
+  INFO_LOG(m_logger) << "Connected to server url: " << m_socket->requestUrl().toDisplayString()
                      << " using local port: " << m_socket->localPort();
   emit connected();
 }
 
 void WebSocketHelper::onDisconnected()
 {
-  INFO_LOG() << "Disconnected from server url: " << m_socket->requestUrl().toDisplayString();
+  INFO_LOG(m_logger) << "Disconnected from server url: " << m_socket->requestUrl().toDisplayString();
   emit disconnected();
 }
 
 void WebSocketHelper::onError(QAbstractSocket::SocketError error)
 {
-  ERROR_LOG() << "Error occured: " << error << " closing socket.";
+  ERROR_LOG(m_logger) << "Error occured: " << error << " closing socket.";
   m_socket->close();
 }
 
@@ -131,7 +131,7 @@ void WebSocketHelper::parseMessage(const QString &message)
     clientMessage = m_messageFactory->createMessage(m_webSocketClient, message);
   else
   {
-    WARNING_LOG() << "Could not parse incoming message: '" << message
+    WARNING_LOG(m_logger) << "Could not parse incoming message: '" << message
                           << "', error: " << result.errorString();
     clientMessage = new InvalidMessage(m_webSocketClient, QString(),
                                        QStringLiteral("Got message which is not JSON conform (%1)").arg(result.errorString()));
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.h
index 96862619e..00fa9e8a1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.h
@@ -56,6 +56,8 @@ signals:
   void onSendTextMessage(const QString &msg);
 
 private:
+
+NGL::INGLLogger &m_logger;
   AbstractClientMessageFactory *m_messageFactory;
 
   QThread          *m_webSocketHelperThread;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_server.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_server.cpp
index 08c03ea41..9d3351f00 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_server.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_server.cpp
@@ -29,7 +29,7 @@ bool LtsWebSocketServer::init(const QString &serviceName, const unsigned short p
 
   if (!m_connectionHandler->init(serviceName, port))
   {
-    ERROR_LOG() << "Could not init m_connectionHandler with servicename: " << serviceName << ((port == 0) ? QStringLiteral(" random port") : QStringLiteral(" port: ") + QString::number(port));
+    ERROR_LOG(m_logger) << "Could not init m_connectionHandler with servicename: " << serviceName << ((port == 0) ? QStringLiteral(" random port") : QStringLiteral(" port: ") + QString::number(port));
     m_connectionHandler.reset();
     return false;
   }
@@ -59,7 +59,7 @@ bool LtsWebSocketServer::init(const QString &serviceName, const QPair<quint16, q
 
 void LtsWebSocketServer::sendToAllClients(ReplyMessage *message)
 {
-  DEBUG_LOG() << "Sending message to all clients: " << message->toJsonString();
+  DEBUG_LOG(m_logger) << "Sending message to all clients: " << message->toJsonString();
   m_connectionHandler->sendToAllClients(message);
 }
 
@@ -81,7 +81,7 @@ void LtsWebSocketServer::onNewTextMessage(ReplyHandler *client, const QString &m
     client->addReply(new PongMessage(message.mid(pingMsg.size())));
     return;
   }
-  DEBUG_LOG() << "Got new message: " << message;
+  DEBUG_LOG(m_logger) << "Got new message: " << message;
 
   m_messageQueue.append({client, message});
 
@@ -102,7 +102,7 @@ void LtsWebSocketServer::onQueueTimerTimeout()
     clientMessage = m_messageFactory->createMessage(credentials.client, credentials.message);
   else
   {
-    WARNING_LOG() << "Could not parse incoming message: '" << credentials.message << "', error: " << result.errorString();
+    WARNING_LOG(m_logger) << "Could not parse incoming message: '" << credentials.message << "', error: " << result.errorString();
 
     clientMessage = new InvalidMessage(credentials.client, QString(), QStringLiteral("Got message which is not JSON conform"));
   }
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 cc01887dd..80f4cdf3f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/CMakeLists.txt
@@ -153,40 +153,38 @@ MESSAGE(STATUS "DEBUG: After NGL_ADD_BIG_RESOURCES")
 
 NGL_ADD_BIG_RESOURCES(ltswidgets_SRCS resources/lts_resources.qrc)
 
-MESSAGE(STATUS "DEBUG BEFORE IF: BUILD_RTI=${BUILD_RTI}, BUILD_WS=${BUILD_WS}")
+MESSAGE(STATUS "DEBUG: BUILD_RTI=${BUILD_RTI}, BUILD_WS=${BUILD_WS}, building LtsWidgets")
+NGL_ADD_LIBRARY2(WS TOOLSWS TOOLSSV LtsWidgets SHARED ${ltswidgets_SRCS})
 
+NGL_TARGET_INCLUDE_DIRECTORIES(LtsWidgets
+  PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/../
+    ${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsCore
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+NGL_TARGET_LINK_LIBRARIES(LtsWidgets
+  PRIVATE
+    Qt6::Network # for QHostInfo - for portability
+    Qt6::Svg
+    ngltools
+    ngltranslator
+    TabBarTabStyle
+    LtsSessionData
+    LtsUtilsSettings
+  PUBLIC
+    LtsUtilsCore
+    Qt6::Core
+    Qt6::Widgets
+    Qt6::Gui
+)
+
+NGL_INSTALL_TARGET(LtsWidgets)
+
+#
+# Designer-Plugin (RTI-dependent)
+#
 IF(BUILD_RTI)
-  MESSAGE(STATUS "DEBUG: BUILD_RTI=${BUILD_RTI}, BUILD_WS=${BUILD_WS}, building LtsWidgets")
-  NGL_ADD_LIBRARY2(WS TOOLSWS TOOLSSV LtsWidgets SHARED ${ltswidgets_SRCS})
-
-  NGL_TARGET_INCLUDE_DIRECTORIES(LtsWidgets
-    PUBLIC
-      ${CMAKE_CURRENT_SOURCE_DIR}/../
-      ${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsCore
-      ${CMAKE_CURRENT_BINARY_DIR}
-  )
-
-  NGL_TARGET_LINK_LIBRARIES(LtsWidgets
-    PRIVATE
-      Qt6::Network # for QHostInfo - for portability
-      Qt6::Svg
-      ngltools
-      ngltranslator
-      TabBarTabStyle
-      LtsSessionData
-      LtsUtilsSettings
-    PUBLIC
-      LtsUtilsCore
-      Qt6::Core
-      Qt6::Widgets
-      Qt6::Gui
-  )
-
-  NGL_INSTALL_TARGET(LtsWidgets)
-
-  #
-  # Designer-Plugin
-  #
   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)
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 8ec9b8b37..dea43d262 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.cpp
@@ -486,13 +486,13 @@ void LtsDialog::showEvent(QShowEvent *event)
 
 void LtsDialog::tryLockTopic()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (!m_topicInfo.isValid())
     return;
 
   if (m_topicInfo.isLocked())
   {
-    WARNING_LOG() << Q_FUNC_INFO << " tried to lock with an already locked topic info, return";
+    WARNING_LOG(m_logger) << Q_FUNC_INFO << " tried to lock with an already locked topic info, return";
     return;
   }
 
@@ -508,7 +508,7 @@ void LtsDialog::tryLockTopic()
   
   bool bIsConnected = isSignalConnected(QMetaMethod::fromSignal(&LtsDialog::signalLockTopic));
 
-  DEBUG_LOG() << Q_FUNC_INFO
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO
                       << " signalLockTopic(): "
                       << ", TopicName =" << m_topicInfo.topicName()
                       << ", entity =" << m_topicInfo.entityId()
@@ -520,7 +520,7 @@ void LtsDialog::tryLockTopic()
     
     m_topicInfo.setLocked();
   }
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void LtsDialog::initTopicLockHandler(const QString &topicName, int entityId)
@@ -535,14 +535,14 @@ void LtsDialog::initTopicLockHandler(const QString &topicName, int entityId)
 
 void LtsDialog::tryLockTopicNew()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   tryLockTopic();
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void LtsDialog::tryLockTopicNew(const QString &topicName, int entityId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
                       << ", topicName='" << topicName << "'"
                       << ", entityId=" << entityId;
 
@@ -550,7 +550,7 @@ void LtsDialog::tryLockTopicNew(const QString &topicName, int entityId)
 
   if (m_topicInfo.entityId() != entityId)
   {
-    DEBUG_LOG() << Q_FUNC_INFO << " topicName='" << topicName << "'"
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " topicName='" << topicName << "'"
                         << " change from " << m_topicInfo.entityId() << " to " << entityId;
     m_topicInfo.setLocked(false);
   }
@@ -561,16 +561,16 @@ void LtsDialog::tryLockTopicNew(const QString &topicName, int entityId)
   m_topicInfo.setValid();
 
   tryLockTopic();
-  TRACE_LOG() << Q_FUNC_INFO << " END"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END"
                       << ", topicName='" << topicName << "'"
                       << ", entityId=" << entityId;
 }
 
 void LtsDialog::triggerTopicLock()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START" << " !!trigger!!";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START" << " !!trigger!!";
   tryLockTopic();
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 
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 aedb37ba2..13f0534df 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.h
@@ -43,6 +43,8 @@ public:
   void setValid() { m_valid = true; }
 
 private:
+
+NGL::INGLLogger &m_logger;
   QString m_topicName;
   int m_entityId{0};
   bool m_locked{false};
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 dcc96ecfc..1e3cad565 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.cpp
@@ -78,7 +78,7 @@ void Pacemaker::init(DDSConnector::DdsConnector *ddsConnector)
   m_dtsCurrentRunningState = ddsConnector->createDTS<DTS::CurrentRunningStateImpl>();
   if (!m_dtsCurrentRunningState)
   {
-    WARNING_LOG() << "Can not initialize DTS::CurrentRunningState!";
+    WARNING_LOG(m_logger) << "Can not initialize DTS::CurrentRunningState!";
     return;
   }
   m_state.pid(QCoreApplication::applicationPid());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.h
index 17834ae9d..62441675a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.h
@@ -41,10 +41,12 @@ public Q_SLOTS:
   void publishState();
 
 private:
+  NGL::INGLLogger &m_logger;
   void init(DDSConnector::DdsConnector *ddsConnector);
   void setNewStateInternal(Core::RunningState newState, const QString &errorString = QString());
   void addPortInternal(unsigned short number, Core::PortType portType, const QString &properties = QStringLiteral(""));
 private:
+  NGL::INGLLogger &m_logger;
   static constexpr const int m_publishTimerDelay = 3000;
 
   CurrentRunningState  m_state;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.cpp
index e839c418a..0f87098c8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.cpp
@@ -33,7 +33,7 @@ DdsConnector::DdsConnector(int domainId,
   .getNGLLogger("Common.DDSConnector"))
 {
   initInternal();
-  DEBUG_LOG() << "DdsConnector ctor: " << m_domainId << "," << m_partitionId << ","<< m_exerciseId << "," << static_cast<int>(m_defaultPartitionType);
+  DEBUG_LOG(m_logger) << "DdsConnector ctor: " << m_domainId << "," << m_partitionId << ","<< m_exerciseId << "," << static_cast<int>(m_defaultPartitionType);
 }
 
 DdsConnector::DdsConnector(int domainId,
@@ -108,7 +108,7 @@ bool DdsConnector::init(const QStringList &qosFileList)
 
 QUrl DdsConnector::getTcpConnectionUrl() const
 {
-  DEBUG_LOG() << this << " gettcpConnectionUrl: " << m_tcpConnectionUrl.toString();
+  DEBUG_LOG(m_logger) << this << " gettcpConnectionUrl: " << m_tcpConnectionUrl.toString();
   return m_tcpConnectionUrl;
 }
 
@@ -180,7 +180,7 @@ std::string DdsConnector::getPartitionString(IDL::PartitionType pt, int partitio
   }
 
   NGL::INGLLogger &m_logger = NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("Common.DDSConnector");
-  ERROR_LOG() << "Invalid partition type: " << static_cast<int>(pt);
+  ERROR_LOG(m_logger) << "Invalid partition type: " << static_cast<int>(pt);
   return std::string();
 }
 
@@ -204,7 +204,7 @@ void DdsConnector::setDomainParticipant(const dds::domain::DomainParticipant &pa
   }
   catch (const dds::core::Exception &ex)
   {
-    WARNING_LOG() << "Could not enable DomainParticipant: " << ex.what();
+    WARNING_LOG(m_logger) << "Could not enable DomainParticipant: " << ex.what();
     exit(1);
   }
 }
@@ -213,7 +213,7 @@ void DdsConnector::setPublisher(Publisher *publisher)
 {
   if (m_publisher && publisher != m_publisher)
   {
-    WARNING_LOG() << "Trying to set publisher but there is already a publisher set - overwriting!";
+    WARNING_LOG(m_logger) << "Trying to set publisher but there is already a publisher set - overwriting!";
     delete m_publisher;
   }
   m_publisher = publisher;
@@ -232,7 +232,7 @@ void DdsConnector::setSubscriber(Subscriber *subscriber)
 {
   if (m_subscriber && subscriber != m_subscriber)
   {
-    WARNING_LOG() << "Trying to set subscriber but there is already a subscriber set - overwriting!";
+    WARNING_LOG(m_logger) << "Trying to set subscriber but there is already a subscriber set - overwriting!";
     delete m_subscriber;
   }
   m_subscriber = subscriber;
@@ -257,13 +257,13 @@ void DdsConnector::initInternal()
       m_defaultPartitionType == IDL::PartitionType::AllExercises)
     m_partitionId = -1;
   if (m_defaultPartitionType == IDL::PartitionType::Exercise && m_partitionId < 0)
-    WARNING_LOG() << "Want to subscribe to an exercise, but no exercise Id is given!";
+    WARNING_LOG(m_logger) << "Want to subscribe to an exercise, but no exercise Id is given!";
   if (m_defaultPartitionType == IDL::PartitionType::Global)
   {
     m_partitionId = 0;
     m_exerciseId = 0;
   }
-  INFO_LOG() << "DDSConnector(" << m_domainId << ") for partition: " << m_partitionId
+  INFO_LOG(m_logger) << "DDSConnector(" << m_domainId << ") for partition: " << m_partitionId
                      << " with partition type " << static_cast<int>(m_defaultPartitionType);
 
   
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.h
index cbe3028c4..2fcbd7199 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.h
@@ -182,9 +182,11 @@ public:
   }
 
 private:
+  NGL::INGLLogger &m_logger;
   void initInternal();
   void createWaitSetHandler();
 private:
+  NGL::INGLLogger &m_logger;
   int                                m_domainId;
   IDL::PartitionType                 m_defaultPartitionType;
   int                                m_partitionId;
@@ -207,6 +209,7 @@ public:
     : m_coherentSet(connector->getDdsPublisher())
   {}
 private:
+  NGL::INGLLogger &m_logger;
   dds::pub::CoherentSet m_coherentSet;
 };
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/pub_sub_base.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/pub_sub_base.h
index 981326e93..2816ce0e7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/pub_sub_base.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/pub_sub_base.h
@@ -18,6 +18,7 @@ namespace DDSConnector
 class DDSCONNECTOR_EXPORT PubSubBase
 {
 protected:
+NGL::INGLLogger &m_logger;
   PubSubBase(const dds::domain::DomainParticipant &domainParticipant,
                       const std::string &partition,
                       const char *loggerName);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DTC/generic_dtc_impl.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/DTC/generic_dtc_impl.h
index 0a7af6968..47a793190 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DTC/generic_dtc_impl.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DTC/generic_dtc_impl.h
@@ -81,12 +81,12 @@ public:
   {
     if (m_subscriberCallback)
     {
-      WARNING_LOG() << "Can not set subscriber callback - already set ...";
+      WARNING_LOG(m_logger) << "Can not set subscriber callback - already set ...";
       return false;
     }
     if (!m_subscriberListener)
     {
-      WARNING_LOG() << "Can not set subscriber callback - no subscriber listener ...";
+      WARNING_LOG(m_logger) << "Can not set subscriber callback - no subscriber listener ...";
       return false;
     }
 
@@ -94,7 +94,7 @@ public:
 
     if (!m_dataReaderObject)
     {
-      WARNING_LOG() << "Can not set subscriber callback - no data reader object ...";
+      WARNING_LOG(m_logger) << "Can not set subscriber callback - no data reader object ...";
       return false;
     }
 
@@ -193,7 +193,7 @@ protected:
     Q_UNUSED(topicType);
     if (m_writerState.testAndSetRelaxed(1, 0))
     {
-      DEBUG_LOG() << "Recreate Reader for topic " << topicName
+      DEBUG_LOG(m_logger) << "Recreate Reader for topic " << topicName
                           << ", type name " << DDS::topic_type_name<TopicTypeRead>::value();
       if (m_subscriberListener)
         m_subscriberListener->removeCallback(m_dataReaderObject->getDataReader(), this);
@@ -202,7 +202,7 @@ protected:
         m_subscriberListener->addCallback(m_dataReaderObject->getDataReader(), this);
     }
 
-    DEBUG_LOG() << "IN droDataAvailable(), topic name: " << topicName
+    DEBUG_LOG(m_logger) << "IN droDataAvailable(), topic name: " << topicName
                         << ", type name " << DDS::topic_type_name<TopicTypeRead>::value()
                         << ", this: " << this
                         << ", m_dataReaderObject: " << m_dataReaderObject
@@ -235,7 +235,7 @@ protected:
   {
     if (!droInitOk)
     {
-      ERROR_LOG() << "Error initializing DRO for type " << DDS::topic_type_name<TopicTypeRead>::value();
+      ERROR_LOG(m_logger) << "Error initializing DRO for type " << DDS::topic_type_name<TopicTypeRead>::value();
       delete m_dataReaderObject;
       m_dataReaderObject  = nullptr;
       return false;
@@ -243,13 +243,13 @@ protected:
 
     if (m_subscriberListener)
     {
-      DEBUG_LOG() << "subscriberListener exists, adding type "
+      DEBUG_LOG(m_logger) << "subscriberListener exists, adding type "
                           << DDS::topic_type_name<TopicTypeRead>::value();
       m_subscriberListener->addCallback(m_dataReaderObject->getDataReader(), this);
     }
     else
     {
-      DEBUG_LOG() << "Cannot add DTC to subscriberListener callback - type: "
+      DEBUG_LOG(m_logger) << "Cannot add DTC to subscriberListener callback - type: "
                           << DDS::topic_type_name<TopicTypeRead>::value();
     }
     m_dataReaderObject->setHaveSubscriberCallback(m_subscriberListener != nullptr);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DTS/generic_dts_impl.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/DTS/generic_dts_impl.h
index c554e1e4d..f6d6b156d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DTS/generic_dts_impl.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DTS/generic_dts_impl.h
@@ -36,7 +36,7 @@ namespace DTS
     bool write(const TopicType &data,
                const dds::core::optional<dds::sub::SampleInfo> &si = dds::core::optional<dds::sub::SampleInfo>())  override final
     {
-      DEBUG_LOG() << "IN write ("
+      DEBUG_LOG(m_logger) << "IN write ("
                           << DDS::topic_type_name<TopicType>::value()
                           << ")";
 
@@ -45,11 +45,11 @@ namespace DTS
 
       if (!m_dataWriterObject->write(data, si))
       {
-        ERROR_LOG() << "Error writing for "
+        ERROR_LOG(m_logger) << "Error writing for "
                             << DDS::topic_type_name<TopicType>::value();
         return false;
       }
-      DEBUG_LOG() << "TopicData ("
+      DEBUG_LOG(m_logger) << "TopicData ("
                           << DDS::topic_type_name<TopicType>::value()
                           << ") written";
 
@@ -58,7 +58,7 @@ namespace DTS
 
     bool remove(const TopicType &data, bool errorMsgIfNotExists = true) override final
     {
-      DEBUG_LOG() << "IN remove ("
+      DEBUG_LOG(m_logger) << "IN remove ("
                           << DDS::topic_type_name<TopicType>::value()
                           << ")";
 
@@ -68,11 +68,11 @@ namespace DTS
       if (!m_dataWriterObject->remove(data, errorMsgIfNotExists))
       {
         if (errorMsgIfNotExists)
-          ERROR_LOG() << "Error removing for "
+          ERROR_LOG(m_logger) << "Error removing for "
                               << DDS::topic_type_name<TopicType>::value();
         return false;
       }
-      DEBUG_LOG() << "TopicData ("
+      DEBUG_LOG(m_logger) << "TopicData ("
                           << DDS::topic_type_name<TopicType>::value()
                           << ") removed";
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests.cpp
index 26d4d4bd9..174766ff6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests.cpp
@@ -15,8 +15,7 @@
 #include <QThread>
 
 
-DataTopicTests::DataTopicTests()
-  : m_domainParticipantPub(nullptr)
+DataTopicTests::DataTopicTests() : m_domainParticipantPub(nullptr)
   , m_domainParticipantSub(nullptr)
   , m_domainId(0)
   , m_partitionId(1)
@@ -26,12 +25,12 @@ DataTopicTests::DataTopicTests()
   , m_subscriberListener(nullptr)
   , m_dtcTestPart(nullptr)
   , m_mainThreadId(QThread::currentThreadId())
-  .getNGLLogger("UnitTests.DataTopicTests"))
-{
+  .getNGLLogger("UnitTests.DataTopicTests")),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   if (!DDS::QosProfile::setDefault())
-    ERROR_LOG() << "Error setting default QoS from xml-file ";
+    ERROR_LOG(m_logger) << "Error setting default QoS from xml-file ";
 
-  DEBUG_LOG() << "Main thread ID is " << m_mainThreadId;
+  DEBUG_LOG(m_logger) << "Main thread ID is " << m_mainThreadId;
 }
 
 DataTopicTests::~DataTopicTests()
@@ -65,7 +64,7 @@ bool DataTopicTests::initPublisher()
   partitionQos.name( { partition.toStdString() } );
   publisherQos << partitionQos;
 
-  DEBUG_LOG() << "Publish on partition " << partition;
+  DEBUG_LOG(m_logger) << "Publish on partition " << partition;
 
   m_ddsPublisher = dds::pub::Publisher(m_domainParticipantPub, publisherQos);
   m_testPart = new DTS::TestParticipantImpl(m_domainParticipantPub, m_ddsPublisher);
@@ -75,8 +74,8 @@ bool DataTopicTests::initPublisher()
 
 bool DataTopicTests::write(const DdsUnitTests::TestParticipant &data)
 {
-  INFO_LOG() << "Publish topic TestParticipant ";
-  DEBUG_LOG() << "ParticipantId: " << data.location().participantId()
+  INFO_LOG(m_logger) << "Publish topic TestParticipant ";
+  DEBUG_LOG(m_logger) << "ParticipantId: " << data.location().participantId()
                       << ", equipNo = " << data.location().equipNo();
 
   return m_testPart->write(data);
@@ -88,7 +87,7 @@ bool DataTopicTests::write(const DdsUnitTests::TestParticipant &data)
 
 bool DataTopicTests::initSubscriber()
 {
-  DEBUG_LOG() << "Initialisation DDS (Subscriber/Reader)";
+  DEBUG_LOG(m_logger) << "Initialisation DDS (Subscriber/Reader)";
 
   m_domainParticipantSub =
       dds::domain::DomainParticipant(m_domainId,
@@ -108,7 +107,7 @@ bool DataTopicTests::initSubscriber()
   partitionQos.name( partitions );
   subscriberQos << partitionQos;
 
-  DEBUG_LOG() << "Initialise DTC::SubscriberListener";
+  DEBUG_LOG(m_logger) << "Initialise DTC::SubscriberListener";
   m_subscriberListener = new DDSGeneric::SubscriberListener();
   m_ddsSubscriber = dds::sub::Subscriber(m_domainParticipantSub,
                                          subscriberQos,
@@ -142,10 +141,10 @@ void DataTopicTests::deleteSubscriber()
 
 void DataTopicTests::processData(const DdsUnitTests::TestParticipant &instance, const dds::sub::SampleInfo &si)
 {
-  INFO_LOG() << "process data in topic TestParticipant, Sampleinfo: " << si.source_timestamp().sec();
+  INFO_LOG(m_logger) << "process data in topic TestParticipant, Sampleinfo: " << si.source_timestamp().sec();
 
-  DEBUG_LOG() << "participantId: "  << instance.location().participantId();
-  DEBUG_LOG() << "equipNo: " << instance.location().equipNo();
+  DEBUG_LOG(m_logger) << "participantId: "  << instance.location().participantId();
+  DEBUG_LOG(m_logger) << "equipNo: " << instance.location().equipNo();
 
   m_receivedParticipantData = instance;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests.h
index 0449855c9..1f1dbbacf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests.h
@@ -34,6 +34,7 @@ public:
 
 protected:
   
+  NGL::INGLLogger &m_logger;
   void processData(const DdsUnitTests::TestParticipant &instance, const dds::sub::SampleInfo &si);
 
 Q_SIGNALS:  
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests_main.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests_main.cpp
index 678e84399..364035cf1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests_main.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests_main.cpp
@@ -33,7 +33,7 @@ DataTopicTestsMain::DataTopicTestsMain()
 
 void DataTopicTestsMain::initTestCase()
 {
-  DEBUG_LOG() <<"DataTopicTestsMain: initTestCase";
+  DEBUG_LOG(m_logger) <<"DataTopicTestsMain: initTestCase";
 
   m_dtTest = new DataTopicTests();
   QVERIFY2(m_dtTest, "Initialisation of DataTopicTest failed");
@@ -46,20 +46,20 @@ void DataTopicTestsMain::initTestCase()
 
 void DataTopicTestsMain::publishTestCase()
 {  
-  DEBUG_LOG() <<"DataTopicTestsMain: publish TestParticipant";
+  DEBUG_LOG(m_logger) <<"DataTopicTestsMain: publish TestParticipant";
   
   m_sentParticipantData.location().participantId(100);
   m_sentParticipantData.location().equipNo(1010);
   m_sentParticipantData.testId(100);
   QVERIFY2(m_dtTest->write(m_sentParticipantData), "Publishing Topic TestParticipant failed");
 
-  DEBUG_LOG() <<"DataTopicTestsMain: publish ready";
+  DEBUG_LOG(m_logger) <<"DataTopicTestsMain: publish ready";
 }
 
 
 void DataTopicTestsMain::subscribeTestCase()
 {
-  DEBUG_LOG() << "IN subscribeTestCase";
+  DEBUG_LOG(m_logger) << "IN subscribeTestCase";
 
   QTRY_COMPARE(m_participantDataArrivedSpy->count(), 1);
 
@@ -95,7 +95,7 @@ void DataTopicTestsMain::deleteDataReaderTestCase()
 
 void DataTopicTestsMain::cleanupTestCase()
 {
-  DEBUG_LOG() <<"DataTopicTestsMain: cleanupTestCase";
+  DEBUG_LOG(m_logger) <<"DataTopicTestsMain: cleanupTestCase";
   delete m_dtTest; m_dtTest = nullptr;
   delete m_participantDataArrivedSpy; m_participantDataArrivedSpy = nullptr;  
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests_main.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests_main.h
index 242958b1e..0a2d2dd16 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests_main.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests_main.h
@@ -30,6 +30,7 @@ private Q_SLOTS:
 
 protected:
 
+  NGL::INGLLogger &m_logger;
 private:  
   DdsUnitTests::TestParticipant  m_sentParticipantData;
   QSignalSpy                    *m_participantDataArrivedSpy = nullptr;
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 2f0520be8..4ccce30e7 100755
--- 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
@@ -27,10 +27,9 @@ int main(int argc, char *argv[])
 }
 
 
-FunctionTopicTests::FunctionTopicTests()
-  : m_mainThreadId(QThread::currentThreadId())
-  .getNGLLogger("UnitTests.FunctionTopicTests"))
-{
+FunctionTopicTests::FunctionTopicTests() : m_mainThreadId(QThread::currentThreadId())
+  .getNGLLogger("UnitTests.FunctionTopicTests")),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   qRegisterMetaType<DdsUnitTests::FunctionReply>("DdsUnitTests::FunctionReply");
   qRegisterMetaType<DdsUnitTests::FunctionReplyWithState>("DdsUnitTests::FunctionReplyWithState");
 }
@@ -38,7 +37,7 @@ FunctionTopicTests::FunctionTopicTests()
 
 void FunctionTopicTests::initTestCase()
 {
-  DEBUG_LOG() <<"FunctionTopicTests: initTestCase";
+  DEBUG_LOG(m_logger) <<"FunctionTopicTests: initTestCase";
 
   const int domainId = 0;
 
@@ -97,7 +96,7 @@ void FunctionTopicTests::requestWithState()
   QSignalSpy spyRequest(this, &FunctionTopicTests::functionTopicRequestFinished);
   QSignalSpy spyReply(this, &FunctionTopicTests::functionTopicReply);
 
-  DEBUG_LOG() <<"FunctionTopicTests: request";
+  DEBUG_LOG(m_logger) <<"FunctionTopicTests: request";
 
   
   DdsUnitTests::FunctionRequestWithState data;
@@ -125,7 +124,7 @@ void FunctionTopicTests::requestTestCase2()
   QSignalSpy spyRequest(this, &FunctionTopicTests::functionTopicRequestFinished);
   QSignalSpy spyReply(this, &FunctionTopicTests::functionTopicReply);
 
-  DEBUG_LOG() <<"FunctionTopicTests: request";
+  DEBUG_LOG(m_logger) <<"FunctionTopicTests: request";
 
   
   DdsUnitTests::FunctionRequest data;
@@ -149,7 +148,7 @@ void FunctionTopicTests::requestTestCase2()
 
 void FunctionTopicTests::cleanupTestCase()
 {
-  DEBUG_LOG() <<"FunctionTopicTests: cleanupTestCase";
+  DEBUG_LOG(m_logger) <<"FunctionTopicTests: cleanupTestCase";
 
   m_fts = nullptr;
   m_ftc = nullptr;
@@ -165,7 +164,7 @@ void FunctionTopicTests::onFunctionTopicRequest(const rti::core::SampleIdentity
 {
   QCOMPARE(m_mainThreadId, QThread::currentThreadId());
 
-  INFO_LOG() << "Got function topic request (with status member)";
+  INFO_LOG(m_logger) << "Got function topic request (with status member)";
   m_requestTopicWithState = request;
   QCOMPARE(m_requestTopicWithState.id(), 1);
   QCOMPARE(m_requestTopicWithState.info().get(), std::string("Test request"));
@@ -173,7 +172,7 @@ void FunctionTopicTests::onFunctionTopicRequest(const rti::core::SampleIdentity
 
   DdsUnitTests::FunctionReplyWithState reply;
 
-  DEBUG_LOG() << "Send sample with status REPLY_COMPLETED";
+  DEBUG_LOG(m_logger) << "Send sample with status REPLY_COMPLETED";
   reply.id(1);
   reply.errorString("Hello");
   reply.replyState(Core::FtReplyState::Completed);
@@ -191,7 +190,7 @@ void FunctionTopicTests::onFunctionTopicRequest(const rti::core::SampleIdentity
 {
   QCOMPARE(m_mainThreadId, QThread::currentThreadId());
 
-  INFO_LOG() << "Got function topic request (without status member)";
+  INFO_LOG(m_logger) << "Got function topic request (without status member)";
 
   m_requestTopic = request;
 
@@ -214,7 +213,7 @@ void FunctionTopicTests::slotRequestedData(const DdsUnitTests::FunctionTopicTest
   Q_UNUSED(seqNo);
   QCOMPARE(m_mainThreadId, QThread::currentThreadId());
 
-  INFO_LOG() << "Got reply from FTS: " << reply.replyState();
+  INFO_LOG(m_logger) << "Got reply from FTS: " << reply.replyState();
 
   m_replyTopicWithState = reply;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/function_topic_tests.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/function_topic_tests.h
index 41014a3bd..214c9fe25 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/function_topic_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/function_topic_tests.h
@@ -48,9 +48,11 @@ protected Q_SLOTS:
                               const DdsUnitTests::FunctionRequestWithState &request);
 
 private:
+  NGL::INGLLogger &m_logger;
   void requestWithState();
 private:
   
+  NGL::INGLLogger &m_logger;
   std::unique_ptr<FTS::FunctionTopicTest> m_fts;
   std::unique_ptr<FTS::FunctionTopicTestWithState> m_ftsWS;
   
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/generic_data_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/generic_data_tests.cpp
index 45ba551bf..c471f69b2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/generic_data_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/generic_data_tests.cpp
@@ -38,7 +38,7 @@ GenericDataTests::GenericDataTests()
 
 void GenericDataTests::initTestCase()
 {
-  DEBUG_LOG() <<"GenericDataTests: initTestCase";
+  DEBUG_LOG(m_logger) <<"GenericDataTests: initTestCase";
 
   m_init = new Initialisation();
 
@@ -81,7 +81,7 @@ void GenericDataTests::initDWTestCase()
 
 void GenericDataTests::dataWriterTestCase()
 {
-  DEBUG_LOG() <<"GenericDataTests: dataWriter";
+  DEBUG_LOG(m_logger) <<"GenericDataTests: dataWriter";
 
   
   DdsUnitTests::SpatialData data;
@@ -125,7 +125,7 @@ void GenericDataTests::dataWriterTestCase()
 
 void GenericDataTests::dataReaderTestCase()
 {
-  DEBUG_LOG() << "GenericDataTests: dataReader";
+  DEBUG_LOG(m_logger) << "GenericDataTests: dataReader";
 
   
   QTRY_COMPARE(m_spatialData.equipNo(), 999);
@@ -136,7 +136,7 @@ void GenericDataTests::dataReaderTestCase()
 
   bool bSeenUnreadSamples = false;
   dds::sub::LoanedSamples<DdsUnitTests::TestParticipant> vecTp = m_dataReader->readAlive(bSeenUnreadSamples);
-  INFO_LOG() <<"vecTp size: " << vecTp.length();
+  INFO_LOG(m_logger) <<"vecTp size: " << vecTp.length();
   QCOMPARE(vecTp.length(), static_cast<decltype(vecTp.length())>(5));
   QCOMPARE(vecTp[0].data().id(), 10000);
   QCOMPARE(vecTp[1].data().id(), 11000);
@@ -145,7 +145,7 @@ void GenericDataTests::dataReaderTestCase()
   QCOMPARE(vecTp[4].data().id(), 11111);
 
   dds::sub::LoanedSamples<DdsUnitTests::TestParticipant> vecTpLoaned = m_dataReader->takeAlive(bSeenUnreadSamples);
-  INFO_LOG() <<"vecTpLoaned size: " << vecTp.length();
+  INFO_LOG(m_logger) <<"vecTpLoaned size: " << vecTp.length();
   QCOMPARE(vecTpLoaned.length(), static_cast<decltype(vecTpLoaned.length())>(5));
   QCOMPARE(vecTpLoaned[0].data().id(), 10000);
   QCOMPARE(vecTpLoaned[1].data().id(), 11000);
@@ -177,7 +177,7 @@ void GenericDataTests::deleteDataReaderTestCase()
 
 void GenericDataTests::cleanupTestCase()
 {
-  DEBUG_LOG() <<"GenericDataTests: cleanupTestCase";
+  DEBUG_LOG(m_logger) <<"GenericDataTests: cleanupTestCase";
   if (m_dataReader)
   {
     m_init->getSubscriberListener()->removeCallback(m_dataReader->getDataReader(), this);
@@ -198,21 +198,21 @@ void GenericDataTests::cleanupTestCase()
 
 void GenericDataTests::processData(const DdsUnitTests::SpatialData &data, DataModification modType)
 {
-  DEBUG_LOG() << "SpatialData: equipNo = " << data.equipNo() << " modType: " << modType;
+  DEBUG_LOG(m_logger) << "SpatialData: equipNo = " << data.equipNo() << " modType: " << modType;
   m_spatialData = data;
 }
 
 void GenericDataTests::processData(const DdsUnitTests::TestParticipant &data, const dds::sub::SampleInfo &si)
 {
   Q_UNUSED(si);
-  DEBUG_LOG() << "TestParticipant: equipNo = " << data.location().equipNo();
+  DEBUG_LOG(m_logger) << "TestParticipant: equipNo = " << data.location().equipNo();
   m_testPart = data;
 }
 
 void GenericDataTests::droDataAvailable(const std::string &topicType, const std::string &topicName)
 {
   Q_UNUSED(topicName)
-  DEBUG_LOG() << "IN  droDataAvailable: type = " << topicType;
+  DEBUG_LOG(m_logger) << "IN  droDataAvailable: type = " << topicType;
   if (topicType == "DdsUnitTests::TestParticipant")
   {
     m_init->getSubscriberListener()->enableCallback(m_dataReader->getDataReader(), this);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/generic_data_tests.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/generic_data_tests.h
index 1f45f88e3..f774e9312 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/generic_data_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/generic_data_tests.h
@@ -34,6 +34,7 @@ private Q_SLOTS:
   void cleanupTestCase();
 
 protected:
+  NGL::INGLLogger &m_logger;
   void droDataAvailable(const std::string &topicType, const std::string &topicName) override;
   void noWriterAnymore(const std::string &topicType, const std::string &topicName) override
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/initialisation.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/initialisation.cpp
index 7f341cdfd..547b5c79c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/initialisation.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/initialisation.cpp
@@ -8,18 +8,17 @@
 #include <Lts/Common/ProjectConfig/project_defines.h>
 
 
-Initialisation::Initialisation()
-  : m_domainParticipant(nullptr)
+Initialisation::Initialisation() : m_domainParticipant(nullptr)
   , m_domainParticipantSub(nullptr)
   , m_domainId(0)
   , m_exerciseId(-1)
   , m_ddsPublisher(nullptr)
   , m_ddsSubscriber(nullptr)
   , m_subListener(new DDSGeneric::SubscriberListener)
-  .getNGLLogger("UnitTests.Initialisation"))
-{
+  .getNGLLogger("UnitTests.Initialisation")),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   if (!DDS::QosProfile::setDefault())
-    ERROR_LOG() << "Error setting default QoS from xml-file ";
+    ERROR_LOG(m_logger) << "Error setting default QoS from xml-file ";
 
 }
 
@@ -52,7 +51,7 @@ bool Initialisation::initDDS(int domainId, int exerciseId, PubSub pubsub)
   {
     dds::pub::qos::PublisherQos publisherQos = m_domainParticipant.default_publisher_qos();
 
-    DEBUG_LOG() << "Publish on partition " << IDL::exercisePartition(exerciseId);
+    DEBUG_LOG(m_logger) << "Publish on partition " << IDL::exercisePartition(exerciseId);
 
     
     dds::core::policy::Partition partitionQos;
@@ -74,7 +73,7 @@ bool Initialisation::initDDS(int domainId, int exerciseId, PubSub pubsub)
 
     dds::sub::qos::SubscriberQos subscriberQos = domainPart.default_subscriber_qos();
 
-    DEBUG_LOG() << "Subsribing on partition " << IDL::exercisePartition(exerciseId);
+    DEBUG_LOG(m_logger) << "Subsribing on partition " << IDL::exercisePartition(exerciseId);
 
     
     dds::core::policy::Partition partitionQos;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/initialisation.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/initialisation.h
index 44165ef7f..11c4d4220 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/initialisation.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/initialisation.h
@@ -33,6 +33,7 @@ public:
   DDSGeneric::SubscriberListener *getSubscriberListener()   { return m_subListener; }
 
 private:
+  NGL::INGLLogger &m_logger;
   dds::domain::DomainParticipant  m_domainParticipant;
   dds::domain::DomainParticipant  m_domainParticipantSub;
   int                             m_domainId;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_impl.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_impl.h
index b72f46f7a..bdaf164e1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_impl.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_impl.h
@@ -100,7 +100,7 @@ public:
     DDS::QosProfile::print(m_requesterParams.datareader_qos(), m_logger);
     DDS::QosProfile::print(m_requesterParams.datawriter_qos(), m_logger);
 
-    DEBUG_LOG() << "=> Static request using request/reply topic names: "
+    DEBUG_LOG(m_logger) << "=> Static request using request/reply topic names: "
                         << TopicNameHelper::requestTopicName()
                         << ", reply: "
                         << TopicNameHelper::replyTopicName();
@@ -395,13 +395,13 @@ private:
     bool inProgress = true;
     while (inProgress && isRun())
     {
-      DEBUG_LOG() << "Waiting for reply ";
+      DEBUG_LOG(m_logger) << "Waiting for reply ";
 
       connext::Sample<ReplyTopic> reply;
       
       if (!requester.receive_reply(reply, MAX_WAIT))
       {
-        WARNING_LOG() << "Timed out waiting for reply";
+        WARNING_LOG(m_logger) << "Timed out waiting for reply";
         sendError(request, 3);
         return;
       }
@@ -412,14 +412,14 @@ private:
         if (request.sample.info().identity() != reply.info()->related_original_publication_virtual_sample_identity())
         {
           
-          INFO_LOG() << "#receiveReply - outdated. sample id: " << connext::DebugInfo::toReadable(request.sample.info().identity())
+          INFO_LOG(m_logger) << "#receiveReply - outdated. sample id: " << connext::DebugInfo::toReadable(request.sample.info().identity())
                              << ", virutal sample id: " << connext::DebugInfo::toReadable(reply.info()->related_original_publication_virtual_sample_identity());
           continue;
         }
         inProgress = isInProgress(reply);
         if (request.replySlot.isValid())
         {
-          INFO_LOG() << "#receiveReply for " << TopicNameHelper::replyTopicTypeName();
+          INFO_LOG(m_logger) << "#receiveReply for " << TopicNameHelper::replyTopicTypeName();
           
           request.replySlot.invoke(m_objToInform, Qt::QueuedConnection,
                                    QArgument<ReplyTopic>(TopicNameHelper::replyTopicTypeName(), reply.data()),  
@@ -428,13 +428,13 @@ private:
         }
         else
         {
-          WARNING_LOG() << "reply slot doesn't exist for " << dds::topic::topic_type_name<ReplyTopic>::value();
+          WARNING_LOG(m_logger) << "reply slot doesn't exist for " << dds::topic::topic_type_name<ReplyTopic>::value();
         }
         if (!inProgress)
           return;
       }
       else
-        WARNING_LOG() << "No valid data available ";
+        WARNING_LOG(m_logger) << "No valid data available ";
 
       
 
@@ -457,7 +457,7 @@ private:
       
       if (!requester.receive_reply(reply, MAX_WAIT))
       {
-        WARNING_LOG() << "Timeout while waiting for reply!";
+        WARNING_LOG(m_logger) << "Timeout while waiting for reply!";
         throw std::runtime_error("Timeout while waiting for reply!");
       }
 
@@ -465,7 +465,7 @@ private:
 
       if (!reply.info().valid())
       {
-        WARNING_LOG() << "No valid data available!";
+        WARNING_LOG(m_logger) << "No valid data available!";
         
         throw std::runtime_error("No valid data available!");
       }
@@ -473,7 +473,7 @@ private:
       if (request.sample.info().identity() != reply.info()->related_original_publication_virtual_sample_identity())
       {
         
-        INFO_LOG() << "#receiveReply - outdated. sample id: " << connext::DebugInfo::toReadable(request.sample.info().identity())
+        INFO_LOG(m_logger) << "#receiveReply - outdated. sample id: " << connext::DebugInfo::toReadable(request.sample.info().identity())
                            << ", virutal sample id: " << connext::DebugInfo::toReadable(reply.info()->related_original_publication_virtual_sample_identity());
         continue;
       }
@@ -481,10 +481,10 @@ private:
       Q_ASSERT(!isInProgress(reply));
       if (isInProgress(reply))
       {
-        ERROR_LOG() << "Used ModernRequest for a request with FtReplyState! Your data will most likely be imcomplete!";
+        ERROR_LOG(m_logger) << "Used ModernRequest for a request with FtReplyState! Your data will most likely be imcomplete!";
       }
 
-      INFO_LOG() << "#receiveReply for " << TopicNameHelper::replyTopicTypeName();
+      INFO_LOG(m_logger) << "#receiveReply for " << TopicNameHelper::replyTopicTypeName();
 
       request.promise.set_value(reply.data());
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/connext.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/connext.h
index a5a0115b7..f2eec26a4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/connext.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/connext.h
@@ -312,7 +312,7 @@ public:
       
       m_contentFilteredTopic->filter(dds::topic::Filter(filterContent.data()));
     }
-    DEBUG_LOG() << "content filter for topic "
+    DEBUG_LOG(m_logger) << "content filter for topic "
                         << ReplyRequestBase<REQUEST, REPLY>::m_requestTopic.name()
                         << " - related_sample_identity should be: "
                         << writerGuid;
@@ -349,7 +349,7 @@ public:
     m_dataWriter->write(request.data(), request.info());
 
     const rti::core::SampleIdentity currentSampleIdentity = request.info().identity();
-    DEBUG_LOG() << "send_request for topic "
+    DEBUG_LOG(m_logger) << "send_request for topic "
                         << ReplyRequestBase<REQUEST, REPLY>::m_requestTopic.name()
                         << ", m_currentSampleIdentity: "
                         << DebugInfo::toReadable(currentSampleIdentity);
@@ -369,12 +369,12 @@ public:
       
       if (m_dataReader->take(reply.data(), reply.info()) && reply.info().valid())
       {
-        DEBUG_LOG() << "receive_reply for topic "
+        DEBUG_LOG(m_logger) << "receive_reply for topic "
                             << ReplyRequestBase<REQUEST, REPLY>::m_requestTopic.name()
                             << ", SampleIdentity - original publication virtual: "
                             << DebugInfo::toReadable(reply.info()->original_publication_virtual_sample_identity());
 
-        DEBUG_LOG() << "receive_reply for topic "
+        DEBUG_LOG(m_logger) << "receive_reply for topic "
                             << ReplyRequestBase<REQUEST, REPLY>::m_requestTopic.name()
                             << ", SampleIdentity - related original: "
                             << DebugInfo::toReadable(reply.info()->related_original_publication_virtual_sample_identity());
@@ -387,7 +387,7 @@ public:
       dds::core::cond::WaitSet::ConditionSeq activeConditionsSeq = waitset.wait(duration);
       if (activeConditionsSeq.empty())
       {
-        ERROR_LOG() << "Bailing out!";
+        ERROR_LOG(m_logger) << "Bailing out!";
         break;
       }
     }
@@ -398,7 +398,7 @@ public:
       if (!m_curInstanceHandle.is_nil())
       {
         
-        DEBUG_LOG() << "Keyed topic - disposing instance: "
+        DEBUG_LOG(m_logger) << "Keyed topic - disposing instance: "
                             << ReplyRequestBase<REQUEST, REPLY>::m_requestTopic.name();
         m_dataWriter.dispose_instance(m_curInstanceHandle);
       }
@@ -448,7 +448,7 @@ public:
                   const rti::core::SampleIdentity &identity,
                   bool bLastSample = true)
   {
-    DEBUG_LOG() << "send_reply for topic "
+    DEBUG_LOG(m_logger) << "send_reply for topic "
                         << ReplyRequestBase<REQUEST, REPLY>::m_requestTopic.name()
                         << ", sampleIdentity: " << DebugInfo::toReadable(identity);
 
@@ -459,7 +459,7 @@ public:
       sf |= rti::core::SampleFlag::intermediate_reply_sequence();
     reply.info().flag(sf);
     reply.info().related_sample_identity(identity);
-    DEBUG_LOG() << "send_reply for topic "
+    DEBUG_LOG(m_logger) << "send_reply for topic "
                         << ReplyRequestBase<REQUEST, REPLY>::m_requestTopic.name()
                         << ", related sampleIdentity: " << DebugInfo::toReadable(reply.info().related_sample_identity());
 
@@ -473,7 +473,7 @@ public:
 
     if (request.info().valid())
     {
-      DEBUG_LOG() << "receive_request for topic "
+      DEBUG_LOG(m_logger) << "receive_request for topic "
                           << ReplyRequestBase<REQUEST, REPLY>::m_requestTopic.name()
                           << ", sampleIdentity publication_virtual_sample_identity: "
                           << DebugInfo::toReadable(request.info()->publication_virtual_sample_identity())
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_impl.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_impl.h
index a34b52ac1..655d263ef 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_impl.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_impl.h
@@ -131,7 +131,7 @@ public:
   {
     if (m_subscriberCallback)
     {
-      WARNING_LOG() << "Can not set subscriber callback - already set ...";
+      WARNING_LOG(m_logger) << "Can not set subscriber callback - already set ...";
       return false;
     }
 
@@ -157,7 +157,7 @@ public:
 
   bool sendReply(const rti::core::SampleIdentity &requestIdentity, const QVector<ReplyTopic> &replyData) override final
   {
-    DEBUG_LOG() << TopicNameHelper::requestTopicName() << " - IN sendReply";
+    DEBUG_LOG(m_logger) << TopicNameHelper::requestTopicName() << " - IN sendReply";
 
     for(int i = 0; i < replyData.size(); ++i)
     {
@@ -184,7 +184,7 @@ protected:
 
   void processRequest(const connext::Sample<RequestTopic> &request)
   {
-    DEBUG_LOG() << TopicNameHelper::requestTopicName() << " - processRequest: "
+    DEBUG_LOG(m_logger) << TopicNameHelper::requestTopicName() << " - processRequest: "
                         << connext::DebugInfo::toReadable(request.identity());
 
     qint64 age = qAbs(qint64(request.info().source_timestamp().to_secs()) - time(nullptr));
@@ -203,7 +203,7 @@ protected:
         s.append("...");
       }
 
-      DEBUG_LOG() << "received a request for topic "
+      DEBUG_LOG(m_logger) << "received a request for topic "
                            << TopicNameHelper::requestTopicName()
                            << " but it was outdated - ignoring. "
                            << " local time: " << (time(nullptr) - 10) << "[s], source timestamp: "
@@ -226,7 +226,7 @@ protected:
 
   void processRequests() override
   {
-    DEBUG_LOG() << TopicNameHelper::requestTopicName() << " - processRequests";
+    DEBUG_LOG(m_logger) << TopicNameHelper::requestTopicName() << " - processRequests";
 
     while (true)
     {
@@ -235,21 +235,21 @@ protected:
         std::lock_guard<std::mutex> l(m_requestMutex);
         if (m_requests.empty())
         {
-          DEBUG_LOG() << "No more requests";
+          DEBUG_LOG(m_logger) << "No more requests";
           return;
         }
-        DEBUG_LOG() << TopicNameHelper::requestTopicName() << " - read one request for ";
+        DEBUG_LOG(m_logger) << TopicNameHelper::requestTopicName() << " - read one request for ";
         request = m_requests.front();
         m_requests.pop();
       }
       if (!request.info().valid())
       {
-        WARNING_LOG() << TopicNameHelper::requestTopicName() << " - No valid data";
+        WARNING_LOG(m_logger) << TopicNameHelper::requestTopicName() << " - No valid data";
         continue;
       }
       processRequest(request);
     }
-    DEBUG_LOG() << TopicNameHelper::requestTopicName() << " - processRequests finished";
+    DEBUG_LOG(m_logger) << TopicNameHelper::requestTopicName() << " - processRequests finished";
   }
 
   bool enqueueRequests() override
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/dynamic_data_reader.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/dynamic_data_reader.h
index e3fb1d03b..b4a08228d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/dynamic_data_reader.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/dynamic_data_reader.h
@@ -53,19 +53,19 @@ public:
               const std::string &specialTopicName,
               const StructType &structType)
   {
-    DEBUG_LOG() << "IN DynamicDataReader::create ("
+    DEBUG_LOG(m_logger) << "IN DynamicDataReader::create ("
                         << m_structType->name()
                         << ")";
 
     if (domainParticipant == nullptr)
     {
-      ERROR_LOG() << "DomainParticipant does not exist ";
+      ERROR_LOG(m_logger) << "DomainParticipant does not exist ";
       return false;
     }
 
     if (m_ddsTopic != nullptr)
     {
-      ERROR_LOG() << "Type '"
+      ERROR_LOG(m_logger) << "Type '"
                           << m_structType->name()
                           << "' already created";
       return false;
@@ -84,7 +84,7 @@ public:
                                     DDS::Helper::getShortTopicName(m_structType->name()) :
                                     specialTopicName;
 
-      DEBUG_LOG() << "Creating topic " << topicName << " with type: "
+      DEBUG_LOG(m_logger) << "Creating topic " << topicName << " with type: "
                           << m_structType->name();
 
       m_ddsTopic = dds::topic::find<dds::topic::Topic<DynamicData>>(domainParticipant, topicName);
@@ -97,16 +97,16 @@ public:
         m_ddsTopic = dds::topic::Topic<DynamicData>(domainParticipant, topicName, structType);
       }
 
-      DEBUG_LOG() << "m_ddsTopic created: " << m_ddsTopic.name();
+      DEBUG_LOG(m_logger) << "m_ddsTopic created: " << m_ddsTopic.name();
 
       if (m_logger.isDebugEnabled())
       {
         dds::sub::qos::SubscriberQos subscriberQoS = ddsSubscriber.qos();
         dds::core::policy::Partition partition = subscriberQoS.policy<dds::core::policy::Partition>();
         dds::core::StringSeq parititionNames = partition.name();
-        DEBUG_LOG() << "Subscribing partitions: " << parititionNames.size();
+        DEBUG_LOG(m_logger) << "Subscribing partitions: " << parititionNames.size();
         for (const std::string &name : parititionNames)
-          DEBUG_LOG() << "SubscriberQoS: partition name = " << name;
+          DEBUG_LOG(m_logger) << "SubscriberQoS: partition name = " << name;
       }
 
       dds::sub::qos::DataReaderQos dataReaderQos = ddsSubscriber.default_datareader_qos();
@@ -129,7 +129,7 @@ public:
 
       if (m_dataReader == nullptr)
       {
-        ERROR_LOG() << "Creating dataReader for '" << topicName << "' with type: '"
+        ERROR_LOG(m_logger) << "Creating dataReader for '" << topicName << "' with type: '"
                             << m_structType->name()
                             << "' failed";
         return false;
@@ -138,11 +138,11 @@ public:
     }
     catch (const dds::core::Exception &ex)
     {
-      ERROR_LOG() << ex.what();
+      ERROR_LOG(m_logger) << ex.what();
       return false;
     }
 
-    DEBUG_LOG() << "dataReader created ("
+    DEBUG_LOG(m_logger) << "dataReader created ("
                         << m_structType->name()
                         << ")";
 
@@ -153,7 +153,7 @@ public:
   bool hasSamples() const
   {
     qint64 sampleSize = m_dataReader->datareader_cache_status().sample_count();
-    DEBUG_LOG() << "sampleSize = " << sampleSize;
+    DEBUG_LOG(m_logger) << "sampleSize = " << sampleSize;
     return sampleSize > 0;
   }
 
@@ -162,7 +162,7 @@ public:
   {
     dds::sub::LoanedSamples<DynamicData> samples =
       m_dataReader.select().state(dds::sub::status::InstanceState::alive()).read();
-    TRACE_LOG() << "readAlive for " << DDS::topic_type_name<TopicType>::value()
+    TRACE_LOG(m_logger) << "readAlive for " << DDS::topic_type_name<TopicType>::value()
                         << ", count: " << samples.length()
                         << ", this: " << this << ", instance handle " << m_dataReader.instance_handle();
 
@@ -175,7 +175,7 @@ public:
   {
     dds::sub::LoanedSamples<DynamicData> samples =
       m_dataReader.select().state(dds::sub::status::InstanceState::alive()).take();
-    TRACE_LOG() << "takeAlive for " << DDS::topic_type_name<TopicType>::value()
+    TRACE_LOG(m_logger) << "takeAlive for " << DDS::topic_type_name<TopicType>::value()
                         << ", count: " << samples.length()
                         << ", this: " << this << ", instance handle " << m_dataReader.instance_handle();
 
@@ -187,7 +187,7 @@ public:
   {
     dds::sub::LoanedSamples<DynamicData> samples =
       m_dataReader.select().state(dds::sub::status::InstanceState::not_alive_disposed()).take();
-    TRACE_LOG() << "takeDisposed for " << DDS::topic_type_name<TopicType>::value()
+    TRACE_LOG(m_logger) << "takeDisposed for " << DDS::topic_type_name<TopicType>::value()
                         << ", count: " << samples.length()
                         << ", this: " << this << ", instance handle " << m_dataReader.instance_handle();
     return samples;
@@ -196,18 +196,18 @@ public:
   template<typename C>
   bool read(C callbackFunc)
   {
-    DEBUG_LOG() << "IN read ("
+    DEBUG_LOG(m_logger) << "IN read ("
                         << DDS::topic_type_name<TopicType>::value()
                         << "), this: " << this << ", instance handle " << m_dataReader.instance_handle();
 
     if (m_dataReader == nullptr || m_ddsTopic == nullptr)
     {
-      ERROR_LOG() << "No dataReader initialised ";
+      ERROR_LOG(m_logger) << "No dataReader initialised ";
       return false;
     }
     if (!isValid(callbackFunc))
     {
-      ERROR_LOG() << "No subscriber set for "
+      ERROR_LOG(m_logger) << "No subscriber set for "
                           << DDS::topic_type_name<TopicType>::value();
       return false;
     }
@@ -216,7 +216,7 @@ public:
     
     dds::sub::LoanedSamples<DynamicData> samples = m_dataReader.select().state(dds::sub::status::DataState::new_data()).read();
 
-    DEBUG_LOG() << "got " << samples.length() + m_newSamplesDuringRead.size() << " samples from reader for "
+    DEBUG_LOG(m_logger) << "got " << samples.length() + m_newSamplesDuringRead.size() << " samples from reader for "
                         << DDS::topic_type_name<TopicType>::value();
 
     for (const auto &sample : samples)
@@ -297,7 +297,7 @@ private:
     if (samples.length() == 0)
       return false;
 
-    DEBUG_LOG() << "got " << samples.length() << " disposed instances from reader for "
+    DEBUG_LOG(m_logger) << "got " << samples.length() << " disposed instances from reader for "
                         << m_ddsTopic.name();
 
     for (const auto &sample : samples)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_data_reader.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_data_reader.h
index ba11436ea..36c643799 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_data_reader.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_data_reader.h
@@ -47,19 +47,19 @@ public:
               const std::string &topicName = DDS::Helper::getShortTopicName(DDS::topic_type_name<TopicType>::value()),
               bool bCreateDataReader = true)
   {
-    DEBUG_LOG() << "IN GenericDataReader::create ("
+    DEBUG_LOG(m_logger) << "IN GenericDataReader::create ("
                         << DDS::topic_type_name<TopicType>::value()
                         << "), this: " << this;
 
     if (domainParticipant == nullptr)
     {
-      ERROR_LOG() << "DomainParticipant does not exist ";
+      ERROR_LOG(m_logger) << "DomainParticipant does not exist ";
       return false;
     }
 
     if (m_ddsTopic != nullptr)
     {
-      ERROR_LOG() << "Type '"
+      ERROR_LOG(m_logger) << "Type '"
                           << DDS::topic_type_name<TopicType>::value()
                           << "' already created";
       return false;
@@ -67,7 +67,7 @@ public:
 
     try
     {
-      DEBUG_LOG() << "Creating read topic " << topicName << " with type: "
+      DEBUG_LOG(m_logger) << "Creating read topic " << topicName << " with type: "
                           << DDS::topic_type_name<TopicType>::value();
 
       m_ddsTopic = dds::topic::find<DataTopic>(domainParticipant, topicName);
@@ -79,9 +79,9 @@ public:
         dds::sub::qos::SubscriberQos subscriberQoS = ddsSubscriber.qos();
         dds::core::policy::Partition partition = subscriberQoS.policy<dds::core::policy::Partition>();
         dds::core::StringSeq parititionNames = partition.name();
-        DEBUG_LOG() << "Subscribing partitions: " << parititionNames.size();
+        DEBUG_LOG(m_logger) << "Subscribing partitions: " << parititionNames.size();
         for (const std::string &name : parititionNames)
-          DEBUG_LOG() << " partition name = " << name;
+          DEBUG_LOG(m_logger) << " partition name = " << name;
       }
 
       if (bCreateDataReader)
@@ -90,7 +90,7 @@ public:
         m_dataReader = DataReader(ddsSubscriber, m_ddsTopic, drQos);
         if (m_dataReader == nullptr)
         {
-          ERROR_LOG() << "Creating dataReader for '" << topicName << "' with type: '"
+          ERROR_LOG(m_logger) << "Creating dataReader for '" << topicName << "' with type: '"
                               << DDS::topic_type_name<TopicType>::value()
                               << "' failed";
           return false;
@@ -99,11 +99,11 @@ public:
     }
     catch (const dds::core::Exception &ex)
     {
-      ERROR_LOG() << ex.what();
+      ERROR_LOG(m_logger) << ex.what();
       return false;
     }
 
-    DEBUG_LOG() << "dataReader created ("
+    DEBUG_LOG(m_logger) << "dataReader created ("
                         << DDS::topic_type_name<TopicType>::value()
                         << ")";
 
@@ -114,7 +114,7 @@ public:
   bool hasSamples() const
   {
     qint64 sampleSize = m_dataReader->datareader_cache_status().sample_count();
-    DEBUG_LOG() << "sampleSize = " << sampleSize;
+    DEBUG_LOG(m_logger) << "sampleSize = " << sampleSize;
     return sampleSize > 0;
   }
 
@@ -124,7 +124,7 @@ public:
   {
     dds::sub::LoanedSamples<TopicTypeRead> samples =
       m_dataReader.select().state(dds::sub::status::InstanceState::alive()).read();
-    TRACE_LOG() << "readAlive for " << DDS::topic_type_name<TopicType>::value()
+    TRACE_LOG(m_logger) << "readAlive for " << DDS::topic_type_name<TopicType>::value()
                         << ", count: " << samples.length()
                         << ", this: " << this << ", instance handle " << m_dataReader.instance_handle();
 
@@ -138,7 +138,7 @@ public:
   {
     dds::sub::LoanedSamples<TopicTypeRead> samples =
       m_dataReader.select().state(dds::sub::status::InstanceState::alive()).take();
-    TRACE_LOG() << "takeAlive for " << DDS::topic_type_name<TopicType>::value()
+    TRACE_LOG(m_logger) << "takeAlive for " << DDS::topic_type_name<TopicType>::value()
                         << ", count: " << samples.length()
                         << ", this: " << this << ", instance handle " << m_dataReader.instance_handle();
 
@@ -150,7 +150,7 @@ public:
   {
     dds::sub::LoanedSamples<TopicTypeRead> samples =
       m_dataReader.select().state(dds::sub::status::InstanceState::not_alive_disposed()).take();
-    TRACE_LOG() << "takeDisposed for " << DDS::topic_type_name<TopicType>::value()
+    TRACE_LOG(m_logger) << "takeDisposed for " << DDS::topic_type_name<TopicType>::value()
                         << ", count: " << samples.length()
                         << ", this: " << this << ", instance handle " << m_dataReader.instance_handle();
     return samples;
@@ -159,18 +159,18 @@ public:
   template<typename C>
   bool read(C callbackFunc)
   {
-    DEBUG_LOG() << "IN read ("
+    DEBUG_LOG(m_logger) << "IN read ("
                         << DDS::topic_type_name<TopicType>::value()
                         << "), this: " << this << ", instance handle " << m_dataReader.instance_handle();
 
     if (m_dataReader == nullptr)
     {
-      ERROR_LOG() << "No dataReader initialised ";
+      ERROR_LOG(m_logger) << "No dataReader initialised ";
       return false;
     }
     if (!isValid(callbackFunc))
     {
-      ERROR_LOG() << "No subscriber set for "
+      ERROR_LOG(m_logger) << "No subscriber set for "
                           << DDS::topic_type_name<TopicType>::value();
       return false;
     }
@@ -189,7 +189,7 @@ public:
       }
     }
 
-    DEBUG_LOG() << "got " << samples.size() + m_newSamplesDuringRead.size() << " samples from reader for "
+    DEBUG_LOG(m_logger) << "got " << samples.size() + m_newSamplesDuringRead.size() << " samples from reader for "
                         << DDS::topic_type_name<TopicType>::value();
 
     for (const SampleStruct &ss : samples)
@@ -265,7 +265,7 @@ private:
     if (samples.length() == 0)
       return false;
 
-    DEBUG_LOG() << "got " << samples.length() << " disposed instances from reader for "
+    DEBUG_LOG(m_logger) << "got " << samples.length() << " disposed instances from reader for "
                         << DDS::topic_type_name<TopicType>::value();
 
     for (const auto &sample : samples)
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 178aae114..73c48692f 100755
--- 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
@@ -32,19 +32,19 @@ public:
               const dds::pub::Publisher &ddsPublisher,
               const std::string &topicName = DDS::Helper::getShortTopicName(DDS::topic_type_name<TopicType>::value()))
   {
-    DEBUG_LOG() << "IN GenericDataWriter::create ("
+    DEBUG_LOG(m_logger) << "IN GenericDataWriter::create ("
                         << DDS::topic_type_name<TopicType>::value()
                         << ")";
 
     if (participant == nullptr)
     {
-      ERROR_LOG() << "Participant not available, aborting. ";
+      ERROR_LOG(m_logger) << "Participant not available, aborting. ";
       return false;
     }
 
     if (m_ddsTopic != nullptr)
     {
-      ERROR_LOG() << "Type '"
+      ERROR_LOG(m_logger) << "Type '"
                           << DDS::topic_type_name<TopicType>::value()
                           << "' already created";
       return false;
@@ -52,7 +52,7 @@ public:
 
     try {
 
-      DEBUG_LOG() << "Creating write topic " << topicName << " with type: "
+      DEBUG_LOG(m_logger) << "Creating write topic " << topicName << " with type: "
                           << DDS::topic_type_name<TopicType>::value();
 
       m_ddsTopic = dds::topic::find<DataTopic>(participant, topicName);
@@ -65,7 +65,7 @@ public:
 
       if (m_dataWriter == nullptr)
       {
-        ERROR_LOG() << "Initialisation of "
+        ERROR_LOG(m_logger) << "Initialisation of "
                             << DDS::topic_type_name<TopicType>::value()
                             << " failed ";
         return false;
@@ -74,11 +74,11 @@ public:
     }
     catch ( const dds::core::Exception &ex )
     {
-      ERROR_LOG() << ex.what();
+      ERROR_LOG(m_logger) << ex.what();
       return false;
     }
 
-    DEBUG_LOG() << "dataWriter created ("
+    DEBUG_LOG(m_logger) << "dataWriter created ("
                         << DDS::topic_type_name<TopicType>::value()
                         << ")";
 
@@ -88,12 +88,12 @@ public:
   bool write(const TopicType &data,
              const dds::core::optional<dds::sub::SampleInfo> &si = dds::core::optional<dds::sub::SampleInfo>())
   {
-    DEBUG_LOG() << "IN write ("
+    DEBUG_LOG(m_logger) << "IN write ("
                         << DDS::topic_type_name<TopicType>::value()
                         << ") ";
 
     if (m_dataWriter == nullptr) {
-      ERROR_LOG() << "No dataWriter initialised ";
+      ERROR_LOG(m_logger) << "No dataWriter initialised ";
       return false;
     }
 
@@ -112,18 +112,18 @@ public:
 
   bool remove(const TopicType &data, bool errorMsgIfNotExists = true)
   {
-    DEBUG_LOG() << "IN remove ("
+    DEBUG_LOG(m_logger) << "IN remove ("
                         << DDS::topic_type_name<TopicType>::value()
                         << ") ";
 
     if (m_dataWriter == nullptr) {
-      ERROR_LOG() << "No dataWriter initialised ";
+      ERROR_LOG(m_logger) << "No dataWriter initialised ";
       return false;
     }
     const dds::core::InstanceHandle ih = m_dataWriter.lookup_instance(data);
     if (ih.is_nil()) {
       if (errorMsgIfNotExists)
-        ERROR_LOG() << "Could not find instance for topic "
+        ERROR_LOG(m_logger) << "Could not find instance for topic "
                             << DDS::topic_type_name<TopicType>::value()
                             << " for unregistering!";
       return false;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/subscriber_listener.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/subscriber_listener.cpp
index c641c0291..6cc2140b8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/subscriber_listener.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/subscriber_listener.cpp
@@ -13,7 +13,7 @@ SubscriberListener::SubscriberListener()
   , m_logger(DDS::getLogger("SubscriberListener", DDS::DataType::DATA_TOPIC_CLIENT))
 {
   qRegisterMetaType<std::string>("std::string");
-  DEBUG_LOG() << "SubscriberListener initialized, this " << this;
+  DEBUG_LOG(m_logger) << "SubscriberListener initialized, this " << this;
 }
 
 void SubscriberListener::addCallback(const std::string &topicName,
@@ -21,7 +21,7 @@ void SubscriberListener::addCallback(const std::string &topicName,
                                      const dds::sub::AnyDataReader &dataReader,
                                      SubscriberListenerCallback *cb)
 {
-  DEBUG_LOG() << "addSubscriberCallback for " << topicName << ", type " << topicTypeName
+  DEBUG_LOG(m_logger) << "addSubscriberCallback for " << topicName << ", type " << topicTypeName
                       << ", cb " << cb << ", this " << this;
   QWriteLocker l(&m_accessLock);
   if (m_bPrepareForShutdown)
@@ -34,7 +34,7 @@ void SubscriberListener::removeCallback(const std::string &topicName,
                                         const dds::sub::AnyDataReader &dataReader,
                                         SubscriberListenerCallback *cb)
 {
-  DEBUG_LOG() << "IN removeSubscriberCallback for " << topicName << ", type " << topicTypeName
+  DEBUG_LOG(m_logger) << "IN removeSubscriberCallback for " << topicName << ", type " << topicTypeName
                       << ", cb " << cb << ", this " << this;
   QWriteLocker l(&m_accessLock);
   m_droCallbacks.remove(std::make_pair(topicName, topicTypeName), fillData(dataReader, cb));
@@ -68,7 +68,7 @@ void SubscriberListener::enaDisaCallback(const std::string &topicName,
   }
 
   if (!bFound)
-    WARNING_LOG() << "Can not " << (bEnable ? "enable" : "disable")
+    WARNING_LOG(m_logger) << "Can not " << (bEnable ? "enable" : "disable")
                           << " callback for " << topicName << ", type " << topicTypeName
                           << ", cb " << cb  << ", this " << this << " - not found!";
 }
@@ -91,7 +91,7 @@ void SubscriberListener::on_data_available(dds::sub::AnyDataReader &reader)
   QReadLocker l(&m_accessLock);
   if (m_droCallbacks.isEmpty() || m_bPrepareForShutdown)
     return;
-  DEBUG_LOG() << "Data available for " << topicName << ", type " << topicTypeName << ", this " << this;
+  DEBUG_LOG(m_logger) << "Data available for " << topicName << ", type " << topicTypeName << ", this " << this;
   QMultiMap<std::pair<std::string, std::string>, cbData>::iterator cbIt = m_droCallbacks.find(key);  
   const QMultiMap<std::pair<std::string, std::string>, cbData>::iterator cbEnd = m_droCallbacks.end();
   for( ; cbIt != cbEnd && cbIt.key() == key; ++cbIt)
@@ -122,7 +122,7 @@ void SubscriberListener::on_liveliness_changed(dds::sub::AnyDataReader &reader,
   const std::string &topicName = reader.topic_name();
   const std::string &topicTypeName = reader.type_name();
   
-  DEBUG_LOG() << "on_liveliness_changed: " << livelinessStatus.alive_count()
+  DEBUG_LOG(m_logger) << "on_liveliness_changed: " << livelinessStatus.alive_count()
                       << ", " << livelinessStatus.not_alive_count()
                       << ", " << livelinessStatus.alive_count_change()
                       << ", " << livelinessStatus.not_alive_count_change()
@@ -154,7 +154,7 @@ void SubscriberListener::on_liveliness_changed(dds::sub::AnyDataReader &reader,
 
     if (bNoWritersAnymore)
     {
-      DEBUG_LOG() << "bNoWritersAnymore for " << topicName << ", type " << topicTypeName;
+      DEBUG_LOG(m_logger) << "bNoWritersAnymore for " << topicName << ", type " << topicTypeName;
       data.cb->noWriterAnymore(topicTypeName, topicName);
     }
     else if (bNewWriters)
@@ -164,7 +164,7 @@ void SubscriberListener::on_liveliness_changed(dds::sub::AnyDataReader &reader,
         continue;
       if (data.methodToCall.isValid())
       {
-        DEBUG_LOG() << "methodcall is valid for " << topicName << ", type " << topicTypeName;
+        DEBUG_LOG(m_logger) << "methodcall is valid for " << topicName << ", type " << topicTypeName;
         data.methodToCall.invoke(data.cb, Qt::QueuedConnection,
                                  Q_ARG(std::string, topicTypeName),
                                  Q_ARG(std::string, topicName));
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/subscriber_listener.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/subscriber_listener.h
index d477af773..770a9bba2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/subscriber_listener.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/subscriber_listener.h
@@ -71,6 +71,7 @@ public:
   void prepareShutdown();
 
 protected:
+  NGL::INGLLogger &m_logger;
   void addCallback(const std::string &topicName,
                    const std::string &topicTypeName,
                    const dds::sub::AnyDataReader &dataReader,
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/wait_set_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/wait_set_handler.cpp
index e69159b15..61811ae97 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/wait_set_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/wait_set_handler.cpp
@@ -24,7 +24,7 @@ WaitSetHandler::~WaitSetHandler()
 
 bool WaitSetHandler::attachWaitSet(const dds::core::cond::Condition &cond, CallbackInterface *cb)
 {
-  DEBUG_LOG() << "AttachWaitSet with callback " << cb;
+  DEBUG_LOG(m_logger) << "AttachWaitSet with callback " << cb;
 
   WaitSetData wsd(cond, cb);
 
@@ -33,7 +33,7 @@ bool WaitSetHandler::attachWaitSet(const dds::core::cond::Condition &cond, Callb
   auto it = m_waitSetData.find(wsd.condition->native_condition());
   if (it != m_waitSetData.end())
   {
-    WARNING_LOG() << "Waitset " << cb << " already registered";
+    WARNING_LOG(m_logger) << "Waitset " << cb << " already registered";
     return false;
   }
 
@@ -47,7 +47,7 @@ bool WaitSetHandler::attachWaitSet(const dds::core::cond::Condition &cond, Callb
 
 bool WaitSetHandler::detachWaitSet(const dds::core::cond::Condition &cond, CallbackInterface *cb)
 {
-  DEBUG_LOG() << "DetachWaitSet with callback " << cb;
+  DEBUG_LOG(m_logger) << "DetachWaitSet with callback " << cb;
 
   WaitSetData wsd(cond, cb);
 
@@ -56,7 +56,7 @@ bool WaitSetHandler::detachWaitSet(const dds::core::cond::Condition &cond, Callb
   auto it = m_waitSetData.find(wsd.condition->native_condition());
   if (it == m_waitSetData.end())
   {
-    WARNING_LOG() << "Waitset for " << cb << " not registered";
+    WARNING_LOG(m_logger) << "Waitset for " << cb << " not registered";
     return false;
   }
 
@@ -67,7 +67,7 @@ bool WaitSetHandler::detachWaitSet(const dds::core::cond::Condition &cond, Callb
 
 bool WaitSetHandler::enableWaitSet(const dds::core::cond::Condition &cond, CallbackInterface *cb)
 {
-  DEBUG_LOG() << "EnableWaitSet with callback " << cb;
+  DEBUG_LOG(m_logger) << "EnableWaitSet with callback " << cb;
 
   WaitSetData wsd(cond, cb);
 
@@ -75,7 +75,7 @@ bool WaitSetHandler::enableWaitSet(const dds::core::cond::Condition &cond, Callb
   auto it = m_waitSetData.find(wsd.condition->native_condition());
   if (it == m_waitSetData.end())
   {
-    ERROR_LOG() << "Could not find WaitSetData - cannot enable waitSet for " << cb;
+    ERROR_LOG(m_logger) << "Could not find WaitSetData - cannot enable waitSet for " << cb;
     return false;
   }
 
@@ -88,7 +88,7 @@ bool WaitSetHandler::enableWaitSet(const dds::core::cond::Condition &cond, Callb
 
 bool WaitSetHandler::disableWaitSet(const dds::core::cond::Condition &cond, CallbackInterface *cb)
 {
-  DEBUG_LOG() << "DisableWaitSet with callback " << cb;
+  DEBUG_LOG(m_logger) << "DisableWaitSet with callback " << cb;
 
   WaitSetData wsd(cond, cb);
 
@@ -96,7 +96,7 @@ bool WaitSetHandler::disableWaitSet(const dds::core::cond::Condition &cond, Call
   auto it = m_waitSetData.find(wsd.condition->native_condition());
   if (it == m_waitSetData.end())
   {
-    ERROR_LOG() << "Could not find WaitSetData - cannot disable waitSet for  " << cb;
+    ERROR_LOG(m_logger) << "Could not find WaitSetData - cannot disable waitSet for  " << cb;
     return false;
   }
 
@@ -133,7 +133,7 @@ void WaitSetHandler::waitSetTask()
         WaitSetData &wsd = it->second;
         if (wsd.enabled)
         {
-          DEBUG_LOG() << "Condition triggered for " << wsd.callback;
+          DEBUG_LOG(m_logger) << "Condition triggered for " << wsd.callback;
           wsd.callback->dataAvailable();
         }
         ++it;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/wait_set_handler.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/wait_set_handler.h
index 0a7335e87..57fe05afb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/wait_set_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/wait_set_handler.h
@@ -39,6 +39,7 @@ public:
   int attachedConditionCount() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   struct WaitSetData final
   {
     dds::core::cond::Condition condition;
@@ -52,9 +53,11 @@ private:
     {}
   };
 private:
+  NGL::INGLLogger &m_logger;
   void waitSetTask();
 private:
 
+  NGL::INGLLogger &m_logger;
   dds::core::cond::WaitSet m_waitSet;
   dds::core::cond::GuardCondition m_abortCondition;
   std::future<void> m_task;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Routing/routing_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/Routing/routing_plugin.h
index 9e4d622e6..e4dcc771a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Routing/routing_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Routing/routing_plugin.h
@@ -132,7 +132,7 @@ public:
 
   void writeSamples() override
   {
-    TRACE_LOG() << "Writing samples for " << DDS::topic_type_name<TOPIC>::value()
+    TRACE_LOG(m_logger) << "Writing samples for " << DDS::topic_type_name<TOPIC>::value()
                       << ", sample count: " << m_loanedSamples.length();
     rti::pub::WriteParams writeParams;
     for (const auto &sample : m_loanedSamples)
@@ -148,7 +148,7 @@ public:
 
         
 
-        TRACE_LOG() << "identity: " << DebugInfo::toReadable(writeParams.identity())
+        TRACE_LOG(m_logger) << "identity: " << DebugInfo::toReadable(writeParams.identity())
                             << ", related_sample_identity: " << DebugInfo::toReadable(writeParams.related_sample_identity());
 
         const auto &state = sample.info().state();  
@@ -159,20 +159,20 @@ public:
         }
         else if (instanceState == dds::sub::status::InstanceState::not_alive_disposed())
         {
-          TRACE_LOG() << " - is disposed";
+          TRACE_LOG(m_logger) << " - is disposed";
           m_dataWriter->dispose_instance(writeParams);
         }
         else if (instanceState == dds::sub::status::InstanceState::not_alive_no_writers())
         {
-          TRACE_LOG() << " - is unregistered";
+          TRACE_LOG(m_logger) << " - is unregistered";
           m_dataWriter->unregister_instance(writeParams);
         }
         else
-          WARNING_LOG() << "Unknown instance state: " << instanceState;
+          WARNING_LOG(m_logger) << "Unknown instance state: " << instanceState;
       }
       catch (const dds::core::Exception &ex)
       {
-        ERROR_LOG() << "writeSamples exception: " << ex.what();
+        ERROR_LOG(m_logger) << "writeSamples exception: " << ex.what();
       }
     }
     m_dataWriter->flush();
@@ -207,7 +207,7 @@ public:
   {
     if (!m_dwt)
       return false;
-    DEBUG_LOG() << "Creating DataWriter for domain " << dpOut.domain_id();
+    DEBUG_LOG(m_logger) << "Creating DataWriter for domain " << dpOut.domain_id();
     m_dataWriter = dds::pub::DataWriter<T>(pubOut,
                                            getTopic<T>(dpOut, m_topicName),
                                            DDS::QosProfile::dataWriterDefault(m_topicType));
@@ -222,7 +222,7 @@ public:
   {
     
 
-    TRACE_LOG() << "Data available for " << DDS::topic_type_name<T>::value();
+    TRACE_LOG(m_logger) << "Data available for " << DDS::topic_type_name<T>::value();
     auto ws = new SampleWriter<T>(reader.take(), m_dataWriter, m_topicType == DDS::QosProfile::TopicType::FunctionTopic, m_logger);
     m_dwt->enqueue(ws);
   }
@@ -275,14 +275,14 @@ protected:
             const dds::domain::DomainParticipant &dpOut,
             const dds::pub::Publisher &pubOut) override
   {
-    DEBUG_LOG() << "Initializing TopicDispatcher " << "(" << this << ")";
+    DEBUG_LOG(m_logger) << "Initializing TopicDispatcher " << "(" << this << ")";
     if (m_dataReader != nullptr)
       return false;
 
     m_dataReader = dds::sub::DataReader<TOPIC>(subIn,
                                                getTopic<TOPIC>(dpIn, m_topicName),
                                                DDS::QosProfile::dataReaderDefault(m_topicType));
-    DEBUG_LOG() << "Creating DataReader for domain " << dpIn.domain_id() << ", ptr: " <<  m_dataReader.delegate().get();
+    DEBUG_LOG(m_logger) << "Creating DataReader for domain " << dpIn.domain_id() << ", ptr: " <<  m_dataReader.delegate().get();
 
     m_dtl.reset(new DataTopicListener<TOPIC>(dwt, m_topicName, m_topicType, m_logger));
     
@@ -294,10 +294,10 @@ protected:
 
   void shutdown() override
   {
-    DEBUG_LOG() << "Cleaning up TopicDispatcher " << "(" << this << ")";
+    DEBUG_LOG(m_logger) << "Cleaning up TopicDispatcher " << "(" << this << ")";
     if (m_dataReader != nullptr)
     {
-      DEBUG_LOG() << "shutting down DataReader: " <<  m_dataReader.delegate().get();
+      DEBUG_LOG(m_logger) << "shutting down DataReader: " <<  m_dataReader.delegate().get();
       m_dataReader.listener(nullptr, dds::core::status::StatusMask::none());
       try
       {
@@ -305,7 +305,7 @@ protected:
       }
       catch (const dds::core::Exception &ex)
       {
-        ERROR_LOG() << "topic close ex: " << ex.what();
+        ERROR_LOG(m_logger) << "topic close ex: " << ex.what();
       }
     }
     
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 e801f4176..2b53c760d 100755
--- 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
@@ -19,7 +19,7 @@ ForeignInterfaceImpl::ForeignInterfaceImpl(const std::shared_ptr<ParticipantMana
 {
   if (!m_ppmDtc)
   {
-    WARNING_LOG() << "m_ppmDtc not available, No color and injury information will be included in created symbols";
+    WARNING_LOG(m_logger) << "m_ppmDtc not available, No color and injury information will be included in created symbols";
     Q_ASSERT(false);
   }
 }
@@ -97,7 +97,7 @@ QSharedPointer<SymbolResult> ForeignInterfaceImpl::findImage(const ParticipantMa
     {
       if (!m_aesDtc)
       {
-        WARNING_LOG() << "Fetching 'm_aesDtc' failed,  No color and injury information will be included in symbol created for participant.id() " << participant.id();
+        WARNING_LOG(m_logger) << "Fetching 'm_aesDtc' failed,  No color and injury information will be included in symbol created for participant.id() " << participant.id();
         return findImage(symDataToRender);
       }
       const int partyId = m_aesDtc->partyForDusMine(lastState.originatorId());
@@ -110,7 +110,7 @@ QSharedPointer<SymbolResult> ForeignInterfaceImpl::findImage(const ParticipantMa
     {
       if (!m_aesDtc)
       {
-        WARNING_LOG() << "Fetching 'm_aesDtc' failed,  No color and injury information will be included in symbol created for participant.id() " << participant.id();
+        WARNING_LOG(m_logger) << "Fetching 'm_aesDtc' failed,  No color and injury information will be included in symbol created for participant.id() " << participant.id();
         return findImage(symDataToRender);
       }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.h
index 3ddea6ed9..4e07a85f8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.h
@@ -52,6 +52,8 @@ public:
   AdvancedSymbology::SymbologyType defaultSymbologyType() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   static AdvancedSymbology::Injury stateToInjury(const ProjectDataManagement::VulnerabilityState &state);
 
   std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
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 c3da76232..1cc6ad0dd 100755
--- 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
@@ -20,6 +20,8 @@ public:
   ~SelectTextDialog();
 
 protected:
+
+NGL::INGLLogger &m_logger;
   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 43537d8bc..81f2efd70 100755
--- 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
@@ -152,9 +152,9 @@ SymbolEditor::SymbolEditor(LtsSession::LtsSession *session, QWidget *parent)
   , m_session(session)
   .getNGLLogger("SymbolEditor"))
 {
-  DEBUG_LOG() << "SymbolEditor(" << "parent=" << parent << ")";
+  DEBUG_LOG(m_logger) << "SymbolEditor(" << "parent=" << parent << ")";
   m_ui->setupUi(this);
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 bool SymbolEditor::init(const std::shared_ptr<FileManagement::Interface::Ftc>        &flmFtc,
@@ -163,7 +163,7 @@ bool SymbolEditor::init(const std::shared_ptr<FileManagement::Interface::Ftc>
                         const std::shared_ptr<ParticipantManagement::Interface::Dtc> &ppmDtc,
                         bool asApp)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   setOnlineHelpFilename(QStringLiteral("Symbol_Editor-Application"));
   if (asApp)
@@ -214,25 +214,25 @@ bool SymbolEditor::init(const std::shared_ptr<FileManagement::Interface::Ftc>
 
   
   if (!m_internal->m_symbolFrames.setDirectory(QLatin1String(":/Symbole/Attributes/symbolframes"), QStringList(QLatin1String("*.xml"))))
-    ERROR_LOG() << "Error while reading SymbolFrame-XML-Files!";
+    ERROR_LOG(m_logger) << "Error while reading SymbolFrame-XML-Files!";
   if (!m_internal->m_branchSymbols.setDirectory(QLatin1String(":/Symbole/Attributes/branch"), QStringList(QLatin1String("*.xml"))))
-    ERROR_LOG() << "Error while reading Branch/Truppengattung-XML-Files!";
+    ERROR_LOG(m_logger) << "Error while reading Branch/Truppengattung-XML-Files!";
   if (!m_internal->m_mobilitySymbols.setDirectory(QLatin1String(":/Symbole/Attributes/mobility"), QStringList(QLatin1String("*.xml"))))
-    ERROR_LOG() << "Error while reading Mobility-XML-Files!";
+    ERROR_LOG(m_logger) << "Error while reading Mobility-XML-Files!";
   if (!m_internal->m_bcdabSymbols.setDirectory(QLatin1String(":/Symbole/Attributes/bcdab"), QStringList(QLatin1String("*.xml"))))
-    ERROR_LOG() << "Error while reading BCDAB-XML-Files!";
+    ERROR_LOG(m_logger) << "Error while reading BCDAB-XML-Files!";
   if (!m_internal->m_commandLevelSymbols.setDirectory(QLatin1String(":/Symbole/Attributes/commandlevel"), QStringList(QLatin1String("*.xml"))))
-    ERROR_LOG() << "Error while reading CommandLevel-XML-Files!";
+    ERROR_LOG(m_logger) << "Error while reading CommandLevel-XML-Files!";
   if (!m_internal->m_vehicleSymbols.setDirectory(QLatin1String(":/Symbole/Attributes/vehicle"), QStringList(QLatin1String("*.xml"))))
-    ERROR_LOG() << "Error while reading vehicle-XML-Files!";
+    ERROR_LOG(m_logger) << "Error while reading vehicle-XML-Files!";
   if (!m_internal->m_intrinsicMobilitySymbols.setDirectory(QLatin1String(":/Symbole/Attributes/intrinsicmobility"), QStringList(QLatin1String("*.xml"))))
-    ERROR_LOG() << "Error while reading Intrinsic-Mobility-XML-Files!";
+    ERROR_LOG(m_logger) << "Error while reading Intrinsic-Mobility-XML-Files!";
   if (!m_internal->m_armingSymbols.setDirectory(QLatin1String(":/Symbole/Attributes/arming"), QStringList(QLatin1String("*.xml"))))
-    ERROR_LOG() << "Error while reading arming-XML-Files!";
+    ERROR_LOG(m_logger) << "Error while reading arming-XML-Files!";
   if (!m_internal->m_miscSymbols.setDirectory(QLatin1String(":/Symbole/Attributes/misc"), QStringList(QLatin1String("*.xml"))))
-    ERROR_LOG() << "Error while reading arming-XML-Files!";
+    ERROR_LOG(m_logger) << "Error while reading arming-XML-Files!";
   if (!m_internal->m_sectorSymbols.setDirectory(QLatin1String(":/Symbole/Attributes/sectoricon"), QStringList(QLatin1String("*.xml"))))
-    ERROR_LOG() << "Error while reading sectoricon-XML-Files!";
+    ERROR_LOG(m_logger) << "Error while reading sectoricon-XML-Files!";
 
   m_internal->m_symbolColorsEditView.clear();
   m_internal->m_symbolColorsEditView.insert(SymbologyXML::SymbolTypes::UNKNOWN,  QColor(255, 255, 128));  
@@ -438,22 +438,22 @@ bool SymbolEditor::init(const std::shared_ptr<FileManagement::Interface::Ftc>
   connect(m_ui->SliderTransparency, &QSlider::valueChanged,
           this, &SymbolEditor::onSliderTransparencyValueChanged);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 
   return true;
 }
 
 SymbolEditor::~SymbolEditor()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   delete m_internal;
   delete m_ui;
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 void SymbolEditor::movePrimitive(QPointF diff)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   if (m_internal->m_currentGraphicsItem != nullptr)
   {
     QGraphicsItem *sepi = m_internal->m_currentGraphicsItem;
@@ -467,12 +467,12 @@ void SymbolEditor::movePrimitive(QPointF diff)
       setChanged(true);
     }
   }
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 bool SymbolEditor::createNewSymbol(const QString &symbolname)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   m_internal->m_symbol.reset();
   m_internal->m_symbol.setName(symbolname);
@@ -485,13 +485,13 @@ bool SymbolEditor::createNewSymbol(const QString &symbolname)
   setChanged(false);
   clearUndo();
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
   return true;
 }
 
 void SymbolEditor::resetGUI()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   bool bOldUpdateInProgress = m_internal->m_updateInProgress;
   m_internal->m_updateInProgress = true;
@@ -615,14 +615,14 @@ void SymbolEditor::resetGUI()
 
   m_internal->m_updateInProgress = bOldUpdateInProgress;
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 void SymbolEditor::fillListWidget(const QMap<int, QString> &container, QWidget *widget,
                                   e_category category, SymbologyXML::SymbolTypes::t_icon_type iconType,
                                   bool withIcons, bool sort)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   if (!widget)
     return;
@@ -668,14 +668,14 @@ void SymbolEditor::fillListWidget(const QMap<int, QString> &container, QWidget *
     cwidget->setMaxVisibleItems(25);
   }
 
-  DEBUG_LOG() << "END" << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END" << Q_FUNC_INFO;
 }
 
 void SymbolEditor::widgetInsertItem(QWidget *widget, int index, const QString &text, int key,
                                     e_category category, SymbologyXML::SymbolTypes::t_icon_type iconType,
                                     bool withIcons)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   QListWidget *lwidget = qobject_cast<QListWidget *>(widget);
   QComboBox *cwidget = qobject_cast<QComboBox *>(widget);
@@ -704,12 +704,12 @@ void SymbolEditor::widgetInsertItem(QWidget *widget, int index, const QString &t
       cwidget->insertItem(index, text, key);
   }
 
-  DEBUG_LOG() << "END" << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END" << Q_FUNC_INFO;
 }
 
 QIcon SymbolEditor::getIcon(e_category category, SymbologyXML::SymbolTypes::t_icon_type iconType, int iconId, QSize iconSize)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   SymbologyXML::Symbol *newSymbol = nullptr;
   bool isAttrib = true;
@@ -817,14 +817,14 @@ QIcon SymbolEditor::getIcon(e_category category, SymbologyXML::SymbolTypes::t_ic
   QTransform transformView;
   transformView.scale(1.0, -1.0);
 
-  DEBUG_LOG() << "END" << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END" << Q_FUNC_INFO;
 
   return QIcon(pm.transformed(transformView));
 }
 
 int SymbolEditor::getFrameSymbolID(SymbologyXML::SymbolTypes::t_dimen dimen, SymbologyXML::SymbolTypes::t_affil affil)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   SymbologyXML::SymbolTypes::t_affil tmp_affil = affil;
   if (tmp_affil == SymbologyXML::SymbolTypes::PENDING)
@@ -834,14 +834,14 @@ int SymbolEditor::getFrameSymbolID(SymbologyXML::SymbolTypes::t_dimen dimen, Sym
   if (tmp_affil == SymbologyXML::SymbolTypes::ASSUMED_FRIEND)
     tmp_affil = SymbologyXML::SymbolTypes::FRIEND;
 
-  DEBUG_LOG() << "END" << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END" << Q_FUNC_INFO;
 
   return SymbologyXML::SymbolTable::getFrameSymbolID(dimen, tmp_affil);
 }
 
 void SymbolEditor::updateGUI()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   m_internal->m_updateInProgress = true;
 
@@ -857,12 +857,12 @@ void SymbolEditor::updateGUI()
   updateGraphicViews(true, true);
   m_internal->m_updateInProgress = false;
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 void SymbolEditor::updateSymbolAttributesWidgets()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   bool bOldUpdateInProgress = m_internal->m_updateInProgress;
   m_internal->m_updateInProgress = true;
@@ -930,7 +930,7 @@ void SymbolEditor::updateSymbolAttributesWidgets()
           
           int idx = m_ui->ComboBoxSectorMain->findData(iconId);
           if (idx < 0)
-            ERROR_LOG() << "SECTORMAIN: iconid (" << iconId << ") not found";
+            ERROR_LOG(m_logger) << "SECTORMAIN: iconid (" << iconId << ") not found";
           else
             m_ui->ComboBoxSectorMain->setCurrentIndex(m_ui->ComboBoxSectorMain->findData(iconId));
         }
@@ -994,12 +994,12 @@ void SymbolEditor::updateSymbolAttributesWidgets()
 
   m_internal->m_updateInProgress = bOldUpdateInProgress;
 
-  DEBUG_LOG() << "END" << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END" << Q_FUNC_INFO;
 }
 
 void SymbolEditor::updateTextProperties()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   
   QLineEdit *arLE[3] = {m_ui->LineEdit1, m_ui->LineEdit2, m_ui->LineEdit3};
@@ -1051,12 +1051,12 @@ void SymbolEditor::updateTextProperties()
     break;
   }
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 void SymbolEditor::updateGraphicViews(bool editview, bool preview)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   if (!m_internal->m_initFinished)
     return;
@@ -1452,7 +1452,7 @@ void SymbolEditor::updateGraphicViews(bool editview, bool preview)
   delete bcdabSymbol;
   delete commandLevelSymbol;
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 void SymbolEditor::reset()
@@ -1474,7 +1474,7 @@ void SymbolEditor::drawSymbol(const SymbologyXML::Symbol *symbol, QGraphicsScene
                               const QColor &color, const QColor &fillColor,
                               double z, bool isAttrib, bool updateMap, bool drawBoundRect)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   QMap<QGraphicsItem *, SymbologyXML::Primitive *> *mapItemPrimitives_p = nullptr;
   if (updateMap)
@@ -1502,14 +1502,14 @@ void SymbolEditor::drawSymbol(const SymbologyXML::Symbol *symbol, QGraphicsScene
                                            mapItemPrimitives_p, drawBoundRect
                                            );
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 void SymbolEditor::drawSymbolPrimitive(SymbologyXML::Primitive *primitive, QGraphicsScene *scene,
                                        const QColor &color, const QColor &fillColor,
                                        double z, bool isAttrib, bool drawBoundRect)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   SymbologyXML::SymbolTypes::t_symbolTableCont symTableCont;
   symTableCont.resize(SymbologyXML::SymbolTypes::ICON_TYPE_END);
@@ -1522,12 +1522,12 @@ void SymbolEditor::drawSymbolPrimitive(SymbologyXML::Primitive *primitive, QGrap
   SymbologyXML::SymbolExporter::drawSymbolPrimitive(primitive, symTableCont, scene, color, fillColor,
                                                     z, isAttrib, &m_internal->m_mapItemPrimitives, drawBoundRect);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 void SymbolEditor::enableSelectMove(bool enable)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   QMapIterator<QGraphicsItem *, SymbologyXML::Primitive *> it(m_internal->m_mapItemPrimitives);
   while (it.hasNext())
@@ -1538,24 +1538,24 @@ void SymbolEditor::enableSelectMove(bool enable)
     pi->setFlag(QGraphicsItem::ItemIsMovable, enable);
   }
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 void SymbolEditor::setZoom(double zoom)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   m_ui->GraphicView->resetTransform();
   QTransform transformView = m_ui->GraphicView->transform();
   transformView.scale(VIEW_SCALE * zoom, -VIEW_SCALE * zoom);
   m_ui->GraphicView->setTransform(transformView);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 void SymbolEditor::addItem(SymbologyXML::Primitive *prim)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   pushUndo();
   prim->setFill(m_internal->m_fillPrimitive);
@@ -1579,16 +1579,16 @@ void SymbolEditor::addItem(SymbologyXML::Primitive *prim)
   }
   enableSelectMove(false);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 void SymbolEditor::slotImportTemplate()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   if (!m_internal->m_flmGui)
   {
-    ERROR_LOG() << Q_FUNC_INFO << "Error FileManagementGuiPlugin isn't loaded.";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << "Error FileManagementGuiPlugin isn't loaded.";
     return;
   }
 
@@ -1598,7 +1598,7 @@ void SymbolEditor::slotImportTemplate()
   {
     if (content.size() == 0)
     {
-      ERROR_LOG() << Q_FUNC_INFO << "Empty SymbolContent read from library";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << "Empty SymbolContent read from library";
     }
     else
     {
@@ -1620,13 +1620,13 @@ void SymbolEditor::slotImportTemplate()
 
   resetToolButtonGroupState();
 
-  DEBUG_LOG() << "END" << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END" << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onToolButtonSelectClicked()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   m_internal->m_graphicsScene.setDrawMode(SymbolEditScene::ELEMENT_MOVE);
   m_internal->m_editMode = EDIT_MOVE;
@@ -1638,12 +1638,12 @@ void SymbolEditor::onToolButtonSelectClicked()
     m_internal->m_currentGraphicsItem->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
   }
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 void SymbolEditor::onToolButtonRotateClicked()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   SymbolEditScene::DrawMode dm = m_internal->m_graphicsScene.getDrawMode();
   m_internal->m_graphicsScene.setDrawMode(SymbolEditScene::ELEMENT_ROTATE);
@@ -1685,16 +1685,16 @@ void SymbolEditor::onToolButtonRotateClicked()
 
   resetToolButtonGroupState();
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 void SymbolEditor::onToolButtonScaleClicked()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   if (m_internal->m_currentGraphicsItem == nullptr)
   {
-    DEBUG_LOG() << "END " << Q_FUNC_INFO;
+    DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
     return;
   }
 
@@ -1750,12 +1750,12 @@ void SymbolEditor::onToolButtonScaleClicked()
 
   resetToolButtonGroupState();
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 void SymbolEditor::onToolButtonClearClicked()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   DeleteElementsDialog *selElemsDial = new DeleteElementsDialog(this);
   if (selElemsDial->exec() != QDialog::Accepted) 
@@ -1846,13 +1846,13 @@ void SymbolEditor::onToolButtonClearClicked()
 
   resetToolButtonGroupState();
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onToolButtonUndoClicked()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   int scrollx = m_ui->GraphicView->horizontalScrollBar()->sliderPosition();
   int scrolly = m_ui->GraphicView->verticalScrollBar()->sliderPosition();
@@ -1864,13 +1864,13 @@ void SymbolEditor::onToolButtonUndoClicked()
   m_ui->GraphicView->horizontalScrollBar()->setSliderPosition(scrollx);
   m_ui->GraphicView->verticalScrollBar()->setSliderPosition(scrolly);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onToolButtonDeleteClicked()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   if (m_internal->m_mapItemPrimitives.find(m_internal->m_currentGraphicsItem) != m_internal->m_mapItemPrimitives.end())
   {
@@ -1895,13 +1895,13 @@ void SymbolEditor::onToolButtonDeleteClicked()
 
   resetToolButtonGroupState();
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onToolButtonCopyClicked()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   m_internal->m_editMode = EDIT_COPY;
 
@@ -1913,13 +1913,13 @@ void SymbolEditor::onToolButtonCopyClicked()
 
   resetToolButtonGroupState();
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onToolButtonPasteClicked()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   m_internal->m_editMode = EDIT_PASTE;
 
@@ -1939,57 +1939,57 @@ void SymbolEditor::onToolButtonPasteClicked()
 
   resetToolButtonGroupState();
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onToolButtonEllipseClicked()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   m_internal->m_graphicsScene.setDrawMode(SymbolEditScene::ELLIPSE_START);
   enableSelectMove(false);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onToolButtonLineClicked()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   m_internal->m_graphicsScene.setDrawMode(SymbolEditScene::LINE_START);
   enableSelectMove(false);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onToolButtonPolylineClicked()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   m_internal->m_graphicsScene.setDrawMode(SymbolEditScene::POLYLINE_START);
   enableSelectMove(false);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onToolButtonPolygonClicked()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   m_internal->m_graphicsScene.setDrawMode(SymbolEditScene::POLYGON_START);
   enableSelectMove(false);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onToolButtonTextClicked()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   resetToolButtonGroupState();
 
@@ -2028,7 +2028,7 @@ void SymbolEditor::onToolButtonTextClicked()
 
   
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
@@ -2040,7 +2040,7 @@ void SymbolEditor::resetToolButtonGroupState()
 
 void SymbolEditor::onPushButtonFillColorClicked()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   m_internal->m_fillColor = QColorDialog::getColor(Qt::white, this, tr("Select fill color"), QColorDialog::DontUseNativeDialog);
   setPushButtonFillColorBackground(m_internal->m_fillColor);
 
@@ -2072,33 +2072,33 @@ void SymbolEditor::onPushButtonFillColorClicked()
       }
     }
   }
-  DEBUG_LOG() << "END" << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END" << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::setPushButtonFillColorBackground(QColor color)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   m_internal->m_fillColor = color;
   m_ui->PushButtonFillColor->setStyleSheet(QStringLiteral("background-color:rgb(%1,%2,%3)").arg(color.red()).arg(color.green()).arg(color.blue()));
-  DEBUG_LOG() << "END" << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END" << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onToolButtonRectClicked()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   m_internal->m_graphicsScene.setDrawMode(SymbolEditScene::RECT_START);
   enableSelectMove(false);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::copyElementsFromSymbol(const SymbologyXML::Symbol &tmpSymbol) const
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   
   if (m_internal->m_symbol.getDimen() == SymbologyXML::SymbolTypes::DIMEN_UNDEFINED)
     m_internal->m_symbol.setDimen(tmpSymbol.getDimen());
@@ -2158,16 +2158,16 @@ void SymbolEditor::copyElementsFromSymbol(const SymbologyXML::Symbol &tmpSymbol)
   }
   m_internal->m_symbol.setText(text1, align1, text2, align2, text3, align3);
 
-  DEBUG_LOG() << "END" << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END" << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onComboBoxDimenCurrentIndexChanged(int index)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   if (m_internal->m_updateInProgress || (index < 0))
   {
-    DEBUG_LOG() << "END " << Q_FUNC_INFO;
+    DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
     return;
   }
 
@@ -2187,16 +2187,16 @@ void SymbolEditor::onComboBoxDimenCurrentIndexChanged(int index)
   }
   updateGraphicViews(true, true);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onComboBoxAffilCurrentIndexChanged(int index)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   if (m_internal->m_updateInProgress || (index < 0))
   {
-    DEBUG_LOG() << "END " << Q_FUNC_INFO;
+    DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
     return;
   }
 
@@ -2219,16 +2219,16 @@ void SymbolEditor::onComboBoxAffilCurrentIndexChanged(int index)
 
   updateGraphicViews(true, true);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onComboBoxBCDABCurrentIndexChanged(int index)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   if (m_internal->m_updateInProgress || (index < 0))
   {
-    DEBUG_LOG() << "END " << Q_FUNC_INFO;
+    DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
     return;
   }
 
@@ -2239,16 +2239,16 @@ void SymbolEditor::onComboBoxBCDABCurrentIndexChanged(int index)
   setChanged(true);
   updateGraphicViews(true, true);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onComboBoxHeadquarterCurrentIndexChanged(int index)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   if (m_internal->m_updateInProgress || (index < 0))
   {
-    DEBUG_LOG() << "END " << Q_FUNC_INFO;
+    DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
     return;
   }
 
@@ -2257,16 +2257,16 @@ void SymbolEditor::onComboBoxHeadquarterCurrentIndexChanged(int index)
   setChanged(true);
   updateGraphicViews(true, true);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onComboBoxCommandLevelCurrentIndexChanged(int index)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   if (m_internal->m_updateInProgress || (index < 0))
   {
-    DEBUG_LOG() << "END " << Q_FUNC_INFO;
+    DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
     return;
   }
 
@@ -2276,16 +2276,16 @@ void SymbolEditor::onComboBoxCommandLevelCurrentIndexChanged(int index)
   setChanged(true);
   updateGraphicViews(true, true);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onComboBoxMobCurrentIndexChanged(int index)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   if (m_internal->m_updateInProgress || (index < 0))
   {
-    DEBUG_LOG() << "END " << Q_FUNC_INFO;
+    DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
     return;
   }
 
@@ -2295,13 +2295,13 @@ void SymbolEditor::onComboBoxMobCurrentIndexChanged(int index)
   setChanged(true);
   updateGraphicViews(true, true);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onComboBoxVehicleCurrentIndexChanged(int index)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   SymbologyXML::SymbolTypes::t_sector_rectpos rectpos = SymbologyXML::SymbolTypes::SECTOR_RECTPOS_DEFAULT;
   if (m_ui->CheckBoxVehicle->isChecked())
@@ -2311,13 +2311,13 @@ void SymbolEditor::onComboBoxVehicleCurrentIndexChanged(int index)
                                SymbologyXML::SymbolTypes::ICON_TYPE_VEHICLE,
                                SymbologyXML::SymbolTypes::SECTORMAIN, rectpos);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onCheckBoxVehicleStateChanged(int state)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   SymbologyXML::SymbolTypes::t_sector_rectpos rectpos = SymbologyXML::SymbolTypes::SECTOR_RECTPOS_DEFAULT;
   if (state)
     rectpos = SymbologyXML::SymbolTypes::SECTOR_RECTPOS_LARGE;
@@ -2326,13 +2326,13 @@ void SymbolEditor::onCheckBoxVehicleStateChanged(int state)
                                SymbologyXML::SymbolTypes::instance()->getVehicle()->getContainerAsInt(),
                                SymbologyXML::SymbolTypes::ICON_TYPE_VEHICLE,
                                SymbologyXML::SymbolTypes::SECTORMAIN, rectpos);
-  DEBUG_LOG() << "END" << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END" << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onComboBoxIntrinsicMobCurrentIndexChanged(int index)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
 
   help_on_ComboBoxIndexChanged(m_ui->ComboBoxIntrinsicMob,
@@ -2341,13 +2341,13 @@ void SymbolEditor::onComboBoxIntrinsicMobCurrentIndexChanged(int index)
                                SymbologyXML::SymbolTypes::SECTOR2);
   m_ui->ComboBoxIntrinsicMob_2->setCurrentIndex(index);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onComboBoxIntrinsicMob2CurrentIndexChanged(int index)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
 
   help_on_ComboBoxIndexChanged(m_ui->ComboBoxIntrinsicMob_2,
@@ -2356,13 +2356,13 @@ void SymbolEditor::onComboBoxIntrinsicMob2CurrentIndexChanged(int index)
                                SymbologyXML::SymbolTypes::SECTOR2);
   m_ui->ComboBoxIntrinsicMob->setCurrentIndex(index);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onComboBoxArmingCurrentIndexChanged(int index)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   SymbologyXML::SymbolTypes::t_sector_rectpos rectpos = SymbologyXML::SymbolTypes::SECTOR_RECTPOS_DEFAULT;
   if (m_ui->CheckBoxArming->isChecked())
@@ -2372,7 +2372,7 @@ void SymbolEditor::onComboBoxArmingCurrentIndexChanged(int index)
                                SymbologyXML::SymbolTypes::ICON_TYPE_ARMING,
                                SymbologyXML::SymbolTypes::SECTORMAIN, rectpos);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
@@ -2391,11 +2391,11 @@ void SymbolEditor::onCheckBoxArmingStateChanged(int state)
 
 void SymbolEditor::onListViewMiscItemSelectionChanged()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   if (m_internal->m_updateInProgress)
   {
-    DEBUG_LOG() << "END " << Q_FUNC_INFO;
+    DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
     return;
   }
 
@@ -2428,13 +2428,13 @@ void SymbolEditor::onListViewMiscItemSelectionChanged()
 
   setChanged(true);
   updateGraphicViews(true, true);
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onComboBoxSector1CurrentIndexChanged(int index)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   help_on_ComboBoxIndexChanged(m_ui->ComboBoxSector1,
                                index,
@@ -2442,13 +2442,13 @@ void SymbolEditor::onComboBoxSector1CurrentIndexChanged(int index)
                                SymbologyXML::SymbolTypes::ICON_TYPE_SECTOR_ICON,
                                SymbologyXML::SymbolTypes::SECTOR1);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onComboBoxSectorMainCurrentIndexChanged(int index)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   SymbologyXML::SymbolTypes::t_sector_rectpos rectpos = SymbologyXML::SymbolTypes::SECTOR_RECTPOS_DEFAULT;
   if (m_ui->CheckBoxMain && m_ui->CheckBoxMain->isChecked())
@@ -2460,7 +2460,7 @@ void SymbolEditor::onComboBoxSectorMainCurrentIndexChanged(int index)
                                SymbologyXML::SymbolTypes::ICON_TYPE_SECTOR_ICON,
                                SymbologyXML::SymbolTypes::SECTORMAIN, rectpos);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
@@ -2481,11 +2481,11 @@ void SymbolEditor::onCheckBoxMainStateChanged(int state)
 
 void SymbolEditor::onListViewSectorMainItemSelectionChanged()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   if (m_internal->m_updateInProgress)
   {
-    DEBUG_LOG() << "END " << Q_FUNC_INFO;
+    DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
     return;
   }
 
@@ -2518,20 +2518,20 @@ void SymbolEditor::onListViewSectorMainItemSelectionChanged()
   setChanged(true);
   updateGraphicViews(true, true);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onComboBoxSector2CurrentIndexChanged(int index)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   help_on_ComboBoxIndexChanged(m_ui->ComboBoxSector2,
                                index,
                                SymbologyXML::SymbolTypes::instance()->getSectorIcon()->getContainerAsInt(SymbologyXML::SymbolTypes::SECTOR2),
                                SymbologyXML::SymbolTypes::ICON_TYPE_SECTOR_ICON,
                                SymbologyXML::SymbolTypes::SECTOR2);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
@@ -2541,11 +2541,11 @@ void SymbolEditor::help_on_ComboBoxIndexChanged(QComboBox *comboBox,
                                                 SymbologyXML::SymbolTypes::t_sector_position pos,
                                                 SymbologyXML::SymbolTypes::t_sector_rectpos rectpos)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   if (m_internal->m_updateInProgress || index < 0)
   {
-    DEBUG_LOG() << "END " << Q_FUNC_INFO;
+    DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
     return;
   }
 
@@ -2566,16 +2566,16 @@ void SymbolEditor::help_on_ComboBoxIndexChanged(QComboBox *comboBox,
   setChanged(true);
   updateGraphicViews(true, true);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onComboBoxAlign1CurrentIndexChanged(int index)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   if (m_internal->m_updateInProgress || (index < 0))
   {
-    DEBUG_LOG() << "END " << Q_FUNC_INFO;
+    DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
     return;
   }
 
@@ -2586,16 +2586,16 @@ void SymbolEditor::onComboBoxAlign1CurrentIndexChanged(int index)
   setChanged(true);
   updateGraphicViews(true, true);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onComboBoxAlign2CurrentIndexChanged(int index)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   if (m_internal->m_updateInProgress || (index < 0))
   {
-    DEBUG_LOG() << "END " << Q_FUNC_INFO;
+    DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
     return;
   }
 
@@ -2606,16 +2606,16 @@ void SymbolEditor::onComboBoxAlign2CurrentIndexChanged(int index)
   setChanged(true);
   updateGraphicViews(true, true);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onComboBoxAlign3CurrentIndexChanged(int index)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   if (m_internal->m_updateInProgress || (index < 0))
   {
-    DEBUG_LOG() << "END " << Q_FUNC_INFO;
+    DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
     return;
   }
 
@@ -2626,25 +2626,25 @@ void SymbolEditor::onComboBoxAlign3CurrentIndexChanged(int index)
   setChanged(true);
   updateGraphicViews(true, true);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 void SymbolEditor::onComboBoxColorCurrentIndexChanged(int index)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   if (index != -1)
   {
     m_internal->m_previewColor = m_internal->m_symbolColorsPreview.at(index).second;
 
     updateGraphicViews(true, true);
   }
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onComboBoxLineStyleCurrentIndexChanged(int index)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   switch (index)
   {
@@ -2693,16 +2693,16 @@ void SymbolEditor::onComboBoxLineStyleCurrentIndexChanged(int index)
     }
   }
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onLineEdit1TextChanged(const QString &text)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   if (m_internal->m_updateInProgress)
   {
-    DEBUG_LOG() << "END " << Q_FUNC_INFO;
+    DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
     return;
   }
 
@@ -2714,16 +2714,16 @@ void SymbolEditor::onLineEdit1TextChanged(const QString &text)
   updateGraphicViews(true, true);
   setChanged(true);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onLineEdit2TextChanged(const QString &text)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   if (m_internal->m_updateInProgress)
   {
-    DEBUG_LOG() << "END " << Q_FUNC_INFO;
+    DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
     return;
   }
 
@@ -2735,16 +2735,16 @@ void SymbolEditor::onLineEdit2TextChanged(const QString &text)
   updateGraphicViews(true, true);
   setChanged(true);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onLineEdit3TextChanged(const QString &text)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   if (m_internal->m_updateInProgress)
   {
-    DEBUG_LOG() << "END " << Q_FUNC_INFO;
+    DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
     return;
   }
 
@@ -2754,17 +2754,17 @@ void SymbolEditor::onLineEdit3TextChanged(const QString &text)
   updateGraphicViews(true, true);
   setChanged(true);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onListViewTruppengattungItemSelectionChanged()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   if (m_internal->m_updateInProgress)
   {
-    DEBUG_LOG() << "END " << Q_FUNC_INFO;
+    DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
     return;
   }
 
@@ -2784,43 +2784,43 @@ void SymbolEditor::onListViewTruppengattungItemSelectionChanged()
   }
   setChanged(true);
   updateGraphicViews(true, true);
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onCheckBoxBackgroundStateChanged(int state)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   m_internal->m_displayPreviewBackground = (bool)state;
   updateGraphicViews(false, true);
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onCheckBoxPlannedStateChanged(int state)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   if ((bool)state)
     m_internal->m_additionalDataPreview.m_state = SymbologyXML::SymbolTypes::STATE_ANTICIPATED;
   else
     m_internal->m_additionalDataPreview.m_state = SymbologyXML::SymbolTypes::STATE_PRESENT;
   updateGraphicViews(false, true);
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onCheckBoxCopyValuesStateChanged(int state)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   m_internal->m_copyFromSelectedPrimitive = (bool)state;
   copyFromSelectedPrimitive();
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onCheckBoxFillStateChanged(int state)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   m_internal->m_fillPrimitive = state;
 
   if (m_internal->m_copyFromSelectedPrimitive && (m_internal->m_currentGraphicsItem != nullptr))
@@ -2852,37 +2852,37 @@ void SymbolEditor::onCheckBoxFillStateChanged(int state)
     }
   }
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onCheckBoxDrawAreaStateChanged(int state)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   m_internal->m_showDrawArea = (bool)state;
   m_internal->m_graphicsScene.setShowDrawingArea(m_internal->m_showDrawArea);
   m_internal->m_graphicsScene.invalidate(m_internal->m_graphicsScene.sceneRect(), QGraphicsScene::ForegroundLayer);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onSpinBoxRasterValueChanged(double d)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   m_internal->m_gridWidth = d;
   m_internal->m_graphicsScene.setGridWidth(d);
   m_internal->m_graphicsScene.invalidate(m_internal->m_graphicsScene.sceneRect(), QGraphicsScene::BackgroundLayer);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onSpinBoxScaleValueChanged(double d)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   m_internal->m_symbol.setScale(d);
   setChanged(true);
@@ -2890,13 +2890,13 @@ void SymbolEditor::onSpinBoxScaleValueChanged(double d)
   m_internal->m_previewZoom = d;
   updateGraphicViews(false, true);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onSpinBoxLineWidthValueChanged(double d)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   m_internal->m_pen.setWidthF(d);
   m_internal->m_graphicsScene.setPen(m_internal->m_pen);
@@ -2930,34 +2930,34 @@ void SymbolEditor::onSpinBoxLineWidthValueChanged(double d)
     }
   }
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::onSliderTransparencyValueChanged(int value)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   m_internal->m_transparency = 1.0 - (double)value / 100.0;
   m_ui->LabelTransparency->setText(QLocale().toString((double)value / 100.0, 'f', 2));
   updateGraphicViews(false, true);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::setChanged(bool changed)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   if (changed)
     slotChangesMade();
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::selectionChanged()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   bool enableEdit = false;
   bool selPrimIsICON = false;
@@ -3002,18 +3002,18 @@ void SymbolEditor::selectionChanged()
   m_ui->CheckBoxFill->blockSignals(false);
   copyFromSelectedPrimitive();
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::copyFromSelectedPrimitive()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   if (!m_internal->m_copyFromSelectedPrimitive || (m_internal->m_currentGraphicsItem == nullptr))
   {
     
-    DEBUG_LOG() << "END " << Q_FUNC_INFO;
+    DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
     return;
   }
 
@@ -3043,16 +3043,16 @@ void SymbolEditor::copyFromSelectedPrimitive()
     }
   }
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 void SymbolEditor::pushUndo()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   if (m_internal->m_updateInProgress)
   {
-    DEBUG_LOG() << "END " << Q_FUNC_INFO;
+    DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
     return;
   }
 
@@ -3060,13 +3060,13 @@ void SymbolEditor::pushUndo()
 
   m_ui->ToolButtonUndo->setEnabled(true);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::popUndo()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   SymbolEditScene::DrawMode dm = m_internal->m_graphicsScene.getDrawMode();
 
@@ -3088,25 +3088,25 @@ void SymbolEditor::popUndo()
   
   m_internal->m_graphicsScene.setDrawMode(dm);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::clearUndo()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   m_internal->m_symbolUndoStack.clear();
 
   m_ui->ToolButtonUndo->setEnabled(false);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::keyPressEvent(QKeyEvent *keyEvent)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   
 
@@ -3150,13 +3150,13 @@ void SymbolEditor::keyPressEvent(QKeyEvent *keyEvent)
   else
     LtsWidgets::LtsDialog::keyPressEvent(keyEvent);
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::transformSelection(int key, Qt::KeyboardModifiers modifiers)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   
   u_int modAlt       = Qt::AltModifier;
@@ -3197,7 +3197,7 @@ void SymbolEditor::transformSelection(int key, Qt::KeyboardModifiers modifiers)
   }
   else
   {
-    DEBUG_LOG() << "END " << Q_FUNC_INFO;
+    DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
     return;
   }
 
@@ -3233,13 +3233,13 @@ void SymbolEditor::transformSelection(int key, Qt::KeyboardModifiers modifiers)
   else
     movePrimitive(QPointF(stepWidth * factor * dx, stepWidth * factor * dy));
 
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 
 void SymbolEditor::restoreSelection(SymbologyXML::Primitive *prim)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   QMapIterator<QGraphicsItem *, SymbologyXML::Primitive *> it(m_internal->m_mapItemPrimitives);
   while (it.hasNext())
   {
@@ -3251,7 +3251,7 @@ void SymbolEditor::restoreSelection(SymbologyXML::Primitive *prim)
       pi->setSelected(true);
     }
   }
-  DEBUG_LOG() << "END " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "END " << Q_FUNC_INFO;
 }
 
 void SymbolEditor::retranslate()
@@ -3264,7 +3264,7 @@ bool SymbolEditor::writeFile(bool saveAsNew)
   bool bRet = false;
   if (!m_internal->m_flmGui)
   {
-    ERROR_LOG() << Q_FUNC_INFO << "Error FileManagementGuiPlugin isn't loaded.";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << "Error FileManagementGuiPlugin isn't loaded.";
     return false;
   }
 
@@ -3277,7 +3277,7 @@ bool SymbolEditor::writeFile(bool saveAsNew)
   int fileId = m_internal->m_flmGui->saveFileContent(this, FileManagement::FileType::OperatorDefinedSymbol, m_session->exerciseId(), byteArray, SYMBOL_FOLDER_ID, properties);
   if (fileId > 0)
   {
-    DEBUG_LOG() << "Saved file with id = " << fileId;
+    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();
@@ -3287,7 +3287,7 @@ bool SymbolEditor::writeFile(bool saveAsNew)
     bRet = true;
   }
   else
-    ERROR_LOG() << "Could not save file in library ";
+    ERROR_LOG(m_logger) << "Could not save file in library ";
 
   return bRet;
 }
@@ -3322,9 +3322,9 @@ void SymbolEditor::slotSave()
     const QString properties = QString::fromUtf8(m_internal->m_attributes.toJson(QJsonDocument::Compact));
 
     if (m_internal->m_flmGui->saveContent(m_internal->m_lastFileId, byteArray, properties))
-      DEBUG_LOG() << "Saved file with id = " << m_internal->m_lastFileId;
+      DEBUG_LOG(m_logger) << "Saved file with id = " << m_internal->m_lastFileId;
     else
-      ERROR_LOG() << "Could not save file in library ";
+      ERROR_LOG(m_logger) << "Could not save file in library ";
   }
   emit saveFinished();
 }
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 5090c4279..60cb937bf 100755
--- 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
@@ -180,6 +180,8 @@ private slots:
 
 private:
 
+
+NGL::INGLLogger &m_logger;
   void resetGUI();
   void updateGUI();
   void updateSymbolAttributesWidgets();
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 13311db11..5a17727f2 100755
--- 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
@@ -105,7 +105,7 @@ FlmSubscriber::FlmSubscriber(const std::shared_ptr<FileManagement::Interface::Dt
   : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("AdvSymbology.FlmSubscriber"))
   , d(new Private())
 {
-  INFO_LOG() << Q_FUNC_INFO << " m_counter =" << ++d->m_counter;
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " m_counter =" << ++d->m_counter;
   d->m_flmDtc = flmDtc;
   d->m_flmFtc = flmFtc;
   d->m_opmDtc = opmDtc;
@@ -122,7 +122,7 @@ FlmSubscriber::FlmSubscriber(const std::shared_ptr<FileManagement::Interface::Dt
 
 FlmSubscriber::~FlmSubscriber()
 {
-  INFO_LOG() << Q_FUNC_INFO << " m_counter =" << d->m_counter--;
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " m_counter =" << d->m_counter--;
 
   if (d->m_reFetchTimer)
     d->m_reFetchTimer->stop();
@@ -154,9 +154,9 @@ bool FlmSubscriber::createFlmSymbolProxy(int type_placeholder)
     updateFileContentMap(data);
   };
   if (!d->m_flmDtc->fileContents(cb))
-    ERROR_LOG() << Q_FUNC_INFO << " Error performing fileContents";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Error performing fileContents";
 
-  INFO_LOG() << Q_FUNC_INFO << " m_fileContentMap.size()=" << d->m_fileContentMap.size() ;
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " m_fileContentMap.size()=" << d->m_fileContentMap.size() ;
 
   
   
@@ -181,7 +181,7 @@ bool FlmSubscriber::createFlmSymbolProxy(int type_placeholder)
       fcsRef.monitoring.replyState = FileContentStruct::Requested;
     } else {
       fcsRef.monitoring.replyState = FileContentStruct::RequestFailure;
-      ERROR_LOG() << "Error requesting FileContentData,  fileContentId=" << fileContentId;
+      ERROR_LOG(m_logger) << "Error requesting FileContentData,  fileContentId=" << fileContentId;
     }
 
   } 
@@ -192,7 +192,7 @@ bool FlmSubscriber::createFlmSymbolProxy(int type_placeholder)
   const int randomOffset = rand() % 10 + 5; 
   QTimer::singleShot(randomOffset, this , [this]()
   {
-    DEBUG_LOG() << "start ReFetchingTimer";
+    DEBUG_LOG(m_logger) << "start ReFetchingTimer";
     d->m_reFetchTimer->start();  
   });
 
@@ -204,11 +204,11 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte
 {
   const int32_t fileContentId = reply.id();
 
-  TRACE_LOG() << Q_FUNC_INFO << " START, " << fileContentId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, " << fileContentId;
 
   if (!d->m_fileContentMap.contains(fileContentId))
   {
-    ERROR_LOG()  << Q_FUNC_INFO << " fileContentId unknown, fileContentId=" << fileContentId;
+    ERROR_LOG(m_logger)  << Q_FUNC_INFO << " fileContentId unknown, fileContentId=" << fileContentId;
     return;
   }
 
@@ -218,7 +218,7 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte
   const QString &operatorName = fcData.operatorName;
   const qint64 lastModified   = fcData.lastModified;
 
-  DEBUG_LOG() << Q_FUNC_INFO
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO
                       << " fileContentId=" << fileContentId
                       << " name=" << name
                       << " operatorName=" << operatorName
@@ -234,7 +234,7 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte
     QImage image;
     if (!svgToImage(QByteArray::fromRawData(reinterpret_cast<const char*>(&reply.content().at(0)), reply.content().size()), image))
     {
-      ERROR_LOG()  << Q_FUNC_INFO << " svgToImage failed, fileContentId=" << fileContentId;
+      ERROR_LOG(m_logger)  << Q_FUNC_INFO << " svgToImage failed, fileContentId=" << fileContentId;
       fcData.monitoring.replyState = FileContentStruct::ReplyFailure;    
       return;
     }
@@ -265,7 +265,7 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte
     }
     else
     {
-      ERROR_LOG()  << Q_FUNC_INFO << " xmlSymbolContent is empty, fileContentId=" << fileContentId;
+      ERROR_LOG(m_logger)  << Q_FUNC_INFO << " xmlSymbolContent is empty, fileContentId=" << fileContentId;
       fcData.monitoring.replyState = FileContentStruct::ReplyFailure;    
     }
     break;
@@ -273,24 +273,24 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte
 
   case FileContentStruct::SymbolType::UnsupportedSymbol:
   {
-    ERROR_LOG()  << Q_FUNC_INFO << " unsupported symbol found, fileContentId=" << fileContentId;
+    ERROR_LOG(m_logger)  << Q_FUNC_INFO << " unsupported symbol found, fileContentId=" << fileContentId;
     fcData.monitoring.replyState = FileContentStruct::ReplyFailure;    
     break;
   }
 
   } 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool FlmSubscriber::svgToImage(const QByteArray &svgByteArray, QImage &imageOut)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   
   QSvgRenderer svgRenderer;
   if (!svgRenderer.load(svgByteArray))
   {
-    ERROR_LOG()  << Q_FUNC_INFO << " svgRenderer.load failed";
+    ERROR_LOG(m_logger)  << Q_FUNC_INFO << " svgRenderer.load failed";
     return false;
   }
 
@@ -304,7 +304,7 @@ bool FlmSubscriber::svgToImage(const QByteArray &svgByteArray, QImage &imageOut)
   svgRenderer.render(&painter);
   painter.end();
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
@@ -383,7 +383,7 @@ void FlmSubscriber::checkForReFetching()
 
 void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent &data, DataModification modType)
 {
-  TRACE_LOG() << Q_FUNC_INFO
+  TRACE_LOG(m_logger) << Q_FUNC_INFO
                       << " data.id=" << data.id()
                       << " data.fileStatus=" << data.fileStatus().underlying()
                       << " modType=" << modType
@@ -432,13 +432,13 @@ void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent &data
 
     FileManagement::GetFileContentDataRequest request(fileContentId);
     if (!d->m_flmFtc->getFileContentDataRequest(request, this))  
-      ERROR_LOG() << Q_FUNC_INFO << "Error reading FileContentData, fileContentId=" << fileContentId;
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << "Error reading FileContentData, fileContentId=" << fileContentId;
     break;
   }
 
   case DataModification::eRemoved:
   {
-    DEBUG_LOG() << Q_FUNC_INFO
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO
                         << " modType=" << modType
                         << " fileContentId=" << fileContentId
                         << " fileContentName=" << data.name();
@@ -448,7 +448,7 @@ void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent &data
 
     
     if (!d->m_symbolProxy.removeSymbol(fileContentId))
-      ERROR_LOG() << Q_FUNC_INFO << " removeSymbol failed"
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " removeSymbol failed"
                           << " fileContentId=" << fileContentId
                           << " fileContentName='" << data.name() << "'"
                           << " contains=" << d->m_fileContentMap.contains(fileContentId);
@@ -460,7 +460,7 @@ void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent &data
 
 void FlmSubscriber::updateFileContentMap(const FileManagement::FileContent &data)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
                       << " d->m_fileContentMap.size()=" << d->m_fileContentMap.size()
                       << " fileContentId=" << data.id()
                       << " data.isDeleted()=" <<data.isDeleted()
@@ -534,7 +534,7 @@ void FlmSubscriber::updateFileContentMap(const FileManagement::FileContent &data
       } 
 
     } else {
-      ERROR_LOG() << Q_FUNC_INFO
+      ERROR_LOG(m_logger) << Q_FUNC_INFO
                           << " QJsonParseError->errorString: '" << parseError.errorString() << "'"
                           << ", offset: " << parseError.offset;
     } 
@@ -542,7 +542,7 @@ void FlmSubscriber::updateFileContentMap(const FileManagement::FileContent &data
 
   d->m_fileContentMap[fileContentId] = fcData;
 
-  TRACE_LOG() << Q_FUNC_INFO << " END"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END"
                       << " d->m_fileContentMap.size()=" << d->m_fileContentMap.size()
                       << " fileContentId=" << data.id()
                       << " data.isDeleted()=" <<data.isDeleted()
@@ -573,7 +573,7 @@ void FlmSubscriber::onLocalSymbolProxyEtsSymbolRemoved(qint32 fileContentId, con
   {
     AdvancedSymbology::SymbolDictionary &dict =
       AdvancedSymbology::SymbolDictionary::dictionary(symbologyType);
-    INFO_LOG()  << Q_FUNC_INFO << " dict.removeEtsSymbol:"
+    INFO_LOG(m_logger)  << Q_FUNC_INFO << " dict.removeEtsSymbol:"
                          << " symbologyType='" << (int)symbologyType << "'"
                          << ", name='" << name << "'"
                          << ", fileContentId=" << fileContentId;
@@ -589,7 +589,7 @@ void FlmSubscriber::onLocalSymbolProxyXmlSymbolAdded(qint32 fileContentId,
                                                      const QString     &xmlContent,
                                                      const QStringList &usrTags)
 {
-  TRACE_LOG()  << Q_FUNC_INFO << " START"
+  TRACE_LOG(m_logger)  << Q_FUNC_INFO << " START"
                         << " fileContentId=" << fileContentId
                         << " name='" << name << "'";
 
@@ -600,25 +600,25 @@ void FlmSubscriber::onLocalSymbolProxyXmlSymbolAdded(qint32 fileContentId,
       AdvancedSymbology::SymbolDictionary &dict =
         AdvancedSymbology::SymbolDictionary::dictionary(symbologyType);
       if (!this->setXmlSymbolToDict(dict, fileContentId, operatorName, lastModified, name, xmlContent, usrTags))
-        ERROR_LOG()  << Q_FUNC_INFO << " dict.setXmlSymbolToDict failed"
+        ERROR_LOG(m_logger)  << Q_FUNC_INFO << " dict.setXmlSymbolToDict failed"
                              << ", symbologyType='" << (int)symbologyType << "'"
                              << ", name='" << name << "'";
     }
   }
-  TRACE_LOG()  << Q_FUNC_INFO << " END"
+  TRACE_LOG(m_logger)  << Q_FUNC_INFO << " END"
                         << " fileContentId=" << fileContentId
                         << " name='" << name << "'";
 }
 
 void FlmSubscriber::onLocalSymbolProxyXmlSymbolRemoved(qint32 fileContentId)
 {
-  TRACE_LOG()  << Q_FUNC_INFO << " START" << " fileContentId=" << fileContentId;
+  TRACE_LOG(m_logger)  << Q_FUNC_INFO << " START" << " fileContentId=" << fileContentId;
 
   for (const SymbologyType &symbologyType : std::as_const(d->m_symbolDictionaryToUpdate))
   {
     AdvancedSymbology::SymbolDictionary &dict =
       AdvancedSymbology::SymbolDictionary::dictionary(symbologyType);
-    DEBUG_LOG()  << Q_FUNC_INFO << " dict.removeXmlSymbol:"
+    DEBUG_LOG(m_logger)  << Q_FUNC_INFO << " dict.removeXmlSymbol:"
                          << " symbologyType='" << symbologyType << "'"
                          << ", fileContentId=" << fileContentId;
 
@@ -627,7 +627,7 @@ void FlmSubscriber::onLocalSymbolProxyXmlSymbolRemoved(qint32 fileContentId)
     dict.removeXmlSymbol(sidc);
     dict.removeXmlSymbol(fileContentId);
   }
-  TRACE_LOG()  << Q_FUNC_INFO << " END" << " fileContentId=" << fileContentId;
+  TRACE_LOG(m_logger)  << Q_FUNC_INFO << " END" << " fileContentId=" << fileContentId;
 }
 
 
@@ -638,7 +638,7 @@ void FlmSubscriber::onLocalSymbolProxyXmlSymbolRemoved(qint32 fileContentId)
 bool FlmSubscriber::connectFlmSymbolProxy(int type_placeholder, SymbologyType symbologyType)
 {
   Q_UNUSED(type_placeholder);
-  TRACE_LOG() << Q_FUNC_INFO << " m_fileContentMap.size()=" << d->m_fileContentMap.size() ;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " m_fileContentMap.size()=" << d->m_fileContentMap.size() ;
 
   d->m_symbolDictionaryToUpdate.insert(symbologyType);
 
@@ -701,12 +701,12 @@ bool FlmSubscriber::setEtsSymbolToDict(SymbolDictionary  &dict,
 
   if (!dict.setEtsSymbol(fileContentId, symProps.sidc(), symProps, image))
   {
-    ERROR_LOG()  << Q_FUNC_INFO << " dict.insertExtraSymbol failed"
+    ERROR_LOG(m_logger)  << Q_FUNC_INFO << " dict.insertExtraSymbol failed"
                          << ", fileContentId=" << fileContentId << ", name='" << name << "'";
     return false;
   }
   else
-    INFO_LOG()  << Q_FUNC_INFO << " dict.insertExtraSymbol done"
+    INFO_LOG(m_logger)  << Q_FUNC_INFO << " dict.insertExtraSymbol done"
                         << ", fileContentId=" << fileContentId << ", name='" << name << "'";
 
   return true;
@@ -731,7 +731,7 @@ bool FlmSubscriber::setXmlSymbolToDict(SymbolDictionary  &dict,
   bool success = dict.setXmlSymbol(fileContentId, name, operatorName, lastModified, xmlContent, symProps);
 
   if (!success)
-    ERROR_LOG() << Q_FUNC_INFO << " setXmlSymbol failed:"
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " setXmlSymbol failed:"
                         << ", file-id=" << fileContentId
                         << ", filenameid='" << name << "'";
   return success;
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 3518d1da1..58feaaee5 100755
--- 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
@@ -40,6 +40,8 @@ public:
   bool connectFlmSymbolProxy(int type_placeholder, SymbologyType symbologyType) override;
 
 private: 
+
+NGL::INGLLogger &m_logger;
   bool setEtsSymbolToDict(SymbolDictionary  &dict,
                           qint32            fileContentId,
                           const QString     &name,
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 c53c40e57..d9716d709 100755
--- 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
@@ -43,7 +43,7 @@ bool ConfigAlarmModel::initModel(const std::shared_ptr<AlarmManagement::Interfac
 
   
   const QMap<qint32, AlarmManagement::AlarmConfig> alarmConfigs = m_dtc->alarmConfigs();
-  INFO_LOG() << "initModel - #AlarmConfig: " << alarmConfigs.size();
+  INFO_LOG(m_logger) << "initModel - #AlarmConfig: " << alarmConfigs.size();
 
   connect(m_dtc.get(), &Interface::Dtc::alarmConfigChanged,
           this, &ConfigAlarmModel::onAlarmConfigChanged);
@@ -59,7 +59,7 @@ bool ConfigAlarmModel::initModel(const std::shared_ptr<AlarmManagement::Interfac
 
 QVariant ConfigAlarmModel::data(const QModelIndex &index, int role) const
 {
-  DEBUG_LOG() << "AlarmManagementModel::data";
+  DEBUG_LOG(m_logger) << "AlarmManagementModel::data";
 
   if (role != Qt::DisplayRole || !indexIsValid(index))
     return QVariant();
@@ -123,7 +123,7 @@ void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig &
   const int eventTypeId = data.eventTypeId().underlying();
   const bool messageWindow = data.messageWindow();
   const bool setMarker = data.setMarker();
-  DEBUG_LOG() << "onAlarmConfigChanged: " << eventTypeId << " messageWindow=" << messageWindow
+  DEBUG_LOG(m_logger) << "onAlarmConfigChanged: " << eventTypeId << " messageWindow=" << messageWindow
                       << "setMarker"<<setMarker;
 
   switch (modType)
@@ -131,7 +131,7 @@ void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig &
   case DataModification::eRemoved:
   {
     
-    DEBUG_LOG() << "AlarmConfig was removed: " << id;
+    DEBUG_LOG(m_logger) << "AlarmConfig was removed: " << id;
     AlarmManagement::AlarmConfig data1 = data;
     data1.messageWindow(false);
     data1.setMarker(false);
@@ -141,7 +141,7 @@ void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig &
   }
   case DataModification::eModified:
   {
-    DEBUG_LOG() << "DataModification::eModified: ";
+    DEBUG_LOG(m_logger) << "DataModification::eModified: ";
     if (row < 0)
     {
       
@@ -153,7 +153,7 @@ void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig &
   }
   case DataModification::eAdded:
   {
-    DEBUG_LOG() << "DataModification::eAdded";
+    DEBUG_LOG(m_logger) << "DataModification::eAdded";
     insertRow(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 d9113ab1e..38fc83f29 100755
--- 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
@@ -45,6 +45,7 @@ private slots:
   void onAlarmConfigChanged(const AlarmManagement::AlarmConfig &data,
                             const DataModification modType);
 private:
+NGL::INGLLogger &m_logger;
   std::shared_ptr<AlarmManagement::Interface::Dtc> m_dtc;
   std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
   AlarmHistoryModel *m_alarmHistoryModel;
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 edfd42251..a2f9d4b78 100755
--- 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
@@ -176,7 +176,7 @@ void AlarmHistoryModel::onNotificationChanged(const AlarmManagement::Notificatio
   const int global = propertieJsonObj[QStringLiteral("Global")].toInt();
   const int friendlyFire = propertieJsonObj[QStringLiteral("FriendlyFire")].toInt();
 
-  DEBUG_LOG() << Q_FUNC_INFO
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO
                       << " notification:" << data
                       << ", Global: " << global
                       << ", FriendlyFire: " << friendlyFire;
@@ -197,7 +197,7 @@ void AlarmHistoryModel::onParticipantChanged(const ParticipantManagement::Partic
 
   QString tacticalIdentifier = QString::fromStdString(participant.tacticalIdentifier());
   m_idTactIdentifierMap.insert(participant.id(), tacticalIdentifier);
-  DEBUG_LOG() << Q_FUNC_INFO << " id=" << participant.id()
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id=" << participant.id()
                       << " designator=" << designator
                       << " tacticalIdentifier=" << tacticalIdentifier;
 } 
@@ -205,7 +205,7 @@ void AlarmHistoryModel::onParticipantChanged(const ParticipantManagement::Partic
 int AlarmHistoryModel::participantId2EquipNo(const int participantId) const
 {
   int ret = m_partId2EquipNoMap.value(participantId, 0);
-  INFO_LOG() << "participantId2EquipNo participantId=" << participantId
+  INFO_LOG(m_logger) << "participantId2EquipNo participantId=" << participantId
                      << " EquipmentNumber=" << ret;
   return ret;
 } 
@@ -213,7 +213,7 @@ int AlarmHistoryModel::participantId2EquipNo(const int participantId) const
 QString AlarmHistoryModel::getDesignator(const int participantId) const
 {
   QString designator = m_idDesignatorMap.value(participantId);
-  DEBUG_LOG() << "m_idDesignatorMap.value(participantId)=" <<  designator;
+  DEBUG_LOG(m_logger) << "m_idDesignatorMap.value(participantId)=" <<  designator;
 
   return  designator;
 }
@@ -221,7 +221,7 @@ QString AlarmHistoryModel::getDesignator(const int participantId) const
 QString AlarmHistoryModel::getTactIdentifier(const int participantId) const
 {
   QString tactIdentifier = m_idTactIdentifierMap.value(participantId);
-  DEBUG_LOG() << "m_idTactIdentifierMap.value(participantId)=" <<  tactIdentifier;
+  DEBUG_LOG(m_logger) << "m_idTactIdentifierMap.value(participantId)=" <<  tactIdentifier;
 
   return tactIdentifier;
 }
@@ -234,7 +234,7 @@ void AlarmHistoryModel::onBCContaminationChanged(const AreaEffectSimulation::BCC
   int id = data.id();
   QString name = QString::fromStdString(data.name());
   m_aesNameMap[id] = name;
-  DEBUG_LOG() << "onBCContaminationChanged:  " << data
+  DEBUG_LOG(m_logger) << "onBCContaminationChanged:  " << data
                        << " Name=" << name
                        << " id=" << id;
 }
@@ -247,7 +247,7 @@ void AlarmHistoryModel::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap
   int id = data.id();
   QString name = QString::fromStdString(data.name());
   m_aesNameMap[id] = name;
-  DEBUG_LOG() << "BoobyTrap:  " << data
+  DEBUG_LOG(m_logger) << "BoobyTrap:  " << data
                        << " Name=" << name
                        << " id=" << id;
 }
@@ -260,7 +260,7 @@ void AlarmHistoryModel::onOffRouteMineChanged(const AreaEffectSimulation::OffRou
   int id = data.id();
   QString name = QString::fromStdString(data.name());
   m_aesNameMap[id] = name;
-  DEBUG_LOG() << "OffRouteMine:  " << data
+  DEBUG_LOG(m_logger) << "OffRouteMine:  " << data
                        << " Name=" << name
                        << " id=" << id;
 }
@@ -273,7 +273,7 @@ void AlarmHistoryModel::onAesItemChanged(const AreaEffectSimulation::AesItem &it
   QString name = QString::fromStdString(item.name());
   int id = item.id();
   m_aesNameMap[id] = name;
-  DEBUG_LOG() << "AreaEffectSimulation::AesItem onAesItemChanged:  " << item
+  DEBUG_LOG(m_logger) << "AreaEffectSimulation::AesItem onAesItemChanged:  " << item
                        << " Name=" << name
                        << " id=" << item.id();
 } 
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 4af3875cb..22948d44a 100755
--- 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
@@ -63,6 +63,8 @@ public:
   QString getTactIdentifier(const int participantId) const;
 
 protected:
+
+NGL::INGLLogger &m_logger;
   bool isFiltered(const NotificationEx &data, DataModification modType) const override;
 private slots:
   void onNotificationChanged(const AlarmManagement::Notification &data,
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 5f5eab276..10dc5e716 100755
--- 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
@@ -154,7 +154,7 @@ bool AlarmDialog::init(const std::shared_ptr<AlarmManagement::Interface::Ftc> &f
   bool global = true;
   m_configAlarmModel->initModel(m_dtc, ppmDtc, alarmHistoryModel, global);
 
-  INFO_LOG() << "AlarmDialog::init";
+  INFO_LOG(m_logger) << "AlarmDialog::init";
   return true;
 }
 
@@ -170,7 +170,7 @@ void AlarmDialog::onAlarmConfigChanged(const AlarmManagement::AlarmConfig &data,
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG() << "************** onAlarmConfigChanged "
+  DEBUG_LOG(m_logger) << "************** onAlarmConfigChanged "
                       << " id=" << data.id()
                       << " operatorId=" << data.operatorId()
                       << " m_operatorId=" << m_operatorId
@@ -183,33 +183,33 @@ void AlarmDialog::onAlarmConfigChanged(const AlarmManagement::AlarmConfig &data,
 
   if (data.operatorId() == m_operatorId)
   {
-    DEBUG_LOG() << "************** onAlarmConfig zuweisen ";
+    DEBUG_LOG(m_logger) << "************** onAlarmConfig zuweisen ";
     switch (data.eventTypeId().underlying())
     {
     case ProjectDataManagement::EventType_def::EnterNuclear:
     {
-      DEBUG_LOG() << "EnterNuclear zuweisen ";
+      DEBUG_LOG(m_logger) << "EnterNuclear zuweisen ";
       m_ui->cbxNMarker->setChecked(setMarker);
       m_ui->cbxNMessage->setChecked(messageWindow);
       break;
     }
     case ProjectDataManagement::EventType_def::EnterDangerArea:
     {
-      DEBUG_LOG() << "EnterDangerArea zuweisen ";
+      DEBUG_LOG(m_logger) << "EnterDangerArea zuweisen ";
       m_ui->cbxDanerAreaMarker->setChecked(setMarker);
       m_ui->cbxDangerAreaMessage->setChecked(messageWindow);
       break;
     }
     case ProjectDataManagement::EventType_def::EnterMineArea:
     {
-      DEBUG_LOG() << "EnterMineArea zuweisen ";
+      DEBUG_LOG(m_logger) << "EnterMineArea zuweisen ";
       m_ui->cbxMineAreaEntryMarker->setChecked(setMarker);
       m_ui->cbxMineAreaEntryMessage->setChecked(messageWindow);
       break;
     }
     case ProjectDataManagement::EventType_def::HitMine:
     {
-      DEBUG_LOG() << "HitMine zuweisen ";
+      DEBUG_LOG(m_logger) << "HitMine zuweisen ";
       m_ui->cbxMineAreaHitMarker->setChecked(setMarker);
       m_ui->cbxMineAreaHitMessage->setChecked(messageWindow);
       break;
@@ -217,14 +217,14 @@ void AlarmDialog::onAlarmConfigChanged(const AlarmManagement::AlarmConfig &data,
 
     case ProjectDataManagement::EventType_def::Hit:
     {
-      DEBUG_LOG() << "Hit zuweisen ";
+      DEBUG_LOG(m_logger) << "Hit zuweisen ";
       m_ui->cbxDirectFireMarker->setChecked(setMarker);
       m_ui->cbxDirectFireMessage->setChecked(messageWindow);
       break;
     }
     case ProjectDataManagement::EventType_def::HitEffectSimulation:
     {
-      DEBUG_LOG() << "HitEffectSimulation zuweisen ";
+      DEBUG_LOG(m_logger) << "HitEffectSimulation zuweisen ";
       m_ui->cbxIndirectFireMarker->setChecked(setMarker);
       m_ui->cbxIndirectFireMessage->setChecked(messageWindow);
       break;
@@ -232,27 +232,27 @@ void AlarmDialog::onAlarmConfigChanged(const AlarmManagement::AlarmConfig &data,
 
     case ProjectDataManagement::EventType_def::CrossLocalBorderline:
     {
-      DEBUG_LOG() << "CrossLocalBorderline zuweisen ";
+      DEBUG_LOG(m_logger) << "CrossLocalBorderline zuweisen ";
       m_ui->cbxLocalBorderMarker->setChecked(setMarker);
       m_ui->cbxLocalBorderMessage->setChecked(messageWindow);
       break;
     }
     case ProjectDataManagement::EventType_def::CrossGlobalBorderline:
     {
-      DEBUG_LOG() << "CrossGlobalBorderline zuweisen ";
+      DEBUG_LOG(m_logger) << "CrossGlobalBorderline zuweisen ";
       m_ui->cbxGlobalBorderMarker->setChecked(setMarker);
       m_ui->cbxGlobalBorderMessage->setChecked(messageWindow);
       break;
     }
     case ProjectDataManagement::EventType_def::AirSupport:
     {
-      DEBUG_LOG() << "AirSupport zuweisen ";
+      DEBUG_LOG(m_logger) << "AirSupport zuweisen ";
       m_ui->cbxAirSupportMarker->setChecked(setMarker);
       m_ui->cbxAirSupportMessage->setChecked(messageWindow);
       break;
     }
     default:
-      ERROR_LOG() << "Not possible to set with Operator App!!!";
+      ERROR_LOG(m_logger) << "Not possible to set with Operator App!!!";
       break;
     }
   }
@@ -272,22 +272,22 @@ std::vector<AlarmManagement::AlarmAction> AlarmDialog::getCheckedValues() const
     if (item.checkboxMarker->isChecked())
     {
       alarmActionDds.setMarker(true);
-      DEBUG_LOG() << item.name << " setMarker = true";
+      DEBUG_LOG(m_logger) << item.name << " setMarker = true";
     }
     else
     {
       alarmActionDds.setMarker(false);
-      DEBUG_LOG() << item.name << " setMarker = false";
+      DEBUG_LOG(m_logger) << item.name << " setMarker = false";
     }
     if (item.checkboxWindow->isChecked())
     {
       alarmActionDds.messageWindow(true);
-      DEBUG_LOG() << item.name << " messageWindow = true";
+      DEBUG_LOG(m_logger) << item.name << " messageWindow = true";
     }
     else
     {
       alarmActionDds.messageWindow(false);
-      DEBUG_LOG() << item.name << " messageWindow = false";
+      DEBUG_LOG(m_logger) << item.name << " messageWindow = false";
     }
     if (alarmActionDds.setMarker() || alarmActionDds.messageWindow())
       ret.push_back(alarmActionDds);
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 4b164936f..6b22abadc 100755
--- 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
@@ -21,7 +21,7 @@ AlarmView::AlarmView(LtsSession::LtsSession *session, QWidget *parent)
   , m_session(session)
   , m_ui(new Ui::AlarmView)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " --- AlarmView Konstruktor() ";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " --- AlarmView Konstruktor() ";
   m_ui->setupUi(this);
   m_ui->widget->setSelectionMode(QAbstractItemView::MultiSelection);
 
@@ -50,7 +50,7 @@ AlarmView::AlarmView(LtsSession::LtsSession *session, QWidget *parent)
 
 AlarmView::~AlarmView()
 {
-  INFO_LOG() << "--- AlarmView Destruktor() ";
+  INFO_LOG(m_logger) << "--- AlarmView Destruktor() ";
   m_sitMapGuiIfc = nullptr;
   delete m_ui;
 } 
@@ -65,14 +65,14 @@ void AlarmView::retranslate()
 bool AlarmView::init(const std::shared_ptr<AlarmManagement::Interface::Dtc> &dtc,
                      AlarmHistoryModel *alarmHistoryModel)
 {
-  INFO_LOG() << "--- init() ";
+  INFO_LOG(m_logger) << "--- init() ";
   if (!dtc)
     return false;
 
   m_dtc = dtc;
   m_alarmHistoryModel = alarmHistoryModel;
 
-  DEBUG_LOG() << "--- AlarmView::init   ";
+  DEBUG_LOG(m_logger) << "--- AlarmView::init   ";
   m_proxyModel = new AlarmHistoryProxyModel(this);
   m_proxyModel->setSourceModel(m_alarmHistoryModel);
   m_ui->widget->setModel(m_proxyModel);
@@ -101,14 +101,14 @@ void AlarmView::onSelectionChanged()
 
 void AlarmView::onShowAlarm()
 {
-  INFO_LOG() << "--- onShowMAlarm() ";
+  INFO_LOG(m_logger) << "--- onShowMAlarm() ";
 } 
 
 
 
 void AlarmView::onRemoveAlarm()
 {
-  DEBUG_LOG() << "onRemoveAlarm selectedRows.size"
+  DEBUG_LOG(m_logger) << "onRemoveAlarm selectedRows.size"
                       << m_ui->widget->selectedRows().size();
 
   const QModelIndexList idxList = m_ui->widget->selectedRows();
@@ -124,7 +124,7 @@ void AlarmView::onRemoveAlarm()
 
 void AlarmView::onCenterAlarm()
 {
-  DEBUG_LOG() << "onCenterAlarm";
+  DEBUG_LOG(m_logger) << "onCenterAlarm";
   if (!m_sitMapGuiIfc)
     return;
   const QModelIndexList indexList = m_ui->widget->selectedRows();
@@ -137,14 +137,14 @@ void AlarmView::onCenterAlarm()
 
   if (!position.isNull())
   {
-    DEBUG_LOG() << Q_FUNC_INFO << " position=" << position.x() << " - " << position.y();
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " position=" << position.x() << " - " << position.y();
     m_sitMapGuiIfc->setCenterPoint(position);
   }
   else
   {
     const QModelIndex &indexParticipantId = m_alarmHistoryModel->index(index.row(), AlarmHistoryModel::ParticipantId, index.parent());
     const int participantId = indexParticipantId.data().toInt();
-    DEBUG_LOG() << Q_FUNC_INFO << " participantId=" << participantId;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " participantId=" << participantId;
     m_sitMapGuiIfc->centerMapToParticipant(participantId);
   }
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_history.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_history.h
index 40b3ec54d..ec30d4cc4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_history.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_history.h
@@ -29,6 +29,8 @@ public:
             AlarmHistoryModel *alarmHistoryModel);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void onSelectionChanged();
   void onShowAlarm();
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 4817b76f8..d7bdaba65 100755
--- 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
@@ -99,10 +99,10 @@ bool ConfigParticipantsDialog::init(const std::shared_ptr<ParticipantManagement:
 
   m_ui->equipmentNoContent->setText(equipmentNumbersStr);
 
-  DEBUG_LOG() << "current participantId = " << participantData.id();
+  DEBUG_LOG(m_logger) << "current participantId = " << participantData.id();
 
   m_typeClass = ppmDtc->type(participantData.typeId()).typeClass();
-  DEBUG_LOG() << "m_typeClass=" << m_typeClass << " TypeId=" << participantData.typeId();
+  DEBUG_LOG(m_logger) << "m_typeClass=" << m_typeClass << " TypeId=" << participantData.typeId();
   fillCbx();
 
   m_almDtc->alarmConfigs([this](const AlarmManagement::AlarmConfig &alarm) { setAlaramData(alarm); });
@@ -111,7 +111,7 @@ bool ConfigParticipantsDialog::init(const std::shared_ptr<ParticipantManagement:
 
 void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig &alarm)
 {
-  DEBUG_LOG() << "setAlaramData:" << alarm;
+  DEBUG_LOG(m_logger) << "setAlaramData:" << alarm;
   if (alarm.operatorId() != m_operatorId ||
       alarm.participantId() != m_participantData.id() ||
       alarm.global())
@@ -121,7 +121,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig
   {
   case ProjectDataManagement::EventType_def::Hit:
   {
-    DEBUG_LOG() << "Hit zuweisen ";
+    DEBUG_LOG(m_logger) << "Hit zuweisen ";
     m_ui->cbxDirectFire->setChecked(true);
     m_ui->cbxSetMarker->setChecked(alarm.setMarker());
     m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
@@ -135,7 +135,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig
   }
   case ProjectDataManagement::EventType_def::HitEffectSimulation:
   {
-    DEBUG_LOG() << "HitIndirect zuweisen ";
+    DEBUG_LOG(m_logger) << "HitIndirect zuweisen ";
     m_ui->cbxIndirectFire->setChecked(true);
     m_ui->cbxSetMarker->setChecked(alarm.setMarker());
     m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
@@ -143,7 +143,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig
   }
   case ProjectDataManagement::EventType_def::AirSupport:
   {
-    DEBUG_LOG() << "AirSupport zuweisen ";
+    DEBUG_LOG(m_logger) << "AirSupport zuweisen ";
     m_ui->cbxAirSupport->setChecked(true);
     m_ui->cbxSetMarker->setChecked(alarm.setMarker());
     m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
@@ -151,7 +151,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig
   }
   case ProjectDataManagement::EventType_def::HitMine:
   {
-    DEBUG_LOG() << "HitMine zuweisen ";
+    DEBUG_LOG(m_logger) << "HitMine zuweisen ";
     m_ui->cbxMines->setChecked(true);
     m_ui->cbxSetMarker->setChecked(alarm.setMarker());
     m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
@@ -161,7 +161,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig
   case ProjectDataManagement::EventType_def::HitN:
   case ProjectDataManagement::EventType_def::HitC:
   {
-    DEBUG_LOG() << "Hit N/B/C zuweisen ";
+    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());
@@ -169,7 +169,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig
   }
   case ProjectDataManagement::EventType_def::FriendlyFire:
   {
-    DEBUG_LOG() << "FriendlyFire zuweisen ";
+    DEBUG_LOG(m_logger) << "FriendlyFire zuweisen ";
     m_ui->cbxFriendlyFire->setChecked(true);
     m_ui->cbxSetMarker->setChecked(alarm.setMarker());
     m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
@@ -183,7 +183,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig
   }
   case ProjectDataManagement::EventType_def::Manipulation:
   {
-    DEBUG_LOG() << "Manipulation zuweisen ";
+    DEBUG_LOG(m_logger) << "Manipulation zuweisen ";
     m_ui->cbxManipulation->setChecked(true);
     m_ui->cbxSetMarker->setChecked(alarm.setMarker());
     m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
@@ -191,7 +191,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig
   }
   case ProjectDataManagement::EventType_def::CrossGlobalBorderline:
   {
-    DEBUG_LOG() << "CrossGlobalBorderline zuweisen ";
+    DEBUG_LOG(m_logger) << "CrossGlobalBorderline zuweisen ";
     m_ui->cbxGlobalBorderLine->setChecked(true);
     m_ui->cbxSetMarker->setChecked(alarm.setMarker());
     m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
@@ -199,7 +199,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig
   }
   case ProjectDataManagement::EventType_def::CrossLocalBorderline:
   {
-    DEBUG_LOG() << "CrossLocalBorderline zuweisen ";
+    DEBUG_LOG(m_logger) << "CrossLocalBorderline zuweisen ";
     m_ui->cbxLocalBorderLine->setChecked(true);
     m_ui->cbxSetMarker->setChecked(alarm.setMarker());
     m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
@@ -207,7 +207,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig
   }
   default:
   {
-    ERROR_LOG() << "Not possible to set with Operator App!!!";
+    ERROR_LOG(m_logger) << "Not possible to set with Operator App!!!";
   }
   }
 }
@@ -215,7 +215,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig
 std::vector<AlarmManagement::AlarmAction> ConfigParticipantsDialog::getCheckedValues() const
 {
   AlarmManagement::AlarmAction alarmActionDds;
-  DEBUG_LOG() << "getCheckedValues";
+  DEBUG_LOG(m_logger) << "getCheckedValues";
 
   std::vector<AlarmManagement::AlarmAction> alarmsDds;
 
@@ -289,7 +289,7 @@ std::vector<AlarmManagement::AlarmAction> ConfigParticipantsDialog::getCheckedVa
 
 bool ConfigParticipantsDialog::apply()
 {
-  DEBUG_LOG() << "apply";
+  DEBUG_LOG(m_logger) << "apply";
   AlarmManagement::ConfigureAlarmsRequest req;
   req.participantIds(m_participantVector);
   req.alarms(getCheckedValues());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_config_participant_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_config_participant_dialog.h
index c7c5e10ff..12b79bee9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_config_participant_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_config_participant_dialog.h
@@ -35,6 +35,8 @@ public:
             const std::vector<int> &equipmentVector);
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void onConfigureAlarmsReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
 
 private: 
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 9ccfea779..0e1c28581 100755
--- 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
@@ -112,7 +112,7 @@ bool ParticipantsDialog::init(LtsSession::LtsSession *session,
 void ParticipantsDialog::onSelectionChanged()
 {
   bool configureAlarms = false;
-  DEBUG_LOG() << "onSelectionChanged";
+  DEBUG_LOG(m_logger) << "onSelectionChanged";
   const QModelIndexList currentlySelectedParticipants = m_ui->dvParticipants->selectedRows();
 
   for (const QModelIndex &index : currentlySelectedParticipants)
@@ -121,7 +121,7 @@ void ParticipantsDialog::onSelectionChanged()
     if ((data.equipmentNumber().is_set() && data.equipmentNumber().get() > 0) ||
         m_ppmDtc->type(data.typeId()).typeClass() == ParticipantManagement::TypeClass_def::Unit)
       configureAlarms = true;
-    DEBUG_LOG() << "setChildrenSelected row =" << index.row() << " column=" << index.column();
+    DEBUG_LOG(m_logger) << "setChildrenSelected row =" << index.row() << " column=" << index.column();
 
   }
   m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Edit, configureAlarms);
@@ -141,7 +141,7 @@ void ParticipantsDialog::onCbPartyChanged()
 
 void ParticipantsDialog::onAddButtonClicked()
 {
-  DEBUG_LOG() << "onAddButtonClicked";
+  DEBUG_LOG(m_logger) << "onAddButtonClicked";
   
   m_participantVector.clear();
   m_equipmentVector.clear();
@@ -151,14 +151,14 @@ void ParticipantsDialog::onAddButtonClicked()
 
     for (const QModelIndex &index : currentlySelectedParticipants)
     {
-      DEBUG_LOG() << "setChildrenSelected: " << index.row() << " column=" << index.column();
+      DEBUG_LOG(m_logger) << "setChildrenSelected: " << index.row() << " column=" << index.column();
       setChildrenSelected(index);
     }
   }
 
   QModelIndex participantIndex = m_ui->dvParticipants->currentIndex();
   ParticipantManagement::ParticipantData data = m_participantModel->getParticipantData(participantIndex);
-  DEBUG_LOG() << "current participantId = " << data.id();
+  DEBUG_LOG(m_logger) << "current participantId = " << data.id();
   m_participantVector.push_back(data.id());
 
   const auto partData = m_participantModel->getParticipantData(participantIndex);
@@ -186,16 +186,16 @@ void ParticipantsDialog::setChildrenSelected(const QModelIndex &parent)
     if (m_participantModel->hasChildren(childIndex))
       setChildrenSelected(childIndex);
 
-    DEBUG_LOG() << "Setting row "
+    DEBUG_LOG(m_logger) << "Setting row "
                         << childIndex.row()
                         << " selected";
 
     ParticipantManagement::ParticipantData data = m_participantModel->getParticipantData(childIndex);
-    DEBUG_LOG() << "append participantId = " << data.id();
+    DEBUG_LOG(m_logger) << "append participantId = " << data.id();
     m_participantVector.push_back(data.id());
     if (data.equipmentNumber().is_set())
     {
-      DEBUG_LOG() << "append equipmentNumber = " << data.equipmentNumber().get();
+      DEBUG_LOG(m_logger) << "append equipmentNumber = " << data.equipmentNumber().get();
       m_equipmentVector.push_back(data.equipmentNumber().get());
     }
 
@@ -211,7 +211,7 @@ void ParticipantsDialog::tableColumnOrganiserSetting()
 
 void ParticipantsDialog::onConfigureAlarmsReply(const Core::FunctionReplyObject &replyObject)
 {
-  DEBUG_LOG() << "onConfigureAlarmsReply" << replyObject.str();
+  DEBUG_LOG(m_logger) << "onConfigureAlarmsReply" << replyObject.str();
   m_requestHelper->requestReply(replyObject);
 }
 
@@ -220,7 +220,7 @@ void ParticipantsDialog::onDoubleClicked()
   if (!m_buttonBox->isButtonEnabled(LtsWidgets::DialogButton::Edit))
     return;
 
-  DEBUG_LOG() << "onDoubleClicked";
+  DEBUG_LOG(m_logger) << "onDoubleClicked";
   onAddButtonClicked();
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_dialog.h
index 881ad367d..0e8bbaae2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_dialog.h
@@ -45,6 +45,8 @@ public:
             const std::shared_ptr<ParticipantManagement::ForeignGuiComboboxInterface> &ppmGuiCbxIfc);
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void onConfigureAlarmsReply(const Core::FunctionReplyObject &replyObject) override final;
 
 private slots:
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 ad53b3eea..16a15d10a 100755
--- 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
@@ -19,7 +19,7 @@ ParticipantAlarmModel::ParticipantAlarmModel(QObject *parent,
 {
   m_titles += tr("Alarm Assignable");
 
-  DEBUG_LOG() << "ParticipantAlarmModel::ParticipantAlarmModel";
+  DEBUG_LOG(m_logger) << "ParticipantAlarmModel::ParticipantAlarmModel";
 }
 
 QVariant ParticipantAlarmModel::data(const QModelIndex &index, int role) const
@@ -42,7 +42,7 @@ void ParticipantAlarmModel::onParticipantChanged(const ParticipantManagement::Pa
   if (data.partyId() != partyId())
     return;
 
-  INFO_LOG() << "onParticipantChanged isSimulated=" << data.isSimulated();
+  INFO_LOG(m_logger) << "onParticipantChanged isSimulated=" << data.isSimulated();
   onReinitModel(partyId());
   emit newData();
 }
@@ -56,7 +56,7 @@ bool ParticipantAlarmModel::isSelectableByAlarm(const QModelIndex &index, bool *
       m_dtc->type(data.typeId()).typeClass() == ParticipantManagement::TypeClass_def::Unit)
     isSimulatable = true;
 
-  DEBUG_LOG() << "ParticipantId: " << data.id()
+  DEBUG_LOG(m_logger) << "ParticipantId: " << data.id()
                       << " isSimulated:" << data.isSimulated()
                       << " equipmentNo:" << data.equipmentNumber()
                       << " typeId=" << data.typeId()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_model.h
index 1a11d4539..4a9941c88 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_model.h
@@ -21,6 +21,8 @@ signals:
   void newData();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType);
   bool isSelectableByAlarm(const QModelIndex &index, bool *bIsSimulated = nullptr) const;
 };
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 27b1f3037..cacbf61d4 100755
--- 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
@@ -23,7 +23,7 @@ ParticipantShowConfigView::ParticipantShowConfigView(LtsSession::LtsSession *ses
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_logger(AlarmManagement::getLogger("ParticipantShowConfigView"))
 {
-  DEBUG_LOG() << "--- ParticipantShowConfigView Konstruktor() ";
+  DEBUG_LOG(m_logger) << "--- ParticipantShowConfigView Konstruktor() ";
   m_ui->setupUi(this);
   m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
 
@@ -47,7 +47,7 @@ ParticipantShowConfigView::ParticipantShowConfigView(LtsSession::LtsSession *ses
 
 ParticipantShowConfigView::~ParticipantShowConfigView()
 {
-  INFO_LOG() << "--- ParticipantShowConfigView Destruktor() ";
+  INFO_LOG(m_logger) << "--- ParticipantShowConfigView Destruktor() ";
   delete m_ui;
 } 
 
@@ -62,7 +62,7 @@ bool ParticipantShowConfigView::init(const std::shared_ptr<AlarmManagement::Inte
                                      const std::shared_ptr<ParticipantManagement::Interface::Dtc> &ppmDtc,
                                      const std::shared_ptr<AreaEffectSimulation::Interface::Dtc> &aesDtc)
 {
-  INFO_LOG() << "--- init() ";
+  INFO_LOG(m_logger) << "--- init() ";
   if (!dtc || !ftc)
     return false;
 
@@ -71,7 +71,7 @@ bool ParticipantShowConfigView::init(const std::shared_ptr<AlarmManagement::Inte
   m_alarmHistoryModel = new AlarmManagement::AlarmHistoryModel(this);
   m_alarmHistoryModel->initModel(dtc, ppmDtc, aesDtc);
 
-  DEBUG_LOG() << "--- ParticipantShowConfigView::init   ";
+  DEBUG_LOG(m_logger) << "--- ParticipantShowConfigView::init   ";
   m_configAlarmModel = new AlarmManagement::ConfigAlarmModel(this);
   m_configAlarmModel->initModel(m_dtc, ppmDtc, m_alarmHistoryModel, false);
   m_ui->widget->setModel(m_configAlarmModel);
@@ -92,7 +92,7 @@ void ParticipantShowConfigView::onSelectionChanged()
 
 void ParticipantShowConfigView::onConfigureAlarmsReply(const Core::FunctionReplyObject &replyObject)
 {
-  DEBUG_LOG()<<"onConfigureAlarmsReply"<<replyObject.str();
+  DEBUG_LOG(m_logger)<<"onConfigureAlarmsReply"<<replyObject.str();
   m_requestHelper->requestReply(replyObject);
 } 
 
@@ -104,14 +104,14 @@ void ParticipantShowConfigView::tableColumnOrganiserSetting()
 
 void ParticipantShowConfigView::onShowAlarm()
 {
-  INFO_LOG() << "--- onShowAlarm() ";
+  INFO_LOG(m_logger) << "--- onShowAlarm() ";
 } 
 
 
 
 void ParticipantShowConfigView::onRemoveAlarm()
 {
-  DEBUG_LOG() << "onRemoveAlarm"
+  DEBUG_LOG(m_logger) << "onRemoveAlarm"
   << " id = "<< m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).id()
   << " eventTypeId = "<< m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).eventTypeId()
   << " operatorId = "<< m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).operatorId()
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 b73411bbf..4c63ad58d 100755
--- 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
@@ -42,6 +42,8 @@ private Q_SLOTS:
   void onPrint();
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void onConfigureAlarmsReply(const Core::FunctionReplyObject &replyObject) override final;
 
 private:
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 70627d395..e83efcf58 100755
--- 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
@@ -41,9 +41,9 @@ bool EmergencyCallDialog::init(const std::shared_ptr<AlarmManagement::Interface:
                                const std::shared_ptr<OperatorManagement::Interface::Dtc> &opmDtc,
                                LtsSession::LtsSession *session)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START ";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START ";
   if (!ftc || !dtc || !session){
-    ERROR_LOG()<<" init Emergency call dialog failed !!";
+    ERROR_LOG(m_logger)<<" init Emergency call dialog failed !!";
     return false;
   }
 
@@ -99,8 +99,8 @@ bool EmergencyCallDialog::init(const std::shared_ptr<AlarmManagement::Interface:
   m_ui->emergencyCallView->hideColumn(EmergencyCallModel::EXPIRED);
 #endif
 
-  INFO_LOG() << "EmergencyCallDialog::init done";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  INFO_LOG(m_logger) << "EmergencyCallDialog::init done";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
@@ -172,14 +172,14 @@ void EmergencyCallDialog::setAcknowledgeUi()
 
 void EmergencyCallDialog::onEditBtCliked()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   const AlmEmergencyCall &sos = getSelectedSOS();
   if (sos.id() <= 0)
     return;
   setAcknowledgeUi();
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 
@@ -222,7 +222,7 @@ void EmergencyCallDialog::onEmergencyIndexDoubleClicked(const QModelIndex &index
 
 void EmergencyCallDialog::sendAcknowledgeEmergency(const QString &comment)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   const AlmEmergencyCall &sos = getSelectedSOS();
   if (sos.id() <= 0 || sos.expired())
@@ -243,7 +243,7 @@ void EmergencyCallDialog::sendAcknowledgeEmergency(const QString &comment)
   });
 
   enaDisa();
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void EmergencyCallDialog::tableColumnOrganiserSetting()
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 08436a065..f22ab1894 100755
--- 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
@@ -71,10 +71,10 @@ bool EmergencyCallInfoDialog::init(const std::shared_ptr<Interface::Ftc> &ftc,
                                    const std::shared_ptr<SituationMap::ForeignGuiInterface> &sitMapGuiIfc,
                                    const std::shared_ptr<OperatorManagement::Interface::Dtc>&opmDtc)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (!ftc || !dtc)
   {
-    ERROR_LOG()<<" init Emergency call Info dialog failed !!";
+    ERROR_LOG(m_logger)<<" init Emergency call Info dialog failed !!";
     return false;
   }
 
@@ -94,7 +94,7 @@ bool EmergencyCallInfoDialog::init(const std::shared_ptr<Interface::Ftc> &ftc,
   connect(m_ui->pbAckEmergency, &QPushButton::clicked, this, &EmergencyCallInfoDialog::onPbAckEmergencyClicked );
   connect(m_ui->pbEmergencyCallFindOnMap, &QPushButton::clicked, this, &EmergencyCallInfoDialog::onFindEmergencyOnMap);
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
@@ -109,10 +109,10 @@ QString EmergencyCallInfoDialog::emergencyIdentifier() const
 
 bool EmergencyCallInfoDialog::setUiValues()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (!m_dtc || !m_ftc || m_emergency.id() < 0)
   {
-    ERROR_LOG()<<" >> unabled to init EmergencyCallInfoDialog";
+    ERROR_LOG(m_logger)<<" >> unabled to init EmergencyCallInfoDialog";
     return false;
   }
 
@@ -133,7 +133,7 @@ bool EmergencyCallInfoDialog::setUiValues()
   QPixmap iconPixmap = QPixmap::fromImage(renderEmergencySymbol(m_emergency.expired()));
   m_ui->lblIcon->setPixmap(iconPixmap);
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
@@ -141,7 +141,7 @@ bool EmergencyCallInfoDialog::setUiValues()
 
 void EmergencyCallInfoDialog::onEmergencyCallChanged(AlarmManagement::AlmEmergencyCall data, DataModification modType)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (data.id() != m_emergency.id() || data.id() == 0)
     return;
 
@@ -157,7 +157,7 @@ void EmergencyCallInfoDialog::onEmergencyCallChanged(AlarmManagement::AlmEmergen
     setUiValues();
   }
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 
@@ -171,7 +171,7 @@ void EmergencyCallInfoDialog::onFindEmergencyOnMap()
 
 void EmergencyCallInfoDialog::onPbAckEmergencyClicked()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   LtsWidgets::LtsFramelessDialog *popup = new LtsWidgets::LtsFramelessDialog(this, LtsWidgets::Behaviour::Popup);
   LtsWidgets::LtsDialogButtonBox *btnBox = new LtsWidgets::LtsDialogButtonBox(popup);
@@ -203,7 +203,7 @@ void EmergencyCallInfoDialog::onPbAckEmergencyClicked()
   popup->setMinimumWidth(350);
   popup->show();
   le->setFocus();
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.h
index ff7fe601c..2acf75fc1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.h
@@ -40,6 +40,7 @@ public:
 private slots:
   void onAlarmEmergencyCallChanged(const AlarmManagement::AlmEmergencyCall &data, const DataModification modType);
 private:
+NGL::INGLLogger &m_logger;
   std::shared_ptr<AlarmManagement::Interface::Dtc> m_dtc;
   std::shared_ptr<OperatorManagement::Interface::Dtc> m_opmDtc;
   friend class EmergencyCallProxyModel;
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 af5530711..e1e77881e 100755
--- 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
@@ -51,13 +51,13 @@ bool AesChargeEffectItemInfo::init(LtsSession::LtsSession *session)
 
   if (!session->getDtc<ProjectDataManagement::DataInterface>(m_pdmDtc))
   {
-    ERROR_LOG() << " failed to get pdmDtc";
+    ERROR_LOG(m_logger) << " failed to get pdmDtc";
     return false;
   }
 
   if (!session->getDtc<AreaEffectSimulation::DataInterface>(m_aesDtc))
   {
-    ERROR_LOG() << " failed to get aesDtc";
+    ERROR_LOG(m_logger) << " failed to get aesDtc";
     return false;
   }
   if (!m_aesDtc->isAesItemViewEnabled())
@@ -103,12 +103,12 @@ void AesChargeEffectItemInfo::retranslate()
 
 void AesChargeEffectItemInfo::onFindOnMap() const
 {
-  DEBUG_LOG() << "onFindOnMap() aesId: "<<m_ChargeEffectId;
+  DEBUG_LOG(m_logger) << "onFindOnMap() aesId: "<<m_ChargeEffectId;
   std::shared_ptr<SituationMap::ForeignGuiInterface> ifc;
   if (m_session->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(ifc))
     ifc->centerMapToChargeEffectObject(m_ChargeEffectId);
   else
-    WARNING_LOG() << Q_FUNC_INFO << "getForeignGuiInterface<SituationMap::ForeignGuiInterface> failed!";
+    WARNING_LOG(m_logger) << Q_FUNC_INFO << "getForeignGuiInterface<SituationMap::ForeignGuiInterface> failed!";
 }
 
 template <typename InterfaceType>
@@ -125,13 +125,13 @@ bool AesChargeEffectItemInfo::tryShowStandardEditDialog(const AesItemView& aiv)
     return true;
   }
 
-  WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface failed for specific AES interface!";
+  WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface failed for specific AES interface!";
   return false;
 }
 
 void AesChargeEffectItemInfo::onShowDetails()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   const ChargeEffect item = m_aesDtc->chargeEffect(m_ChargeEffectId);
 
@@ -139,7 +139,7 @@ void AesChargeEffectItemInfo::onShowDetails()
   {
     AesItemView aiv;
     m_aesDtc->aesItemViewFromEntityId(item.originatorId(), AreaEffectSimulation::AesType::AtUnknown, aiv);
-    DEBUG_LOG() << "aiv.id():" << aiv.id() << ", aesType: " << aiv.aesTypeId();
+    DEBUG_LOG(m_logger) << "aiv.id():" << aiv.id() << ", aesType: " << aiv.aesTypeId();
 
     
      auto registerDialog = [this](AreaEffectSimulation::BaseEdit* dialog) {
@@ -200,7 +200,7 @@ void AesChargeEffectItemInfo::onShowDetails()
            registerDialog(ifc->showEditWindow(aiv.aesItemId(), true, this));
       }
       else
-        WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesBCContamination::ForeignGuiInterface> failed!";
+        WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesBCContamination::ForeignGuiInterface> failed!";
       break;
     }
     case AreaEffectSimulation::AesType::AtBoobyTrap:
@@ -210,7 +210,7 @@ void AesChargeEffectItemInfo::onShowDetails()
       if (m_session->getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface>(ifc))
          registerDialog(ifc->showBoobyTrapEditWindow(aiv.aesItemId(), this));
       else
-        WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
+        WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
       break;
     }
     case AreaEffectSimulation::AesType::AtOffRouteMine:
@@ -220,7 +220,7 @@ void AesChargeEffectItemInfo::onShowDetails()
       if (m_session->getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface>(ifc))
         registerDialog(ifc->showOffRouteMineEditWindow(aiv.aesItemId(), this));
       else
-        WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
+        WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
       break;
     }
     case AreaEffectSimulation::AesType::AtExplosionSingle:
@@ -244,7 +244,7 @@ void AesChargeEffectItemInfo::onShowDetails()
         }
       }
       else
-        WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
+        WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
       break;
     }
 
@@ -260,7 +260,7 @@ void AesChargeEffectItemInfo::onShowDetails()
         registerDialog(ifc->showEditWindow(aiv.aesItemId(), ai.effectSourceId(), this));
       }
       else
-        WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
+        WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
       break;
     }
 
@@ -283,10 +283,10 @@ void AesChargeEffectItemInfo::onShowDetails()
       break;
     case AreaEffectSimulation::AesType::AtUnknown:
       Q_ASSERT(false);
-      WARNING_LOG() << "Unknown AesType found for aesEntityId: " << aiv.aesTypeId();
+      WARNING_LOG(m_logger) << "Unknown AesType found for aesEntityId: " << aiv.aesTypeId();
       break;
     default:
-      DEBUG_LOG() << "Couldn't find AesItem to ChargeEffect (any more). Hiding the button";
+      DEBUG_LOG(m_logger) << "Couldn't find AesItem to ChargeEffect (any more). Hiding the button";
       m_ui->pbDetails->hide();
        break;
     } 
@@ -302,13 +302,13 @@ void AesChargeEffectItemInfo::onShowDetails()
         addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
     }
     else
-      WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface ChargeEffect failed!";
+      WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface ChargeEffect failed!";
   }
 }
 
 void AesChargeEffectItemInfo::onChargeEffectChanged(const ChargeEffect &data, DataModification modType)
 {
-  DEBUG_LOG() << " [onChargeEffectChanged] id: " << data.id();
+  DEBUG_LOG(m_logger) << " [onChargeEffectChanged] id: " << data.id();
   if (data.id() == m_ChargeEffectId && modType != DataModification::eRemoved)
     handleChargeEffect(data);
 }
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 5a94b9f55..2780a269f 100755
--- 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
@@ -99,12 +99,12 @@ bool DangerAreaAesItemInfo::init(LtsSession::LtsSession *session)
 {
   if (m_session && session)
   {
-    ERROR_LOG() << "double init()!";
+    ERROR_LOG(m_logger) << "double init()!";
     return false;
   }
   if (!m_session && !session)
   {
-    ERROR_LOG() << "No Session available!";
+    ERROR_LOG(m_logger) << "No Session available!";
     return false;
   }
   if (!m_session)
@@ -129,7 +129,7 @@ void DangerAreaAesItemInfo::insertAesItem(int aesItemId)
   }
   delete item;
 
-  WARNING_LOG() << "AesItem with id " << aesItemId << " is not of any known type!";
+  WARNING_LOG(m_logger) << "AesItem with id " << aesItemId << " is not of any known type!";
 }
 
 void DangerAreaAesItemInfo::setText()
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 e73eabf04..2fc5ceb87 100755
--- 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
@@ -47,7 +47,7 @@ AesInfoDialog::AesInfoDialog(int aesEntityId, AesType aesType, QWidget *parent)
   , m_ui(new Ui::AesInfoDialog)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
 {
-  DEBUG_LOG() << "ctor AesInfoDialog() ";
+  DEBUG_LOG(m_logger) << "ctor AesInfoDialog() ";
   m_ui->setupUi(this);
   m_ui->lblAesId->setText(QString::number(aesEntityId));
 
@@ -80,7 +80,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
   if (aesItemView.aesItemId() != m_aesEntityId)
     return false;
 
-  DEBUG_LOG() << "AesItemView found for aesEntityId: " << m_aesEntityId
+  DEBUG_LOG(m_logger) << "AesItemView found for aesEntityId: " << m_aesEntityId
                       << " AesItemView.aesTypeId(): " << aesItemView.aesTypeId();
 
   if (aesItemView.aesTypeId() != m_aesType)
@@ -94,7 +94,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
   {
     handleNContamination(aesItemView);
     connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::nContaminationChanged, this, &AesInfoDialog::onNContaminationChanged);
-    DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::NContaminationChanged for aesEntityId: " << m_aesEntityId;
+    DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::NContaminationChanged for aesEntityId: " << m_aesEntityId;
     setOnlineHelpFilename(QStringLiteral("Info_Dialog-N-Contamination"));
     break;
   }
@@ -102,7 +102,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
   {
     handleBCContamination(aesItemView);
     connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::bCContaminationChanged, this, &AesInfoDialog::onBCContaminationChanged);
-    DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::bCContaminationChanged for aesEntityId: " << m_aesEntityId;
+    DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::bCContaminationChanged for aesEntityId: " << m_aesEntityId;
     setOnlineHelpFilename(QStringLiteral("Info_Dialog-C-Contamination"));
     break;
   }
@@ -111,7 +111,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
   {
     handleBoobyTrap(aesItemView);
     connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::boobyTrapChanged, this, &AesInfoDialog::onBoobyTrapChanged);
-    DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::boobyTrapChanged for aesEntityId: " << m_aesEntityId;
+    DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::boobyTrapChanged for aesEntityId: " << m_aesEntityId;
     setOnlineHelpFilename(QStringLiteral("Info_Dialog-BoobyTrap"));
     break;
   }
@@ -120,7 +120,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
   {
     handleOffRouteMine(aesItemView);
     connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::offRouteMineChanged, this, &AesInfoDialog::onOffRouteMineChanged);
-    DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::offRouteMineChanged for aesEntityId: " << m_aesEntityId;
+    DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::offRouteMineChanged for aesEntityId: " << m_aesEntityId;
     setOnlineHelpFilename(QStringLiteral("Info_Dialog-OffRouteMine"));
     break;
   }
@@ -128,7 +128,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
   {
     handleExplosionArea(aesItemView);
     connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::explosionAreaChanged, this, &AesInfoDialog::onExplosionAreaChanged);
-    DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::explosionAreaChanged for aesEntityId: " << m_aesEntityId;
+    DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::explosionAreaChanged for aesEntityId: " << m_aesEntityId;
     setOnlineHelpFilename(QStringLiteral("Info_Dialog-Area_Artillery"));
     break;
   }
@@ -136,7 +136,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
   {
     handleExplosionSingle(aesItemView);
     connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::explosionSingleChanged, this, &AesInfoDialog::onExplosionSingleChanged);
-    DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::explosionSingleChanged for aesEntityId: " << m_aesEntityId;
+    DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::explosionSingleChanged for aesEntityId: " << m_aesEntityId;
     setOnlineHelpFilename(QStringLiteral("Info_Dialog-Single_Artillery"));
     break;
   }
@@ -144,7 +144,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
   {
     handleMineArea(aesItemView);
     connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::mineAreaChanged, this, &AesInfoDialog::onMineAreaChanged);
-    DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::mineAreaChanged for aesEntityId: " << m_aesEntityId;
+    DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::mineAreaChanged for aesEntityId: " << m_aesEntityId;
     setOnlineHelpFilename(QStringLiteral("Info_Dialog-Mine_Area"));
     break;
   }
@@ -152,7 +152,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
   {
     handleMineCorridor(aesItemView);
     connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::mineCorridorChanged, this, &AesInfoDialog::onMineCorridorChanged);
-    DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::mineCorridorChanged for aesEntityId: " << m_aesEntityId;
+    DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::mineCorridorChanged for aesEntityId: " << m_aesEntityId;
     setOnlineHelpFilename(QStringLiteral("Info_Dialog-Mine_Corridor"));
     break;
   }
@@ -160,7 +160,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
   {
     handleGasPipe(aesItemView);
     connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::gasPipeChanged, this, &AesInfoDialog::onGasPipeChanged);
-    DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::gasPipeChanged for aesEntityId: " << m_aesEntityId;
+    DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::gasPipeChanged for aesEntityId: " << m_aesEntityId;
     setOnlineHelpFilename(QStringLiteral("Info_Dialog-Gas_Pipeline"));
     break;
   }
@@ -168,7 +168,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
   {
     handleDangerArea(aesItemView);
     connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::dangerAreaChanged, this, &AesInfoDialog::onDangerAreaChanged);
-    DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::dangerAreaChanged for aesEntityId: " << m_aesEntityId;
+    DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::dangerAreaChanged for aesEntityId: " << m_aesEntityId;
     setOnlineHelpFilename(QStringLiteral("Info_Dialog-Danger_Area"));
     break;
   }
@@ -176,7 +176,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
   {
     handleBorderline(aesItemView);
     connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::borderlineChanged, this, &AesInfoDialog::onBorderlineChanged);
-    DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::borderlineChanged for aesEntityId: " << m_aesEntityId;
+    DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::borderlineChanged for aesEntityId: " << m_aesEntityId;
     setOnlineHelpFilename(QStringLiteral("Info_Dialog-Borderline"));
 
     
@@ -196,7 +196,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
   {
     handleFunctionalArea(aesItemView);
     connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::functionalAreaChanged, this, &AesInfoDialog::onFunctionalAreaChanged);
-    DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::functionalAreaChanged for aesEntityId: " << m_aesEntityId;
+    DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::functionalAreaChanged for aesEntityId: " << m_aesEntityId;
     setOnlineHelpFilename(QStringLiteral("Info_Dialog-Functional_Area"));
     break;
   }
@@ -204,7 +204,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
   {
     handleAirSupportImpact(aesItemView);
     connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::airSupportImpactChanged, this, &AesInfoDialog::onAirSupportImpactChanged);
-    DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::airSupportImpactChanged for aesEntityId: " << m_aesEntityId;
+    DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::airSupportImpactChanged for aesEntityId: " << m_aesEntityId;
     setOnlineHelpFilename(QStringLiteral("Info_Dialog-Aerial_Ordnance")); 
     break;
   }
@@ -212,7 +212,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
   {
     handleExplosionCluster(aesItemView);
     connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::explosionClusterChanged, this, &AesInfoDialog::onExplosionClusterChanged);
-    DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::ExplosionCluster for aesEntityId: "<<m_aesEntityId;
+    DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::ExplosionCluster for aesEntityId: "<<m_aesEntityId;
     setOnlineHelpFilename(QStringLiteral("Info_Dialog-Explosion_Cluster")); 
     break;
   }
@@ -220,7 +220,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
   {
     handleEffectCluster(aesItemView);
     connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::effectClusterChanged, this, &AesInfoDialog::onEffectClusterChanged);
-    DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::EffectCluster for aesEntityId: " << m_aesEntityId;
+    DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::EffectCluster for aesEntityId: " << m_aesEntityId;
     setOnlineHelpFilename(QStringLiteral("Info_Dialog-Explosion_Cluster")); 
     break;
   }
@@ -237,7 +237,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
     
     break;
   case AreaEffectSimulation::AesType::AtUnknown:
-    WARNING_LOG() << "Unknown AesType found for aesEntityId " << m_aesEntityId << ": " << aesItemView.aesTypeId();
+    WARNING_LOG(m_logger) << "Unknown AesType found for aesEntityId " << m_aesEntityId << ": " << aesItemView.aesTypeId();
     Q_ASSERT(false);
     break;
   } 
@@ -308,7 +308,7 @@ bool AesInfoDialog::init(LtsSession::LtsSession *session,
 
 void AesInfoDialog::handleNContamination(const AesItemView &aesItemView)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
                       << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
 
   handleNContamination(m_dtc->nContamination(m_aesEntityId));
@@ -317,7 +317,7 @@ void AesInfoDialog::handleNContamination(const AesItemView &aesItemView)
 
 void AesInfoDialog::handleNContamination(const AreaEffectSimulation::NContamination &data)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::NContamination)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::NContamination)"
                       << " data.id(): " << data.id();
 
   handleAesItem(data, AesType::AtNContamination);
@@ -331,7 +331,7 @@ void AesInfoDialog::handleNContamination(const AreaEffectSimulation::NContaminat
 
 void AesInfoDialog::handleBCContamination(const AesItemView &aesItemView)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
                       << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
 
   handleBCContamination(m_dtc->bCContamination(m_aesEntityId));
@@ -340,7 +340,7 @@ void AesInfoDialog::handleBCContamination(const AesItemView &aesItemView)
 
 void AesInfoDialog::handleBCContamination(const AreaEffectSimulation::BCContamination &data)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::BCContamination)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::BCContamination)"
                       << " data.id(): " << data.id();
 
   handleAesItem(data, AesType::AtBCContamination);
@@ -356,7 +356,7 @@ void AesInfoDialog::handleBCContamination(const AreaEffectSimulation::BCContamin
 
 void AesInfoDialog::handleBoobyTrap(const AesItemView &aesItemView)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
                       << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
 
   handleBoobyTrap(m_dtc->boobyTrap(m_aesEntityId));
@@ -365,7 +365,7 @@ void AesInfoDialog::handleBoobyTrap(const AesItemView &aesItemView)
 
 void AesInfoDialog::handleBoobyTrap(const AreaEffectSimulation::BoobyTrap &data)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::BoobyTrap)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::BoobyTrap)"
                       << " data.id(): " << data.id();
 
   handleAesItem(data, AesType_def::AtBoobyTrap);
@@ -386,7 +386,7 @@ void AesInfoDialog::handleBoobyTrap(const AreaEffectSimulation::BoobyTrap &data)
 
 void AesInfoDialog::handleOffRouteMine(const AesItemView &aesItemView)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
                       << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
 
   handleOffRouteMine(m_dtc->offRouteMine(m_aesEntityId));
@@ -395,7 +395,7 @@ void AesInfoDialog::handleOffRouteMine(const AesItemView &aesItemView)
 
 void AesInfoDialog::handleOffRouteMine(const AreaEffectSimulation::OffRouteMine &data)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::OffRouteMine)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::OffRouteMine)"
                       << " data.id(): " << data.id();
 
   handleAesItem(data, AesType_def::AtOffRouteMine);
@@ -416,7 +416,7 @@ void AesInfoDialog::handleOffRouteMine(const AreaEffectSimulation::OffRouteMine
 
 void AesInfoDialog::handleExplosionArea(const AesItemView &aesItemView)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
                       << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
 
   handleExplosionArea(m_dtc->explosionArea(m_aesEntityId));
@@ -425,7 +425,7 @@ void AesInfoDialog::handleExplosionArea(const AesItemView &aesItemView)
 
 void AesInfoDialog::handleExplosionArea(const AreaEffectSimulation::ExplosionArea &data)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::ExplosionArea)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::ExplosionArea)"
                       << " data.id(): " << data.id();
 
   handleAesItem(data, AesType::AtExplosionArea);
@@ -448,7 +448,7 @@ void AesInfoDialog::handleExplosionArea(const AreaEffectSimulation::ExplosionAre
 
 void AesInfoDialog::handleExplosionSingle(const AesItemView &aesItemView)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
                       << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
   handleExplosionSingle(m_dtc->explosionSingle(m_aesEntityId));
 } 
@@ -456,7 +456,7 @@ void AesInfoDialog::handleExplosionSingle(const AesItemView &aesItemView)
 
 void AesInfoDialog::handleExplosionSingle(const AreaEffectSimulation::ExplosionSingle &data)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::ExplosionSingle)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::ExplosionSingle)"
                       << " data.id(): " << data.id();
 
   handleAesItem(data, AesType::AtExplosionSingle);
@@ -472,7 +472,7 @@ void AesInfoDialog::handleExplosionSingle(const AreaEffectSimulation::ExplosionS
 
 void AesInfoDialog::handleMineArea(const AesItemView &aesItemView)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
                       << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
   handleMineArea(m_dtc->mineArea(m_aesEntityId));
 } 
@@ -480,7 +480,7 @@ void AesInfoDialog::handleMineArea(const AesItemView &aesItemView)
 
 void AesInfoDialog::handleMineArea(const AreaEffectSimulation::MineArea &data)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::MineArea)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::MineArea)"
                       << " data.id(): " << data.id();
 
   handleAesItem(data, AesType::AtMineArea);
@@ -504,7 +504,7 @@ void AesInfoDialog::handleMineArea(const AreaEffectSimulation::MineArea &data)
 
 void AesInfoDialog::handleMineCorridor(const AesItemView &aesItemView)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
                       << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
   handleMineCorridor(m_dtc->mineCorridor(m_aesEntityId));
 } 
@@ -512,7 +512,7 @@ void AesInfoDialog::handleMineCorridor(const AesItemView &aesItemView)
 
 void AesInfoDialog::handleMineCorridor(const AreaEffectSimulation::MineCorridor &data)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::MineArea)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::MineArea)"
                       << " data.id(): " << data.id();
 
   handleAesItem(data, AesType::AtMineCorridor);
@@ -530,7 +530,7 @@ void AesInfoDialog::handleMineCorridor(const AreaEffectSimulation::MineCorridor
 
 void AesInfoDialog::handleGasPipe(const AesItemView &aesItemView)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
                       << " handleGasPipe: aesItemView.aesItemId(): " << aesItemView.aesItemId();
   handleGasPipe(m_dtc->gasPipe(m_aesEntityId));
 } 
@@ -538,7 +538,7 @@ void AesInfoDialog::handleGasPipe(const AesItemView &aesItemView)
 
 void AesInfoDialog::handleGasPipe(const AreaEffectSimulation::GasPipe &data)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::GasPipe)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::GasPipe)"
                       << " data.id(): " << data.id();
 
   handleAesItem(data, AesType::AtGasPipe);
@@ -555,7 +555,7 @@ void AesInfoDialog::handleGasPipe(const AreaEffectSimulation::GasPipe &data)
 
 void AesInfoDialog::handleDangerArea(const AesItemView &aesItemView)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
                       << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
   handleDangerArea(m_dtc->dangerArea(m_aesEntityId));
 } 
@@ -563,7 +563,7 @@ void AesInfoDialog::handleDangerArea(const AesItemView &aesItemView)
 
 void AesInfoDialog::handleDangerArea(const AreaEffectSimulation::DangerArea &data)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::DangerArea)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::DangerArea)"
                       << " data.id(): " << data.id();
 
   handleAesItem(data, AesType::AtDangerArea);
@@ -586,7 +586,7 @@ void AesInfoDialog::handleDangerArea(const AreaEffectSimulation::DangerArea &dat
 
 void AesInfoDialog::handleBorderline(const AesItemView &aesItemView)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
                       << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
   handleBorderline(m_dtc->borderline(m_aesEntityId));
 } 
@@ -594,7 +594,7 @@ void AesInfoDialog::handleBorderline(const AesItemView &aesItemView)
 
 void AesInfoDialog::handleBorderline(const AreaEffectSimulation::Borderline &data)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::Borderline)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::Borderline)"
                       << " data.id(): " << data.id();
 
   handleAesItem(data, AesType::AtBorderline);
@@ -614,7 +614,7 @@ void AesInfoDialog::handleBorderline(const AreaEffectSimulation::Borderline &dat
 
 void AesInfoDialog::handleFunctionalArea(const AesItemView &aesItemView)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
                       << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
   handleFunctionalArea(m_dtc->functionalArea(m_aesEntityId));
 }
@@ -623,7 +623,7 @@ void AesInfoDialog::handleFunctionalArea(const AesItemView &aesItemView)
 
 void AesInfoDialog::handleFunctionalArea(const FunctionalArea &data)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::FunctionalArea)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::FunctionalArea)"
                       << " data.id(): " << data.id();
 
   handleAesItem(data, AesType::AtFunctionalArea);
@@ -661,7 +661,7 @@ void AesInfoDialog::handleFunctionalArea(const FunctionalArea &data)
 
 void AesInfoDialog::handleAirSupportImpact(const AesItemView &aesItemView)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
                       << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
   handleAirSupportImpact(m_dtc->airSupportImpact(m_aesEntityId));
 }
@@ -670,7 +670,7 @@ void AesInfoDialog::handleAirSupportImpact(const AesItemView &aesItemView)
 
 void AesInfoDialog::handleAirSupportImpact(const AirSupportImpact &data)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::FunctionalArea)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::FunctionalArea)"
                       << " data.id(): " << data.id();
 
   handleAesItem(data, AesType::AtAirSupportImpact);
@@ -861,14 +861,14 @@ void AesInfoDialog::handleSingleDusMine()
 
 void AesInfoDialog::handleExplosionCluster(const AesItemView &aesItemView)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
                       << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
   handleExplosionCluster(m_dtc->explosionCluster(m_aesEntityId));
 }
 
 void AesInfoDialog::handleExplosionCluster(const ExplosionCluster &data)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::ExplosionCluster)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::ExplosionCluster)"
                       << " data.id(): " << data.id();
 
   handleAesItem(data, AesType::AtExplosionCluster);
@@ -882,14 +882,14 @@ void AesInfoDialog::handleExplosionCluster(const ExplosionCluster &data)
 
 void AesInfoDialog::handleEffectCluster(const AesItemView &aesItemView)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
                       << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
   handleEffectCluster(m_dtc->effectCluster(m_aesEntityId));
 }
 
 void AesInfoDialog::handleEffectCluster(const EffectCluster &data)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::EffectCluster)"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::EffectCluster)"
                       << " data.id(): " << data.id();
 
   handleAesItem(data, AesType::AtEffectCluster);
@@ -954,18 +954,18 @@ void AesInfoDialog::handleAesItem(const AesItem &aesData, AesType aesTypeId)
 
 void AesInfoDialog::onFindOnMap()
 {
-  DEBUG_LOG() << "onFindOnMap()";
+  DEBUG_LOG(m_logger) << "onFindOnMap()";
   std::shared_ptr<SituationMap::ForeignGuiInterface> ifc;
   if (m_session->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(ifc))
     ifc->centerMapToAesObject(m_aesEntityId);
   else
-    WARNING_LOG() << Q_FUNC_INFO << "getForeignGuiInterface<SituationMap::ForeignGuiInterface> failed!";
+    WARNING_LOG(m_logger) << Q_FUNC_INFO << "getForeignGuiInterface<SituationMap::ForeignGuiInterface> failed!";
 } 
 
 
 void AesInfoDialog::onShowDetails()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   switch (m_aesType.underlying())
   {
@@ -979,7 +979,7 @@ void AesInfoDialog::onShowDetails()
         addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
     }
     else
-      WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesNContamination::ForeignGuiInterface> failed!";
+      WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesNContamination::ForeignGuiInterface> failed!";
     break;
   }
   case AreaEffectSimulation::AesType::AtBCContamination:
@@ -1005,7 +1005,7 @@ void AesInfoDialog::onShowDetails()
       }
     }
     else
-      WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesBCContamination::ForeignGuiInterface> failed!";
+      WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesBCContamination::ForeignGuiInterface> failed!";
     break;
   }
   case AreaEffectSimulation::AesType::AtBoobyTrap:
@@ -1020,7 +1020,7 @@ void AesInfoDialog::onShowDetails()
       break;
     }
     else
-      WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
+      WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
     break;
   }
   case AreaEffectSimulation::AesType::AtOffRouteMine:
@@ -1035,7 +1035,7 @@ void AesInfoDialog::onShowDetails()
       break;
     }
     else
-      WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
+      WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
     break;
   }
   case AreaEffectSimulation::AesType::AtExplosionSingle:
@@ -1058,7 +1058,7 @@ void AesInfoDialog::onShowDetails()
       break;
     }
     else
-      WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
+      WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
     break;
   }
   case AreaEffectSimulation::AesType::AtExplosionArea:
@@ -1080,7 +1080,7 @@ void AesInfoDialog::onShowDetails()
       }
     }
     else
-      WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
+      WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
     break;
   }
   case AreaEffectSimulation::AesType::AtExplosionCluster:
@@ -1095,7 +1095,7 @@ void AesInfoDialog::onShowDetails()
       break;
     }
     else
-      WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
+      WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
     break;
   }
   case AreaEffectSimulation::AesType::AtMineArea:
@@ -1108,7 +1108,7 @@ void AesInfoDialog::onShowDetails()
         addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
     }
     else
-      WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesMineArea::ForeignGuiInterface> failed!";
+      WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesMineArea::ForeignGuiInterface> failed!";
     break;
   }
   case AreaEffectSimulation::AesType::AtMineCorridor:
@@ -1121,7 +1121,7 @@ void AesInfoDialog::onShowDetails()
         addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
     }
     else
-      WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesMineCorridor::ForeignGuiInterface> failed!";
+      WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesMineCorridor::ForeignGuiInterface> failed!";
     break;
   }
   case AreaEffectSimulation::AesType::AtGasPipe:
@@ -1134,7 +1134,7 @@ void AesInfoDialog::onShowDetails()
         addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
     }
     else
-      WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesGasPipe::ForeignGuiInterface> failed!";
+      WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesGasPipe::ForeignGuiInterface> failed!";
     break;
   }
   case AreaEffectSimulation::AesType::AtDangerArea:
@@ -1147,7 +1147,7 @@ void AesInfoDialog::onShowDetails()
         addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
     }
     else
-      WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesDangerArea::ForeignGuiInterface> failed!";
+      WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesDangerArea::ForeignGuiInterface> failed!";
     break;
   }
   case AreaEffectSimulation::AesType::AtBorderline:
@@ -1160,7 +1160,7 @@ void AesInfoDialog::onShowDetails()
         addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
     }
     else
-      WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesBorderline::ForeignGuiInterface> failed!";
+      WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesBorderline::ForeignGuiInterface> failed!";
     break;
   }
   case AreaEffectSimulation::AesType::AtFunctionalArea:
@@ -1173,7 +1173,7 @@ void AesInfoDialog::onShowDetails()
         addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
     }
     else
-      WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesFunctionalArea::ForeignGuiInterface> failed!";
+      WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesFunctionalArea::ForeignGuiInterface> failed!";
     break;
   }
   case AreaEffectSimulation::AesType::AtAirSupportImpact:
@@ -1191,7 +1191,7 @@ void AesInfoDialog::onShowDetails()
     break;
   case AreaEffectSimulation::AesType::AtUnknown:
     Q_ASSERT(false);
-    WARNING_LOG() << "Unknown AesType found for aesEntityId: " << m_aesEntityId;
+    WARNING_LOG(m_logger) << "Unknown AesType found for aesEntityId: " << m_aesEntityId;
     break;
   default:
     break;
@@ -1204,7 +1204,7 @@ bool AesInfoDialog::onResetDusMines()
 {
   if (m_aesType == AreaEffectSimulation::AesType_def::AtMineAreaSingleMines)
   {
-    DEBUG_LOG() << "onResetDusMines() AtMineAreaSingleMines mineId: " << m_aesEntityId;
+    DEBUG_LOG(m_logger) << "onResetDusMines() AtMineAreaSingleMines mineId: " << m_aesEntityId;
     MineResetRequest req(0, {m_aesEntityId});
 
     return m_requestHelper->startSingleRequest([req, this]()
@@ -1225,7 +1225,7 @@ bool AesInfoDialog::onResetDusMines()
 
 void AesInfoDialog::onNContaminationChanged(const AreaEffectSimulation::NContamination &data, DataModification modType)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
   if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
     handleNContamination(data);
 } 
@@ -1233,7 +1233,7 @@ void AesInfoDialog::onNContaminationChanged(const AreaEffectSimulation::NContami
 
 void AesInfoDialog::onBCContaminationChanged(const AreaEffectSimulation::BCContamination &data, DataModification modType)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
   if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
     handleBCContamination(data);
 } 
@@ -1241,7 +1241,7 @@ void AesInfoDialog::onBCContaminationChanged(const AreaEffectSimulation::BCConta
 
 void AesInfoDialog::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap &data, DataModification modType)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
   if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
     handleBoobyTrap(data);
 } 
@@ -1249,7 +1249,7 @@ void AesInfoDialog::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap &da
 
 void AesInfoDialog::onOffRouteMineChanged(const AreaEffectSimulation::OffRouteMine &data, DataModification modType)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
   if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
     handleOffRouteMine(data);
 } 
@@ -1257,7 +1257,7 @@ void AesInfoDialog::onOffRouteMineChanged(const AreaEffectSimulation::OffRouteMi
 
 void AesInfoDialog::onExplosionAreaChanged(const AreaEffectSimulation::ExplosionArea &data, DataModification modType)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
   if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
     handleExplosionArea(data);
 } 
@@ -1265,7 +1265,7 @@ void AesInfoDialog::onExplosionAreaChanged(const AreaEffectSimulation::Explosion
 
 void AesInfoDialog::onExplosionSingleChanged(const AreaEffectSimulation::ExplosionSingle &data, DataModification modType)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
   if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
     handleExplosionSingle(data);
 } 
@@ -1273,7 +1273,7 @@ void AesInfoDialog::onExplosionSingleChanged(const AreaEffectSimulation::Explosi
 
 void AesInfoDialog::onMineAreaChanged(const AreaEffectSimulation::MineArea &data, DataModification modType)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
   if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
     handleMineArea(data);
 } 
@@ -1281,7 +1281,7 @@ void AesInfoDialog::onMineAreaChanged(const AreaEffectSimulation::MineArea &data
 
 void AesInfoDialog::onMineCorridorChanged(const MineCorridor &data, DataModification modType)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
   if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
     handleMineCorridor(data);
 } 
@@ -1289,7 +1289,7 @@ void AesInfoDialog::onMineCorridorChanged(const MineCorridor &data, DataModifica
 
 void AesInfoDialog::onGasPipeChanged(const GasPipe &data, DataModification modType)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
   if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
     handleGasPipe(data);
 } 
@@ -1297,7 +1297,7 @@ void AesInfoDialog::onGasPipeChanged(const GasPipe &data, DataModification modTy
 
 void AesInfoDialog::onDangerAreaChanged(const AreaEffectSimulation::DangerArea &data, DataModification modType)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
   if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
     handleDangerArea(data);
 } 
@@ -1305,7 +1305,7 @@ void AesInfoDialog::onDangerAreaChanged(const AreaEffectSimulation::DangerArea &
 
 void AesInfoDialog::onBorderlineChanged(const AreaEffectSimulation::Borderline &data, DataModification modType)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
   if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
     handleBorderline(data);
 }
@@ -1313,7 +1313,7 @@ void AesInfoDialog::onBorderlineChanged(const AreaEffectSimulation::Borderline &
 
 void AesInfoDialog::onFunctionalAreaChanged(const FunctionalArea &data, DataModification modType)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
   if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
     handleFunctionalArea(data);
 }
@@ -1321,7 +1321,7 @@ void AesInfoDialog::onFunctionalAreaChanged(const FunctionalArea &data, DataModi
 
 void AesInfoDialog::onAirSupportImpactChanged(const AirSupportImpact &data, DataModification modType)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
   if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
     handleAirSupportImpact(data);
 }
@@ -1329,7 +1329,7 @@ void AesInfoDialog::onAirSupportImpactChanged(const AirSupportImpact &data, Data
 
 void AesInfoDialog::onDusMineStateChanged(const DusMineState &data, DataModification modType)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
 
   if (modType == DataModification::eRemoved)
     return;
@@ -1356,7 +1356,7 @@ void AesInfoDialog::onDusMineStateChanged(const DusMineState &data, DataModifica
 
 void AesInfoDialog::onDusSingleMineChanged(const DusSingleMine &data, DataModification modType)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
   if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
     handleSingleDusMine();
 }
@@ -1364,14 +1364,14 @@ void AesInfoDialog::onDusSingleMineChanged(const DusSingleMine &data, DataModifi
 
 void AesInfoDialog::onExplosionClusterChanged(const ExplosionCluster &data, DataModification modType)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
+  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() << Q_FUNC_INFO << " id: " << data.id();
+  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/AesInfo/aes_info_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_info_dialog.h
index 4ee4c0a34..679aeae28 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_info_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_info_dialog.h
@@ -44,6 +44,7 @@ public:
   void onMineResetReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
 
 private:
+  NGL::INGLLogger &m_logger;
   void retranslate() override;
 
   void handleNContamination(const AesItemView &aesItemView);
@@ -108,6 +109,7 @@ private Q_SLOTS:
   void onEffectClusterChanged(const EffectCluster &data, DataModification modType);
 
 private:
+  NGL::INGLLogger &m_logger;
   int                                 m_aesEntityId;
   QString                             m_aesEntityName;
   AreaEffectSimulation::AesType       m_aesType;
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 d4edabd75..a54bd2a40 100755
--- 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
@@ -297,7 +297,7 @@ bool BaseEdit::init(int aesItemId, LtsSession::LtsSession *session)
 {
   if (m_session)
   {
-    ERROR_LOG() << "double init()!";
+    ERROR_LOG(m_logger) << "double init()!";
     return false;
   }
   m_session   = session;
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 d5462561b..adc4960c1 100755
--- 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
@@ -31,7 +31,7 @@ bool AesGuiBasHelpers::initModel(LtsSession::LtsSession *session)
 {
   if (m_aesDtc)
   {
-    ERROR_LOG() << "double init()!";
+    ERROR_LOG(m_logger) << "double init()!";
     return false;
   }
 
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 f1be1bce0..e1ca19483 100755
--- 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
@@ -50,7 +50,7 @@ bool AesItemList::init(LtsSession::LtsSession *session)
 {
   if (m_session)
   {
-    ERROR_LOG() << "double init()!";
+    ERROR_LOG(m_logger) << "double init()!";
     return false;
   }
   m_session = session;
@@ -170,7 +170,7 @@ void AesItemList::onAdlerBtn()
   AesEffectState aesEffectState = model()->aesEffectStateId(currentRow());
   ProjectDataManagement::EffectSource effectSource = model()->aesEffectSourceId(currentRow());
 
-  DEBUG_LOG() << "onAdlerBtn aesEffectState=" << aesEffectState;
+  DEBUG_LOG(m_logger) << "onAdlerBtn aesEffectState=" << aesEffectState;
 
   switch (aesEffectState.underlying())
   {
@@ -208,7 +208,7 @@ void AesItemList::onAdlerBtn()
       AreaEffectSimulation::SetAesItemEffectorStateRequest req;
       req.aesId(model()->aesId(currentRow()));
       req.newEffectorState(AesEffectorState::EsReadyToFire);
-      DEBUG_LOG() << "Send setAesItemEffectorStateRequest with aesId: " << req.aesId() << ", AesEffectorState: " << req.newEffectorState();
+      DEBUG_LOG(m_logger) << "Send setAesItemEffectorStateRequest with aesId: " << req.aesId() << ", AesEffectorState: " << req.newEffectorState();
 
       m_requestHelper->startSingleRequest([req, this]() { return m_ftc->setAesItemEffectorStateRequest(req, this); });
     }
@@ -223,7 +223,7 @@ void AesItemList::onAdlerBtn()
 void AesItemList::onHandleAdler()
 {
   AesEffectState aesEffectState = model()->aesEffectStateId(currentRow());
-  DEBUG_LOG() << "onHandleAdler aesEffectState=" << aesEffectState;
+  DEBUG_LOG(m_logger) << "onHandleAdler aesEffectState=" << aesEffectState;
   auto *adlerBtn = m_buttonBox->getButton(ADLER_BTN);
 
   switch (aesEffectState.underlying())
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 110b33e6d..6daae0906 100755
--- 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
@@ -61,7 +61,7 @@ bool ChargeAdministrationAdlerList::init(LtsSession::LtsSession *session)
 {
   if (m_session)
   {
-    ERROR_LOG() << "double init()!";
+    ERROR_LOG(m_logger) << "double init()!";
     return false;
   }
   m_session = session;
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 70d7cdef7..2d8a1d093 100755
--- 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
@@ -79,7 +79,7 @@ bool ChargeAdministrationAdlerModel::initModel(LtsSession::LtsSession *session)
   QMap<qint32, ParticipantManagement::Party> parties;
   if (!m_ppmDtc->visibleParties(parties, LtsSessionData::LtsSessionData::getInstance()->getVisibleParties(session->exerciseId())))
   {
-    DEBUG_LOG() << "Could not retrieve visible Parties!";
+    DEBUG_LOG(m_logger) << "Could not retrieve visible Parties!";
     return false;
   }
 
@@ -104,7 +104,7 @@ void ChargeAdministrationAdlerModel::onStateChanged(const ParticipantManagement:
   case DataModification::eAdded:
   case DataModification::eModified:
   {
-    DEBUG_LOG() << "+++++++++ DataModification --> " << modType;
+    DEBUG_LOG(m_logger) << "+++++++++ DataModification --> " << modType;
     updateParticipantChargeTypeMap(data);
     
     updateItem(m_ppmDtc->participant(data.participantId()).partyId());
@@ -188,10 +188,10 @@ void ChargeAdministrationAdlerModel::updateItem(int partyId)
   {
     if (participantCharges.partyId != partyId)
       continue;
-    DEBUG_LOG() << "+++++++++ ParticipantId -> " << participantCharges.participantId << ", sampleTime ->" << sampleTime;
+    DEBUG_LOG(m_logger) << "+++++++++ ParticipantId -> " << participantCharges.participantId << ", sampleTime ->" << sampleTime;
     for (auto it = participantCharges.chargeTypeTotalStockMap.cbegin(), end = participantCharges.chargeTypeTotalStockMap.cend(); it != end; ++it)
     {
-      DEBUG_LOG() << "+++++++++ chargeRemain ->" << it.key() << ": " << it.value().remain
+      DEBUG_LOG(m_logger) << "+++++++++ chargeRemain ->" << it.key() << ": " << it.value().remain
                           << it.value().lastUpdate;
       GearData data;
       data.lastUpdate = it.value().lastUpdate;
@@ -211,7 +211,7 @@ void ChargeAdministrationAdlerModel::updateItem(int partyId)
   item.partyId = partyId;
   for (auto gearData = chargeTypeGearData.cbegin(), end = chargeTypeGearData.cend(); gearData != end; ++gearData)
   {
-    DEBUG_LOG() << "### PartyId " << item.partyId << " insert item -> chargeTypeId: " << gearData.key() << ", amount: " << gearData.value().remain
+    DEBUG_LOG(m_logger) << "### PartyId " << item.partyId << " insert item -> chargeTypeId: " << gearData.key() << ", amount: " << gearData.value().remain
                         << ", lastUpdate:" << gearData.value().lastUpdate;
 
     item.chargeTypeId = gearData.key();
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 0673c8a9e..07f81e77b 100755
--- 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
@@ -69,7 +69,7 @@ bool ChargeAdministrationList::init(LtsSession::LtsSession *session)
 {
   if (m_session)
   {
-    ERROR_LOG() << "double init()!";
+    ERROR_LOG(m_logger) << "double init()!";
     return false;
   }
   m_session = session;
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 ab5f0bb03..d818059ab 100755
--- 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
@@ -66,7 +66,7 @@ bool ChargeAdministrationModel::initModel(LtsSession::LtsSession *session, QVect
 {
   if (m_aesDtc)
   {
-    ERROR_LOG() << "double init()!";
+    ERROR_LOG(m_logger) << "double init()!";
     return false;
   }
 
@@ -101,7 +101,7 @@ bool ChargeAdministrationModel::initModel(LtsSession::LtsSession *session, QVect
   QMap<qint32, ParticipantManagement::Party> parties;
   if (!ppmDtc->visibleParties(parties, LtsSessionData::LtsSessionData::getInstance()->getVisibleParties(session->exerciseId())))
   {
-    ERROR_LOG() << "Could not retrieve visible Parties!";
+    ERROR_LOG(m_logger) << "Could not retrieve visible Parties!";
     return false;
   }
 
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 b503b2518..c868fedb4 100755
--- 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
@@ -70,12 +70,12 @@ bool AsmEditTrainingAreaDialog::init(LtsSession::LtsSessionDataDds *session,
   m_session = session;
   if (!m_session->getDtc<AssetManagement::DataInterface>(m_asmDtc))
   {
-    ERROR_LOG() << "AsmEditTrainingAreaDialog::init() Could not enable DTC from ASM";
+    ERROR_LOG(m_logger) << "AsmEditTrainingAreaDialog::init() Could not enable DTC from ASM";
     return false;
   }
   if(!m_session->getFtc<AssetManagement::DataInterface>(m_asmFtc))
   {
-    ERROR_LOG() << "AsmEditTrainingAreaDialog::init() Could not enable FTC from ASM";
+    ERROR_LOG(m_logger) << "AsmEditTrainingAreaDialog::init() Could not enable FTC from ASM";
     return false;
   }
   m_asmFtc->enableTrainingAreaRemove(true);
@@ -85,7 +85,7 @@ bool AsmEditTrainingAreaDialog::init(LtsSession::LtsSessionDataDds *session,
 
   if (!sitMapGuiIfc)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Invalid shared_ptr sitMapGuiIfc!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Invalid shared_ptr sitMapGuiIfc!";
     return false;
   }
 
@@ -93,7 +93,7 @@ bool AsmEditTrainingAreaDialog::init(LtsSession::LtsSessionDataDds *session,
   AssetManagement::TrainingArea ta = AssetManagement::TrainingArea();
   if(trainingAreaId == 0)
   {
-    DEBUG_LOG() << Q_FUNC_INFO << " New training area ";
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " New training area ";
     ta.id()     = 0;
     ta.name()   = QStringLiteral("newArea").toStdString();
     ta.width()  = 12800;
@@ -105,12 +105,12 @@ bool AsmEditTrainingAreaDialog::init(LtsSession::LtsSessionDataDds *session,
     ta = m_asmDtc->trainingArea(trainingAreaId);
     if(ta.id()<= 0)
     {
-      ERROR_LOG() << Q_FUNC_INFO << " training area not valid id: "<< trainingAreaId;
+      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()));
-    DEBUG_LOG() << Q_FUNC_INFO << " edit training area " <<trainingAreaId;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " edit training area " <<trainingAreaId;
   }
 
   m_trainingArea  = ta;
@@ -183,7 +183,7 @@ void AsmEditTrainingAreaDialog::getPosition()
     m_sitMapGuiIfc->getCoordinate(this, SLOT(onCoordinate(QPointF)), nullptr);
     break;
   case SituationMap::MapMode::Undefined:
-    ERROR_LOG() << Q_FUNC_INFO << " ModeMode == Undefined ";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " ModeMode == Undefined ";
     break;
   } 
 
@@ -202,7 +202,7 @@ void AsmEditTrainingAreaDialog::onRectData(const QPointF &centerPoint, double wi
     m_trainingArea.width() = width;
     m_trainingArea.bottomLeft() = convert(btmLeft);
 
-  DEBUG_LOG() << "Pos X: " << centerPoint.x() << " Y: " << centerPoint.y() << " W: " << width << " H: " << height;
+  DEBUG_LOG(m_logger) << "Pos X: " << centerPoint.x() << " Y: " << centerPoint.y() << " W: " << width << " H: " << height;
 
   showPreviewObject();
 }
@@ -235,7 +235,7 @@ void AsmEditTrainingAreaDialog::onCoordinate(const QPointF &centerPoint)
   m_trainingArea.width() = width;
   m_trainingArea.bottomLeft() = convert(btmLeft);
 
-  DEBUG_LOG() << "Pos X: " << centerPoint.x() << " Y: " << centerPoint.y() << " W: " << width << " H: " << height;
+  DEBUG_LOG(m_logger) << "Pos X: " << centerPoint.x() << " Y: " << centerPoint.y() << " W: " << width << " H: " << height;
 
   showPreviewObject();
 
@@ -245,10 +245,10 @@ void AsmEditTrainingAreaDialog::onCoordinate(const QPointF &centerPoint)
 
 void AsmEditTrainingAreaDialog::onEditClicked()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START Editing..";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START Editing..";
   if (!m_sitMapGuiIfc || m_trainingArea.id() < 0)
   {
-    ERROR_LOG() << "onEditClicked: sitMapGuiIfc  or trainingArea_id: "<<m_trainingArea.id()<<" invalid! ";
+    ERROR_LOG(m_logger) << "onEditClicked: sitMapGuiIfc  or trainingArea_id: "<<m_trainingArea.id()<<" invalid! ";
     return;
   }
 
@@ -263,7 +263,7 @@ void AsmEditTrainingAreaDialog::onEditClicked()
                                     m_ui->sbWidth->value(),
                                     m_ui->sbHeight->value());
 
-  TRACE_LOG() << Q_FUNC_INFO << " END Edit";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END Edit";
 
   onSelectionChanged();
 
@@ -279,7 +279,7 @@ void AsmEditTrainingAreaDialog::showPreviewObject()
 {
   if (!m_sitMapGuiIfc || m_previewPolygon.size() == 0)
   {
-    TRACE_LOG() << " AsmEditTrainingAreaDialog::showPreviewObject(): m_sitMapGuiIfc invalid or polygon empty ";
+    TRACE_LOG(m_logger) << " AsmEditTrainingAreaDialog::showPreviewObject(): m_sitMapGuiIfc invalid or polygon empty ";
     return;
   }
   m_sitMapGuiIfc->displayPreviewObject(this, m_previewPolygon, true);
@@ -292,7 +292,7 @@ QPointF AsmEditTrainingAreaDialog::getCentPos(TrainingArea ta)
                                                                                             ta.bottomLeft().lat());
 
   QPointF centerPoint = utmCoordinate.geographic((ta.width() / 2.0), ta.height() / 2.0);
-  TRACE_LOG() << Q_FUNC_INFO << " coord: x: "<< centerPoint.x() <<" y: "<< centerPoint.y();
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " coord: x: "<< centerPoint.x() <<" y: "<< centerPoint.y();
 
   return centerPoint;
 }
@@ -306,7 +306,7 @@ bool AsmEditTrainingAreaDialog::apply()
 
   if(!m_asmFtc)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Can not retrieve AssetManagement::FTC";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Can not retrieve AssetManagement::FTC";
     return false;
   }
   double height = m_ui->sbHeight->value();
@@ -325,7 +325,7 @@ bool AsmEditTrainingAreaDialog::apply()
     return m_asmFtc->trainingAreaModifyRequest(req, this);
   });
 
-  TRACE_LOG() << Q_FUNC_INFO << " scucess=" <<   success;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " scucess=" <<   success;
   return success;
 }
 
@@ -346,7 +346,7 @@ QPolygonF AsmEditTrainingAreaDialog::getTrainingArea(const TrainingArea &ta)
   QPolygonF polygonF;
   if(!m_asmDtc)
   {
-    ERROR_LOG() << " m_asmDtc is not valid!";
+    ERROR_LOG(m_logger) << " m_asmDtc is not valid!";
     return{};
   }
   AssetManagement::TrainingArea ddsTrainingArea = ta;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_edit_training_area_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_edit_training_area_dialog.h
index 376668eb3..9903c7554 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_edit_training_area_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_edit_training_area_dialog.h
@@ -48,6 +48,7 @@ private slots:
   void onEditClicked();
   void onSelectionChanged();
 private:
+  NGL::INGLLogger &m_logger;
   void retranslate() override;
   void onTrainingAreaModifyReply(const Core::FunctionReplyObject &reply) override final { m_requestHelper->requestReply(reply); }
   void onTrainingAreaRemoveReply(const Core::FunctionReplyObject &reply) override final { m_requestHelper->requestReply(reply); }
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 5d5610f96..cacc4a78c 100755
--- 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
@@ -63,19 +63,19 @@ bool AsmTrainingAreaDialog::init(LtsSession::LtsSessionDataDds *session, const s
 
   if (!m_session->getDtc<AssetManagement::DataInterface>(m_asmDtc)) 
   {
-    ERROR_LOG() << "Could not enable DTC from ASM";
+    ERROR_LOG(m_logger) << "Could not enable DTC from ASM";
     return false;
   }
   if(!m_session->getFtc<AssetManagement::DataInterface>(m_asmFtc))
   {
-    ERROR_LOG() << "Could not enable FTC from ASM";
+    ERROR_LOG(m_logger) << "Could not enable FTC from ASM";
     return false;
   }
 
   m_sitMapGuiIfc = sitMapGuiIfc;
   if(!m_sitMapGuiIfc)
   {
-    ERROR_LOG() << "m_sitMapGuiIfc is invalid ";
+    ERROR_LOG(m_logger) << "m_sitMapGuiIfc is invalid ";
     return false;
   }
   bool bRet = true;
@@ -86,11 +86,11 @@ bool AsmTrainingAreaDialog::init(LtsSession::LtsSessionDataDds *session, const s
 
   if(!bRet)
   {
-    ERROR_LOG() << "Could not enable dtc or ftc from ASM";
+    ERROR_LOG(m_logger) << "Could not enable dtc or ftc from ASM";
     return false;
   }
 
-  INFO_LOG() << "Ftc && Dtc enabled from ASM";
+  INFO_LOG(m_logger) << "Ftc && Dtc enabled from ASM";
 
   delete m_model;
   m_model = new AsmTrainingAreaDialogModel(this);
@@ -134,12 +134,12 @@ void AsmTrainingAreaDialog::onAddTrainingArea()
     addDialog(dialog, m_menuGroup, identifier, LtsWidgets::LayoutArea::eDialogTab);
   }
 
-  TRACE_LOG() << Q_FUNC_INFO << " adding temp training Area  ";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " adding temp training Area  ";
 }
 
 void AsmTrainingAreaDialog::onRemoveTrainingArea()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START" ;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START" ;
   QModelIndexList indexList = m_ui->trainingAreaView->selectedRows();
   if (indexList.size() == 0)
     return;
@@ -147,7 +147,7 @@ void AsmTrainingAreaDialog::onRemoveTrainingArea()
   TrainingArea req = m_model->getRowData(indexList.front().row());
   if (req.id() < 0)
   {
-    ERROR_LOG() << 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()))
@@ -157,7 +157,7 @@ void AsmTrainingAreaDialog::onRemoveTrainingArea()
       return m_asmFtc->trainingAreaRemoveRequest(TrainingAreaRemoveRequest(req.id()), this);
     });
 
-    TRACE_LOG() << Q_FUNC_INFO << " success = " <<   success;
+    TRACE_LOG(m_logger) << Q_FUNC_INFO << " success = " <<   success;
   }
   else
   {
@@ -165,7 +165,7 @@ void AsmTrainingAreaDialog::onRemoveTrainingArea()
                                               tr("Cannot remove currently edited Training Area"));
   }
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void AsmTrainingAreaDialog::onEditTrainingArea()
@@ -176,7 +176,7 @@ void AsmTrainingAreaDialog::onEditTrainingArea()
   TrainingArea taItem = m_model->getRowData(indexList.front().row());
   if (taItem.id() < 0)
   {
-    ERROR_LOG() << "onEditTrainingArea invalid id = "<< taItem.id();
+    ERROR_LOG(m_logger) << "onEditTrainingArea invalid id = "<< taItem.id();
     return;
   }
 
@@ -205,16 +205,16 @@ void AsmTrainingAreaDialog::onEditTrainingArea()
 void AsmTrainingAreaDialog::onSelectionChanged()
 {
   enaDisa();
-  DEBUG_LOG() << "onSelectionChanged() called !";
+  DEBUG_LOG(m_logger) << "onSelectionChanged() called !";
   const QModelIndex curIdx = m_ui->trainingAreaView->currentIndex();
   if (!curIdx.isValid())
     return;
 
   AssetManagement::TrainingArea taItem = m_model->getRowData(curIdx.row());
-  DEBUG_LOG() << "onSelectionChanged() selected training area id: "<<taItem.id();
+  DEBUG_LOG(m_logger) << "onSelectionChanged() selected training area id: "<<taItem.id();
   if(taItem.id() < 0)
   {
-    ERROR_LOG() << "onEditTrainingArea invalid id"<< taItem.id();
+    ERROR_LOG(m_logger) << "onEditTrainingArea invalid id"<< taItem.id();
     return;
   }
 
@@ -236,13 +236,13 @@ QPolygonF AsmTrainingAreaDialog::getTrainingArea(int trainingAreaId)
 {
   if(!m_asmDtc)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " m_asmDtc is not valid!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " m_asmDtc is not valid!";
     return {};
   }
   const AssetManagement::TrainingArea &ddsTrainingArea = m_asmDtc->trainingArea(trainingAreaId);
   if (ddsTrainingArea.id() != trainingAreaId)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " TrainingArea not found, trainingAreaId = " << trainingAreaId;
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " TrainingArea not found, trainingAreaId = " << trainingAreaId;
     return {};
   }
 
@@ -280,7 +280,7 @@ void AsmTrainingAreaDialog::showAllTrainingAreas()
   for (int row = 0; row < rowCount; ++row)
   {
     const TrainingArea &currentArea = m_model->getRowData(row);
-    INFO_LOG() << " row = " << row << " ; currentArea = " <<  currentArea;
+    INFO_LOG(m_logger) << " row = " << row << " ; currentArea = " <<  currentArea;
     const QPolygonF &poly = getTrainingArea(currentArea);
     polyVec.append(poly);
   } 
@@ -292,7 +292,7 @@ void AsmTrainingAreaDialog::showPreviewObject()
 {
   if (!this->m_sitMapGuiIfc || m_previewPolygon.size() == 0)
   {
-    TRACE_LOG() << " showPreviewObject(): m_sitMapGuiIfc invalid or polygon empty ";
+    TRACE_LOG(m_logger) << " showPreviewObject(): m_sitMapGuiIfc invalid or polygon empty ";
     return;
   }
   this->m_sitMapGuiIfc->displayPreviewObject(this, m_previewPolygon, true);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_dialog.h
index dc639f263..5d09aac7d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_dialog.h
@@ -53,6 +53,7 @@ private slots:
   void onSelectionChanged();
 
 private:
+  NGL::INGLLogger &m_logger;
   void retranslate() override;
   void onTrainingAreaModifyReply(const Core::FunctionReplyObject &reply) override final { m_requestHelper->requestReply(reply); }
   void onTrainingAreaRemoveReply(const Core::FunctionReplyObject &reply) override final { m_requestHelper->requestReply(reply); }
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 6adfde568..b6e21b677 100755
--- 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
@@ -34,7 +34,7 @@ bool AsmTrainingAreaDialogModel::initModel(const std::shared_ptr<Interface::Dtc>
     });
 
   } else {
-    WARNING_LOG() << Q_FUNC_INFO << " no m_asmDtc";
+    WARNING_LOG(m_logger) << Q_FUNC_INFO << " no m_asmDtc";
   }
 
   return true;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_model.h
index e32e9dbda..14c6411b8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_model.h
@@ -34,6 +34,9 @@ public:
 
 
 private:
+
+
+NGL::INGLLogger &m_logger;
   bool m_hideRemoved;
   std::shared_ptr<Interface::Dtc> m_asmDtc;
 };
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 502d66942..451f9c253 100755
--- 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
@@ -109,7 +109,7 @@ QVariant AvailStreamsModel::data(const QModelIndex &index, int role) const
     {
       NGLTreeItem *item = privateData(index);
       StreamData data = item->data().value<StreamData>();
-      DEBUG_LOG() << data.name;
+      DEBUG_LOG(m_logger) << data.name;
       return data.name;
     }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_avail_streams_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_avail_streams_model.h
index 4bedd4065..affbdea36 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_avail_streams_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_avail_streams_model.h
@@ -45,6 +45,8 @@ private slots:
   void onTvcConfigChanged(const AudioVideoManagement::TvcConfig &data, DataModification modType);
 
 private:
+
+NGL::INGLLogger &m_logger;
   template <typename T>
   void insertUpdateData(const T &data, DataModification modType, NGLTreeItem *parent);
 
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 d88728d3b..a667ddb58 100755
--- 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
@@ -122,7 +122,7 @@ void AudioSettingsDialog::retranslate()
 void AudioSettingsDialog::onOperatorChanged(const OperatorManagement::User &data, DataModification modType)
 {
   
-  DEBUG_LOG() << "************** onOperatorChanged ";
+  DEBUG_LOG(m_logger) << "************** onOperatorChanged ";
   switch (modType)
   {
     case DataModification::eRemoved:
@@ -245,7 +245,7 @@ void AudioSettingsDialog::onDownButtonClicked()
 
 void AudioSettingsDialog::onSelectionChangedAllocation(const QItemSelection &selected, const QItemSelection &deselected)
 {
-  DEBUG_LOG() << "onSelectionChangedAllocation selected.isEmpty()=" << selected.isEmpty();
+  DEBUG_LOG(m_logger) << "onSelectionChangedAllocation selected.isEmpty()=" << selected.isEmpty();
   Q_UNUSED(deselected);
   QModelIndex first = m_ui->treeViewAllocated->model()->index(0, 0);
   int rowCnt = m_ui->treeViewAllocated->model()->rowCount();
@@ -281,7 +281,7 @@ bool AudioSettingsDialog::apply()
 bool AudioSettingsDialog::applyRemove()
 {
   RemoveCnrTvcProfileRequest    removeRequest;
-  DEBUG_LOG() << "AudioSettingsDialog::applyRemove";
+  DEBUG_LOG(m_logger) << "AudioSettingsDialog::applyRemove";
 
   for (const auto &profile : std::as_const(m_cnrTvcProfileMap))
   {
@@ -304,7 +304,7 @@ bool AudioSettingsDialog::applyRemove()
 bool AudioSettingsDialog::applyModify()
 {
   ModifyCnrTvcProfileRequest modifyRequest;
-  DEBUG_LOG() << "AudioSettingsDialog::applyModify";
+  DEBUG_LOG(m_logger) << "AudioSettingsDialog::applyModify";
 
   for (const auto &profile : std::as_const(m_cnrTvcProfileMap))
   {
@@ -382,7 +382,7 @@ void AudioSettingsDialog::onSelectionOperatorChanged(const int index)
   m_ui->pushButtonUp->setEnabled(false);
   m_ui->pushButtonDown->setEnabled(false);
   m_operatorId = m_ui->operatorComboBox->currentData().toInt();
-  DEBUG_LOG() << "onSelectionOperatorChanged" << " operatorStr=" << m_ui->operatorComboBox->currentText() << " m_operatorId= " << m_operatorId;
+  DEBUG_LOG(m_logger) << "onSelectionOperatorChanged" << " operatorStr=" << m_ui->operatorComboBox->currentText() << " m_operatorId= " << m_operatorId;
   fillOperatorList();
   m_modelAllocated->resetChangeState();
   m_modelAvailable->resetChangeState();
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 174284c9a..f469c7c97 100755
--- 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
@@ -31,7 +31,7 @@ QVariant AllocatedStreamsModel::data(const QModelIndex &index, int role) const
     {
       NGLTreeItem *item = privateData(index);
       StreamData data = item->data().value<StreamData>();
-      DEBUG_LOG() << data.name;
+      DEBUG_LOG(m_logger) << data.name;
       return data.name;
     }
 
@@ -92,14 +92,14 @@ bool AllocatedStreamsModel::dropMimeData(const QMimeData *data, Qt::DropAction a
   qDeleteAll(droppedItems);
   emit droppedStreamNames(streams);
   m_changes = true;
-  DEBUG_LOG() << data->data(QStringLiteral("NGLTreeModel/dragDrop"));
+  DEBUG_LOG(m_logger) << data->data(QStringLiteral("NGLTreeModel/dragDrop"));
   return NGLTreeModel::dropMimeData(data, action, row, 0, QModelIndex());
 }
 
 
 void AllocatedStreamsModel::setNewStreamData(const QVector<StreamData> &newData)
 {
-  DEBUG_LOG() << "set new stream data, count: " << newData.size();
+  DEBUG_LOG(m_logger) << "set new stream data, count: " << newData.size();
   resetModel();
   for (const StreamData &sd : newData)
     m_rootItem->appendChild(new NGLTreeItem(QVariant::fromValue(sd)));
@@ -116,15 +116,15 @@ QVector<StreamData> AllocatedStreamsModel::getStreamDataVector() const
     const NGLTreeItem *item = m_rootItem->child(i);
     const StreamData sd = item->data().value<StreamData>();
     result.append(sd);
-    DEBUG_LOG() << "result.append(sd.name):" << sd.name;
+    DEBUG_LOG(m_logger) << "result.append(sd.name):" << sd.name;
   }
-  DEBUG_LOG() << "getStreamDataVector() size: " << result.size();
+  DEBUG_LOG(m_logger) << "getStreamDataVector() size: " << result.size();
   return result;
 }
 
 void AllocatedStreamsModel::changeOrder(const QModelIndex &idx, bool up)
 {
-  DEBUG_LOG() << "changeOrder "
+  DEBUG_LOG(m_logger) << "changeOrder "
                       << " index = " << idx.row()
                       << " up = " << up
                       << " m_rootItem->childCount()= " << m_rootItem->childCount();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_used_streams_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_used_streams_model.h
index 9befaf236..17cd0798f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_used_streams_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_used_streams_model.h
@@ -40,6 +40,8 @@ signals:
   void droppedStreamNames(const QVector<AudioVideoManagement::StreamData> &streamNamesDropped);
 
 private:
+
+NGL::INGLLogger &m_logger;
   bool m_changes{false};
   QVector<QPair<bool , int> > m_changedStreams;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/avm_sequence_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/avm_sequence_model.h
index 8853020b5..90e390f3d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/avm_sequence_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/avm_sequence_model.h
@@ -58,6 +58,8 @@ public slots:
   void setTimezoneHoursOffset(int timezoneHoursOffset);
 
 private:
+
+NGL::INGLLogger &m_logger;
   QString dateTimeToStringx(const QDateTime &dt) const;
   QString msecsSinceEpochToStringx(qint64 msecs) const;
 
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 2f902a2ff..ff9aca229 100755
--- 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
@@ -379,7 +379,7 @@ void TopicEditor::onEditSequence()
   if (!m_playbackMenu)
     return;
 
-  DEBUG_LOG() << "slotEditSequence ";
+  DEBUG_LOG(m_logger) << "slotEditSequence ";
   const auto selRows = m_ui->tvSequences->selectionModel()->selectedRows();
 
   if (selRows.size() != 1)
@@ -392,7 +392,7 @@ void TopicEditor::onEditSequence()
   m_model->setHighlightedRow(row);
   const AvsSequence selectedSeq = m_model->getRowData(row);
 
-  DEBUG_LOG() << "selectedSeq.internalStreamName=" << selectedSeq.internalStreamName;
+  DEBUG_LOG(m_logger) << "selectedSeq.internalStreamName=" << selectedSeq.internalStreamName;
   m_playbackMenu->setStreamName(selectedSeq.internalStreamName);
 
   m_ui->dtStart->setMsecsSinceEpoch(std::chrono::milliseconds(selectedSeq.start.time_since_epoch()).count());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/topic_editor.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/topic_editor.h
index b75162feb..52b6d0003 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/topic_editor.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/topic_editor.h
@@ -28,6 +28,7 @@ public:
   ~TopicEditor();
 
 private:
+  NGL::INGLLogger &m_logger;
   void updateInternalData() override final;
   void retranslate() override final;
 
@@ -53,6 +54,7 @@ private slots:
   void onMarkerSelected(const QString &description);
 
 private:
+  NGL::INGLLogger &m_logger;
   const int s_durationLimit{86400000};
 
   LtsSession::LtsSession *m_session{nullptr};
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 fbbaba8af..0d20abd55 100755
--- 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
@@ -57,8 +57,8 @@ AvailableStreamsModel::AvailableStreamsModel(const std::shared_ptr<Interface::Dt
                                              LtsSession::LtsSession *session,
                                              StreamNameMapping *streamNameMapping,
                                              QObject *parent,
-                                             bool isAudio)
-  : NGLTreeModel(parent, new NGLTreeItem(QVariant(), QIcon()), {tr("Available Streams")})
+                                             bool isAudio) : NGLTreeModel(parent, new NGLTreeItem(QVariant(), QIcon()),,
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {tr("Available Streams")})
 , m_isAudio(isAudio)
 , m_avmDtc(avmDtc)
 , m_ismDtc(ismDtc)
@@ -164,7 +164,7 @@ QMimeData *AvailableStreamsModel::mimeData(const QModelIndexList &indexes) const
 bool AvailableStreamsModel::dropMimeData(const QMimeData *data, Qt::DropAction action,
                                          int row, int column, const QModelIndex &parent)
 {
-  INFO_LOG() << "dropMimeData: action = " << action
+  INFO_LOG(m_logger) << "dropMimeData: action = " << action
                      << ", row = " << row
                      << ", parent: valid = " << parent.isValid();
 
@@ -184,7 +184,7 @@ bool AvailableStreamsModel::dropMimeData(const QMimeData *data, Qt::DropAction a
 void AvailableStreamsModel::initModel()
 {
   beginResetModel();
-  INFO_LOG() << "initModel";
+  INFO_LOG(m_logger) << "initModel";
   
   
   m_rootItem->removeAllChildren();
@@ -250,7 +250,7 @@ void AvailableStreamsModel::initModel()
     {
       if (videoTeam.exerciseId() != m_session->exerciseId())
         continue;
-      DEBUG_LOG() << "add new videoteam" << videoTeam;
+      DEBUG_LOG(m_logger) << "add new videoteam" << videoTeam;
       StreamModelData item;
       item.name = QString::fromStdString(videoTeam.streamName().c_str());
       item.mountingPointId = -1 * videoTeam.id(); 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_available_streams_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_available_streams_model.h
index a76c6be62..5686c3be6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_available_streams_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_available_streams_model.h
@@ -89,6 +89,8 @@ public:
   Qt::DropActions supportedDragActions() const override { return Qt::CopyAction; }
 
 private:
+
+NGL::INGLLogger &m_logger;
   void initModel();
 
   const bool                                  m_isAudio;
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 a29300f9c..41bb26cfa 100755
--- 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
@@ -85,11 +85,11 @@ void ChooseMenu::onMenuStructChanged(const MenuStruct &data, DataModification mo
 bool ChooseMenu::apply()
 {
   int menuId = m_ui->cbAudio->currentData().toInt();
-  INFO_LOG() << "MenuId Audio: " << menuId;
+  INFO_LOG(m_logger) << "MenuId Audio: " << menuId;
   m_avsMenus->setAnnouncementMenu(menuId);
 
   menuId = m_ui->cbVideo->currentData().toInt();
-  INFO_LOG() << "MenuId Video: " << menuId;
+  INFO_LOG(m_logger) << "MenuId Video: " << menuId;
   m_avsMenus->setVideoMenu(menuId);
 
   return true;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_choose_menu.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_choose_menu.h
index 76bfbe513..a6ef676d1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_choose_menu.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_choose_menu.h
@@ -42,6 +42,8 @@ private slots:
   void onMenuStructChanged(const MenuStruct &data, DataModification modType);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   bool apply() override final;
   void selectCurrent();
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 f6fcf0ee5..db39cdff2 100755
--- 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
@@ -46,11 +46,11 @@ bool MenuEdit::init(LtsSession::LtsSession *session,
                     StreamNameMapping *streamNameMapping,
                     const MenuStruct &ms)
 {
-  DEBUG_LOG() << "MenuEdit::init()";
+  DEBUG_LOG(m_logger) << "MenuEdit::init()";
 
   if (!ftc || !dtc)
   {
-    ERROR_LOG() << "MenuEdit::init() Invalid shared_ptr!";
+    ERROR_LOG(m_logger) << "MenuEdit::init() Invalid shared_ptr!";
     return false;
   }
 
@@ -119,7 +119,7 @@ void MenuEdit::onRemove()
       return;
     slotChangesMade();
 
-    DEBUG_LOG() << "index row: " << index.row();
+    DEBUG_LOG(m_logger) << "index row: " << index.row();
     m_usedStreamsModel->removeRow(index.row(), index.parent()); 
   }
   else
@@ -131,7 +131,7 @@ void MenuEdit::onRemove()
         return;
       slotChangesMade();
 
-      DEBUG_LOG() << "index row: " << index.row();
+      DEBUG_LOG(m_logger) << "index row: " << index.row();
       m_usedStreamsModel->removeRow(index.row(), index.parent()); 
 
     }
@@ -140,7 +140,7 @@ void MenuEdit::onRemove()
 
 void MenuEdit::onModelDataChanged()
 {
-  INFO_LOG() << "onModelDataChanged";
+  INFO_LOG(m_logger) << "onModelDataChanged";
   m_ui->menuTreeView->expandAll();
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit.h
index 0eb216318..e9b2a86fa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit.h
@@ -59,6 +59,8 @@ public slots:
   void onStreamSelected(const QModelIndex &idx);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   bool apply() override final;
 
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 fcebe89b2..f6cb3b841 100755
--- 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
@@ -149,7 +149,7 @@ void MenuEditView::onEditMenuStruct()
   AudioVideoManagement::MenuStruct ms = m_model->getRowData(row);
   ms.isAudio(m_isAudio);
 
-  DEBUG_LOG() << "---onEditMenuStruct () "
+  DEBUG_LOG(m_logger) << "---onEditMenuStruct () "
                       << " id: " << ms.id()
                       << " name: " << ms.name();
 
@@ -204,15 +204,15 @@ void MenuEditView::onExportButtonClicked()
 
   int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
   if (fileId > 0)
-    DEBUG_LOG() << "Saved file with id = " << fileId;
+    DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
   else
-    ERROR_LOG() << "Could not save file in library ";
+    ERROR_LOG(m_logger) << "Could not save file in library ";
 
 }
 
 void MenuEditView::onImportButtonClicked()
 {
-  DEBUG_LOG() << " onImportButtonClicked() ";
+  DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
 
   QByteArray content;
   int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::AVMMenuEditView));
@@ -239,7 +239,7 @@ void MenuEditView::onImportButtonClicked()
         });
       }
     }
-    INFO_LOG() << "--- onImportButtonClicked() ";
+    INFO_LOG(m_logger) << "--- onImportButtonClicked() ";
   }
 }
 }  
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit_view.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit_view.h
index b0a2675af..e2cd0c69b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit_view.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit_view.h
@@ -48,6 +48,8 @@ public:
             bool isAudio);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void onSelectionChanged();
   void onAddMenuStruct();
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 934a1af2f..bd08bc14b 100755
--- 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
@@ -77,7 +77,7 @@ QByteArray MenuViewModel::modelToJson(int row) const
   QJsonObject obj;
   obj[QStringLiteral("XmlType")] = FileManagement::toString(FileManagement::XmlType::AVMMenuEditView);
 
-  DEBUG_LOG() << "row =" << ": " << row;
+  DEBUG_LOG(m_logger) << "row =" << ": " << row;
   const AudioVideoManagement::MenuStruct &menuStruct = m_vecData.at(row);
 
   obj[QStringLiteral("id")] = 0;
@@ -122,7 +122,7 @@ QVector<AudioVideoManagement::MenuStruct> MenuViewModel::jsonToMenuStructs(const
 
   const QJsonArray arrEntry(obj.value(QStringLiteral("menuEntries")).toArray());
   menuStruct.menuEntries().resize(arrEntry.size());
-  INFO_LOG() << "arrEntry.size()=" << 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());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_view_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_view_model.h
index d299467ab..4cb03b46a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_view_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_view_model.h
@@ -25,6 +25,7 @@ public:
   QByteArray modelToJson(int row) const;
   QVector<AudioVideoManagement::MenuStruct> jsonToMenuStructs(const QByteArray &content) const;
 protected:
+NGL::INGLLogger &m_logger;
   bool isFiltered(const MenuStruct &data, DataModification modType) const override final;
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_new_menu_struct.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_new_menu_struct.h
index b7456fb39..4cf964595 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_new_menu_struct.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_new_menu_struct.h
@@ -29,6 +29,8 @@ Q_SIGNALS:
   void newName(const QString &);
 
 private:
+
+NGL::INGLLogger &m_logger;
   Ui::NewMenuStruct *m_ui;
 };
 
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 ac3bd02e9..a1db2e0c0 100755
--- 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
@@ -279,9 +279,8 @@ private:
 
 
 
-QueryTimeline::QueryTimeline(const AvaStream &stream, const AvaTimePoint &start, const AvaTimePoint &end, AvaControl *control)
-  : QObject()
-{
+QueryTimeline::QueryTimeline(const AvaStream &stream, const AvaTimePoint &start, const AvaTimePoint &end, AvaControl *control) : QObject(),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   connect(control, &AvaControl::queryTimelineResponse,
           this, &QueryTimeline::signalTimelineComplete);
   connect(control, &AvaControl::queryTimelineResponse,
@@ -387,12 +386,12 @@ bool AvmPlaybackMenu::init(LtsSession::LtsSession *session, AvaSession *avaSessi
   m_presetStreamName = streamName;
 
   if (m_presetStreamName)
-    DEBUG_LOG() << "init stream preset: " << m_presetStreamName.get();
+    DEBUG_LOG(m_logger) << "init stream preset: " << m_presetStreamName.get();
 
   m_presetStartTime = startTime;
 
   if (m_presetStartTime)
-    DEBUG_LOG() << "init time preset: " << std::chrono::milliseconds(m_presetStartTime.get().time_since_epoch()).count();
+    DEBUG_LOG(m_logger) << "init time preset: " << std::chrono::milliseconds(m_presetStartTime.get().time_since_epoch()).count();
 
   m_session = session;
   m_playbackApp = std::move(appHandle);
@@ -1006,37 +1005,37 @@ void AvmPlaybackMenu::preselectStream(const QString &fallbackInternalStreamName)
   const QString currentStreamName(m_presetStreamName.is_initialized() ? *m_presetStreamName : QString());
   const QString currentInternalName(currentStreamName.isEmpty() ? fallbackInternalStreamName : QString());
 
-  DEBUG_LOG() << "currentStreamName: " << currentStreamName;
-  DEBUG_LOG() << "currentInternalName: " << currentInternalName;
+  DEBUG_LOG(m_logger) << "currentStreamName: " << currentStreamName;
+  DEBUG_LOG(m_logger) << "currentInternalName: " << currentInternalName;
 
   m_presetStreamName.reset();
 
   if (!currentInternalName.isEmpty() || !currentStreamName.isEmpty())
   {
-    DEBUG_LOG() << "stream preset set - searching for '" << currentStreamName << "'..";
+    DEBUG_LOG(m_logger) << "stream preset set - searching for '" << currentStreamName << "'..";
 
     bool found = false;
     for (int i = 0; i < m_ui->cbStreams->count(); i++)
     {
       const AvaStream &curStream = m_ui->cbStreams->itemData(i).value<AvaStream>();
 
-      DEBUG_LOG() << "stream " << i << ": " << curStream.displayName << " (" << curStream.internalName << ")";
+      DEBUG_LOG(m_logger) << "stream " << i << ": " << curStream.displayName << " (" << curStream.internalName << ")";
 
       if ((!currentInternalName.isEmpty() && curStream.displayName == currentInternalName) ||
           (!currentStreamName.isEmpty() && curStream.internalName == currentStreamName))
       {
         found = true;
-        DEBUG_LOG() << "stream preset set, found & selected";
+        DEBUG_LOG(m_logger) << "stream preset set, found & selected";
         m_ui->cbStreams->setCurrentIndex(i);
         break;
       }
     }
 
     if (!found)
-      WARNING_LOG() << "new stream list does not contain old selected stream (" << currentInternalName << ") !";
+      WARNING_LOG(m_logger) << "new stream list does not contain old selected stream (" << currentInternalName << ") !";
   }
   else
-    DEBUG_LOG() << "no stream preset set";
+    DEBUG_LOG(m_logger) << "no stream preset set";
   }
 
 
@@ -1097,7 +1096,7 @@ void AvmPlaybackMenu::setSavedPos(qint64 msecs)
 
 void AvmPlaybackMenu::onTimelineComplete(const AvaTimeline &timeline)
 {
-  DEBUG_LOG() << "onTimelineComplete";
+  DEBUG_LOG(m_logger) << "onTimelineComplete";
 
   m_intervalModel.setData(timeline.parts());
   m_ui->tavIntervals->resizeColumnsToContents();
@@ -1115,7 +1114,7 @@ void AvmPlaybackMenu::onTimelineComplete(const AvaTimeline &timeline)
     m_savedPos.reset();
   }
 
-  DEBUG_LOG() << "onTimelineComplete " << std::chrono::milliseconds(newPos.time_since_epoch()).count();
+  DEBUG_LOG(m_logger) << "onTimelineComplete " << std::chrono::milliseconds(newPos.time_since_epoch()).count();
   m_avaCtrl->setAbsPosition(m_playbackApp.dialogId(), ALL_STREAMS(), newPos);
 
   m_timelineIsComplete = true;
@@ -1142,7 +1141,7 @@ void AvmPlaybackMenu::onStreamPositionReceived(const QString &dialogId, const QS
     return;
 
   m_lastAvsPos = pos;
-  DEBUG_LOG() << "onStreamPositionReceived: last avs pos now: " << std::chrono::milliseconds((*m_lastAvsPos).time_since_epoch()).count() << " - direct apply? " << m_avaCtrl->isEmpty();
+  DEBUG_LOG(m_logger) << "onStreamPositionReceived: last avs pos now: " << std::chrono::milliseconds((*m_lastAvsPos).time_since_epoch()).count() << " - direct apply? " << m_avaCtrl->isEmpty();
 
   if (m_avaCtrl->isEmpty())
     applyAvsPos();
@@ -1198,13 +1197,13 @@ void AvmPlaybackMenu::onUiTimeChanged(AvaTimePoint t)
       m_currentButtonState != ButtonStates::Stopped)
     return;
 
-  DEBUG_LOG() << "onUiTimeChanged " << std::chrono::milliseconds(t.time_since_epoch()).count();
+  DEBUG_LOG(m_logger) << "onUiTimeChanged " << std::chrono::milliseconds(t.time_since_epoch()).count();
   m_avaCtrl->setAbsPosition(m_playbackApp.dialogId(), ALL_STREAMS(), t);
 }
 
 void AvmPlaybackMenu::onStreamSelectionChanged(const QVector<AvaStream> &selectedStreams)
 {
-  DEBUG_LOG() << "onStreamSelectionChanged count = " << selectedStreams.count();
+  DEBUG_LOG(m_logger) << "onStreamSelectionChanged count = " << selectedStreams.count();
 
   Q_ASSERT(!selectedStreams.isEmpty());
 
@@ -1231,7 +1230,7 @@ void AvmPlaybackMenu::onStreamSelectionChanged(const QVector<AvaStream> &selecte
 void AvmPlaybackMenu::onIntervalActivated(const QModelIndex &index)
 {
   AvaTimelinePart interval = m_intervalModel.getRowData(index.row());
-  DEBUG_LOG() << "start = " << std::chrono::milliseconds(interval.first.time_since_epoch()).count();
+  DEBUG_LOG(m_logger) << "start = " << std::chrono::milliseconds(interval.first.time_since_epoch()).count();
   m_avaCtrl->setAbsPosition(m_playbackApp.dialogId(), ALL_STREAMS(), interval.first); 
   
 
@@ -1302,7 +1301,7 @@ void AvmPlaybackMenu::selectMarker(const MarkerManagement::Marker &marker)
   (void)blocker;
 
   const auto &rowData = marker;
-  DEBUG_LOG() << "AvmPlaybackMenu::onMarkerClicked name = " << QString::fromStdString(rowData.name())
+  DEBUG_LOG(m_logger) << "AvmPlaybackMenu::onMarkerClicked name = " << QString::fromStdString(rowData.name())
                       << " note = " << QString::fromStdString(rowData.note());
 
   bool selectMarkerStream = false;
@@ -1319,7 +1318,7 @@ void AvmPlaybackMenu::selectMarker(const MarkerManagement::Marker &marker)
 
   for (const MarkerManagement::MarkerDescription &desc : rowData.descriptions())
   {
-    DEBUG_LOG() << " description = " << QString::fromStdString(desc.content())
+    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))
@@ -1345,7 +1344,7 @@ void AvmPlaybackMenu::selectMarker(const MarkerManagement::Marker &marker)
 
         avaStream.displayName = m_streamNameMapping->displayName(avaStream.internalName);
         m_ui->cbMarkerStreams->addItem(avaStream.displayName, QVariant::fromValue(avaStream));
-        DEBUG_LOG() << "streams[" << avaStream.internalName << "]"
+        DEBUG_LOG(m_logger) << "streams[" << avaStream.internalName << "]"
                             << " internaName=" << avaStream.internalName
                             << " displayName=" << avaStream.displayName;
         if (bIsSelected && selectedStream.internalName.isEmpty())
@@ -1363,7 +1362,7 @@ void AvmPlaybackMenu::selectMarker(const MarkerManagement::Marker &marker)
 
   qint64 time = rowData.timeStamp() - rowData.timeStampOffset();
 
-  DEBUG_LOG() << "marker time: " << time << " (" << QDateTime::fromMSecsSinceEpoch(time).toString(QStringLiteral("dd.MM.yy HH:mm:ss.zzz")) << ")";
+  DEBUG_LOG(m_logger) << "marker time: " << time << " (" << QDateTime::fromMSecsSinceEpoch(time).toString(QStringLiteral("dd.MM.yy HH:mm:ss.zzz")) << ")";
 
   std::chrono::milliseconds t(time);
   AvaTimePoint p(std::chrono::duration_cast<AvaDuration>(t));
@@ -1403,7 +1402,7 @@ void AvmPlaybackMenu::onSetMarkerClicked()
   if (!m_selectedStreams || m_selectedStreams.get().isEmpty())
   {
     new LtsWidgets::LtsMessageDialogNew(this, tr("No stream selected to create a marker from."));
-    WARNING_LOG() << "onSetMarkerClicked called, but no selected streams available";
+    WARNING_LOG(m_logger) << "onSetMarkerClicked called, but no selected streams available";
     return;
   }
 
@@ -1444,7 +1443,7 @@ void AvmPlaybackMenu::onStartClicked()
 {
   
   
-  DEBUG_LOG() << "onStartClicked"
+  DEBUG_LOG(m_logger) << "onStartClicked"
                       << " dialogId=" << m_playbackApp.dialogId()
                       << " currentSpeed=" << currentSpeed()
                       
@@ -1459,7 +1458,7 @@ void AvmPlaybackMenu::onStartClicked()
       return;
     }
 
-    WARNING_LOG() << "onStartClicked called, but no selected streams available";
+    WARNING_LOG(m_logger) << "onStartClicked called, but no selected streams available";
     return;
   }
 
@@ -1501,14 +1500,14 @@ void AvmPlaybackMenu::onAllStreams()
 void AvmPlaybackMenu::onIntervalBackwardClicked()
 {
   const AvaTimelinePart   &targetInterval = m_intervalModel.previousInterval();
-  DEBUG_LOG() << "onIntervalBackwardClicked " << std::chrono::milliseconds(targetInterval.first.time_since_epoch()).count();
+  DEBUG_LOG(m_logger) << "onIntervalBackwardClicked " << std::chrono::milliseconds(targetInterval.first.time_since_epoch()).count();
   m_avaCtrl->setAbsPosition(m_playbackApp.dialogId(), ALL_STREAMS(), targetInterval.first);
 }
 
 void AvmPlaybackMenu::onIntervalForwardClicked()
 {
   const AvaTimelinePart   &targetInterval = m_intervalModel.nextInterval();
-  DEBUG_LOG() << "onIntervalForwardClicked " << std::chrono::milliseconds(targetInterval.first.time_since_epoch()).count();
+  DEBUG_LOG(m_logger) << "onIntervalForwardClicked " << std::chrono::milliseconds(targetInterval.first.time_since_epoch()).count();
   m_avaCtrl->setAbsPosition(m_playbackApp.dialogId(), ALL_STREAMS(), targetInterval.first);
 }
 
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 73366d22d..700ab0d9a 100755
--- 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
@@ -42,6 +42,7 @@ class QueryTimeline : public QObject
 {
   Q_OBJECT
 private:
+NGL::INGLLogger &m_logger;
   friend class AvmPlaybackMenu;
 
   QueryTimeline(const AvaStream &stream, const AvaTimePoint &start, const AvaTimePoint &end, AvaControl *control);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu_dialog.h
index bbbb8fc12..b89b3944e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu_dialog.h
@@ -29,6 +29,8 @@ public:
   void retranslate() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   bool m_isAudio;
   Ui::AvmPlaybackMenuDialog *m_ui;
   
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 21d150291..a2800ebcf 100755
--- 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
@@ -129,7 +129,7 @@ bool UsedStreamsModel::dropMimeData(const QMimeData *data, Qt::DropAction action
   if (!checkDrop(data, index(row, column), parent, action))
     return false;
 
-  INFO_LOG() << "dropMimeData: action = " << action
+  INFO_LOG(m_logger) << "dropMimeData: action = " << action
                      << ", row = " << row
                      << ", parent: valid = " << parent.isValid();
 
@@ -200,7 +200,7 @@ bool UsedStreamsModel::canDropMimeData(const QMimeData *data, Qt::DropAction act
 
   stream >> idParent >> idItem >>  group >> itemData >> mountId;
   ms = itemData.value<StreamModelData>();
-  INFO_LOG() << "Insert:"
+  INFO_LOG(m_logger) << "Insert:"
                      << "\n ms.name=" << ms.name
                      << "\n ms.isGroup=" << ms.isGroup
                      << "\n ms.parentId=" << ms.parentId
@@ -301,7 +301,7 @@ void UsedStreamsModel::insertChildren(NGLTreeItem *parent, int parentId, const s
 
     if (me.isGroup())
     {
-      DEBUG_LOG() << "insertChildren"
+      DEBUG_LOG(m_logger) << "insertChildren"
                           << me.mountingPointId()
                           << me.name();
       insertChildren(treeItem, me.id(), entries);
@@ -335,7 +335,7 @@ bool UsedStreamsModel::checkSingleItem(NGLTreeItem *target, StreamModelData &toC
   bool retValue = true;
   if (!target)
   {
-    ERROR_LOG() << "Nullptr exception";
+    ERROR_LOG(m_logger) << "Nullptr exception";
     return false;
   }
   else
@@ -343,10 +343,10 @@ bool UsedStreamsModel::checkSingleItem(NGLTreeItem *target, StreamModelData &toC
 
     StreamModelData msTarget = target->data().value<StreamModelData>();
     if (msTarget.id == toCheck.parentId)
-      DEBUG_LOG() << "Drag&drag in same folder.";
+      DEBUG_LOG(m_logger) << "Drag&drag in same folder.";
     else if (msTarget.isGroup && toCheck.isGroup)
     {
-      DEBUG_LOG() << "Trying to drop folder into folder";
+      DEBUG_LOG(m_logger) << "Trying to drop folder into folder";
       retValue = false;
     }
     else
@@ -428,18 +428,18 @@ bool UsedStreamsModel::checkDrop(const QMimeData *data, const QModelIndex &index
     
     else if ((movedFolders.at(0) != item.parentId) && (movedFolders.contains(item.parentId)) && (action == Qt::MoveAction))
     {
-      DEBUG_LOG() << "Ignoring items in sub folder while moving.";
+      DEBUG_LOG(m_logger) << "Ignoring items in sub folder while moving.";
       continue;
     }
     
     else if (!movedFolders.contains(item.parentId) && (action == Qt::MoveAction))
     {
-      DEBUG_LOG() << "Only allow items from same folder to be moved.";
+      DEBUG_LOG(m_logger) << "Only allow items from same folder to be moved.";
       return false;
     }
     if (!checkSingleItem(itemToCheck, item))
     {
-      DEBUG_LOG() << "Not able to add item with name: " << item.name;
+      DEBUG_LOG(m_logger) << "Not able to add item with name: " << item.name;
       return false;
     }
 
@@ -452,7 +452,7 @@ bool UsedStreamsModel::checkDrop(const QMimeData *data, const QModelIndex &index
       }
       else
       {
-        DEBUG_LOG() << "More than one folder selected.";
+        DEBUG_LOG(m_logger) << "More than one folder selected.";
         return false;
       }
     }
@@ -463,7 +463,7 @@ bool UsedStreamsModel::checkDrop(const QMimeData *data, const QModelIndex &index
 
   if (countDropped + countAgainst > 12)
   {
-    DEBUG_LOG() << "Trying to add to many items to folder";
+    DEBUG_LOG(m_logger) << "Trying to add to many items to folder";
     return false;
   }
   return true;
@@ -551,7 +551,7 @@ void UsedStreamsModel::onDataChanged(const InfrastructureManagement::MainStructu
                                      const DataModification modType)
 {
   beginResetModel();
-  INFO_LOG() << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount()
+  INFO_LOG(m_logger) << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount()
                      << " data.elements().size()=" << data.elements().size();
 
   switch (modType)
@@ -562,7 +562,7 @@ void UsedStreamsModel::onDataChanged(const InfrastructureManagement::MainStructu
   case DataModification::eAdded:
     for (const InfrastructureManagement::StructureElement &se : data.elements())
     {
-      INFO_LOG() << "se.id()" << se.id()
+      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());
@@ -577,7 +577,7 @@ void UsedStreamsModel::onDataChangedMvs(const VideoTeam &data, const DataModific
 {
 
   beginResetModel();
-  INFO_LOG() << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount();
+  INFO_LOG(m_logger) << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount();
 
   switch (modType)
   {
@@ -586,7 +586,7 @@ void UsedStreamsModel::onDataChangedMvs(const VideoTeam &data, const DataModific
   case DataModification::eModified:
   case DataModification::eAdded:
 
-    INFO_LOG() << "se.id()" << data.id()
+    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());
@@ -602,8 +602,8 @@ void UsedStreamsModel::onStreamNameDataChanged(int32_t mountingPointId, const QS
   Q_UNUSED(internalName)
 
   beginResetModel();
-  INFO_LOG() << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount();
-  INFO_LOG() << "se.id()" << mountingPointId
+  INFO_LOG(m_logger) << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount();
+  INFO_LOG(m_logger) << "se.id()" << mountingPointId
                      << " se.displayName()" << displayName
                      << " m_rootItem->childCount()" << m_rootItem->childCount();
   updateStreamNames(mountingPointId, displayName, m_rootItem);
@@ -614,7 +614,7 @@ void UsedStreamsModel::onStreamNameDataChanged(int32_t mountingPointId, const QS
 
 void UsedStreamsModel::updateStreamNames(const int mountingPointId, const QString &newName, NGLTreeItem *item)
 {
-  INFO_LOG() << "updateStreamNames mountingPointId=" << mountingPointId
+  INFO_LOG(m_logger) << "updateStreamNames mountingPointId=" << mountingPointId
                      << " newName=" << newName;
 
   int childCount = item->childCount();
@@ -623,17 +623,17 @@ void UsedStreamsModel::updateStreamNames(const int mountingPointId, const QStrin
     NGLTreeItem *child = item->child(i);
     
     if (!child->data().canConvert<StreamModelData>())
-      ERROR_LOG() << "Error convert item";
+      ERROR_LOG(m_logger) << "Error convert item";
 
     StreamModelData usedStream = child->data().value<StreamModelData>();
-    INFO_LOG() << "i=" << i
+    INFO_LOG(m_logger) << "i=" << i
                        << " usedStream.mountingPointId=" << usedStream.mountingPointId
                        << " usedStream.name=" << usedStream.name
                        << " mountingPointId=" << mountingPointId
                        << " newName=" << newName;
     if (mountingPointId == usedStream.mountingPointId)
     {
-      INFO_LOG() << "Set new DisplayName id=" << usedStream.id
+      INFO_LOG(m_logger) << "Set new DisplayName id=" << usedStream.id
                          << " mountingPointId=" << usedStream.mountingPointId
                          << " name=" << usedStream.name
                          << " new Name =" << newName;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_used_streams_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_used_streams_model.h
index 8d8f747de..6eb45f42f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_used_streams_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_used_streams_model.h
@@ -44,6 +44,8 @@ public:
   bool initModel();
 
 protected:
+
+NGL::INGLLogger &m_logger;
   NGLTreeItem *createItem(const QVariant &data, const QIcon &icon) const override;
 
 private slots:
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 84224aabe..8fd3f393c 100755
--- 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
@@ -51,13 +51,13 @@ TopicReplay::TopicReplay(DataInterface *dataIfc, bool isAudio)
   : m_isAudio(isAudio)
   , m_dataIfc(dataIfc)
 {
-  DEBUG_LOG() << "TopicReplay::TopicReplay()";
+  DEBUG_LOG(m_logger) << "TopicReplay::TopicReplay()";
   Q_ASSERT(dataIfc);
 }
 
 TopicReplay::~TopicReplay()
 {
-  DEBUG_LOG() << "TopicReplay::~TopicReplay()";
+  DEBUG_LOG(m_logger) << "TopicReplay::~TopicReplay()";
 
   if (m_isPlaying)
     playbackStop();
@@ -65,7 +65,7 @@ TopicReplay::~TopicReplay()
 
 QWidget *TopicReplay::createWidget()
 {
-  DEBUG_LOG() << "TopicReplay::createWidget()";
+  DEBUG_LOG(m_logger) << "TopicReplay::createWidget()";
   Q_ASSERT(!m_screenPlacementHelper);
 
   if (m_isAudio)
@@ -80,19 +80,19 @@ QWidget *TopicReplay::createWidget()
 void TopicReplay::slotSetScriptResponse(const AudioVideoManagement::AvaStreamInfo &streamInfo, AudioVideoManagement::AvaStreamState streamState)
 {
   if (streamState == AudioVideoManagement::AvaStreamState::NotPossible)
-    ERROR_LOG() << "Script could not be set";
+    ERROR_LOG(m_logger) << "Script could not be set";
   else
-    ERROR_LOG() << "Script set!";
+    ERROR_LOG(m_logger) << "Script set!";
 
-  ERROR_LOG() << "streamInfo: start" << streamInfo.duration.count();
-  ERROR_LOG() << "streamState: " << static_cast<int>(streamState);
+  ERROR_LOG(m_logger) << "streamInfo: start" << streamInfo.duration.count();
+  ERROR_LOG(m_logger) << "streamState: " << static_cast<int>(streamState);
 }
 
 
 bool TopicReplay::playbackInit(const QJsonObject &attributes)
 {
-  DEBUG_LOG() << "TopicReplay::playbackInit()";
-  DEBUG_LOG() << QJsonDocument(attributes).toJson();
+  DEBUG_LOG(m_logger) << "TopicReplay::playbackInit()";
+  DEBUG_LOG(m_logger) << QJsonDocument(attributes).toJson();
 
   if (m_screenPlacementHelper && !m_isAudio)
     m_screenPlacementHelper->show();
@@ -103,7 +103,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
   AvaControl *ctrl = getAvaControl();
   if (ctrl == nullptr)
   {
-    ERROR_LOG() << "no ava control!";
+    ERROR_LOG(m_logger) << "no ava control!";
     return false;
   }
 
@@ -111,7 +111,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
 
   if (!topicData.isValid)
   {
-    ERROR_LOG() << "topicData is invalid";
+    ERROR_LOG(m_logger) << "topicData is invalid";
     return false;
   }
 
@@ -122,7 +122,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
   PlaybackApp *app = m_isAudio ? m_dataIfc->audioPresentationApp() : m_dataIfc->videoPresentationApp();
   if (app == nullptr || app->inUse())
   {
-    ERROR_LOG() << "app invalid or in use!";
+    ERROR_LOG(m_logger) << "app invalid or in use!";
     return false;
   }
 
@@ -142,7 +142,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
 
   if (!m_appHandle)
   {
-    ERROR_LOG() << "appHandle: missing app after creating appHandle!";
+    ERROR_LOG(m_logger) << "appHandle: missing app after creating appHandle!";
     return false;
   }
 
@@ -150,7 +150,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
   NGL::Settings s({});
   bool isLocal = s.isDatabaseConnectionLocal();
 
-  DEBUG_LOG() << "isLocal? " << isLocal;
+  DEBUG_LOG(m_logger) << "isLocal? " << isLocal;
 
   AvaScriptSource source;
   if (isLocal)
@@ -168,7 +168,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
       source = AvaScriptSource::ServerVideo;
   }
 
-  DEBUG_LOG() << "source: " << static_cast<int>(source);
+  DEBUG_LOG(m_logger) << "source: " << static_cast<int>(source);
 
   ctrl->setScript(m_appHandle.dialogId(), m_scriptName,
                   source, topicData.streamList(),
@@ -180,7 +180,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
 
 bool TopicReplay::playbackStart(int secondsOffset)
 {
-  DEBUG_LOG() << "TopicReplay::playbackStart()";
+  DEBUG_LOG(m_logger) << "TopicReplay::playbackStart()";
 
   if (m_screenPlacementHelper && !m_isAudio)
     m_screenPlacementHelper->show();
@@ -188,7 +188,7 @@ bool TopicReplay::playbackStart(int secondsOffset)
   AvaControl *ctrl = getAvaControl();
   if (ctrl == nullptr)
   {
-    ERROR_LOG()  << "ctrl == nullptr";
+    ERROR_LOG(m_logger)  << "ctrl == nullptr";
     return false;
   }
 
@@ -196,7 +196,7 @@ bool TopicReplay::playbackStart(int secondsOffset)
 
   if (!m_appHandle)
   {
-    ERROR_LOG() << "appHandle: missing app!";
+    ERROR_LOG(m_logger) << "appHandle: missing app!";
     return false;
   }
 
@@ -204,13 +204,13 @@ bool TopicReplay::playbackStart(int secondsOffset)
   ctrl->startScript(m_appHandle.dialogId(), m_scriptName);
 
   m_isPlaying = true;
-  DEBUG_LOG()  << "m_isPlaying = true";
+  DEBUG_LOG(m_logger)  << "m_isPlaying = true";
   return true;
 }
 
 bool TopicReplay::playbackPause()
 {
-  DEBUG_LOG() << "TopicReplay::playbackPause()";
+  DEBUG_LOG(m_logger) << "TopicReplay::playbackPause()";
 
   if (m_screenPlacementHelper)
     m_screenPlacementHelper->hide();
@@ -221,13 +221,13 @@ bool TopicReplay::playbackPause()
   AvaControl *ctrl = getAvaControl();
   if (ctrl == nullptr)
   {
-    ERROR_LOG() << "no ctrl!";
+    ERROR_LOG(m_logger) << "no ctrl!";
     return false;
   }
 
   if (!m_appHandle)
   {
-    ERROR_LOG() << "appHandle: missing app!";
+    ERROR_LOG(m_logger) << "appHandle: missing app!";
     return false;
   }
 
@@ -237,7 +237,7 @@ bool TopicReplay::playbackPause()
 
 bool TopicReplay::playbackStop()
 {
-  DEBUG_LOG() << "TopicReplay::playbackStop()";
+  DEBUG_LOG(m_logger) << "TopicReplay::playbackStop()";
 
   if (m_screenPlacementHelper)
     m_screenPlacementHelper->hide();
@@ -248,13 +248,13 @@ bool TopicReplay::playbackStop()
   AvaControl *ctrl = getAvaControl();
   if (ctrl == nullptr)
   {
-    ERROR_LOG() << "no ctrl!";
+    ERROR_LOG(m_logger) << "no ctrl!";
     return false;
   }
 
   if (!m_appHandle)
   {
-    ERROR_LOG() << "appHandle: missing app!";
+    ERROR_LOG(m_logger) << "appHandle: missing app!";
     return false;
   }
 
@@ -274,7 +274,7 @@ bool TopicReplay::exportTopic(const QJsonObject &attributes,
   VdControl *ctrl = getVdControl();
   if (ctrl == nullptr)
   {
-    ERROR_LOG() << "ctrl missing!";
+    ERROR_LOG(m_logger) << "ctrl missing!";
     exportNotifier->setExportFailed();
     return false;
   }
@@ -286,7 +286,7 @@ bool TopicReplay::exportTopic(const QJsonObject &attributes,
 
   if (!topicData.isValid)
   {
-    ERROR_LOG() << "topicData is invalid";
+    ERROR_LOG(m_logger) << "topicData is invalid";
     exportNotifier->setExportFailed();
     return false;
   }
@@ -304,7 +304,7 @@ bool TopicReplay::exportTopic(const QJsonObject &attributes,
 
 void TopicReplay::onWidgetPlaced(const QRect &geometry)
 {
-  WARNING_LOG() << "TopicReplay::onWidgetPlaced() - geo: " << geometry.x() << "/" << geometry.y()
+  WARNING_LOG(m_logger) << "TopicReplay::onWidgetPlaced() - geo: " << geometry.x() << "/" << geometry.y()
                                      << "   m_isAudio=" << m_isAudio;
 
   m_dialogGeometry = geometry;
@@ -315,17 +315,17 @@ void TopicReplay::onWidgetPlaced(const QRect &geometry)
   PlaybackApp *app = m_isAudio ? m_dataIfc->audioPresentationApp() : m_dataIfc->videoPresentationApp();
   if (app == nullptr)
   {
-    ERROR_LOG() << "app missing!";
+    ERROR_LOG(m_logger) << "app missing!";
     return;
   }
 
   if (!app->inUse()) 
   {
-    ERROR_LOG() << "app not in use - waiting for playbackInit to aquire it";
+    ERROR_LOG(m_logger) << "app not in use - waiting for playbackInit to aquire it";
     return;
   }
 
-  DEBUG_LOG() << "setGeometry";
+  DEBUG_LOG(m_logger) << "setGeometry";
   app->setGeometry(*m_dialogGeometry);
 }
 
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 58feb977b..4356e066a 100755
--- 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
@@ -59,7 +59,7 @@ bool CombatNetRadioDialog::init(const std::shared_ptr<Interface::Dtc> &avmDtc,
         avmFtc->enableModifyCnrConfig() &&
         avmFtc->enableRemoveCnrConfig()))
   {
-    ERROR_LOG() << "Could not enable topics";
+    ERROR_LOG(m_logger) << "Could not enable topics";
     return false;
   }
 
@@ -78,7 +78,7 @@ bool CombatNetRadioDialog::init(const std::shared_ptr<Interface::Dtc> &avmDtc,
   {
     m_filter.reset();
     m_model.reset();
-    ERROR_LOG() << "Could not init model";
+    ERROR_LOG(m_logger) << "Could not init model";
     return false;
   }
 
@@ -191,14 +191,14 @@ void CombatNetRadioDialog::onExportButtonClicked()
 
   int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
   if (fileId > 0)
-    DEBUG_LOG() << "Saved file with id = " << fileId;
+    DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
   else
-    ERROR_LOG() << "Could not save file in library ";
+    ERROR_LOG(m_logger) << "Could not save file in library ";
 }
 
 void CombatNetRadioDialog::onImportButtonClicked()
 {
-  DEBUG_LOG() << " onImportButtonClicked() ";
+  DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
 
   QByteArray content;
   int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::AVMCombatNetRadio));
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog.h
index eb206dc32..2cc2322e1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog.h
@@ -79,6 +79,8 @@ private Q_SLOTS:
   void onImportButtonClicked();
 
 private: 
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void tableColumnOrganiserSetting() override;
 
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 9955af8a4..dcfe486a7 100755
--- 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
@@ -40,7 +40,7 @@ QVariant CombatNetRadioDialogModel::data(const QModelIndex &index, int role) con
     switch (index.column())
     {
     case CHANNEL:
-      INFO_LOG()<<"CombatNetRadioDialogModel::data role =" << role
+      INFO_LOG(m_logger)<<"CombatNetRadioDialogModel::data role =" << role
                         << " row = " << index.row();
       return QString::fromStdString(m_cnrChannels.value(config.cnrChannelId()).name());
     case RADIO_CIRCUIT:
@@ -61,14 +61,14 @@ QVariant CombatNetRadioDialogModel::data(const QModelIndex &index, int role) con
       if (unit.id() != unitId)
         return {};
 
-      INFO_LOG() << " config.unitId()=" << unitId
+      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()));
-      INFO_LOG() << "unitStr = " << unitStr;
+      INFO_LOG(m_logger) << "unitStr = " << unitStr;
 
       return unitStr;
     }
@@ -98,7 +98,7 @@ bool CombatNetRadioDialogModel::init(const std::shared_ptr<Interface::Dtc> &avmD
 
   if (!ppmDtc->visibleParties(m_parties, LtsSessionData::LtsSessionData::getInstance()->getVisibleParties(m_exerciseId)))
   {
-    ERROR_LOG() << "Could not retrieve visible Parties!";
+    ERROR_LOG(m_logger) << "Could not retrieve visible Parties!";
     return false;
   }
   m_units = ppmDtc->units();
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 93764d390..ab240a8b2 100755
--- 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
@@ -41,6 +41,8 @@ public:
   bool onlyGlobals();
 
 private:
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<Interface::Dtc> m_avmDtc;
   int32_t m_exerciseId;
   QMap<int32_t, CnrChannel> m_cnrChannels;
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 de52724a4..13c7f6426 100755
--- 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
@@ -173,7 +173,7 @@ bool EditCombatNetRadioDialog::apply()
   if (m_ui->cbUnit->currentIndex() > 0)
   {
     request.unitId().set(m_ui->cbUnit->currentData().toInt());
-    INFO_LOG()<< "currentIndex="<<m_ui->cbUnit->currentIndex()
+    INFO_LOG(m_logger)<< "currentIndex="<<m_ui->cbUnit->currentIndex()
                       << " unitId ="<<request.unitId().get();
   }
 
@@ -189,7 +189,7 @@ void EditCombatNetRadioDialog::init(LtsSession::LtsSession *session)
 
   QMap<qint32, ParticipantManagement::Party> parties;
   if (!m_ppmDtc->visibleParties(parties, LtsSessionData::LtsSessionData::getInstance()->getVisibleParties(m_exerciseId)))
-    ERROR_LOG() << "Could not retrieve visible Parties!";
+    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());
@@ -489,10 +489,10 @@ void EditCombatNetRadioDialog::onPartyIndexChanged(int index)
       if (unit.designator().size() > 0)
       {
         unitStr = QString::fromStdString(unit.designator()) + QLatin1Char('/');
-        INFO_LOG()<<"Designator != leer: unitStr = " << unitStr;
+        INFO_LOG(m_logger)<<"Designator != leer: unitStr = " << unitStr;
       }
       unitStr += QString::fromStdString(unit.tacticalIdentifier());
-      INFO_LOG() << "unitStr =" << unitStr
+      INFO_LOG(m_logger) << "unitStr =" << unitStr
                          << " id =" << unit.id();
 
       m_ui->cbUnit->addItem(unitStr, unit.id());
@@ -561,14 +561,14 @@ void EditCombatNetRadioDialog::onExportButtonClicked()
   QByteArray byteArray = cnrConfigRequestToJson();
   int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_exerciseId, byteArray);
   if (fileId > 0)
-    DEBUG_LOG() << "Saved file with id = " << fileId;
+    DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
   else
-    ERROR_LOG() << "Could not save file in library ";
+    ERROR_LOG(m_logger) << "Could not save file in library ";
 }
 
 void EditCombatNetRadioDialog::onImportButtonClicked()
 {
-  DEBUG_LOG() << " onImportButtonClicked() ";
+  DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
 
   QByteArray content;
   int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_exerciseId, FileManagement::toString(FileManagement::XmlType::AVMEditCombatNetRadio));
@@ -588,7 +588,7 @@ void EditCombatNetRadioDialog::onImportButtonClicked()
     {
       ModifyCnrConfigRequest req = jsonToModifyCnrConfig(content);
       setUiValues(toConfig(req));
-      INFO_LOG() << "--- onImportButtonClicked() ";
+      INFO_LOG(m_logger) << "--- onImportButtonClicked() ";
     }
   }
 }
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 2aa00bf36..e9023209c 100755
--- 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
@@ -69,6 +69,8 @@ public:
   void onModifyCnrConfigReply(const Core::FunctionReplyObject &replyObject) override final {  m_requestHelper->requestReply(replyObject); }
 
 protected:
+
+NGL::INGLLogger &m_logger;
   bool apply() override;
 
 private: 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog.h
index 502c9a702..5aafb6983 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog.h
@@ -57,6 +57,8 @@ private Q_SLOTS:
   void onOk();
 
 private: 
+
+NGL::INGLLogger &m_logger;
   std::unique_ptr<Ui::LoadCombatNetRadioDialog> m_ui;
   LoadCombatNetRadioDialogModel *m_model;
   bool m_isApplied = false;
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 5d599d268..0626551a3 100755
--- 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
@@ -35,7 +35,7 @@ LoadCombatNetRadioDialogModel::LoadCombatNetRadioDialogModel(const QByteArray &d
 }, parent)
   , m_exerciseId(session == nullptr ? 0 : session->exerciseId())
 {
-  DEBUG_LOG() << "Own exercise id: " << m_exerciseId;
+  DEBUG_LOG(m_logger) << "Own exercise id: " << m_exerciseId;
 
   if (session != nullptr)
   {
@@ -44,28 +44,28 @@ LoadCombatNetRadioDialogModel::LoadCombatNetRadioDialogModel(const QByteArray &d
     if (!session->getDtc<AudioVideoManagement::DataInterface>(avmDtc)
         || !avmDtc->enableCnrChannel()
         || !avmDtc->enableCnrConfig())
-      ERROR_LOG() << "Could not get AVM data";
+      ERROR_LOG(m_logger) << "Could not get AVM data";
     else
     {
       m_cnrChannels = avmDtc->cnrChannels();
       m_cnrConfigs = avmDtc->cnrConfigs();
     }
 
-    DEBUG_LOG() << "cnrconfigs: " << m_cnrConfigs.size();
-    DEBUG_LOG() << "ownExerciseId: " << m_exerciseId;
+    DEBUG_LOG(m_logger) << "cnrconfigs: " << m_cnrConfigs.size();
+    DEBUG_LOG(m_logger) << "ownExerciseId: " << m_exerciseId;
 
     std::shared_ptr<ExerciseManagement::Interface::Dtc> exmDtc;
 
     if (!session->getDtc<ExerciseManagement::DataInterface>(exmDtc)
         || !exmDtc->enableExercise())
-      ERROR_LOG() << "Could not get EXM data";
+      ERROR_LOG(m_logger) << "Could not get EXM data";
     else
       m_exercises = exmDtc->exercises();
 
-    DEBUG_LOG() << "exercises: " << m_exercises.size();
+    DEBUG_LOG(m_logger) << "exercises: " << m_exercises.size();
   }
   else
-    ERROR_LOG() << "Got invalid session.";
+    ERROR_LOG(m_logger) << "Got invalid session.";
 
   m_vecData = jsonToCnrConfigVector(data);
 
@@ -377,7 +377,7 @@ QVector<Core::RemoveElementRequest> LoadCombatNetRadioDialogModel::removeRequest
     {
       if (!m_conflictedCnrIds.contains(idxCounter))
       {
-        WARNING_LOG() << "Tried to get remove request for row " << idxCounter << " but it is not present.";
+        WARNING_LOG(m_logger) << "Tried to get remove request for row " << idxCounter << " but it is not present.";
         continue;
       }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog_model.h
index 324b15538..de77997f8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog_model.h
@@ -81,6 +81,8 @@ public Q_SLOTS:
 
 private: 
 
+
+NGL::INGLLogger &m_logger;
   LoadCombatNetRadioDialogModel::Conflicts getConflicts(int32_t row, const CnrConfig &config);
   QString conflictsText(Conflicts conflicts) const;
 
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 49b9dfdae..2cb74ee22 100755
--- 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
@@ -138,7 +138,7 @@ void EditFrequencyPlanningDialog::retranslate()
 void EditFrequencyPlanningDialog::onRemoveFrequencyPlanningReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << reply.str();
+    ERROR_LOG(m_logger) << reply.str();
   m_requestHelper->requestReply(reply);
 }
 
@@ -185,7 +185,7 @@ void EditFrequencyPlanningDialog::onAddClicked()
   if (cnrConfigId <= 0)
     return;
 
-  DEBUG_LOG() << "---RessourceDialog aufrufen...."
+  DEBUG_LOG(m_logger) << "---RessourceDialog aufrufen...."
                        << " cnrConfigId: "  << cnrConfigId
                        << " radioCircuit: " << cnrConfigRow.radioCircuit()
                        << " FrequencySetId: " << m_frequencyDataModel->getFrequencySetId();
@@ -270,7 +270,7 @@ void EditFrequencyPlanningDialog::enableSelectedUnassignButton()
     m_buttonBox->setText(LtsWidgets::DialogButton::Add, tr("Assign"));
   }
 
-  DEBUG_LOG() << "---enableAssignUnassignButtons()...."
+  DEBUG_LOG(m_logger) << "---enableAssignUnassignButtons()...."
                       << " cnrConfigId: "    << cnrConfigId
                       << " radioCircuitId: " << cnrConfigRow.radioCircuit();
 
@@ -282,7 +282,7 @@ void EditFrequencyPlanningDialog::enableSelectedUnassignButton()
 
 void EditFrequencyPlanningDialog::onAssignRadioCircuit(const FrequencyPlanningData &fpd)
 {
-    DEBUG_LOG() << "---onAssignRadioCircuit()...."
+    DEBUG_LOG(m_logger) << "---onAssignRadioCircuit()...."
                       << "CnrConfigId: " << fpd.cnrConfigId();
 
   m_frequencyDataModel->setFrequencyPlanningData(fpd);
@@ -370,14 +370,14 @@ void EditFrequencyPlanningDialog::onExportButtonClicked()
   QByteArray byteArray = m_frequencyDataModel->uiToJson();
   int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
   if (fileId > 0)
-    DEBUG_LOG() << "Saved file with id = " << fileId;
+    DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
   else
-    ERROR_LOG() << "Could not save file in library ";
+    ERROR_LOG(m_logger) << "Could not save file in library ";
 }
 
 void EditFrequencyPlanningDialog::onImportButtonClicked()
 {
-  DEBUG_LOG() << "--- onImportButtonClicked() ";
+  DEBUG_LOG(m_logger) << "--- onImportButtonClicked() ";
 
   QByteArray content;
   int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::AVMEditFrequencyPlanning));
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 52226ea58..f98277614 100755
--- 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
@@ -153,7 +153,7 @@ EditFrequencyPlanningFrequencyDataModel::EditFrequencyPlanningFrequencyDataModel
 {
   Q_ASSERT(avmDtc);
   Q_ASSERT(ppmDtc);
-  DEBUG_LOG() << "---EditFrequencyPlanningDataMod m_frequencyPlanningData[c.id()];el() ";
+  DEBUG_LOG(m_logger) << "---EditFrequencyPlanningDataMod m_frequencyPlanningData[c.id()];el() ";
 
   int frequencySetId = initPlanning.frequencySetId();
   std::vector<FrequencySetDataWithId> fsdVec = m_avmDtc->frequencySet(frequencySetId).data();
@@ -384,14 +384,14 @@ QVariant EditFrequencyPlanningFrequencyDataModel::data(const QModelIndex &index,
         return QStringLiteral("-");
       const auto unit = m_units[unitId];
 
-      INFO_LOG() << " config.unitId()=" << unitId
+      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()));
-      INFO_LOG() << "unitStr = " << unitStr;
+      INFO_LOG(m_logger) << "unitStr = " << unitStr;
 
       return unitStr;
     }
@@ -606,7 +606,7 @@ void EditFrequencyPlanningFrequencyDataModel::setFrequencePlanningId(int id)
     m_initPlan.id(id);
     return;
   }
-  WARNING_LOG() << "Trying to set a new frequency planning id but there is alreay an id set ("
+  WARNING_LOG(m_logger) << "Trying to set a new frequency planning id but there is alreay an id set ("
                         << m_initPlan.id() << " - " << id << ")";
 }
 
@@ -783,12 +783,12 @@ bool EditFrequencyPlanningFrequencyDataModel::checkResourceAssignments()
         {
           if (inner != outer)
           {
-            DEBUG_LOG() << "---ist ungleich cnrConfigId(A): " << p.cnrConfigId()
+            DEBUG_LOG(m_logger) << "---ist ungleich cnrConfigId(A): " << p.cnrConfigId()
                                 << " (B): " << pI.cnrConfigId();
           }
           else
           {
-            DEBUG_LOG() << "---ist gleich cnrConfigId(A): " << p.cnrConfigId()
+            DEBUG_LOG(m_logger) << "---ist gleich cnrConfigId(A): " << p.cnrConfigId()
                                 << " (B): " << pI.cnrConfigId();
             if (!m_multipleAssignedCnrIds.contains(p.cnrConfigId()) )
               m_multipleAssignedCnrIds.append(p.cnrConfigId());
@@ -808,7 +808,7 @@ bool EditFrequencyPlanningFrequencyDataModel::checkResourceAssignments()
     qs.append(QString::number(id));
     qs.append(QStringLiteral(", "));
   }
-  DEBUG_LOG() << "---Number of multiple assigned frequency set data: " << m_multipleAssignedCnrIds.size()
+  DEBUG_LOG(m_logger) << "---Number of multiple assigned frequency set data: " << m_multipleAssignedCnrIds.size()
                       << "    cnrConfigIds: " << qs;
 #endif
   return bOk;
@@ -906,9 +906,8 @@ QSet<int> EditFrequencyPlanningFrequencyDataModel::getAllocatedFrequencyPlanning
 
 
 
-FPFDelegate::FPFDelegate(QObject *parent)
-  : QStyledItemDelegate(parent)
-{
+FPFDelegate::FPFDelegate(QObject *parent) : QStyledItemDelegate(parent),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 void FPFDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) 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 d763f603a..2958ca468 100755
--- 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
@@ -88,7 +88,7 @@ bool EditFrequencyPlanningResourceDataModel::isFiltered(const AudioVideoManageme
   
   if (m_assignedFrequencySetDataIds.contains(data.id()))
   {
-    DEBUG_LOG() << "---m_assignments.size(): " << m_assignedFrequencySetDataIds.size()
+    DEBUG_LOG(m_logger) << "---m_assignments.size(): " << m_assignedFrequencySetDataIds.size()
                         << " frequencySetDataId: " << data.id() << " ist bereits enthalten";
     return true;  
   }
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 22d0ee2b2..689120cd8 100755
--- 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
@@ -41,7 +41,7 @@ FrequencyPlanningDialog::FrequencyPlanningDialog(LtsSession::LtsSession *session
 {
   m_ui->setupUi(this);
 
-  DEBUG_LOG() << "---FrequencyPlanningDialog() ";
+  DEBUG_LOG(m_logger) << "---FrequencyPlanningDialog() ";
   m_ui->dataView->setSelectionMode(QAbstractItemView::SingleSelection);
   m_ui->dataView->treeView()->setSelectionBehavior(QAbstractItemView::SelectRows);
   
@@ -91,7 +91,7 @@ bool FrequencyPlanningDialog::init(const std::shared_ptr<Interface::Dtc> &avmDtc
         avmDtc->enableActiveFrequencyPlanning() &&
         ismDtc->enableMainStructureElement()))
   {
-    ERROR_LOG() << "Could not enable topics";
+    ERROR_LOG(m_logger) << "Could not enable topics";
     return false;
   }
 
@@ -108,7 +108,7 @@ bool FrequencyPlanningDialog::init(const std::shared_ptr<Interface::Dtc> &avmDtc
   {
     delete m_model;
     m_model = nullptr;
-    ERROR_LOG() << "Could not init model";
+    ERROR_LOG(m_logger) << "Could not init model";
     return false;
   }
 
@@ -300,7 +300,7 @@ void FrequencyPlanningDialog::onEditClicked()
     return;
 
   const FrequencyPlanning &fp = m_model->data(currentIndex, Qt::UserRole).value<FrequencyPlanning>();
-  DEBUG_LOG() << "---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>());
@@ -440,14 +440,14 @@ void FrequencyPlanningDialog::onExportButtonClicked()
 
   int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
   if (fileId > 0)
-    DEBUG_LOG() << "Saved file with id = " << fileId;
+    DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
   else
-    ERROR_LOG() << "Could not save file in library ";
+    ERROR_LOG(m_logger) << "Could not save file in library ";
 }
 
 void FrequencyPlanningDialog::onImportButtonClicked()
 {
-  DEBUG_LOG() << " onImportButtonClicked() ";
+  DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
   if (m_model->rowCount() > 0)
   {
     QHash<LtsWidgets::Button, QString> texts({{LtsWidgets::Button::Yes, tr("Ok")}});
@@ -484,7 +484,7 @@ void FrequencyPlanningDialog::onImportButtonClicked()
           return m_avmFtc->modifyFrequencyPlanningRequest(request, this);
         });
       }
-      INFO_LOG() << "--- onImportButtonClicked() ";
+      INFO_LOG(m_logger) << "--- onImportButtonClicked() ";
     }
   }
 }
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 6db7da523..bd5ccd1b9 100755
--- 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
@@ -99,6 +99,8 @@ signals:
   void aboutToCloseMe(int);
 
 private: 
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void unsetActiveFrequencyPlanning();
   void setActiveFrequencyPlanning(const ActiveFrequencyPlanning &activePlanning);
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 6d00a6281..4f5ff2502 100755
--- 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
@@ -22,7 +22,7 @@ FrequencyPlanningDialogModel::FrequencyPlanningDialogModel(int32_t exerciseId, Q
       }, parent)
   , m_exerciseId(exerciseId)
 {
-  DEBUG_LOG() << "---FrequencyPlanningDialogModel() ";
+  DEBUG_LOG(m_logger) << "---FrequencyPlanningDialogModel() ";
 }
 
 QVariant FrequencyPlanningDialogModel::data(const QModelIndex &index, int role) const
@@ -82,7 +82,7 @@ FrequencySet FrequencyPlanningDialogModel::frequencySetByIndex(const QModelIndex
 
 void FrequencyPlanningDialogModel::onFrequencyPlanningChanged(const FrequencyPlanning &data, DataModification modType)
 {
-  INFO_LOG() << "onFrequencyPlanningChanged "
+  INFO_LOG(m_logger) << "onFrequencyPlanningChanged "
                      << " data.exerciseId()" << data.exerciseId()
                      << " m_exerciseId=" << m_exerciseId;
   if ((data.exerciseId().is_set()     && data.exerciseId().get() != m_exerciseId)
@@ -100,7 +100,7 @@ QByteArray FrequencyPlanningDialogModel::modelToJson()
 
   for (int row = 0; row < rowCount(); row++)
   {
-    DEBUG_LOG() << "row =" << ": " << row;
+    DEBUG_LOG(m_logger) << "row =" << ": " << row;
     QJsonObject inner;
     const FrequencyPlanning &planning = m_vecData.at(row);
 
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 cc4362b5e..86a4e832d 100755
--- 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
@@ -46,6 +46,8 @@ private Q_SLOTS:
   void onFrequencyPlanningChanged(const FrequencyPlanning &data, DataModification modType);
 
 private:
+
+NGL::INGLLogger &m_logger;
   int32_t m_exerciseId;
   boost::optional<int> m_activePlanningId;
   std::shared_ptr<Interface::Dtc> m_avmDtc;
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 c90ad883d..0c881c624 100755
--- 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
@@ -17,12 +17,11 @@
 namespace AudioVideoManagement
 {
 
-FrequencyPlanningWidget::FrequencyPlanningWidget(const std::shared_ptr<Interface::Dtc> &avmDtc, QSet<int> &allocatedDataSets, QWidget *parent)
-  : QWidget(parent)
+FrequencyPlanningWidget::FrequencyPlanningWidget(const std::shared_ptr<Interface::Dtc> &avmDtc, QSet<int> &allocatedDataSets, QWidget *parent) : QWidget(parent)
   , m_ui(new Ui::FrequencyPlanningWidget)
   , m_assignedFrequencySetDataIds(allocatedDataSets)
-  , m_avmDtc(avmDtc)
-{
+  , m_avmDtc(avmDtc),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_ui->setupUi(this);
 
   m_ui->cbFrequencyBand->addItem(toString(FrequencyBand_def::VHF), FrequencyBand_def::VHF);
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 1b9187f77..19ba4beda 100755
--- 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
@@ -16,7 +16,7 @@ InitFrequencyPlanningDialog::InitFrequencyPlanningDialog(LtsSession::LtsSession
   , m_dateOfCreation(session->partitionTime())
   , m_session(session)
 {
-  DEBUG_LOG() << "---InitFrequencyPlanningDialog() ";
+  DEBUG_LOG(m_logger) << "---InitFrequencyPlanningDialog() ";
   m_ui->setupUi(this);
 
   QMap<int32_t, FrequencySet> frequencySets = avmDtc->frequencySets();
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 4146fcf2b..05db57880 100755
--- 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
@@ -34,6 +34,8 @@ signals:
   void newInitFrequencyPlanning(const FrequencyPlanning &);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   bool apply() override;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog.h
index 4259ad304..97864bf33 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog.h
@@ -59,6 +59,8 @@ private Q_SLOTS:
   void onOk();
 
 private: 
+
+NGL::INGLLogger &m_logger;
   std::unique_ptr<Ui::LoadFrequencyPlanningDialog> m_ui;
   LoadFrequencyPlanningDialogModel *m_model;
   bool m_isApplied = false;
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 a12a67848..d2163af5f 100755
--- 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
@@ -142,7 +142,7 @@ LoadFrequencyPlanningDialogModel::LoadFrequencyPlanningDialogModel(const Frequen
   , m_exerciseId(initPlan.exerciseId().is_set() ? initPlan.exerciseId().get() : 0)
 {
   Q_ASSERT(avmDtc);
-  DEBUG_LOG() << "---EditFrequencyPlanningDataMod m_frequencyPlanningData[c.id()];el() ";
+  DEBUG_LOG(m_logger) << "---EditFrequencyPlanningDataMod m_frequencyPlanningData[c.id()];el() ";
 
   m_initPlan.data().clear();
 
@@ -167,7 +167,7 @@ void LoadFrequencyPlanningDialogModel::setData(const QByteArray &data)
 
   if (m_initPlan.frequencySetId() != obj.value<int>("frequencySetId"))
   {
-    ERROR_LOG() << "false frequency set!";
+    ERROR_LOG(m_logger) << "false frequency set!";
 
     return;
   }
@@ -619,7 +619,7 @@ void LoadFrequencyPlanningDialogModel::checkConflicts()
 
     if (!item || !item->data().canConvert<ItemData>())
     {
-      DEBUG_LOG() << "Could not get item for row " << row;
+      DEBUG_LOG(m_logger) << "Could not get item for row " << row;
       continue;
     }
 
@@ -873,7 +873,7 @@ QVector<FrequencyPlanningData> LoadFrequencyPlanningDialogModel::planningData()
 
     if (!item || !item->data().canConvert<ItemData>())
     {
-      DEBUG_LOG() << "Could not get item for row " << row;
+      DEBUG_LOG(m_logger) << "Could not get item for row " << row;
       continue;
     }
 
@@ -918,9 +918,8 @@ LoadFrequencyPlanningDialogModel::ConfigTreeItem* LoadFrequencyPlanningDialogMod
 
 
 
-DrawDelegate::DrawDelegate(QObject *parent)
-  : QStyledItemDelegate(parent)
-{
+DrawDelegate::DrawDelegate(QObject *parent) : QStyledItemDelegate(parent),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 void DrawDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
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 1cd09e62b..f76bb0cb6 100755
--- 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
@@ -109,7 +109,7 @@ void ElokaDialog::setAvaSessionStatus(bool established)
 
 void ElokaDialog::onAddClicked()
 {
-  DEBUG_LOG() << "**** onAddClicked() ";
+  DEBUG_LOG(m_logger) << "**** onAddClicked() ";
 
   ElokaEditDialog *dialog = new ElokaEditDialog(m_session, m_avaSession, m_avmDtc, m_streamNameMapping,
                                                 ElokaData(), this);
@@ -128,7 +128,7 @@ void ElokaDialog::onAddClicked()
 
 void ElokaDialog::onEditClicked()
 {
-  DEBUG_LOG() << "**** onEditClicked() ";
+  DEBUG_LOG(m_logger) << "**** onEditClicked() ";
 
   const QModelIndex idx = m_ui->tvEloka->currentIndex();
 
@@ -154,7 +154,7 @@ void ElokaDialog::onEditClicked()
 
 void ElokaDialog::onRemoveClicked()
 {
-  DEBUG_LOG() << "**** onRemoveClicked() ";
+  DEBUG_LOG(m_logger) << "**** onRemoveClicked() ";
 
   const QModelIndex idx = m_ui->tvEloka->currentIndex();
 
@@ -184,7 +184,7 @@ void ElokaDialog::onPrint()
 
 void ElokaDialog::onQueryElokaResponse(const QVector<AvaEloka> &&eloka)
 {
-  DEBUG_LOG() << "onQueryElokaResponse";
+  DEBUG_LOG(m_logger) << "onQueryElokaResponse";
 
   m_elokaListCollector.start(); 
   m_elokaModel->clear();
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 80769508e..41454723f 100755
--- 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
@@ -351,7 +351,7 @@ void ElokaEditDialog::getActiveCnrs()
 void ElokaEditDialog::onCnrConfigChanged(const CnrConfig &data,
                                          DataModification modType)
 {
-  DEBUG_LOG() << "onCnrConfigChanged";
+  DEBUG_LOG(m_logger) << "onCnrConfigChanged";
   switch (modType)
   {
   case DataModification::eAdded:
@@ -374,7 +374,7 @@ void ElokaEditDialog::onCnrConfigChanged(const CnrConfig &data,
 void ElokaEditDialog::onTvcConfigChanged(const TvcConfig &data,
                                          DataModification modType)
 {
-  DEBUG_LOG() << "onTvcConfigChanged";
+  DEBUG_LOG(m_logger) << "onTvcConfigChanged";
 
   switch (modType)
   {
@@ -398,7 +398,7 @@ void ElokaEditDialog::onTvcConfigChanged(const TvcConfig &data,
 void ElokaEditDialog::onStreamChanged(const Stream &data,
                                       DataModification modType)
 {
-  DEBUG_LOG() << "onStreamChanged";
+  DEBUG_LOG(m_logger) << "onStreamChanged";
 
   if ((data.type() != StreamType_def::AudioOut) &&
       (data.type() != StreamType_def::AudioInOut))
@@ -427,7 +427,7 @@ void ElokaEditDialog::onCnrTvcProfileChanged(const CnrTvcProfile &data,
                                              DataModification modType)
 {
   Q_UNUSED(modType);
-  DEBUG_LOG() << "onCnrTvcProfileChanged";
+  DEBUG_LOG(m_logger) << "onCnrTvcProfileChanged";
 
   if (data.exerciseId() != m_session->exerciseId() ||
       data.operatorId() != LtsSessionData::LtsSessionData::getInstance()->getOperatorId())
@@ -535,7 +535,7 @@ void ElokaEditDialog::setCurrentCircuit(const ElokaData &data)
 
 void ElokaEditDialog::onGetElokaListResponse(const QVector<QString> &actions)
 {
-  DEBUG_LOG() << "onGetElokaListResponse";
+  DEBUG_LOG(m_logger) << "onGetElokaListResponse";
   if (!m_elokaData.internalName.isEmpty())
     setUnchangeable(true);
 
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 df7d63333..2d4509c48 100755
--- 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
@@ -58,7 +58,7 @@ bool MvsDialog::init(const std::shared_ptr<AudioVideoManagement::Interface::Dtc>
   {
     delete m_model;
     m_model = nullptr;
-    ERROR_LOG() << "Could not init model";
+    ERROR_LOG(m_logger) << "Could not init model";
     return false;
   }
 
@@ -178,14 +178,14 @@ void MvsDialog::onExportButtonClicked()
 
   int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
   if (fileId > 0)
-    DEBUG_LOG() << "Saved file with id = " << fileId;
+    DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
   else
-    ERROR_LOG() << "Could not save file in library ";
+    ERROR_LOG(m_logger) << "Could not save file in library ";
 }
 
 void MvsDialog::onImportButtonClicked()
 {
-  DEBUG_LOG() << " onImportButtonClicked() ";
+  DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
 
   QByteArray content;
   int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::AVMMvsDialog));
@@ -211,7 +211,7 @@ void MvsDialog::onImportButtonClicked()
           return m_avmFtc->videoTeamModifyRequest(request, this);
         });
       }
-      INFO_LOG() << "--- onImportButtonClicked() ";
+      INFO_LOG(m_logger) << "--- onImportButtonClicked() ";
     }
   }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_dialog.h
index a3044cf9c..7f4765d35 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_dialog.h
@@ -70,6 +70,8 @@ private Q_SLOTS:
   void onImportButtonClicked();
 
 private: 
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void tableColumnOrganiserSetting() override;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_edit_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_edit_dialog.h
index 6cb6be89a..55da771d4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_edit_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_edit_dialog.h
@@ -41,6 +41,8 @@ Q_SIGNALS:
   void modifyRequest(const AudioVideoManagement::VideoTeamModifyRequest &request);
 
 protected:
+
+NGL::INGLLogger &m_logger;
   bool apply() override;
 
 private: 
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 aff6e95ff..008ac1543 100755
--- 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
@@ -77,7 +77,7 @@ QByteArray MvsModel::modelToJson()
 
   for (int row = 0; row < rowCount(); row++)
   {
-    DEBUG_LOG() << "row =" << ": " << row;
+    DEBUG_LOG(m_logger) << "row =" << ": " << row;
     QJsonObject inner;
     const VideoTeam &config     = m_vecData.at(row);
     inner[QStringLiteral("id")] =         config.id();
@@ -118,7 +118,7 @@ QVector<VideoTeamModifyRequest> MvsModel::jsonToVideoTeamVector(const QByteArray
     config.exerciseId(m_exerciseId);
     config.streamName(obj[QStringLiteral("streamName")].toString().toStdString());
 
-    INFO_LOG() << "insertRow: " << config.name()
+    INFO_LOG(m_logger) << "insertRow: " << config.name()
                        << " VideoTeamId=" << config.id();
     result.append(std::move(config));
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_model.h
index 788c0015e..ed6a9f416 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_model.h
@@ -35,6 +35,7 @@ public:
   QVector<VideoTeamModifyRequest> jsonToVideoTeamVector(const QByteArray &content);
   bool isFiltered(const VideoTeam &data, DataModification modType) const override;
 private: 
+NGL::INGLLogger &m_logger;
   std::shared_ptr<AudioVideoManagement::Interface::Dtc> m_avmDtc;
   int32_t m_exerciseId;
 
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 36477afe4..f54c53947 100755
--- 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
@@ -169,7 +169,7 @@ void MvsVideoTeamDialog::setData()
 bool MvsVideoTeamDialog::apply()
 {
   VideoReceiverModifyActiveRequest req;
-  DEBUG_LOG() << "apply m_videoTeamButtonGroup.size=" << m_videoTeamButtonGroup.size();
+  DEBUG_LOG(m_logger) << "apply m_videoTeamButtonGroup.size=" << m_videoTeamButtonGroup.size();
   QMap<int, QButtonGroup *> ::const_iterator itBg;
   for (itBg = m_videoTeamButtonGroup.constBegin(); itBg != m_videoTeamButtonGroup.constEnd(); ++itBg)
   {
@@ -177,9 +177,9 @@ bool MvsVideoTeamDialog::apply()
     int mainStructureElementId = itBg.value()->checkedId();
     int oldActiveId = m_dtc->getActiveVideoReceiver(teamId);
 
-    DEBUG_LOG() << "Team id = " << teamId;
-    DEBUG_LOG() << "Main structure element id = " << mainStructureElementId;
-    DEBUG_LOG() << "Old active video receiver = " << oldActiveId;
+    DEBUG_LOG(m_logger) << "Team id = " << teamId;
+    DEBUG_LOG(m_logger) << "Main structure element id = " << mainStructureElementId;
+    DEBUG_LOG(m_logger) << "Old active video receiver = " << oldActiveId;
 
     if (itBg.value()->checkedId() == 0)  
     {
@@ -199,7 +199,7 @@ bool MvsVideoTeamDialog::apply()
       req.isActive(true);
       req.id(m_receiverIds.value(QPair<int, int>(mainStructureElementId, teamId)));
     }
-    DEBUG_LOG() << "itBg.key=" << itBg.key()
+    DEBUG_LOG(m_logger) << "itBg.key=" << itBg.key()
                         << " mainStructureElementId=" << mainStructureElementId
                         << " teamId=" << teamId
                         << " id=" << req.id()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_video_team_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_video_team_dialog.h
index fa99ce075..c7c92ccd7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_video_team_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_video_team_dialog.h
@@ -47,6 +47,8 @@ public:
   void onVideoReceiverModifyActiveReply(const Core::FunctionReplyObject &reply)  override final { m_requestHelper->requestReply(reply); }
 
 private:
+
+NGL::INGLLogger &m_logger;
   ReceiverElement *createReceiverElement(const VideoReceiver &rec);
 
 private slots:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_edit_training_voice_communication_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_edit_training_voice_communication_dialog.h
index 4e87c63e7..5865e2b51 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_edit_training_voice_communication_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_edit_training_voice_communication_dialog.h
@@ -70,6 +70,8 @@ public:
   void retranslate() override;
 
 protected:
+
+NGL::INGLLogger &m_logger;
   bool apply() override;
   void onModifyTvcConfigReply(const Core::FunctionReplyObject &reply) override;
 
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 182770732..5bdd6c464 100755
--- 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
@@ -52,7 +52,7 @@ bool TrainingVoiceCommunicationDialog::init(const std::shared_ptr<Interface::Dtc
         avmFtc->enableModifyTvcConfig() &&
         avmFtc->enableRemoveTvcConfig()))
   {
-    ERROR_LOG() << "Could not enable topics";
+    ERROR_LOG(m_logger) << "Could not enable topics";
     return false;
   }
 
@@ -68,7 +68,7 @@ bool TrainingVoiceCommunicationDialog::init(const std::shared_ptr<Interface::Dtc
   {
     m_filter.reset();
     m_model.reset();
-    ERROR_LOG() << "Could not init model";
+    ERROR_LOG(m_logger) << "Could not init model";
     return false;
   }
 
@@ -167,14 +167,14 @@ void TrainingVoiceCommunicationDialog::onExportButtonClicked()
 
   int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
   if (fileId > 0)
-    DEBUG_LOG() << "Saved file with id = " << fileId;
+    DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
   else
-    ERROR_LOG() << "Could not save file in library ";
+    ERROR_LOG(m_logger) << "Could not save file in library ";
 }
 
 void TrainingVoiceCommunicationDialog::onImportButtonClicked()
 {
-  DEBUG_LOG() << " onImportButtonClicked() ";
+  DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
 
   QByteArray content;
   int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::AVMTrainingVoiceCommunication));
@@ -201,7 +201,7 @@ void TrainingVoiceCommunicationDialog::onImportButtonClicked()
         });
       }
       (void) m_requestHelper->startRequests();
-      INFO_LOG() << "--- onImportButtonClicked() ";
+      INFO_LOG(m_logger) << "--- onImportButtonClicked() ";
     }
 
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog.h
index 7c0dab3c2..37fd80622 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog.h
@@ -72,6 +72,8 @@ private Q_SLOTS:
   void onImportButtonClicked();
 
 private: 
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void tableColumnOrganiserSetting() override;
 
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 b6103cf4f..f2e195c1a 100755
--- 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
@@ -113,7 +113,7 @@ QVector<ModifyTvcConfigRequest> TrainingVoiceCommunicationDialogModel::jsonToTvc
     config.recording(obj[QLatin1String("recording")].toBool());
     config.tetraChannelId(obj[QLatin1String("tetraChannelId")].toInt());
 
-    INFO_LOG() << "insertRow: " << config.radioCircuit()
+    INFO_LOG(m_logger) << "insertRow: " << config.radioCircuit()
                        << " tvcChannelId=" << config.tetraChannelId();
     result.push_back(std::move(config));
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog_model.h
index 9a1c7fad6..00639ae9c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/avm_training_voice_communication_dialog_model.h
@@ -35,6 +35,8 @@ public:
   QVector<ModifyTvcConfigRequest> jsonToTvcConfigVector(const QByteArray &content) const;
 
 private:
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<AudioVideoManagement::Interface::Dtc> m_avmDtc;
   int32_t m_exerciseId;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/buildingmanager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/buildingmanager.cpp
index eb0d14bfd..b69706d4f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/buildingmanager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/buildingmanager.cpp
@@ -230,16 +230,16 @@ void BuildingManager::Tick(const dtEntity::Message &message)
           dtEntityOSG::LayerAttachPointComponent *lac;
           if (!mEntityManager->GetComponent(dspl.mAttachPointId, lac))
           {
-            WARNING_LOG() << "NO sLayerAttachPointComponent";
+            WARNING_LOG(m_logger) << "NO sLayerAttachPointComponent";
             return;
           }
           if( shotdspl.mGeode.valid())
           {
-            DEBUG_LOG() << "displayTimeOver OVER KILL IT drawables: !" << shotdspl.mGeode->getNumDrawables();
+            DEBUG_LOG(m_logger) << "displayTimeOver OVER KILL IT drawables: !" << shotdspl.mGeode->getNumDrawables();
             while (shotdspl.mGeode->getNumDrawables() > 0)
               shotdspl.mGeode->removeDrawables(0, shotdspl.mGeode->getNumDrawables());
             bool ret = lac->GetNode()->asGroup()->removeChild(shotdspl.mGeode);
-            DEBUG_LOG() << "displayTimeOver OVER KILL IT! result: " << ret;
+            DEBUG_LOG(m_logger) << "displayTimeOver OVER KILL IT! result: " << ret;
             
 
             dtEntity::GetWindowInterface()->RequestRedraw(dspl.mContextId);
@@ -248,7 +248,7 @@ void BuildingManager::Tick(const dtEntity::Message &message)
 
         if (lifeTimeOver)
         {
-          DEBUG_LOG() << "lifeTimeOver OVER ERASE IT!";
+          DEBUG_LOG(m_logger) << "lifeTimeOver OVER ERASE IT!";
           itShotDisplay = dspl.mShotDisplays.erase(itShotDisplay);
         }
         else
@@ -280,7 +280,7 @@ bool BuildingManager::getFloorOfRoom(const std::string &bdlgFeatureId, int roomN
 
 void BuildingManager::updateShotDuration(unsigned int newDuration_s)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " newDuration_s= " << newDuration_s;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " newDuration_s= " << newDuration_s;
 
   QMutexLocker locker(&m_mutexShots);
 
@@ -294,7 +294,7 @@ void BuildingManager::updateShotDuration(unsigned int newDuration_s)
     if (!building->mDisplays.empty())
     {
       BuildingDisplay buildingDisplay = building->mDisplays.front();
-      DEBUG_LOG() << Q_FUNC_INFO << " buildingDisplay.mContextId " << buildingDisplay.mContextId;
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " buildingDisplay.mContextId " << buildingDisplay.mContextId;
       updateShots(*building, buildingDisplay);
       dtEntity::GetWindowInterface()->RequestRedraw(buildingDisplay.mContextId);
     }
@@ -426,7 +426,7 @@ bool BuildingManager::displayBuilding(const std::string& featureId, unsigned int
 
 bool BuildingManager::displayBuilding(unsigned int contextid, dtEntity::EntityId buildingid, const osg::Vec4& bgcolor, ViewMode viewmode, bool exactPos)
 {
-  DEBUG_LOG() << "BuildingManager::displayBuilding";
+  DEBUG_LOG(m_logger) << "BuildingManager::displayBuilding";
   mExactPos = exactPos;
   dtEntity::EntityManager &em = *mEntityManager;
 
@@ -629,7 +629,7 @@ bool BuildingManager::displayBuilding(unsigned int contextid, dtEntity::EntityId
 
   
   {
-    DEBUG_LOG() << "mDevices.size = " << building->mDevices.size();
+    DEBUG_LOG(m_logger) << "mDevices.size = " << building->mDevices.size();
     if (!building->mDevices.empty())
     {
       for (Device *d : building->mDevices)
@@ -1333,7 +1333,7 @@ void BuildingManager::updatePlayerPosition(const std::string &navmeshgrpname, dt
 
 osg::Vec3d BuildingManager::remapPosition(const Building &bd, const BuildingDisplay &dspl, const osg::Vec3d &world, int roomNumber)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " mFeatureId = " << bd.mFeatureId.c_str()
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " mFeatureId = " << bd.mFeatureId.c_str()
                       << ", roomNumber= " << roomNumber;
 
   if (roomNumber > 0)
@@ -1349,7 +1349,7 @@ osg::Vec3d BuildingManager::remapPosition(const Building &bd, const BuildingDisp
         if (level.mFloorId == floorOut)
         {
           const osg::Vec3d &l = world * bd.mWorldToLocal;
-          DEBUG_LOG() << Q_FUNC_INFO << " mFeatureId = " << bd.mFeatureId.c_str()
+          DEBUG_LOG(m_logger) << Q_FUNC_INFO << " mFeatureId = " << bd.mFeatureId.c_str()
                               << ", roomNumber= " << roomNumber
                               << ", floorOut= " << floorOut
                               << ", world.z()= " << world.z()
@@ -1369,7 +1369,7 @@ osg::Vec3d BuildingManager::remapPosition(const Building &bd, const BuildingDisp
     if (i == (numlevels - 1) || (dspl.mLevels[i + 1].mHeightAboveGround - 0.1f) > l[2]) 
     {
       const BuildingLevel &level = dspl.mLevels[i];
-      DEBUG_LOG() << Q_FUNC_INFO
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO
                           << " remapXPosition"
                           << ", l.z=" << l.z()
                           << ", i=" << i
@@ -1603,11 +1603,11 @@ dtEntity::EntityId BuildingManager::getWorldPlayerIdFromLocalPlayer(dtEntity::En
 
 void BuildingManager::removeShoot(int32_t id)
 {
-  DEBUG_LOG() << "removeShoot id=" << id;
+  DEBUG_LOG(m_logger) << "removeShoot id=" << id;
   QMutexLocker locker(&m_mutexShots);
   for (Building *bldg : mBuildings)
   {
-    DEBUG_LOG() << "Vorher: bldg->mShots.size()=" << bldg->mShots.size();
+    DEBUG_LOG(m_logger) << "Vorher: bldg->mShots.size()=" << bldg->mShots.size();
     auto it = std::remove_if(bldg->mShots.begin(), bldg->mShots.end(),
                              [id]( Shot *shot)
     {
@@ -1625,12 +1625,12 @@ void BuildingManager::removeShoot(int32_t id)
     bool wasRemoved = (it != bldg->mShots.end());
 
     bldg->mShots.erase(it, bldg->mShots.end());
-    DEBUG_LOG() << "Nachher: bldg->mShots.size()=" << bldg->mShots.size();
+    DEBUG_LOG(m_logger) << "Nachher: bldg->mShots.size()=" << bldg->mShots.size();
 
     if (wasRemoved)
       for (BuildingDisplay &dspl : bldg->mDisplays)
       {
-        DEBUG_LOG() << "wasRemoved id=" << id;
+        DEBUG_LOG(m_logger) << "wasRemoved id=" << id;
         updateShots(*bldg, dspl);
         dtEntity::GetWindowInterface()->RequestRedraw(dspl.mContextId);
       }
@@ -1694,13 +1694,13 @@ void BuildingManager::showShoot(int32_t id, dtEntity::EntityId shooter, dtEntity
         }
       }
       bldg->mShots.push_back(shot);
-      DEBUG_LOG() << "XXXX SIM TIME CREATED = " << QString::number(_simTimeCreated, 'f', 5) << " and SIM TIME IS " <<QString::number(dtEntity::GetSystemInterface()->GetSimulationTime(), 'f', 5);
+      DEBUG_LOG(m_logger) << "XXXX SIM TIME CREATED = " << QString::number(_simTimeCreated, 'f', 5) << " and SIM TIME IS " <<QString::number(dtEntity::GetSystemInterface()->GetSimulationTime(), 'f', 5);
 
       for (BuildingDisplay &bldgDispl : bldg->mDisplays)
       {
         ShotDisplay shotDispl;
         shotDispl.mShot = shot;
-        DEBUG_LOG() << "mShotDisplays.push_back id=" << shot->getId();
+        DEBUG_LOG(m_logger) << "mShotDisplays.push_back id=" << shot->getId();
         bldgDispl.mShotDisplays.push_back(std::move(shotDispl));
 
         updateShots(*bldg, bldgDispl);
@@ -1715,7 +1715,7 @@ void BuildingManager::showShoot(int32_t id, dtEntity::EntityId shooter, dtEntity
 
 void BuildingManager::updateShots(const Building &bd, BuildingDisplay &dspl)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " Building= " << bd.mWorldBuildingId;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " Building= " << bd.mWorldBuildingId;
 
   dtEntityOSG::CameraComponent *camcomp;
   if (!mEntityManager->GetComponent(dspl.mCameraId, camcomp))
@@ -1728,7 +1728,7 @@ void BuildingManager::updateShots(const Building &bd, BuildingDisplay &dspl)
 
   const double simTime = dtEntity::GetSystemInterface()->GetSimulationTime();
 
-  DEBUG_LOG() << Q_FUNC_INFO << " dspl.mShotDisplays.size()= " << dspl.mShotDisplays.size()
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " dspl.mShotDisplays.size()= " << dspl.mShotDisplays.size()
                       << ", simTime=" << (int)simTime;
 
   for (ShotDisplay &shotdspl :  dspl.mShotDisplays)
@@ -1754,7 +1754,7 @@ void BuildingManager::updateShots(const Building &bd, BuildingDisplay &dspl)
     if (shotdspl.mGeode)
       numParents = shotdspl.mGeode->getNumParents();
 
-    DEBUG_LOG() << Q_FUNC_INFO << " BB shotdspl.mShot->getId()= " << shotdspl.mShot->getId()
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " BB shotdspl.mShot->getId()= " << shotdspl.mShot->getId()
                         << ", shotdspl.mGeode=" << shotdspl.mGeode
                         << ", shotdspl.mGeode->getNumParents=" << numParents
                         << ", bDisplay=" << bDisplay;
@@ -1762,7 +1762,7 @@ void BuildingManager::updateShots(const Building &bd, BuildingDisplay &dspl)
     
     if ((!shotdspl.mGeode || shotdspl.mGeode->getNumParents() == 0) && bDisplay)
     {
-      DEBUG_LOG() << "NEW mGeode! id " << shotdspl.mShot->getId();
+      DEBUG_LOG(m_logger) << "NEW mGeode! id " << shotdspl.mShot->getId();
       if (!shotdspl.mGeode)
         shotdspl.mGeode = new osg::Geode();
 
@@ -1770,7 +1770,7 @@ void BuildingManager::updateShots(const Building &bd, BuildingDisplay &dspl)
       ss->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
       ss->setRenderBinDetails(240001, "RenderBin");
       osg::ref_ptr<osg::LineWidth> lw = new osg::LineWidth();
-      DEBUG_LOG() << "NEW LINE " << shotdspl.mShot->getLineType();
+      DEBUG_LOG(m_logger) << "NEW LINE " << shotdspl.mShot->getLineType();
 
       if (shotdspl.mShot->getLineType() < 2 )
       {
@@ -1806,7 +1806,7 @@ void BuildingManager::updateShots(const Building &bd, BuildingDisplay &dspl)
       shooterpos[2] += 1;
       targetpos[2] += 1;
 
-      DEBUG_LOG() << Q_FUNC_INFO << " shotdspl.mShot->getId()= " << shotdspl.mShot->getId()
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " shotdspl.mShot->getId()= " << shotdspl.mShot->getId()
                           << ", getShooterPos.z()=" << shotdspl.mShot->getShooterPos().z()
                           << ", BuildingIdSrc=" << shotdspl.mShot->getBuildingIdSrc() << ", RoomNumberSrc=" << shotdspl.mShot->getRoomNumberSrc()
                           << ", shooterpos=" << shooterpos
@@ -1906,16 +1906,16 @@ void BuildingManager::updateDevices(const Building &bd, BuildingDisplay &dspl)
 void BuildingManager::addDeviceToBuilding(dtEntity::EntityId iconmainid, dtEntity::EntityId buildingid,
                                           const osg::Vec3d &pos, const std::string &iconpath)
 {
-  DEBUG_LOG() << "addDeviceToBuilding";
+  DEBUG_LOG(m_logger) << "addDeviceToBuilding";
   for (Building *building : mBuildings)
   {
 
-    DEBUG_LOG() << "mWorldBuildingId=" << building->mWorldBuildingId
+    DEBUG_LOG(m_logger) << "mWorldBuildingId=" << building->mWorldBuildingId
                         << " buildingid=" << buildingid;
 
     if (building->mWorldBuildingId != buildingid)
       continue;
-    DEBUG_LOG() << "addDeviceToBuilding 1";
+    DEBUG_LOG(m_logger) << "addDeviceToBuilding 1";
 
     Device *device = new Device();
     device->mWorldPlayerId = iconmainid;
@@ -1923,10 +1923,10 @@ void BuildingManager::addDeviceToBuilding(dtEntity::EntityId iconmainid, dtEntit
     device->mPosition = pos;
     building->mDevices.push_back(device);
 
-    DEBUG_LOG() << "building->mDisplays.size=" << building->mDisplays.size();
+    DEBUG_LOG(m_logger) << "building->mDisplays.size=" << building->mDisplays.size();
     for (BuildingDisplay &dspl : building->mDisplays)
     {
-      DEBUG_LOG() << "addDeviceToBuilding 2";
+      DEBUG_LOG(m_logger) << "addDeviceToBuilding 2";
       DeviceDisplay dd;
       dd.mDevice = device;
       dd.mWorldPlayerId = iconmainid;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/buildingmanager.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/buildingmanager.h
index 1d24adbfd..66ea51a4a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/buildingmanager.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/buildingmanager.h
@@ -196,6 +196,7 @@ public:
   int32_t getId() const { return mId; }
 
 private:
+  NGL::INGLLogger &m_logger;
   int32_t mId;
   osg::Vec3d mShooterPos;
   osg::Vec3d mTargetPos;
@@ -424,6 +425,7 @@ public:
   void setCallbackCamPosChanged(const CallbackCamPosChanged &cb);
 
 private:
+  NGL::INGLLogger &m_logger;
   void updateShots(const Building &bd, BuildingDisplay &dspl);
   void updateDevices(const Building &bd, BuildingDisplay &dspl);
   void createRoomNames(dtEntity::EntityId buildingid, Building& building);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewerinterfaceimpl.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewerinterfaceimpl.h
index 18c7fa338..54d413045 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewerinterfaceimpl.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewerinterfaceimpl.h
@@ -308,6 +308,8 @@ public:
   }
 
 private:
+
+NGL::INGLLogger &m_logger;
   bool open(const std::string& strFeatureID, bool exactPos);
   bool open(const std::vector<std::string> &vecFeatureIDs, bool exactPos);
   bool openAll(bool exactPos);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_communication_interface_internal.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_communication_interface_internal.cpp
index 68b264232..80962c68b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_communication_interface_internal.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_communication_interface_internal.cpp
@@ -70,7 +70,7 @@ void CommunicationInterfaceInternal::playerPlace(int playerID, const LtsUtils::Q
   auto it = m_playerId2String.find(playerID);
   if (it == m_playerId2String.end())
   {
-    WARNING_LOG() << "Trying to set player position for unknown (=not created) player with id " << playerID;
+    WARNING_LOG(m_logger) << "Trying to set player position for unknown (=not created) player with id " << playerID;
     return;
   }
 
@@ -148,7 +148,7 @@ void CommunicationInterfaceInternal::playerHit(const int32_t id, int playerIdSrc
                                                int buildingIdSrc, int roomNumberSrc, int buildingIdDst, int roomNumberDst,
                                                int lineType, int64_t time)
 {
-  DEBUG_LOG() << "playerHit id= " << id;
+  DEBUG_LOG(m_logger) << "playerHit id= " << id;
   const std::string playerIdStrDst = m_playerId2String.value(playerIdDst);
   const std::string playerIdStrSrc = m_playerId2String.value(playerIdSrc);
   const VCtrl::Vec3d src(posSrc.x(), posSrc.y(), posSrc.z());
@@ -162,7 +162,7 @@ void CommunicationInterfaceInternal::playerHit(const int32_t id, int playerIdSrc
 
 void CommunicationInterfaceInternal::buildingHit(const int32_t id, int buildingId, int damagePercent, const QMap<int,int>& mapRoomDestructions)
 {
-  DEBUG_LOG() << "buildingHit for building " << buildingId
+  DEBUG_LOG(m_logger) << "buildingHit for building " << buildingId
                        << " id=" << id
                       << " damagePercent " << damagePercent
                       << " roomlist size: " << mapRoomDestructions.size();
@@ -181,12 +181,12 @@ void CommunicationInterfaceInternal::buildingHit(const int32_t id, int buildingI
     for (auto it = mapRoomDestructions.begin(); it != mapRoomDestructions.end(); ++it)
     {
       const int roomNumber = it.key();
-      DEBUG_LOG() << "BuildingId " << buildingId
+      DEBUG_LOG(m_logger) << "BuildingId " << buildingId
                           << ", room: "<< roomNumber
                           << ", destruction: " << it.value();
       std::string roomNumberStr = createRoomNumberString(roomNumber);
       if (!m_pviewerInterface->SetRoomDestructionValue(buildingIdStr, roomNumberStr,it.value() / 100.f))
-        ERROR_LOG() << "SetRoomDestructionValue failed for room "<< roomNumber;
+        ERROR_LOG(m_logger) << "SetRoomDestructionValue failed for room "<< roomNumber;
     }
   }
 }
@@ -201,7 +201,7 @@ void CommunicationInterfaceInternal::roomHit(const int32_t id, int playerIdSrc,
   const std::string roomNumberStrDst = createRoomNumberString(roomNumber);
   const VCtrl::Vec3d src(posSrc.x(), posSrc.y(), posSrc.z());
 
-  DEBUG_LOG() << "roomHit for building palyer " << playerIdStrSrc
+  DEBUG_LOG(m_logger) << "roomHit for building palyer " << playerIdStrSrc
                       << " building " << buildingIdStrDst
                       << " room " << roomNumberStrDst
                        << " id=" << id;
@@ -212,7 +212,7 @@ void CommunicationInterfaceInternal::roomHit(const int32_t id, int playerIdSrc,
 
 void CommunicationInterfaceInternal::removeRoomHit(const int32_t id)
 {
-  DEBUG_LOG() << "removeRoomHit id=" << id;
+  DEBUG_LOG(m_logger) << "removeRoomHit id=" << id;
   m_pviewerInterface->removeShoot(id);
 }
 
@@ -285,21 +285,21 @@ void CommunicationInterfaceInternal::systemSetMountingPoint(const Infrastructure
 
   if(!show)
   {
-    DEBUG_LOG() << "Hiding mounting point \"" << mountingPointName<< "\"";
+    DEBUG_LOG(m_logger) << "Hiding mounting point \"" << mountingPointName<< "\"";
     m_pviewerInterface->HideDeviceIcon(mountingPointName.toStdString());
     return;
   }
 
   if(m_deviceMap.contains(mountingPointName))
   {
-    WARNING_LOG() << "Trying to add a mounting point which was already added - trying to re-add";
+    WARNING_LOG(m_logger) << "Trying to add a mounting point which was already added - trying to re-add";
     
     m_pviewerInterface->HideDeviceIcon(mountingPointName.toStdString());
   }
 
   const VCtrl::Vec3d position(x,y,z);
   if(m_pviewerInterface->ShowDeviceIcon(mountingPointName.toStdString(), buildingIdStr, position, filename.toStdString())) {
-    DEBUG_LOG() << "Added mounting point to scene: " << mountingPointName;
+    DEBUG_LOG(m_logger) << "Added mounting point to scene: " << mountingPointName;
     m_deviceMap[mountingPointName] = DeviceInfo(buildingId, mountingPointName);
   }
 }
@@ -333,7 +333,7 @@ void CommunicationInterfaceInternal::excDeleteBuildingList()
 
 void CommunicationInterfaceInternal::excSetHitlineDuration(uint32_t duration_s)
 {
-  DEBUG_LOG() << "excSetHitlineDuration=" << duration_s;
+  DEBUG_LOG(m_logger) << "excSetHitlineDuration=" << duration_s;
   m_pviewerInterface->setHitLineDuration(duration_s);
 }
 
@@ -451,7 +451,7 @@ void CommunicationInterfaceInternal::clearCameras()
     if (!di.deviceName.startsWith(QLatin1String("Camera")))
       continue;
     if (!m_pviewerInterface->HideDeviceIcon(di.deviceName.toStdString()))
-      ERROR_LOG() << "Could not remove camera with id " << di.deviceName;
+      ERROR_LOG(m_logger) << "Could not remove camera with id " << di.deviceName;
   }
   m_deviceMap.clear();
 }
@@ -497,10 +497,10 @@ void CommunicationInterfaceInternal::PlayerPicked(const std::string &strId)
     
     QString str = QString::fromStdString(strId);
     int structureElementId = str.remove(0, str.lastIndexOf(QStringLiteral("_")) + 1).toInt();
-    INFO_LOG() << "Picked mounting point with id " << strId
+    INFO_LOG(m_logger) << "Picked mounting point with id " << strId
                        << " mountingPointId="  << structureElementId;
     if(structureElementId < 0) {
-      WARNING_LOG() << "Picked mounting point with id " << strId;
+      WARNING_LOG(m_logger) << "Picked mounting point with id " << strId;
       return;
     }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_communication_interface_internal.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_communication_interface_internal.h
index b9b6b9a29..a4af78bf7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_communication_interface_internal.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_communication_interface_internal.h
@@ -137,6 +137,8 @@ Q_SIGNALS:
 
 private:
   
+
+NGL::INGLLogger &m_logger;
   void clearCameras();
   QHash<QString, DeviceInfo> m_deviceMap;
 
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 d7992c5c5..bbe2d53bf 100755
--- 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
@@ -182,7 +182,7 @@ QString BgViewerController::buildingModelPath()
 
 void BgViewerController::clearInterfaces(const LtsSession::DdsConnectionParams &conParams)
 {
-  DEBUG_LOG() << "BgViewerControllerSingleton::clearInterfaces()";
+  DEBUG_LOG(m_logger) << "BgViewerControllerSingleton::clearInterfaces()";
   if (m_pBgViewerDDSController && m_currentDdsConnParams == conParams)
   {
     m_pBgViewerDDSController->uninitialize();
@@ -219,13 +219,13 @@ PluginProvider *BgViewerController::activeSession() const
 
 bool BgViewerController::init(PluginProvider *pSession, bool bStartRendering, const QString &modelPath)
 {
-  DEBUG_LOG() << "getDdsController init: " << pSession->toString();
+  DEBUG_LOG(m_logger) << "getDdsController init: " << pSession->toString();
 
   if (m_currentDdsConnParams == pSession->connParams())
   {
     if (m_initExerciseWasSuccessful)
     {
-      DEBUG_LOG() << "BgViewerControllerSingleton::init Already initialized";
+      DEBUG_LOG(m_logger) << "BgViewerControllerSingleton::init Already initialized";
       slotLoadBuilding();
 
       
@@ -251,7 +251,7 @@ bool BgViewerController::forceInit(PluginProvider *pSession)
   delete m_pBgViewerDDSController;
   m_pBgViewerDDSController = new BuildingViewerDdsController(m_comIfc, m_viewerInterface);
 
-  DEBUG_LOG() << "FORCE INIT! with " << pSession;
+  DEBUG_LOG(m_logger) << "FORCE INIT! with " << pSession;
   return (m_pBgViewerDDSController->init(m_bgViewerBaseLayoutWidget, buildingModelPath(), pSession));
 
 }
@@ -281,11 +281,11 @@ void BgViewerController::showBgViewerInfoMessageBox()
 
 bool BgViewerController::startBgViewerAppInSession(PluginProvider* pStartingSession)
 {
-  DEBUG_LOG() << std::hex << this << " startBgViewerAppInSession " << (m_currentDdsConnParams == pStartingSession->connParams());
+  DEBUG_LOG(m_logger) << std::hex << this << " startBgViewerAppInSession " << (m_currentDdsConnParams == pStartingSession->connParams());
 
   if (m_bgvApp && (m_currentDdsConnParams == pStartingSession->connParams()))
   {
-    INFO_LOG() << std::hex << this << " BuildingViewer already opened. Doing nothing...";
+    INFO_LOG(m_logger) << std::hex << this << " BuildingViewer already opened. Doing nothing...";
     return true;
   }
 
@@ -298,7 +298,7 @@ bool BgViewerController::startBgViewerAppInSession(PluginProvider* pStartingSess
 
   if (m_bgvApp)
   {
-    DEBUG_LOG() << std::hex << this << " Releasing m_bgvApp";
+    DEBUG_LOG(m_logger) << std::hex << this << " Releasing m_bgvApp";
     delete m_bgvApp;
     m_bgvApp = nullptr;
 
@@ -310,7 +310,7 @@ bool BgViewerController::startBgViewerAppInSession(PluginProvider* pStartingSess
   m_bgvApp = LtsAppManager::LtsAppManager::getInstance()->createApp(LtsAppDescriptor::App::BuildingViewer, pStartingSession->connParams());
   if (!m_bgvApp || !m_bgvApp->sessions().size())
   {
-    ERROR_LOG() << std::hex << this << " m_bgvApp is nullptr or has no associated session!";
+    ERROR_LOG(m_logger) << std::hex << this << " m_bgvApp is nullptr or has no associated session!";
     return false;
   }
 
@@ -335,7 +335,7 @@ bool BgViewerController::startBgViewerAppInSession(PluginProvider* pStartingSess
   connect(m_bgvApp, &LtsPluginManager::LtsPluginManager::destroyed,
           this, [this]()
   {
-    DEBUG_LOG() << std::hex << this << " LtsPluginManager destroyed m_bgvApp";
+    DEBUG_LOG(m_logger) << std::hex << this << " LtsPluginManager destroyed m_bgvApp";
     m_tickTimer->stop();
     clearInterfaces(m_currentDdsConnParams);
     m_comIfc->excCloseAllViews();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_controller.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_controller.h
index 592a5302c..6b210c18a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_controller.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_controller.h
@@ -102,6 +102,8 @@ private slots:
   void slotWidgetReleased();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void showBgViewerInfoMessageBox();
 
 private:
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 7850a4e5e..1bebf5e9f 100755
--- 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
@@ -35,10 +35,9 @@ static inline QString gStrSymbolFolderPath()
   return QDir::tempPath() + QStringLiteral("/excon_bgviewer_symbols/");
 }
 
-BuildingViewerDdsController::BuildingViewerDdsController(CommunicationInterfaceInternal *connection, VCtrl::ViewerInterface* viewerInterface)
-  : m_connection(connection)
-  , m_viewerInterface(viewerInterface)
-{}
+BuildingViewerDdsController::BuildingViewerDdsController(CommunicationInterfaceInternal *connection, VCtrl::ViewerInterface* viewerInterface) : m_connection(connection)
+  , m_viewerInterface(viewerInterface),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 
 BuildingViewerDdsController::~BuildingViewerDdsController()
@@ -52,7 +51,7 @@ BuildingViewerDdsController::~BuildingViewerDdsController()
 
 bool BuildingViewerDdsController::init(QWidget *irreplacableWidget, const QString &modelPath, PluginProvider *session)
 {
-  DEBUG_LOG() << "BDV:: init";
+  DEBUG_LOG(m_logger) << "BDV:: init";
   m_session = session;
   m_irreplacableWidget = irreplacableWidget;
   
@@ -61,7 +60,7 @@ bool BuildingViewerDdsController::init(QWidget *irreplacableWidget, const QStrin
 
   if (!m_session)
   {
-    ERROR_LOG() << "No m_session for BuildingViewerController!";
+    ERROR_LOG(m_logger) << "No m_session for BuildingViewerController!";
     return false;
   }
 
@@ -71,7 +70,7 @@ bool BuildingViewerDdsController::init(QWidget *irreplacableWidget, const QStrin
     {
       
       m_session = nullptr;
-      DEBUG_LOG() << getSessionInfo() << "BDV:: BuildingViewerDdsController: m_session has been destroyed!";
+      DEBUG_LOG(m_logger) << getSessionInfo() << "BDV:: BuildingViewerDdsController: m_session has been destroyed!";
       stopAndClearTimer();
       uninitialize();
     }
@@ -80,35 +79,35 @@ bool BuildingViewerDdsController::init(QWidget *irreplacableWidget, const QStrin
   m_asbIfc = session->asbIfc();
   if (!m_asbIfc)
   {
-    ERROR_LOG() << "Fetching 'm_asbIfc' failed!";
+    ERROR_LOG(m_logger) << "Fetching 'm_asbIfc' failed!";
     return false;
   }
 
   m_bldDtc = session->bldDtc();
   if (!m_bldDtc)
   {
-    ERROR_LOG() << "Fetching 'm_bldDtc' failed!";
+    ERROR_LOG(m_logger) << "Fetching 'm_bldDtc' failed!";
     return false;
   }
 
   m_ismDtc = session->ismDtc();
   if (!m_ismDtc)
   {
-    ERROR_LOG() << "Fetching 'm_ismDtc' failed!";
+    ERROR_LOG(m_logger) << "Fetching 'm_ismDtc' failed!";
     return false;
   }
 
   m_pdmDtc = session->pdmDtc();
   if (!m_pdmDtc)
   {
-    ERROR_LOG() << "Fetching 'm_pdmDtc' failed!";
+    ERROR_LOG(m_logger) << "Fetching 'm_pdmDtc' failed!";
     return false;
   }
 
   m_ismIfc = session->ismDataIfc();
   if (!m_ismIfc)
   {
-    WARNING_LOG() << "Fetching 'm_ismIfc' failed!";
+    WARNING_LOG(m_logger) << "Fetching 'm_ismIfc' failed!";
     return false;
   }
   connect(m_ismIfc.get(), &InfrastructureManagement::ForeignDataInterface::mountingPointChanged,
@@ -132,7 +131,7 @@ bool BuildingViewerDdsController::init(QWidget *irreplacableWidget, const QStrin
 
   if (!dir.mkpath(QStringLiteral(".")))
   {
-    ERROR_LOG() << getSessionInfo() << "Could not create path \"" << gStrSymbolFolderPath() << "\" which is required to store BgViewer symbol files!";
+    ERROR_LOG(m_logger) << getSessionInfo() << "Could not create path \"" << gStrSymbolFolderPath() << "\" which is required to store BgViewer symbol files!";
     return false;
   }
 
@@ -140,7 +139,7 @@ bool BuildingViewerDdsController::init(QWidget *irreplacableWidget, const QStrin
   connect(m_connection, &CommunicationInterfaceInternal::signalAssetPicked, this, &BuildingViewerDdsController::onAssetPicked, Qt::UniqueConnection);
   connect(m_connection, &CommunicationInterfaceInternal::signalBgViewerInitFinished, this, &BuildingViewerDdsController::onBgViewerInitFinished, Qt::UniqueConnection);
 
-  INFO_LOG() << getSessionInfo() << "BuildingViewerDdsController::init: The order of the following output must be [1],[2],[3],[4],[5],[6]";
+  INFO_LOG(m_logger) << getSessionInfo() << "BuildingViewerDdsController::init: The order of the following output must be [1],[2],[3],[4],[5],[6]";
 
   
 
@@ -169,10 +168,10 @@ bool BuildingViewerDdsController::init(QWidget *irreplacableWidget, const QStrin
 
 void BuildingViewerDdsController::onBgViewerInitFinished()
 {
-  DEBUG_LOG() << "onBgViewerInitFinished";
+  DEBUG_LOG(m_logger) << "onBgViewerInitFinished";
 
-  INFO_LOG() << getSessionInfo() << "[2] Training area initialization acknowledged by BgViewer";
-  INFO_LOG() << getSessionInfo() << "[3] Sending mounting points, teams, ..., to BgViewer";
+  INFO_LOG(m_logger) << getSessionInfo() << "[2] Training area initialization acknowledged by BgViewer";
+  INFO_LOG(m_logger) << getSessionInfo() << "[3] Sending mounting points, teams, ..., to BgViewer";
 
   if (!m_pSimTimeSyncTimer)
   {
@@ -192,7 +191,7 @@ void BuildingViewerDdsController::onBgViewerInitFinished()
   const bool useExactPositioning = ps->value(QStringLiteral("bld"), QStringLiteral("useExactPositioning")).toBool();
   m_connection->excUseExactPositioning(useExactPositioning);
 
-  INFO_LOG() << getSessionInfo() << "[4] Getting building DDS data ('mainStructureElements')";
+  INFO_LOG(m_logger) << getSessionInfo() << "[4] Getting building DDS data ('mainStructureElements')";
   connect(m_ismDtc.get(), &InfrastructureManagement::Interface::Dtc::mainStructureElementChanged,
           this, &BuildingViewerDdsController::onMainStructureElementChanged);
   
@@ -200,17 +199,17 @@ void BuildingViewerDdsController::onBgViewerInitFinished()
   {
     onMainStructureElementChanged(data, DataModification::eAdded);
   });
-  INFO_LOG() << getSessionInfo() << "\t[4.1] Done";
+  INFO_LOG(m_logger) << getSessionInfo() << "\t[4.1] Done";
 
-  INFO_LOG() << getSessionInfo() << "[5] Creating participants";
+  INFO_LOG(m_logger) << getSessionInfo() << "[5] Creating participants";
   
   createParticipants();
-  INFO_LOG() << getSessionInfo() << "\t[5.1] Done";
-  INFO_LOG() << getSessionInfo() << "[5] Creating Booby Trap";
+  INFO_LOG(m_logger) << getSessionInfo() << "\t[5.1] Done";
+  INFO_LOG(m_logger) << getSessionInfo() << "[5] Creating Booby Trap";
   createBoobyTraps();
-  INFO_LOG() << getSessionInfo() << "\t[5.2] Done";
+  INFO_LOG(m_logger) << getSessionInfo() << "\t[5.2] Done";
 
-  INFO_LOG() << getSessionInfo() << "[6] Getting building DDS data ('buildingStates')";
+  INFO_LOG(m_logger) << getSessionInfo() << "[6] Getting building DDS data ('buildingStates')";
   connect(m_bldDtc.get(), &Buildings::Interface::Dtc::buildingStateChanged,
           this, &BuildingViewerDdsController::onBuildingStateChanged, Qt::UniqueConnection);
   m_bldDtc->buildingStates([this](const Buildings::BuildingState & data)
@@ -219,7 +218,7 @@ void BuildingViewerDdsController::onBgViewerInitFinished()
   });
   connect(m_bldDtc.get(), &Buildings::Interface::Dtc::buildingHitLineInfoChanged,
           this, &BuildingViewerDdsController::onBuildingHitLineInfoChanged, Qt::UniqueConnection);
-  INFO_LOG() << getSessionInfo() << "\t[6.1] Done";
+  INFO_LOG(m_logger) << getSessionInfo() << "\t[6.1] Done";
 
   
   m_connection->excSetGlobalTransparency(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("BgViewer"), QStringLiteral("GlobalTransparency"), 75).toInt() );
@@ -259,7 +258,7 @@ void BuildingViewerDdsController::onBgViewerInitFinished()
   }
   m_pBuildingHitlineCleanupTimer->start();
 
-  INFO_LOG() << getSessionInfo() << "[7] Emitting 'signalDdsInitFinished'";
+  INFO_LOG(m_logger) << getSessionInfo() << "[7] Emitting 'signalDdsInitFinished'";
   m_ddsInitFinished = true;
   emit signalDdsInitFinished();
   onSynchronizeSimulationTime();
@@ -269,7 +268,7 @@ void BuildingViewerDdsController::onBgViewerInitFinished()
 
 void BuildingViewerDdsController::stopAndClearTimer()
 {
-  DEBUG_LOG() << "stopAndClearTimer";
+  DEBUG_LOG(m_logger) << "stopAndClearTimer";
 
   if (m_pFireEventFlashTimer)
     m_pFireEventFlashTimer->stop();
@@ -284,15 +283,15 @@ void BuildingViewerDdsController::stopAndClearTimer()
 
 void BuildingViewerDdsController::uninitialize()
 {
-  DEBUG_LOG() << "uninitialize";
+  DEBUG_LOG(m_logger) << "uninitialize";
   if (!m_bldDtc)  
     return;
   
 
   if (m_ddsInitFinished)
-    DEBUG_LOG() << "Flag 'm_ddsInitFinished' set which means that initialization had been finished completely";
+    DEBUG_LOG(m_logger) << "Flag 'm_ddsInitFinished' set which means that initialization had been finished completely";
   else
-    WARNING_LOG() << "Flag 'm_ddsInitFinished' has not been set within timeout value, forcing quit!";
+    WARNING_LOG(m_logger) << "Flag 'm_ddsInitFinished' has not been set within timeout value, forcing quit!";
 
   stopAndClearTimer();
 
@@ -321,7 +320,7 @@ void BuildingViewerDdsController::uninitialize()
   m_ddsInitFinished = false;
   m_buildingHeight.clear();
 
-  DEBUG_LOG() << "BuildingViewerDdsController::uninitialize() finished";
+  DEBUG_LOG(m_logger) << "BuildingViewerDdsController::uninitialize() finished";
 }
 
 QPointF BuildingViewerDdsController::toRelativePosition(const Core::GeoPosition &geoPos) const
@@ -344,7 +343,7 @@ LtsUtils::QPoint3D BuildingViewerDdsController::toRelative3D(const Core::GeoPosi
 
 bool BuildingViewerDdsController::clear()
 {
-  DEBUG_LOG() << "clear m_connection->playerClear();";
+  DEBUG_LOG(m_logger) << "clear m_connection->playerClear();";
   m_connection->playerClear();
   return true;
 }
@@ -354,7 +353,7 @@ bool BuildingViewerDdsController::syncTeams()
 {
   if (!m_ppmDtc)
     return false;
-  INFO_LOG() << "BuildingViewerDdsController::syncTeams";
+  INFO_LOG(m_logger) << "BuildingViewerDdsController::syncTeams";
 
   m_connection->setTeamConfiguration(m_ppmDtc->partys());
   return true;
@@ -386,7 +385,7 @@ bool BuildingViewerDdsController::calcBaseCoordinate(const QMap<qint32, Infrastr
   }
   if (!bAtLeasOneFound)
   {
-    WARNING_LOG() << "No building available in exercise " << m_exerciseId;
+    WARNING_LOG(m_logger) << "No building available in exercise " << m_exerciseId;
     return false;
   }
   m_baseCoordinate = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPosition.lon(), geoPosition.lat());
@@ -405,7 +404,7 @@ bool BuildingViewerDdsController::writeBuildingDataToXML(const QString &modelPat
   QFile f(getBuildingConfigurationXml());
   if (!f.open(QIODevice::WriteOnly))
   {
-    WARNING_LOG() << "Can not open file " << f.fileName() << " for writing: " << f.errorString();
+    WARNING_LOG(m_logger) << "Can not open file " << f.fileName() << " for writing: " << f.errorString();
     return false;
   }
   m_knownBuildings.clear();
@@ -416,7 +415,7 @@ bool BuildingViewerDdsController::writeBuildingDataToXML(const QString &modelPat
   if (!jsonConfig.exists())
     jsonConfig.setFileName(modelPath + QStringLiteral("/../buildings.json"));
 
-  DEBUG_LOG() << "jsonConfig:" << jsonConfig.fileName();
+  DEBUG_LOG(m_logger) << "jsonConfig:" << jsonConfig.fileName();
   if (jsonConfig.exists() && jsonConfig.open(QIODevice::ReadOnly))
   {
     m_ismDtc->disconnect(this); 
@@ -444,17 +443,17 @@ bool BuildingViewerDdsController::writeBuildingDataToXML(const QString &modelPat
         continue;
       if (!m_ismDtc->isElementAssignedToExercise(mse, m_exerciseId))
       {
-        DEBUG_LOG() << "Not writing mse with id " << mse.id() << " to building xml file since it is not assigned to the current exercise which has id " << m_exerciseId;
+        DEBUG_LOG(m_logger) << "Not writing mse with id " << mse.id() << " to building xml file since it is not assigned to the current exercise which has id " << m_exerciseId;
         continue;
       }
       mseMap.insert(mse.id(), mse);
     }
   }
-  INFO_LOG() << getSessionInfo() << "writeBuildingDataToXML(): Identified Main Structure Elements: " << mseMap.size();
+  INFO_LOG(m_logger) << getSessionInfo() << "writeBuildingDataToXML(): Identified Main Structure Elements: " << mseMap.size();
 
   if (!calcBaseCoordinate(mseMap))
   {
-    WARNING_LOG() << "failed to calc base coordinate";
+    WARNING_LOG(m_logger) << "failed to calc base coordinate";
     return false;
   }
 
@@ -530,7 +529,7 @@ QString BuildingViewerDdsController::getBuildingConfigurationXml() const
 
 void BuildingViewerDdsController::clearAssets()
 {
-  INFO_LOG() << "clearAssets: Removing " <<  m_knownAssetsInBgViewer.size() << " assets";
+  INFO_LOG(m_logger) << "clearAssets: Removing " <<  m_knownAssetsInBgViewer.size() << " assets";
 
   for (const auto &strUniqueAsset : std::as_const(m_knownAssetsInBgViewer))
     m_connection->extHideMountingPointAsset(strUniqueAsset);
@@ -635,13 +634,13 @@ void BuildingViewerDdsController::handleMountingPoint(const InfrastructureManage
   QString strfeatureID = BuildingViewer::databaseId2FeatureId(mp.buildingId());
   QString strMountingPointID = strfeatureID + QStringLiteral("_MountingPoint_") + QString::number(mountingPointId);
 
-  DEBUG_LOG() << "Sending asset for building id " << mp.buildingId() << " ("<<strfeatureID<<")"
+  DEBUG_LOG(m_logger) << "Sending asset for building id " << mp.buildingId() << " ("<<strfeatureID<<")"
                       << " with asset_id " << mp.associatedAssetId()
                       << " matched to structure_element_id " << mp.id() << " as \"" << strMountingPointID <<" \""
                       << " with asset type \"" << strAssetType << "\"";
 
   if (m_mountingPointId2AssetType.contains(mountingPointId))
-    WARNING_LOG() << "Mounting point id " << mountingPointId << " already used for other asset?! Overriding...";
+    WARNING_LOG(m_logger) << "Mounting point id " << mountingPointId << " already used for other asset?! Overriding...";
 
   m_mountingPointId2AssetType[mountingPointId] = assetType;
   m_knownAssetsInBgViewer[mountingPointId] = strMountingPointID;
@@ -653,24 +652,24 @@ void BuildingViewerDdsController::setCurrentTrainingAreaMap(const QString &model
 {
   if (!m_connection)
   {
-    WARNING_LOG() << "BuildingViewerDdsController::setCurrentTrainingAreaMap: (!m_connection)";
+    WARNING_LOG(m_logger) << "BuildingViewerDdsController::setCurrentTrainingAreaMap: (!m_connection)";
     return;
   }
 
   
   m_connection->excDeleteBuildingList();
 
-  INFO_LOG() << getSessionInfo() << "[1] Initializing BgViewer with training area...";
+  INFO_LOG(m_logger) << getSessionInfo() << "[1] Initializing BgViewer with training area...";
 
   if (modelPath.isEmpty())
   {
     QString strErr = tr("Error initializing Building Viewer - can not find map directory.");
-    DEBUG_LOG() << getSessionInfo() << "setCurrentTrainingAreaMap: " << strErr;
+    DEBUG_LOG(m_logger) << getSessionInfo() << "setCurrentTrainingAreaMap: " << strErr;
     QWidget *parentWidgetx = (m_viewerInterface ? m_viewerInterface->getMainWindow() : nullptr);
     LtsWidgets::LtsMessageDialog::showMessage(parentWidgetx, strErr, tr("Error"));
     return;
   }
-  INFO_LOG() << "Map path for building viewer: " << modelPath;
+  INFO_LOG(m_logger) << "Map path for building viewer: " << modelPath;
 
   writeBuildingDataToXML(modelPath);
 
@@ -715,14 +714,14 @@ bool BuildingViewerDdsController::isValidParticipant(const ParticipantManagement
   if (participant.id() == 0)
   {
     if (m_logger.isDebugEnabled())
-      DEBUG_LOG() << getSessionInfo() << "isValidParticipant: Not handling invalid participant with invalid id (0)";
+      DEBUG_LOG(m_logger) << getSessionInfo() << "isValidParticipant: Not handling invalid participant with invalid id (0)";
     return false;
   }
 
   
   if (participant.isDeleted())
   {
-    DEBUG_LOG() << getSessionInfo() << "isValidParticipant: Not handling participant with id "
+    DEBUG_LOG(m_logger) << getSessionInfo() << "isValidParticipant: Not handling participant with id "
                         << participant.id() << " since it is marked as 'deleted'";
     return false;
   }
@@ -733,7 +732,7 @@ bool BuildingViewerDdsController::isValidParticipant(const ParticipantManagement
   
   if (!m_session->isVisibleParty(participant.partyId()))
   {
-    DEBUG_LOG() << getSessionInfo() << "isValidParticipant: Not handling participant with id "
+    DEBUG_LOG(m_logger) << getSessionInfo() << "isValidParticipant: Not handling participant with id "
                         << participant.id() << " since it is not visible for party with id " << participant.partyId();
     return false;
   }
@@ -746,7 +745,7 @@ bool BuildingViewerDdsController::isValidParticipant(const ParticipantManagement
   if(tc == ParticipantManagement::TypeClass_def::SupportUnit ||
      tc == ParticipantManagement::TypeClass_def::Unit)
   {
-    DEBUG_LOG() << getSessionInfo() << "isValidParticipant: Not handling participant with id "
+    DEBUG_LOG(m_logger) << getSessionInfo() << "isValidParticipant: Not handling participant with id "
                         << participant.id() << " since its type is 'SupportUnit', 'Unit' or 'Structure'";
     return false;
   }
@@ -758,7 +757,7 @@ void BuildingViewerDdsController::createBoobyTraps()
 {
   if (!m_aesDtc)
     return;
-  DEBUG_LOG() << "BDV:: create Booby Traps: "<< m_session->exerciseId() << " is replay: " << m_session->isReplayPartition();
+  DEBUG_LOG(m_logger) << "BDV:: create Booby Traps: "<< m_session->exerciseId() << " is replay: " << m_session->isReplayPartition();
 
   m_aesDtc->enableBoobyTrap();
 
@@ -787,7 +786,7 @@ void BuildingViewerDdsController::createParticipants()
 {
   if (!m_ppmDtc)
     return;
-  DEBUG_LOG() << "BDV:: create participants: "<< m_session->exerciseId() << " is replay: " << m_session->isReplayPartition();
+  DEBUG_LOG(m_logger) << "BDV:: create participants: "<< m_session->exerciseId() << " is replay: " << m_session->isReplayPartition();
 
   const int sizeL = LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("BgViewer"), QStringLiteral("PlayerSymbolSize"), 20).toInt();
 
@@ -906,11 +905,11 @@ void BuildingViewerDdsController::onDynParticipantChanged(const ParticipantManag
 
 void BuildingViewerDdsController::onHitLineInfoChanged(const ParticipantManagement::HitLineInfo &hli, DataModification modType)
 {
-  DEBUG_LOG() << "X 0000 onHitLineInfoChanged id=" << hli.id();
+  DEBUG_LOG(m_logger) << "X 0000 onHitLineInfoChanged id=" << hli.id();
 
   if (modType == DataModification::eRemoved)
   {
-    DEBUG_LOG() << "onHitLineInfoChanged removeHit id=" << hli.id();
+    DEBUG_LOG(m_logger) << "onHitLineInfoChanged removeHit id=" << hli.id();
     m_connection->removeRoomHit(hli.id());
     return;
   }
@@ -923,14 +922,14 @@ void BuildingViewerDdsController::onHitLineInfoChanged(const ParticipantManageme
   const ParticipantManagement::Participant &partDst = m_ppmDtc->participant(hli.injuryParticipantId());
   if (partSrc.id() == 0 || partDst.id() == 0)
   {
-    ERROR_LOG() << "no knownn part: " << partSrc.id() << " dst: " << partDst.id();
+    ERROR_LOG(m_logger) << "no knownn part: " << partSrc.id() << " dst: " << partDst.id();
     return;
   }
 
   const QString &strFeatureID = BuildingViewer::databaseId2FeatureId(hli.injuryBuildingId());
   if (!m_viewerInterface->isViewOpen(strFeatureID.toStdString()))
   {
-    DEBUG_LOG() << "building not opened:  hli.buildingId()=" << hli;
+    DEBUG_LOG(m_logger) << "building not opened:  hli.buildingId()=" << hli;
     return;
   }
   
@@ -946,14 +945,14 @@ void BuildingViewerDdsController::onHitLineInfoChanged(const ParticipantManageme
     {
       const QVector<BuildingHit> &bHits = itBuildingHit.value();
       
-      DEBUG_LOG() << "Got Hit lines to add? " << bHits.size();
+      DEBUG_LOG(m_logger) << "Got Hit lines to add? " << bHits.size();
       for (const BuildingHit &bh : bHits)
       {
 
         const bool testFlag = (bh.chargeTypeId == hli.chargeTypeId() &&
                                bh.originatorParticipantId == hli.originatorParticipantId() &&
                                hli.sampleTime() - m_hitlineDuration_ms < bh.sampleTime);
-        DEBUG_LOG() << "testFlag " << testFlag;
+        DEBUG_LOG(m_logger) << "testFlag " << testFlag;
 
 
         if (bh.chargeTypeId == hli.chargeTypeId() &&
@@ -964,10 +963,10 @@ void BuildingViewerDdsController::onHitLineInfoChanged(const ParticipantManageme
     }
   }
 
-  DEBUG_LOG() << "onHitLineInfoChanged: " << hli;
+  DEBUG_LOG(m_logger) << "onHitLineInfoChanged: " << hli;
 
   int sizeL = LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("BgViewer"), QStringLiteral("PlayerSymbolSize"), 20).toInt();
-  DEBUG_LOG() << "onHitLineInfoChanged createPlayerSymbols";
+  DEBUG_LOG(m_logger) << "onHitLineInfoChanged createPlayerSymbols";
   createPlayerSymbols(partDst, sizeL);
 
 
@@ -975,7 +974,7 @@ void BuildingViewerDdsController::onHitLineInfoChanged(const ParticipantManageme
   LtsUtils::QPoint3D originatorSrc = toRelative3D(hli.originatorPos());
   LtsUtils::QPoint3D injuryDest = toRelative3D(hli.injuryPos());
 
-  DEBUG_LOG() << "onHitLineInfoChanged playerHit"
+  DEBUG_LOG(m_logger) << "onHitLineInfoChanged playerHit"
                       << " hli.originatorPos() z=" << hli.originatorPos().z()
                       << " hli.injuryPos() z=" <<hli.injuryPos().z()
                       << " Src=" << originatorSrc.x() << "/" << originatorSrc.y() << "/" << originatorSrc.z()
@@ -986,7 +985,7 @@ void BuildingViewerDdsController::onHitLineInfoChanged(const ParticipantManageme
                       << " hli.injuryRoomId=" << hli.injuryRoomId();
   
   
-  DEBUG_LOG() << "Before z-correction:"
+  DEBUG_LOG(m_logger) << "Before z-correction:"
                       << " Src=" << originatorSrc.x() << "/" << originatorSrc.y() << "/" << originatorSrc.z()
                       << " Dest= " << injuryDest.x() << "/" << injuryDest.y() << "/" << injuryDest.z();
 
@@ -999,8 +998,8 @@ void BuildingViewerDdsController::onHitLineInfoChanged(const ParticipantManageme
   
   double zAddOriginator = m_buildingHeight.value(hli.originatorBuildingId(), 0);
   double zAddInjury = m_buildingHeight.value(hli.injuryBuildingId(), 0);
-  DEBUG_LOG() << "z-correction: zAddOriginator=" << zAddOriginator;
-  DEBUG_LOG() << "z-correction: zAddInjury=" << zAddInjury;
+  DEBUG_LOG(m_logger) << "z-correction: zAddOriginator=" << zAddOriginator;
+  DEBUG_LOG(m_logger) << "z-correction: zAddInjury=" << zAddInjury;
 
   if (hli.originatorBuildingId() <= 0)  
     zAddOriginator = zAddInjury;        
@@ -1011,7 +1010,7 @@ void BuildingViewerDdsController::onHitLineInfoChanged(const ParticipantManageme
   originatorSrc.setZ(originatorSrc.z() + zAddInjury);
   injuryDest.setZ(injuryDest.z() + zAddInjury);
 
-  DEBUG_LOG() << "After z-correction:"
+  DEBUG_LOG(m_logger) << "After z-correction:"
                       << " Src=" << originatorSrc.x() << "/" << originatorSrc.y() << "/" << originatorSrc.z()
                       << " Dest= " << injuryDest.x() << "/" << injuryDest.y() << "/" << injuryDest.z();
 
@@ -1033,7 +1032,7 @@ void BuildingViewerDdsController::onHitLineInfoChanged(const ParticipantManageme
         roomNumberSrc = itRoom.value();
       }
       else
-        WARNING_LOG() << "onHitLineInfoChanged: Room id can not be mapped! Building id: " << hli.injuryBuildingId()<<", originatorRoomId: "<< hli.originatorRoomId();
+        WARNING_LOG(m_logger) << "onHitLineInfoChanged: Room id can not be mapped! Building id: " << hli.injuryBuildingId()<<", originatorRoomId: "<< hli.originatorRoomId();
     }
   }
 
@@ -1051,11 +1050,11 @@ void BuildingViewerDdsController::onHitLineInfoChanged(const ParticipantManageme
         roomNumberDst = itRoom.value();
       }
       else
-        WARNING_LOG() << "onHitLineInfoChanged: Room id can not be mapped! Building id: " << hli.injuryBuildingId()<<", room id: "<< hli.injuryRoomId();
+        WARNING_LOG(m_logger) << "onHitLineInfoChanged: Room id can not be mapped! Building id: " << hli.injuryBuildingId()<<", room id: "<< hli.injuryRoomId();
     }
   }
 
-  DEBUG_LOG() << "After translate buildingId, roomId:"
+  DEBUG_LOG(m_logger) << "After translate buildingId, roomId:"
                       << " hli.originatorBuildingId=" << hli.originatorBuildingId() << " -> " << buildingIdSrc
                       << " hli.originatorRoomId=" << hli.originatorRoomId() << " -> " << roomNumberSrc
                       << " hli.injuryBuildingId=" << hli.injuryBuildingId() << " -> " << buildingIdDst
@@ -1097,7 +1096,7 @@ void BuildingViewerDdsController::onPositionChanged(const ParticipantManagement:
     return;
   }
 
-  DEBUG_LOG() << "onPositionChanged: " << position;
+  DEBUG_LOG(m_logger) << "onPositionChanged: " << position;
 
   
   
@@ -1117,7 +1116,7 @@ void BuildingViewerDdsController::onPositionChanged(const ParticipantManagement:
     }
     else
     {
-      WARNING_LOG() << "onPositionChanged: Room id can not be mapped! Building id: " << position.buildingId()<<", room id: "<< position.roomId();
+      WARNING_LOG(m_logger) << "onPositionChanged: Room id can not be mapped! Building id: " << position.buildingId()<<", room id: "<< position.roomId();
     }
   }
 
@@ -1156,7 +1155,7 @@ void BuildingViewerDdsController::onPositionChanged(const ParticipantManagement:
 
   if (!m_baseCoordinate.isValid())
   {
-    WARNING_LOG() << "not calling playerPlace as there is no base coordinate set - are there no buildings in this exercise?";
+    WARNING_LOG(m_logger) << "not calling playerPlace as there is no base coordinate set - are there no buildings in this exercise?";
     return;
   }
 
@@ -1195,7 +1194,7 @@ void BuildingViewerDdsController::createParticipant(const ParticipantManagement:
 {
   if (!m_baseCoordinate.isValid())
   {
-    WARNING_LOG() << "not calling playerPlace as there is no base coordinate set - are there no buildings in this exercise?";
+    WARNING_LOG(m_logger) << "not calling playerPlace as there is no base coordinate set - are there no buildings in this exercise?";
     return;
   }
 
@@ -1240,8 +1239,8 @@ void BuildingViewerDdsController::createBoobyTrap(const AreaEffectSimulation::Bo
   pos.lat() = trap.impactPosition().lat();
   pos.lon() = trap.impactPosition().lon();
 
-  DEBUG_LOG() << "Try create Booby trap with id " << trap.id() << " internal id " << participant.id();
-  DEBUG_LOG() << "Try create Booby trap with pos " << pos.lat() << " " << pos.lon();
+  DEBUG_LOG(m_logger) << "Try create Booby trap with id " << trap.id() << " internal id " << participant.id();
+  DEBUG_LOG(m_logger) << "Try create Booby trap with pos " << pos.lat() << " " << pos.lon();
   m_connection->playerCreate(participant.id(), participant.partyId(),
                              buildPlayerSymbolFilePath(participant.id()),
                              toRelative3D(pos),
@@ -1321,7 +1320,7 @@ void BuildingViewerDdsController::createSymbolResultWatcher(const ParticipantMan
     std::shared_ptr<int> symbolWatcherDeleter(nullptr, [this, pSymbolWatcher, symbolWatcherBenchmark](int *)
     {
       if (symbolWatcherBenchmark && pSymbolWatcher->m_et != nullptr)
-        DEBUG_LOG() << "Symbol creation took " << pSymbolWatcher->m_et->elapsed() << " ms";
+        DEBUG_LOG(m_logger) << "Symbol creation took " << pSymbolWatcher->m_et->elapsed() << " ms";
 
       pSymbolWatcher->deleteLater();
     });
@@ -1329,7 +1328,7 @@ void BuildingViewerDdsController::createSymbolResultWatcher(const ParticipantMan
 
     if (!pSymbolWatcher->symbolResult()->symbolImage().isValid())
     {
-      WARNING_LOG() << getSessionInfo() << "'slot_SymbolWatcherResultReady': Symbol creation failed -> '!symbolImage.isValid()', BgViewer might not display symbol(s)!";
+      WARNING_LOG(m_logger) << getSessionInfo() << "'slot_SymbolWatcherResultReady': Symbol creation failed -> '!symbolImage.isValid()', BgViewer might not display symbol(s)!";
       return;
     }
 
@@ -1338,7 +1337,7 @@ void BuildingViewerDdsController::createSymbolResultWatcher(const ParticipantMan
     if (writeParticipantSymbols)
       if (!pSymbolWatcher->symbolResult()->symbolImage().image().save(symbolInfo.strPathToSymbolFile))
       {
-        WARNING_LOG() << getSessionInfo() << "Could not write symbol file for BgViewer: \"" << symbolInfo.strPathToSymbolFile << "\", BgViewer might not display symbol(s)!";
+        WARNING_LOG(m_logger) << getSessionInfo() << "Could not write symbol file for BgViewer: \"" << symbolInfo.strPathToSymbolFile << "\", BgViewer might not display symbol(s)!";
         return;
       }
 
@@ -1388,7 +1387,7 @@ void BuildingViewerDdsController::onSynchronizeSimulationTime()
     m_connection->systemSetSimulationTime(m_session->partitionTime());
   }
   else
-    WARNING_LOG() << getSessionInfo() << "'slotSynchronizeSimulationTime': m_session is nullptr, could not query partitionTime!";
+    WARNING_LOG(m_logger) << getSessionInfo() << "'slotSynchronizeSimulationTime': m_session is nullptr, could not query partitionTime!";
 }
 
 void BuildingViewerDdsController::updateBuildingRoomNames(const InfrastructureManagement::MainStructureElement& building)
@@ -1421,7 +1420,7 @@ void BuildingViewerDdsController::onPlayerPicked(int playerId)
   if (m_ppmGuiIfc)
     m_ppmGuiIfc->showParticipantInfoWindow(playerId, true);
   else
-    INFO_LOG() << "No m_ppmGuiIfc";
+    INFO_LOG(m_logger) << "No m_ppmGuiIfc";
 }
 
 
@@ -1430,13 +1429,13 @@ void BuildingViewerDdsController::effectGenerationUnitPicked(int structureElemen
   if (m_blgGuiIfc)
     m_blgGuiIfc->showEffectGenerationUnitWindow(structureElementId);
   else
-    INFO_LOG() << "No m_blgGuiIfc";
+    INFO_LOG(m_logger) << "No m_blgGuiIfc";
 }
 
 
 void BuildingViewerDdsController::onAssetPicked(int structureElementId)
 {
-  DEBUG_LOG() << "User clicked on asset with structureElementId " << structureElementId << " from " << QString::number((quintptr)m_session->adr(), 16);
+  DEBUG_LOG(m_logger) << "User clicked on asset with structureElementId " << structureElementId << " from " << QString::number((quintptr)m_session->adr(), 16);
 
   if (m_session->isReplayPartition())
     return;
@@ -1446,7 +1445,7 @@ void BuildingViewerDdsController::onAssetPicked(int structureElementId)
   auto it = m_mountingPointId2AssetType.find(structureElementId);
   if (it == m_mountingPointId2AssetType.end())
   {
-    WARNING_LOG() << "onAssetPicked: User clicked on asset mounted to structureElementId " << structureElementId << " which was not added beforehand?! Ignoring...";
+    WARNING_LOG(m_logger) << "onAssetPicked: User clicked on asset mounted to structureElementId " << structureElementId << " which was not added beforehand?! Ignoring...";
     return;
   }
 
@@ -1454,18 +1453,18 @@ void BuildingViewerDdsController::onAssetPicked(int structureElementId)
   switch (assetType)
   {
   case BuildingViewer::AssetTypes::AnnouncementUnit:
-    DEBUG_LOG() << "Clicked asset is of type is AnnouncementUnit";
+    DEBUG_LOG(m_logger) << "Clicked asset is of type is AnnouncementUnit";
     if (m_avmIfc)
       m_avmIfc->showAnnouncementUnit(structureElementId);
     return;
 
   case BuildingViewer::AssetTypes::EffectGenerationUnit:
-    DEBUG_LOG() << "Clicked asset is of type is EffectGenerationUnit";
+    DEBUG_LOG(m_logger) << "Clicked asset is of type is EffectGenerationUnit";
     effectGenerationUnitPicked(structureElementId);
     return;
 
   case BuildingViewer::AssetTypes::IndoorCameraWithSpeaker:
-    DEBUG_LOG() << "Clicked asset is of type is IndoorCameraWithSpeaker";
+    DEBUG_LOG(m_logger) << "Clicked asset is of type is IndoorCameraWithSpeaker";
     if (m_avmIfc)
     {
       m_avmIfc->showCamera(m_irreplacableWidget, structureElementId);
@@ -1474,12 +1473,12 @@ void BuildingViewerDdsController::onAssetPicked(int structureElementId)
     return;
 
   case BuildingViewer::AssetTypes::IndoorCamera:
-    DEBUG_LOG() << "Clicked asset is of type is IndoorCamera";
+    DEBUG_LOG(m_logger) << "Clicked asset is of type is IndoorCamera";
     if (m_avmIfc)
       m_avmIfc->showCamera(m_irreplacableWidget, structureElementId);
     return;
   }
-  WARNING_LOG() << "onAssetPicked: BuildingViewer::AssetTypes is unknown: " << assetType;
+  WARNING_LOG(m_logger) << "onAssetPicked: BuildingViewer::AssetTypes is unknown: " << assetType;
 }
 
 
@@ -1514,12 +1513,12 @@ void BuildingViewerDdsController::onBuildingHitLineInfoChanged(const Buildings::
 {
   int topidId = static_cast <int>(hli.id());
 
-  DEBUG_LOG() << "onBuildingHitLineInfoChanged: " << hli;
+  DEBUG_LOG(m_logger) << "onBuildingHitLineInfoChanged: " << hli;
 
   const QString &strFeatureID = BuildingViewer::databaseId2FeatureId(hli.buildingId());
   if (!m_viewerInterface->isViewOpen(strFeatureID.toStdString()))
   {
-    DEBUG_LOG() << "building not opened:  hli.buildingId()=" << hli.buildingId() ;
+    DEBUG_LOG(m_logger) << "building not opened:  hli.buildingId()=" << hli.buildingId() ;
     return;
   }
   
@@ -1529,11 +1528,11 @@ void BuildingViewerDdsController::onBuildingHitLineInfoChanged(const Buildings::
   
 
   const bool isRemove = (modType == DataModification::eRemoved);
-  DEBUG_LOG() << "isRemove=" <<  isRemove;
+  DEBUG_LOG(m_logger) << "isRemove=" <<  isRemove;
 
   if (isRemove)
   {
-    DEBUG_LOG() << "onBuildingHitLineInfoChanged: remove ";
+    DEBUG_LOG(m_logger) << "onBuildingHitLineInfoChanged: remove ";
     QVector<BuildingHit> &bhl = m_buildingHits[hli.buildingId()];
 
     auto it = std::find_if(bhl.begin(), bhl.end(), [hli](const BuildingHit &bh)
@@ -1543,7 +1542,7 @@ void BuildingViewerDdsController::onBuildingHitLineInfoChanged(const Buildings::
 
     if (it != bhl.end())
     {
-      DEBUG_LOG() << "bhl.erase(it)";
+      DEBUG_LOG(m_logger) << "bhl.erase(it)";
       bhl.erase(it);
     }
     m_connection->removeRoomHit(hli.id());
@@ -1578,7 +1577,7 @@ void BuildingViewerDdsController::onBuildingHitLineInfoChanged(const Buildings::
 
 void BuildingViewerDdsController::onCleanupBuildingHitlines()
 {
-  DEBUG_LOG() << "onCleanupBuildingHitlines: ";
+  DEBUG_LOG(m_logger) << "onCleanupBuildingHitlines: ";
   const qint64 tNow = QDateTime::currentMSecsSinceEpoch();
   const auto isOutdated = [tNow](const BuildingHit &bh)
   {
@@ -1600,7 +1599,7 @@ void BuildingViewerDdsController::onMainStructureElementChanged(const Infrastruc
   {
     if (mse.modelId() != 0 && m_ismDtc->isElementAssignedToExercise(mse, m_exerciseId))
     {
-      DEBUG_LOG() << "m_buildingHeight.insert id=" << mse.id() << " z=" << 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());
       QHash<int, int> roomId2RoomNumber;
       for (const InfrastructureManagement::StructureElement &se : mse.elements())
@@ -1638,7 +1637,7 @@ void BuildingViewerDdsController::onFireEventFlashTimer()
 
   if (m_session == nullptr)
   {
-    DEBUG_LOG() << getSessionInfo() << "onFireEventFlashTimer: Session is not available, flashing not possible!";
+    DEBUG_LOG(m_logger) << getSessionInfo() << "onFireEventFlashTimer: Session is not available, flashing not possible!";
     return;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.h
index 6058a4982..d1060cebe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.h
@@ -54,6 +54,7 @@ public:
 signals:
   void signalDdsInitFinished();
 private:
+NGL::INGLLogger &m_logger;
   void setCurrentTrainingAreaMap(const QString &modelPath);
 private slots:
   void onPartyChanged(const ParticipantManagement::Party &party, DataModification modType);
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 c879df2cf..1dd1acc9a 100755
--- 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
@@ -175,7 +175,7 @@ bool BuildingEdit::apply()
   
 
   
-  DEBUG_LOG() << "fortifyFactors.size()=" << fortifyFactors.size();
+  DEBUG_LOG(m_logger) << "fortifyFactors.size()=" << fortifyFactors.size();
   if (fortifyFactors.size())
   {
     m_requestHelper->addRequest([this, fortifyFactors]()
@@ -187,7 +187,7 @@ bool BuildingEdit::apply()
       fortifyRequest.fortifyFactors().reserve(fortifyFactors.size());
       for (const auto &e : fortifyFactors)
       {
-        DEBUG_LOG() << "push_back= databaseId=" << e.structureElementId()
+        DEBUG_LOG(m_logger) << "push_back= databaseId=" << e.structureElementId()
                              << " fortifyFactor=" << e.fortifyFactor();
         fortifyRequest.fortifyFactors().push_back(Buildings::FortifyFactor(e.structureElementId(), e.fortifyFactor()));
       }
@@ -305,7 +305,7 @@ bool BuildingEdit::sendBuildingStateRequest(ProjectDataManagement::Vulnerability
     requestData.buildings(buildings);
     requestData.vulnerabilityState(state);
 
-    DEBUG_LOG() << Q_FUNC_INFO << "currentData: " << state;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << "currentData: " << state;
 
     return m_bldFtc->setBuildingStatesRequest(requestData, this);
   });
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_building_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_building_edit.h
index c9c5bdf84..a51765506 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_building_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_building_edit.h
@@ -58,6 +58,8 @@ private slots:
   void onDestroyElement();
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   bool apply() override;
 
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 fa8349939..34341cdfb 100755
--- 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
@@ -16,8 +16,8 @@ namespace BuildingViewer
 {
 BuildingEditModel::BuildingEditModel(QObject *parent,
                                      const std::shared_ptr<InfrastructureManagement::Interface::Dtc> &ismDtc,
-                                     const std::shared_ptr<Buildings::Interface::Dtc> &bldDtc)
-  : NGLTreeModel(parent, new NGLTreeItem(QVariant()), {
+                                     const std::shared_ptr<Buildings::Interface::Dtc> &bldDtc) : NGLTreeModel(parent, new NGLTreeItem(QVariant()),,
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
                  tr("Selected Building"),
                  QStringLiteral("Name (DEBUG)"),
                  QStringLiteral("MountingPointId (DEBUG)"),
@@ -76,7 +76,7 @@ QVariant BuildingEditModel::data(const QModelIndex &index, int role) const
 
 bool BuildingEditModel::slotUpdateRow(const BuildingViewer::TreeItem &room, const bool fortifyChanged)
 {
-  DEBUG_LOG() << "slotUpdateRow isBuilding=" << room.isBuilding()
+  DEBUG_LOG(m_logger) << "slotUpdateRow isBuilding=" << room.isBuilding()
                        << " isFloor" << room.isFloor()
                        << " isRoom" << room.isRoom();
 
@@ -122,7 +122,7 @@ bool BuildingEditModel::onInsertRow(int &row, const QModelIndex &parent, const B
 
 bool BuildingEditModel::init(int32_t mseId)
 {
-  INFO_LOG() << "init mseId=" << mseId;
+  INFO_LOG(m_logger) << "init mseId=" << mseId;
   NGLTreeModel::resetModel();
   m_mapRoomsWithChangedFortifyFactor.clear();
 
@@ -141,7 +141,7 @@ bool BuildingEditModel::init(int32_t mseId)
   const std::vector<InfrastructureManagement::StructureElement> &vecElements = building.elements();
   for (const auto &se : vecElements)
   {
-    DEBUG_LOG() << "se: " << se;
+    DEBUG_LOG(m_logger) << "se: " << se;
     if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Building)
     {
       BuildingViewer::TreeItem rootItemBuilding(se);
@@ -163,7 +163,7 @@ bool BuildingEditModel::init(int32_t mseId)
 
   for (const auto &se : vecElements)
   {
-    DEBUG_LOG() << "se: =" << se;
+    DEBUG_LOG(m_logger) << "se: =" << se;
     if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType_def::Floor)
     {
       BuildingViewer::TreeItem itemRoom(se);
@@ -208,7 +208,7 @@ bool BuildingEditModel::init(int32_t mseId)
       }
       catch (const std::out_of_range &e)
       {
-        WARNING_LOG() << "Caught exception while trying to get superior id for building " << rootName <<  " with room with mounting point id: " << se.mountingPointId() << ": " << e.what();
+        WARNING_LOG(m_logger) << "Caught exception while trying to get superior id for building " << rootName <<  " with room with mounting point id: " << se.mountingPointId() << ": " << e.what();
         return false;
       }
 
@@ -231,7 +231,7 @@ bool BuildingEditModel::init(int32_t mseId)
     int parentId = item.hasSuperior() ? item.getSuperior() : rootId;
     if (!parentItemIndexCache.contains(parentId))
     {
-      ERROR_LOG() << "Invalid building structure! Tree can not be built!";
+      ERROR_LOG(m_logger) << "Invalid building structure! Tree can not be built!";
       return false;
     }
 
@@ -255,7 +255,7 @@ QModelIndex BuildingEditModel::modelIndexByMountingPointId(int mountingPointId)
     if (privateData(mi)->data().value<TreeItem>().mountingPointId() == mountingPointId)
       return mi;
   }
-  WARNING_LOG()<<"Could not find modelindex for given room mountig point id: " << mountingPointId;
+  WARNING_LOG(m_logger)<<"Could not find modelindex for given room mountig point id: " << mountingPointId;
   return {};
 }
 
@@ -265,7 +265,7 @@ QModelIndex BuildingEditModel::modelIndexByStructureElementId(int structureEleme
   auto it = m_mapModelIndices.find(structureElementId);
   if (it == m_mapModelIndices.end())
   {
-    WARNING_LOG()<<"Could not find modelindex for given room structreElementId: " << structureElementId;
+    WARNING_LOG(m_logger)<<"Could not find modelindex for given room structreElementId: " << structureElementId;
     return {};
   }
   return it.value();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_edit_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_edit_model.h
index 98878b26e..e27df4005 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_edit_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_edit_model.h
@@ -50,6 +50,8 @@ signals:
   void signalModelDataChanged(); 
 
 private:
+
+NGL::INGLLogger &m_logger;
   QVariant data(const QModelIndex &index, int role) const override final;
   bool onInsertRow(int &row, const QModelIndex &parent, const BuildingViewer::TreeItem &folderData);
 
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 5a744438e..2665c7f21 100755
--- 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
@@ -6,15 +6,14 @@
 
 namespace BuildingViewer
 {
-ReplayHandler::ReplayHandler(int buildingTopicStart_s, int buildingTopicEnd_s, const TopicReplay::Interface::SituationReplayTime &replay, QObject *parent)
-  : QObject(parent)
+ReplayHandler::ReplayHandler(int buildingTopicStart_s, int buildingTopicEnd_s, const TopicReplay::Interface::SituationReplayTime &replay, QObject *parent) : QObject(parent)
   , m_actualReplayStart_ms(0)
   , m_actualReplayEnd_ms(0)
   , m_replayDuration_ms(0)
   , m_startOffset_ms(0)
-  , m_replayInfo(replay)
-{
-  DEBUG_LOG() << "buildingTopicStart_s = " << buildingTopicStart_s
+  , m_replayInfo(replay),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  DEBUG_LOG(m_logger) << "buildingTopicStart_s = " << buildingTopicStart_s
                       << ", buildingTopicEnd_s = " << buildingTopicEnd_s
                       << ", replay.topicStart_s = " << replay.topicStart_s
                       << ", replay.topicEnd_s = " << replay.topicEnd_s
@@ -30,7 +29,7 @@ ReplayHandler::ReplayHandler(int buildingTopicStart_s, int buildingTopicEnd_s, c
 
     m_actualReplayStart_ms = replay.replayStart_ms + start_diff_ms;
     m_startOffset_ms = 0;
-    DEBUG_LOG() << "Replay starts before Building-Topic: Shift replay starting point to m_actualReplayStart_ms = " << m_actualReplayStart_ms;
+    DEBUG_LOG(m_logger) << "Replay starts before Building-Topic: Shift replay starting point to m_actualReplayStart_ms = " << m_actualReplayStart_ms;
   }
   else
   {
@@ -38,7 +37,7 @@ ReplayHandler::ReplayHandler(int buildingTopicStart_s, int buildingTopicEnd_s, c
 
     m_actualReplayStart_ms = replay.replayStart_ms;
     m_startOffset_ms = std::abs(start_diff_ms);
-    DEBUG_LOG() << "Building-Topic starts before Replay:  Starting Replay after " << m_startOffset_ms << "msec";
+    DEBUG_LOG(m_logger) << "Building-Topic starts before Replay:  Starting Replay after " << m_startOffset_ms << "msec";
   }
 
   
@@ -47,12 +46,12 @@ ReplayHandler::ReplayHandler(int buildingTopicStart_s, int buildingTopicEnd_s, c
   if (replay.topicEnd_s > buildingTopicEnd_s)
   {
     m_actualReplayEnd_ms -= (replay.topicEnd_s - buildingTopicEnd_s) * 1000;
-    DEBUG_LOG() << "Replay longer than Building-Topic, cutting replay end to m_actualReplayEnd_ms = " << m_actualReplayEnd_ms;
+    DEBUG_LOG(m_logger) << "Replay longer than Building-Topic, cutting replay end to m_actualReplayEnd_ms = " << m_actualReplayEnd_ms;
   }
 
   m_replayDuration_ms = m_actualReplayEnd_ms - m_actualReplayStart_ms;
 
-  DEBUG_LOG() << "Replay from " << m_actualReplayStart_ms << " to " << m_actualReplayEnd_ms << " (duration = " << m_replayDuration_ms << ")";
+  DEBUG_LOG(m_logger) << "Replay from " << m_actualReplayStart_ms << " to " << m_actualReplayEnd_ms << " (duration = " << m_replayDuration_ms << ")";
 
   if (m_startOffset_ms == 0)
     m_startOffset_ms = -1; 
@@ -71,7 +70,7 @@ void ReplayHandler::tick(qint64 diffSinceLastTick)
     return;
   }
 
-  DEBUG_LOG() << "ReplayHandler::tick(): Remaining: " << m_replayDuration_ms << "msec";
+  DEBUG_LOG(m_logger) << "ReplayHandler::tick(): Remaining: " << m_replayDuration_ms << "msec";
 
   if (m_startOffset_ms == -1)
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_replay_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_replay_handler.h
index 15b3bc08b..43d5a38be 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_replay_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_replay_handler.h
@@ -25,6 +25,8 @@ signals:
   void signalStopReplay();
 
 private:
+
+NGL::INGLLogger &m_logger;
   qint64 m_actualReplayStart_ms;
   qint64 m_actualReplayEnd_ms;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_thread_video_exporter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_thread_video_exporter.cpp
index ef2f39ee0..fb63119f2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_thread_video_exporter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_thread_video_exporter.cpp
@@ -15,7 +15,7 @@ namespace BuildingViewer
 VideoExporter::VideoExporter(QObject *parent)
   : QObject(parent)
 {
-  DEBUG_LOG() << "ThreadVideoExporter has been created";
+  DEBUG_LOG(m_logger) << "ThreadVideoExporter has been created";
 }
 
 void VideoExporter::init(const VideoInformation &videoInfo)
@@ -26,12 +26,12 @@ void VideoExporter::init(const VideoInformation &videoInfo)
 
 void VideoExporter::sendAliveSignals()
 {
-  DEBUG_LOG() << "sendAliveSignals() called";
+  DEBUG_LOG(m_logger) << "sendAliveSignals() called";
 
   for (auto &e : std::as_const(m_vecVideosToExport))
     emit e.m_pExportNotifier->stillAlive();
 
-  DEBUG_LOG() << "\tSignals emitted, mutex unlocked";
+  DEBUG_LOG(m_logger) << "\tSignals emitted, mutex unlocked";
 }
 
 
@@ -42,17 +42,17 @@ void VideoExporter::doExport()
     if (QThread::currentThread()->isInterruptionRequested())
       break;
     VideoInformation toExport = m_vecVideosToExport.takeFirst();
-    DEBUG_LOG() << "Starting export of " << toExport.m_strFolderPath;
+    DEBUG_LOG(m_logger) << "Starting export of " << toExport.m_strFolderPath;
 
     const auto state = toExport.m_bgViewerState.value(QStringLiteral("arrBuildingStates"));
 
     if (!state.isArray())
     {
-      WARNING_LOG() << "No opened buildings, nothing to export, skipping video!";
+      WARNING_LOG(m_logger) << "No opened buildings, nothing to export, skipping video!";
       continue;
     }
 
-    DEBUG_LOG() << "Emitting 'signalStartRecording'";
+    DEBUG_LOG(m_logger) << "Emitting 'signalStartRecording'";
     emit signalStartRecording(toExport.m_strFolderPath, state);
 
     QSharedPointer<ReplayHandler> pHandler;
@@ -83,7 +83,7 @@ void VideoExporter::doExport()
       if (diff_ms >= 1000)
       {
         last_tick_elapsed = elapsed_sum_ms;
-        DEBUG_LOG() << "Export: " << elapsed_sum_ms / 1000 << "/" << record_duration_ms / 1000 << "[s] passed";
+        DEBUG_LOG(m_logger) << "Export: " << elapsed_sum_ms / 1000 << "/" << record_duration_ms / 1000 << "[s] passed";
       }
 
       if (pHandler)
@@ -97,12 +97,12 @@ void VideoExporter::doExport()
       if (QThread::currentThread()->isInterruptionRequested())
         break;
     }
-    DEBUG_LOG() << "Done. Emitting 'signalStopRecording'";
+    DEBUG_LOG(m_logger) << "Done. Emitting 'signalStopRecording'";
     emit signalStopRecording();
 
-    DEBUG_LOG() <<"Export done, emitting 'signalExportSuccessful'";
+    DEBUG_LOG(m_logger) <<"Export done, emitting 'signalExportSuccessful'";
     toExport.m_pExportNotifier->setExportSuccessful(toExport.m_strFolderPath);
-    DEBUG_LOG() <<"\tsignal emitted";
+    DEBUG_LOG(m_logger) <<"\tsignal emitted";
   }
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_thread_video_exporter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_thread_video_exporter.h
index 49f7b8ef9..6bd8f970d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_thread_video_exporter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_thread_video_exporter.h
@@ -53,6 +53,8 @@ signals:
   void signalStopRecording();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void sendAliveSignals();
 
   QVector<VideoInformation> m_vecVideosToExport;
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 c0df42053..35d9ea6ee 100755
--- 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
@@ -104,7 +104,7 @@ bool TopicReplayInterface::exportTopic(const QJsonObject &attributes,
   const QJsonArray states = attributes[QStringLiteral("arrBuildingStates")].toArray();
   if (states.isEmpty())
   {
-    INFO_LOG() << "Nothing to export";
+    INFO_LOG(m_logger) << "Nothing to export";
     emit pExportNotifier->exportSuccessful(QString());
     return true;
   }
@@ -113,7 +113,7 @@ bool TopicReplayInterface::exportTopic(const QJsonObject &attributes,
   QFile f(folderPath + QLatin1Char('/') + filename);
   if (!f.open(QIODevice::WriteOnly))
   {
-    WARNING_LOG() << "Can not open file '" << f.fileName() << "' for writing!";
+    WARNING_LOG(m_logger) << "Can not open file '" << f.fileName() << "' for writing!";
     pExportNotifier->setExportFailed();
     return false;
   }
@@ -136,7 +136,7 @@ bool TopicReplayInterface::exportTopic(const QJsonObject &attributes,
   obj[QStringLiteral("replays")] = arr;
   f.write(QJsonDocument(obj).toJson(QJsonDocument::Indented));
   f.close();
-  DEBUG_LOG() << "BDV filename: " << f.fileName();
+  DEBUG_LOG(m_logger) << "BDV filename: " << f.fileName();
 
   QVector<int> buildingIds;
   buildingIds.reserve(states.size());
@@ -146,7 +146,7 @@ bool TopicReplayInterface::exportTopic(const QJsonObject &attributes,
     int buildingId = featureId2DatabaseId(QString::fromStdString(vws.m_featureID));
     if (buildingId <= 0)
     {
-      WARNING_LOG() << "Could not retrieve building id from '" << vws.m_featureID << "' - skipping";
+      WARNING_LOG(m_logger) << "Could not retrieve building id from '" << vws.m_featureID << "' - skipping";
       continue;
     }
     buildingIds += buildingId;
@@ -172,7 +172,7 @@ bool TopicReplayInterface::exportTopic(const QJsonObject &attributes,
   
   if (!m_replayIfc || !m_bgvController)
   {
-    ERROR_LOG() << "BuildingViewer exportTopic: m_replayIfc==nullptr, can not start replay, aborting export";
+    ERROR_LOG(m_logger) << "BuildingViewer exportTopic: m_replayIfc==nullptr, can not start replay, aborting export";
     emit pExportNotifier->exportFailed();
     Q_ASSERT(false);
     return false;
@@ -224,7 +224,7 @@ bool TopicReplayInterface::exportBuildings(const QVector<int> &buildingIds) cons
   const QString modelPath = BgViewerController::buildingModelPath();
   if (modelPath.isEmpty())
   {
-    WARNING_LOG() << "Could not find path with building models - can not copy models";
+    WARNING_LOG(m_logger) << "Could not find path with building models - can not copy models";
     return false;
   }
 
@@ -232,13 +232,13 @@ bool TopicReplayInterface::exportBuildings(const QVector<int> &buildingIds) cons
   QDir dir(outputPath);
   if (!dir.exists() && !dir.mkpath(outputPath))
   {
-    WARNING_LOG() << "Could not create path " << outputPath;
+    WARNING_LOG(m_logger) << "Could not create path " << outputPath;
     return false;
   }
   QFile f(outputPath + QStringLiteral("/buildings.json"));
   if (!f.open(QIODevice::ReadWrite))
   {
-    WARNING_LOG() << "Could not open file " << f.fileName() << " for read/write: " << f.errorString();
+    WARNING_LOG(m_logger) << "Could not open file " << f.fileName() << " for read/write: " << f.errorString();
     return false;
   }
   const QJsonArray arr(QJsonDocument::fromJson(f.readAll()).array());
@@ -257,7 +257,7 @@ bool TopicReplayInterface::exportBuildings(const QVector<int> &buildingIds) cons
     const auto mse = ismDtc->mainStructureElement(buildingId);
     if (mse.id() != buildingId)
     {
-      WARNING_LOG() << "Could not find MainStructureElement for building with id " << buildingId << " - skipping";
+      WARNING_LOG(m_logger) << "Could not find MainStructureElement for building with id " << buildingId << " - skipping";
       continue;
     }
     const QString fnIve = QString::fromStdString(mse.name()) + QStringLiteral(".flt.ive");
@@ -294,7 +294,7 @@ bool TopicReplayInterface::exportShaders() const
 {
   const QString shaderPath(NGL::findFile(NGL::FileType::ConfigFile, QStringLiteral("shaders")));
   const QString outputPath(m_basePath + QStringLiteral("BuildingModels/shaders/"));
-  DEBUG_LOG() << "shaderPath: " << shaderPath << ", outputPath: " << outputPath;
+  DEBUG_LOG(m_logger) << "shaderPath: " << shaderPath << ", outputPath: " << outputPath;
   return NGL::copyDirContentsToDir(shaderPath, outputPath);
 }
 
@@ -306,10 +306,10 @@ bool TopicReplayInterface::copyFile(const QString &srcFn, const QString &srcDir,
   QFile f(src);
   if (!f.exists() || (!QFile::exists(dst) && !f.copy(dst)))
   {
-    WARNING_LOG() << "Could not copy " << src << " to " << dst << ": " << f.errorString();
+    WARNING_LOG(m_logger) << "Could not copy " << src << " to " << dst << ": " << f.errorString();
     return false;
   }
-  DEBUG_LOG() << "Copied from " << src << " to " << dst;
+  DEBUG_LOG(m_logger) << "Copied from " << src << " to " << dst;
   return true;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_topic_replay_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_topic_replay_interface.h
index af19865de..bd0427f1d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_topic_replay_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_topic_replay_interface.h
@@ -47,6 +47,7 @@ private slots:
   void slotStartReplay(qint64 start, qint64 end, double speed);
   void slotStopReplay();
 private:
+NGL::INGLLogger &m_logger;
   bool exportBuildings(const QVector<int> &buildingIds) const;
   bool exportShaders() const;
   bool copyFile(const QString &srcFn, const QString &srcDir, const QString &dstDir) const;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_dialog.h
index 664d0c293..34f2cf1c4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_dialog.h
@@ -32,6 +32,7 @@ public:
 public Q_SLOTS:
   void fetchBuildingList();
 protected:
+NGL::INGLLogger &m_logger;
   void retranslate() override;
 
 signals:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_view.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_view.h
index 523d23e3c..a95805c20 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_view.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_view.h
@@ -50,6 +50,8 @@ public slots:
   void onViewerEventWidgetFocused(const QString &featureID);
 
 private:
+
+NGL::INGLLogger &m_logger;
   Ui::BgViewerDataView *m_ui = nullptr;
   BgViewerDataViewModel *m_pModel = nullptr;
   BgViewerController *m_pBgvController = nullptr;
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 534e59d32..a8c98a64e 100755
--- 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
@@ -19,10 +19,9 @@
 namespace BuildingViewer
 {
 
-BdvPluginProvider::BdvPluginProvider(LtsSession::LtsSession *session, QObject *parent)
-  : PluginProvider(parent)
-  , m_session(session)
-{}
+BdvPluginProvider::BdvPluginProvider(LtsSession::LtsSession *session, QObject *parent) : PluginProvider(parent)
+  , m_session(session),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 bool BdvPluginProvider::init()
 {
@@ -36,7 +35,7 @@ bool BdvPluginProvider::init()
 
   if (!m_session->getDtc<Buildings::DataInterface>(m_bldDtc))
   {
-    ERROR_LOG() << "Fetching 'm_bldDtc' failed!";
+    ERROR_LOG(m_logger) << "Fetching 'm_bldDtc' failed!";
     return false;
   }
   m_session->getForeignGuiInterface<Buildings::ForeignInfoGuiInterface>(m_bldInfoIfc);  
@@ -52,7 +51,7 @@ bool BdvPluginProvider::init()
 
   if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
   {
-    ERROR_LOG() << "Fetching 'm_ppmDtc' failed!";
+    ERROR_LOG(m_logger) << "Fetching 'm_ppmDtc' failed!";
     return false;
   }
   m_session->getForeignGuiInterface<ParticipantManagement::ForeignParticipantInfoGuiInterface>(m_ppmParticipantInfoIfc);  
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 131f06776..5fbc2daec 100755
--- 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
@@ -51,6 +51,8 @@ public:
   LtsSession::LtsSession *m_session;
 
 private:
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<AdvancedSymbology::ForeignDataInterface> m_asbIfc;   
   std::shared_ptr<AudioVideoManagement::ForeignDataInterface> m_avmDataIfc;
   std::shared_ptr<Buildings::Interface::Dtc> m_bldDtc;
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 4b8f9b581..d5d513eb3 100755
--- 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
@@ -98,7 +98,7 @@ void BldConfigDialog::fillCbx()
 
 bool BldConfigDialog::apply()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   if (m_ui->chbOwnership->isChecked())
   {
@@ -134,8 +134,8 @@ bool BldConfigDialog::apply()
 
     requestData.resetContamination(m_ui->chbResetContamination->isChecked());
 
-    DEBUG_LOG() << Q_FUNC_INFO << "currentIndex: " << m_ui->cmbStatus->currentIndex();
-    DEBUG_LOG() << Q_FUNC_INFO << "currentData: " << state;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << "currentIndex: " << m_ui->cmbStatus->currentIndex();
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << "currentData: " << state;
 
     return m_ftc->setBuildingStatesRequest(requestData, this);
   });
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_config_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_config_dialog.h
index fb000951e..13681668a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_config_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_config_dialog.h
@@ -45,9 +45,11 @@ private slots:
   void slotCmbStatusCurrentIndexChanged(int index);
 
 private:
+  NGL::INGLLogger &m_logger;
   void fillCbx();
 
 private:
+  NGL::INGLLogger &m_logger;
   void retranslate() override;
   bool apply() override final;
 
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 64fa9940b..05a527cf5 100755
--- 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
@@ -48,7 +48,7 @@ bool BuildingHistoryDialogModel::initModel(int mseId,
   connect(dtc.get(), &Interface::Dtc::historyStateChanged,
           this, &BuildingHistoryDialogModel::onHistoryStateChanged);
 
-  DEBUG_LOG() << "m_mseId=" << m_mseId;
+  DEBUG_LOG(m_logger) << "m_mseId=" << m_mseId;
   reinitModel(dtc->historyState(m_mseId).stateHistory());
   return true;
 }
@@ -80,7 +80,7 @@ QVariant BuildingHistoryDialogModel::data(const QModelIndex &index, int role) co
 
 void BuildingHistoryDialogModel::onHistoryStateChanged(const Buildings::HistoryState &data, DataModification modType)
 {
-  DEBUG_LOG() << "onHistoryStateChanged";
+  DEBUG_LOG(m_logger) << "onHistoryStateChanged";
   if (m_mseId != data.mseId())
     return;
 
@@ -154,14 +154,14 @@ QString BuildingHistoryDialogModel::getOriginatorName(const HistoryStateItemEx &
 
 QString BuildingHistoryDialogModel::getContaminations(const std::vector< Buildings::ContaminationState > &contaminationStates) const
 {
-  DEBUG_LOG() << "BuildingHistoryDialogModel::getContaminations";
+  DEBUG_LOG(m_logger) << "BuildingHistoryDialogModel::getContaminations";
   QStringList contaminationList;
   for (const auto &cs : contaminationStates)
   {
     AreaEffectSimulation::AesItem item;
     m_aesDtc->aesItemFromId(cs.aesId(), item);
     const ProjectDataManagement::GearClass &gc = m_pdmDtc->gearClassFromChargeTypeId(item.chargeStruct().chargeTypeId());
-    DEBUG_LOG() << "gc=" << gc;
+    DEBUG_LOG(m_logger) << "gc=" << gc;
     if (gc == ProjectDataManagement::GearClass::Unknown)
       continue;
     QString gearClassName = ProjectDataManagement::toString(gc).trimmed();
@@ -169,14 +169,14 @@ QString BuildingHistoryDialogModel::getContaminations(const std::vector< Buildin
     if (!contaminationList.contains(gearClassName))
       contaminationList.append(gearClassName);
     else
-      DEBUG_LOG() << "contaminationList.contains(gearClassName)" << gearClassName;
+      DEBUG_LOG(m_logger) << "contaminationList.contains(gearClassName)" << gearClassName;
   }
   return contaminationList.join(QStringLiteral("+"));
 }
 
 void BuildingHistoryDialogModel::reinitModel(const std::vector<Buildings::HistoryStateItem> &newData)
 {
-  DEBUG_LOG() << "BuildingHistoryDialogModel::reinitModel size=" << newData.size();
+  DEBUG_LOG(m_logger) << "BuildingHistoryDialogModel::reinitModel size=" << newData.size();
   int indexModel = 0;
   
   int contaminationOffest = 0;
@@ -189,16 +189,16 @@ void BuildingHistoryDialogModel::reinitModel(const std::vector<Buildings::Histor
   
   for (size_t stateHistoryIndex = 0; stateHistoryIndex < newData.size(); ++stateHistoryIndex)
   {
-    DEBUG_LOG() << "\n\nstateHistoryIndex=" << 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())))
         && (stateHistoryIndex > 0))
-      DEBUG_LOG() << "1. State ist Kontamination";
+      DEBUG_LOG(m_logger) << "1. State ist Kontamination";
     else
     {
-      DEBUG_LOG() << "State aus StateItem nehmen: stateHistoryIndex=" << stateHistoryIndex;
+      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());
@@ -212,7 +212,7 @@ void BuildingHistoryDialogModel::reinitModel(const std::vector<Buildings::Histor
         data.contamination.clear();
       else
         data.contamination = QStringLiteral("C");
-      DEBUG_LOG() << "indexModel=" << indexModel
+      DEBUG_LOG(m_logger) << "indexModel=" << indexModel
                           << " chargeTypeId=" << data.chargeTypeId()
                           << " chargeTypeName=" << getChargeTypeName(data.chargeTypeId())
                           << " originatorName=" << getOriginatorName(data);
@@ -227,7 +227,7 @@ void BuildingHistoryDialogModel::reinitModel(const std::vector<Buildings::Histor
 
       AreaEffectSimulation::AesItem item;
       m_aesDtc->aesItemFromId(contaminationState.aesId(), item);
-      DEBUG_LOG() << "m_vecData.size=" << m_vecData.size()
+      DEBUG_LOG(m_logger) << "m_vecData.size=" << m_vecData.size()
                           << " indexModel=" << indexModel
                           << " newData.size()=" << newData.size()
                           << " contaminationOffest=" << contaminationOffest;
@@ -235,13 +235,13 @@ void BuildingHistoryDialogModel::reinitModel(const std::vector<Buildings::Histor
       
       if (stateHistoryIndex > 0)
       {
-        DEBUG_LOG() << "stateHistoryIndex=" << stateHistoryIndex
+        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())
         {
           contaminationIndex++;
-          DEBUG_LOG() << "continue";
+          DEBUG_LOG(m_logger) << "continue";
           continue;
         }
       }
@@ -262,7 +262,7 @@ void BuildingHistoryDialogModel::reinitModel(const std::vector<Buildings::Histor
       data.contamination = QStringLiteral("C");
       ::rti::core::int64 time = item.effectStart().get();
       data.time(time);
-      DEBUG_LOG() << " indexModel=" << indexModel
+      DEBUG_LOG(m_logger) << " indexModel=" << indexModel
                           << " AesId=" << contaminationState.aesId()
                           << " chargeTypeId=" << data.chargeTypeId()
                           << " chargeTypeName=" << getChargeTypeName(data.chargeTypeId())
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_history_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_history_dialog_model.h
index 6f9cfd0f6..6740727e9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_history_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_history_dialog_model.h
@@ -80,6 +80,8 @@ private Q_SLOTS:
   void onHistoryStateChanged(const HistoryState &data, DataModification modType);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void reinitModel(const std::vector<Buildings::HistoryStateItem> &newData);
   QString getChargeTypeName(int chargeTypeId, bool shortName = true) const;
   QString getOriginatorName(const HistoryStateItemEx &data) const;
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 c949577d7..bd4a97772 100755
--- 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
@@ -84,7 +84,7 @@ bool HitLineInfoDialog::init(LtsSession::LtsSession *session)
   {
     if (data.id() == m_hitLineId)
     {
-      DEBUG_LOG() << "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());
       showHitLineInfos();
@@ -92,14 +92,14 @@ bool HitLineInfoDialog::init(LtsSession::LtsSession *session)
   });
 
   if (!m_isInitialized)
-    WARNING_LOG() << "Non Building HitLineInfo data found for id: " << m_hitLineId;
+    WARNING_LOG(m_logger) << "Non Building HitLineInfo data found for id: " << m_hitLineId;
   return m_isInitialized;
 } 
 
 
 void HitLineInfoDialog::showHitLineInfos()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " id:" << m_hitLineId;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id:" << m_hitLineId;
 
   if (m_hitLineInfo.buildingId() <= 0 || m_hitLineInfo.originatorParticipantId() <= 0)
     return;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_hitline_info_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_hitline_info_dialog.h
index a8b8ba759..c80e68ebb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_hitline_info_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_hitline_info_dialog.h
@@ -75,6 +75,8 @@ public:
   bool init(LtsSession::LtsSession *session);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void showHitLineInfos();
   QString getContaminations(const std::vector<ContaminationState> &contaminationStates) const;
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 524bc5a7f..e16a21b98 100755
--- 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
@@ -82,10 +82,9 @@ public:
 
 namespace Buildings
 {
-BldInfoDialog::BldInfoDialog(int bldEntityId, const QString &menuGroup, QWidget *parent)
-  : InfoDialogBase(bldEntityId, menuGroup, QStringLiteral("BldInfoDialog"), LtsWidgets::ButtonCombination::CloseOnly, parent)
-  , m_ui(new Ui::BldInfoDialog)
-{
+BldInfoDialog::BldInfoDialog(int bldEntityId, const QString &menuGroup, QWidget *parent) : InfoDialogBase(bldEntityId, menuGroup, QStringLiteral("BldInfoDialog"), LtsWidgets::ButtonCombination::CloseOnly, parent)
+  , m_ui(new Ui::BldInfoDialog),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   DEBUG_LOG(m_logger) << LOGFUNCTION << " START" << ", bldEntityId=" << bldEntityId;
 
   m_ui->setupUi(this);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_dialog.h
index 9e68aba2b..00973d0f2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_dialog.h
@@ -69,6 +69,8 @@ public:
   bool init(LtsSession::LtsSession *session) override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   template <typename ReturnType, typename Container, typename Key>
   static ReturnType constFinder(const Container &container, const Key &key) noexcept(false)
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_history_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_history_dialog_model.h
index 354531da5..ed68f3a27 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_history_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_history_dialog_model.h
@@ -67,6 +67,8 @@ private Q_SLOTS:
   void onHistoryStateChanged(const BridgeStatus &data, DataModification modType);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void reinitModel(const QMap<int, BridgeStatus> &newData);
   int m_ddsId;
   std::shared_ptr<Interface::Dtc> m_dtc;
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 6a000e69a..d8b979fcc 100755
--- 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
@@ -76,13 +76,13 @@ void InfoDialogBase::onFindOnMap()
   if (m_session->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(ifc))
     ifc->centerMapToBuildingObject(m_mseId);
   else
-    WARNING_LOG() << Q_FUNC_INFO << "getForeignGuiInterface<SituationMap::ForeignGuiInterface> failed!";
+    WARNING_LOG(m_logger) << Q_FUNC_INFO << "getForeignGuiInterface<SituationMap::ForeignGuiInterface> failed!";
 } 
 
 
 void InfoDialogBase::onShowDetails()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   BldConfigDialog *dialog = new BldConfigDialog(m_mseId, buildingDisplayName(), this);
 
   if (dialog->init(m_session))
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/info_dialog_base.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/info_dialog_base.h
index 276191e6a..ba8569f35 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/info_dialog_base.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/info_dialog_base.h
@@ -57,10 +57,12 @@ protected slots:
   void onShowEgcuMonitor();
 
 protected:
+  NGL::INGLLogger &m_logger;
   virtual void showBuildingInfos() = 0;
   virtual QString buildingDisplayName() const = 0;
 
 protected:
+  NGL::INGLLogger &m_logger;
   int      m_mseId = -1;
   QString  m_menuGroup;
   int m_exerciseId;
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 85935fbac..c58aba72f 100755
--- 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
@@ -9,13 +9,12 @@
 namespace Buildings
 {
 
-RelayInfoWidget::RelayInfoWidget(int id, QWidget *parent)
-  : QWidget(parent)
+RelayInfoWidget::RelayInfoWidget(int id, QWidget *parent) : QWidget(parent)
   , m_id(id)
   , m_state(false)
-  , m_ui(new Ui::RelayInfoWidget)
-{
-  DEBUG_LOG() << "RelayInfoWidget";
+  , m_ui(new Ui::RelayInfoWidget),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  DEBUG_LOG(m_logger) << "RelayInfoWidget";
   m_ui->setupUi(this);
 
   m_ui->ledStatus->setAspectHint(LtsWidgets::LtsLedWidget::AspectHint::WidthIsHeight);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/relay_info.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/relay_info.h
index 3bd0e20cc..dea6fe4d9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/relay_info.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/relay_info.h
@@ -44,6 +44,8 @@ private slots:
   void onButtonClicked();
 
 private:
+
+NGL::INGLLogger &m_logger;
   int  m_id;
   bool m_state;
   Ui::RelayInfoWidget *m_ui;
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 00c96fc0c..3b67a5d07 100755
--- 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
@@ -134,7 +134,7 @@ void ParticipantMoveDialog::onSimulatedMovementChanged(const CentralEffectSimula
 {
   if (modType == DataModification::eRemoved || m_participantData.id() != data.participantId())
     return;
-    INFO_LOG() << "onSimulatedMovementChanged";
+    INFO_LOG(m_logger) << "onSimulatedMovementChanged";
 
   
   clearContent();
@@ -189,7 +189,7 @@ void ParticipantMoveDialog::onSimulatedMovementModifyReply(const Core::FunctionR
 void ParticipantMoveDialog::retranslate()
 {
   translate(m_ui, QString::fromStdString(m_participantData.tacticalIdentifier()), false, tr("Waypoints")); 
-  DEBUG_LOG() << "retranslate";
+  DEBUG_LOG(m_logger) << "retranslate";
 }
 
 void ParticipantMoveDialog::initTableHeader()
@@ -261,7 +261,7 @@ void ParticipantMoveDialog::onFocus()
 
 void ParticipantMoveDialog::onGetPolyline()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   if (!m_sitMapGuiIfc)
     return;
@@ -298,7 +298,7 @@ void ParticipantMoveDialog::onGetPolyline()
 
 void ParticipantMoveDialog::onPolylineData(const QPolygonF &polyline)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " numberOfPoints: " << polyline.size();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " numberOfPoints: " << polyline.size();
 
   if (polyline.size() < 2)
     return;
@@ -381,7 +381,7 @@ bool ParticipantMoveDialog::apply()
   {
     const SimulatedMovement req = requestContent();
 
-    INFO_LOG() << "--- onApplyMessage() ";
+    INFO_LOG(m_logger) << "--- onApplyMessage() ";
 
     m_requestHelper->addRequest([this, req]()
     {
@@ -395,7 +395,7 @@ bool ParticipantMoveDialog::apply()
       Core::RemoveElementRequest req(m_id);
       m_id = 0; 
 
-      INFO_LOG() << "--- onApplyMessage() ";
+      INFO_LOG(m_logger) << "--- onApplyMessage() ";
 
       m_requestHelper->addRequest([req, this]()
       {
@@ -484,14 +484,14 @@ void ParticipantMoveDialog::onExportButtonClicked()
 
   int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
   if (fileId > 0)
-    DEBUG_LOG() << "Saved file with id = " << fileId;
+    DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
   else
-    ERROR_LOG() << "Could not save file in library ";
+    ERROR_LOG(m_logger) << "Could not save file in library ";
 }
 
 void ParticipantMoveDialog::onImportButtonClicked()
 {
-  DEBUG_LOG() << " onImportButtonClicked() ";
+  DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
 
   QByteArray content;
   int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::CESParticipantMove));
@@ -511,7 +511,7 @@ void ParticipantMoveDialog::onImportButtonClicked()
     {
       SimulatedMovement req = jsonToSimulatedMovement(content);
 
-      INFO_LOG() << "--- onImportButtonClicked() ";
+      INFO_LOG(m_logger) << "--- onImportButtonClicked() ";
 
       m_requestHelper->addRequest([this, req]()
       {
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 232025f6a..52e001e20 100755
--- 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
@@ -112,14 +112,14 @@ bool ParticipantsMoveDialog::init(LtsSession::LtsSession *session,
   std::shared_ptr<ExerciseManagement::Interface::Dtc>      exmDtc;
   if (!m_session->getDtc<ExerciseManagement::DataInterface>(exmDtc))
   {
-    ERROR_LOG() << "failed to get exmDtc ";
+    ERROR_LOG(m_logger) << "failed to get exmDtc ";
     return false;
   }
 
   std::shared_ptr<AssetManagement::Interface::Dtc>       asmDtc;
   if (!m_session->getDtc<AssetManagement::DataInterface>(asmDtc))
   {
-    ERROR_LOG() << "failed to get asmDtc ";
+    ERROR_LOG(m_logger) << "failed to get asmDtc ";
     return false;
   }
 
@@ -130,13 +130,13 @@ bool ParticipantsMoveDialog::init(LtsSession::LtsSession *session,
   AssetManagement::TrainingArea ta = asmDtc->trainingArea(exc.trainingAreaId());
   if (ta.id() != exc.trainingAreaId())
   {
-    ERROR_LOG()<<" couldn't get Training Area with id: "<<exc.trainingAreaId();
+    ERROR_LOG(m_logger)<<" couldn't get Training Area with id: "<<exc.trainingAreaId();
     return false;
   }
 
   if (!m_session ->getDtc<AreaEffectSimulation::DataInterface>(m_aesDtc))
   {
-    ERROR_LOG()<<"failed to get aesDtc";
+    ERROR_LOG(m_logger)<<"failed to get aesDtc";
     return false;
   }
 
@@ -211,7 +211,7 @@ void ParticipantsMoveDialog::onSelectionChanged()
     return;
 
   const ParticipantManagement::ParticipantData data(participantFromIndex(indexList.first()));
-  DEBUG_LOG() << "ParticipantId: " << data.id();
+  DEBUG_LOG(m_logger) << "ParticipantId: " << data.id();
   m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Remove, data.isSimulated());
   
   if (data.isSimulated() && m_participantDialogMap.contains(data.id()))
@@ -257,7 +257,7 @@ void ParticipantsMoveDialog::onSelectionChanged()
 void ParticipantsMoveDialog::onModelChanged()
 {
   m_ui->dvParticipants->expandAll();
-  DEBUG_LOG() << "onModelChanged";
+  DEBUG_LOG(m_logger) << "onModelChanged";
 }
 
 void ParticipantsMoveDialog::onDoubleClicked()
@@ -282,7 +282,7 @@ void ParticipantsMoveDialog::onDoubleClicked()
     return;
 
   const ParticipantManagement::ParticipantData data(participantFromIndex(indexList.first()));
-  DEBUG_LOG() << "ParticipantId: " << data.id();
+  DEBUG_LOG(m_logger) << "ParticipantId: " << data.id();
 
   if (!m_participantDialogMap.contains(data.id()))
   {
@@ -335,7 +335,7 @@ void ParticipantsMoveDialog::onRemove()
     return;
 
   const ParticipantManagement::ParticipantData data(participantFromIndex(indexList.first()));
-  INFO_LOG() << "onRemove ParticipantId: " << data.id();
+  INFO_LOG(m_logger) << "onRemove ParticipantId: " << data.id();
 
   
   delete m_participantDialogMap.value(data.id());
@@ -430,7 +430,7 @@ void ParticipantsMoveDialog::onGetCoordinate(QPointF coordinate)
 
   const ParticipantManagement::ParticipantData participantData(participantFromIndex(indexList.first()));
 
-  INFO_LOG() << Q_FUNC_INFO << "ParticipantId=" << participantData.id()
+  INFO_LOG(m_logger) << Q_FUNC_INFO << "ParticipantId=" << participantData.id()
                      << " EquipmentNr=" << participantData.equipmentNumber()
                      << " onGetCoordinate x=" << coordinate.x() << " y=" << coordinate.y();
   if (participantData.id() <= 0)
@@ -500,7 +500,7 @@ bool ParticipantsMoveDialog::isParticipantInUseForExplosionCluster(int id)
 {
   if (!m_aesDtc)
   {
-    ERROR_LOG()<<" m_aesDTC is not setted";
+    ERROR_LOG(m_logger)<<" m_aesDTC is not setted";
     return true;
   }
 
@@ -658,7 +658,7 @@ void ParticipantsMoveDialog::setFormationAndPositioningUi(const ParticipantManag
       
       m_formationProps.angle = std::fmod((mil2Deg(angleMil) + 90), 360);
 
-      DEBUG_LOG()<<" angle in deg mil: "<<angleMil
+      DEBUG_LOG(m_logger)<<" angle in deg mil: "<<angleMil
                            <<" -> degree: "<< mil2Deg(angleMil)<<" final position(°): "<<m_formationProps.angle;
     }
 
@@ -673,7 +673,7 @@ void ParticipantsMoveDialog::setFormationAndPositioningUi(const ParticipantManag
     const QPointF  mgrsCoordinate = posEdit->coordinate();
     if (mgrsCoordinate.isNull())
     {
-      WARNING_LOG()<<"MGRS Coordinates invalid!";
+      WARNING_LOG(m_logger)<<"MGRS Coordinates invalid!";
       LtsWidgets::LtsMessageDialog::showMessage(this, tr("Coordinates invalid!\nPlease check them and try again."));
       return;
     }
@@ -732,7 +732,7 @@ bool ParticipantsMoveDialog::getUnitPosition(int32_t participantId, Core::GeoPos
   ParticipantManagement::UnitPosition up = m_ppmDtc->unitPosition(participantId);
   if (up.participantId() != participantId)
   {
-    ERROR_LOG() << Q_FUNC_INFO << ", unitPosition failed for participantId=" << participantId;
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << ", unitPosition failed for participantId=" << participantId;
     return false;
   }
 
@@ -767,7 +767,7 @@ void ParticipantsMoveDialog::doSetSimulatedPositionRequest(const ParticipantMana
   {
     const ParticipantManagement::TypeClass tc = m_ppmDtc->type(participantData.typeId()).typeClass();
 
-    DEBUG_LOG() << "ParticipantId=" << participantData.id()
+    DEBUG_LOG(m_logger) << "ParticipantId=" << participantData.id()
                         << " EquipmentNr=" << participantData.equipmentNumber()
                         << " onGetCoordinate x=" << coordinate.x() << " y=" << coordinate.y()
                         << ", tc=" << tc;
@@ -816,11 +816,11 @@ void ParticipantsMoveDialog::doSetSimulatedPositionRelativeRequest(const Partici
   Core::GeoPosition unitPositionOut;
   if (!getUnitPosition(participantId, unitPositionOut))
   {
-    ERROR_LOG() << Q_FUNC_INFO << ", getUnitPosition failed for participantId=" << participantId;
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << ", getUnitPosition failed for participantId=" << participantId;
     return;
   }
 
-  INFO_LOG() << Q_FUNC_INFO << ", getUnitPosition for participantId=" << participantId
+  INFO_LOG(m_logger) << Q_FUNC_INFO << ", getUnitPosition for participantId=" << participantId
                      << ", unitPositionOut: lon=" << unitPositionOut.lon() << " - lat=" << unitPositionOut.lat();
 
   LtsCoordTrans::UtmCoordinate curUnitPosUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(unitPositionOut.lon(), unitPositionOut.lat());
@@ -829,7 +829,7 @@ void ParticipantsMoveDialog::doSetSimulatedPositionRelativeRequest(const Partici
 
   if (offset.isNull())
   {
-    ERROR_LOG() << Q_FUNC_INFO << ", required offset is zero. not expected... return";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << ", required offset is zero. not expected... return";
     return;
   }
 
@@ -838,7 +838,7 @@ void ParticipantsMoveDialog::doSetSimulatedPositionRelativeRequest(const Partici
   req.positionOffsetX(offset.x());
   req.positionOffsetY(offset.y());
 
-  DEBUG_LOG() << "SetSimulatedPositionRelative = " << req;
+  DEBUG_LOG(m_logger) << "SetSimulatedPositionRelative = " << req;
 
   m_requestHelper->startSingleRequest([req, this]()
   {
@@ -856,11 +856,11 @@ void ParticipantsMoveDialog::doSetSimulatedParticipantFormationRequest(const Par
   Core::GeoPosition unitPositionOut;
   if (!getUnitPosition(participantId, unitPositionOut))
   {
-    ERROR_LOG() << Q_FUNC_INFO << ", getUnitPosition failed for participantId=" << participantId;
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << ", getUnitPosition failed for participantId=" << participantId;
     return;
   }
 
-  INFO_LOG() << Q_FUNC_INFO << ", getUnitPosition for participantId=" << participantId
+  INFO_LOG(m_logger) << Q_FUNC_INFO << ", getUnitPosition for participantId=" << participantId
                      << ", unitPositionOut: lon=" << unitPositionOut.lon() << " - lat=" << unitPositionOut.lat();
 
   LtsCoordTrans::UtmCoordinate curUnitPosUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(unitPositionOut.lon(), unitPositionOut.lat());
@@ -869,7 +869,7 @@ void ParticipantsMoveDialog::doSetSimulatedParticipantFormationRequest(const Par
 
   if (offset.isNull())
   {
-    ERROR_LOG() << Q_FUNC_INFO << ", required offset is zero. not expected... return";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << ", required offset is zero. not expected... return";
     return;
   }
 
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 adb66bcb2..afad18139 100755
--- 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
@@ -19,7 +19,7 @@ ParticipantMoveModel::ParticipantMoveModel(QObject *parent,
   connect(m_dtc.get(), &ParticipantManagement::Interface::Dtc::participantChanged,
           this, &ParticipantMoveModel::onParticipantChanged);
 
-  DEBUG_LOG() << "ParticipantMoveModel::ParticipantMoveModel";
+  DEBUG_LOG(m_logger) << "ParticipantMoveModel::ParticipantMoveModel";
 }
 
 
@@ -42,7 +42,7 @@ void ParticipantMoveModel::onParticipantChanged(const ParticipantManagement::Par
   Q_UNUSED(modType)
   if (data.partyId() != m_partyId)
     return;
-  INFO_LOG() << "onParticipantChanged isSimulated=" << data.isSimulated();
+  INFO_LOG(m_logger) << "onParticipantChanged isSimulated=" << data.isSimulated();
   onReinitModel(partyId());
   emit newData();
 }
@@ -56,7 +56,7 @@ bool ParticipantMoveModel::isSelectableBySimulation(const QModelIndex &index, bo
       m_dtc->type(data.typeId()).typeClass() == ParticipantManagement::TypeClass_def::Unit)
     isSimulatable = false;
 
-  DEBUG_LOG() << "ParticipantId: " << data.id()
+  DEBUG_LOG(m_logger) << "ParticipantId: " << data.id()
                       << " isSimulated:" << data.isSimulated()
                       << " equipmentNo:" << data.equipmentNumber()
                       << " typeId=" << data.typeId()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_model.h
index 0dca6f6bb..eee0d476a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_model.h
@@ -28,6 +28,8 @@ signals:
   void newData();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType);
   bool isSelectableBySimulation(const QModelIndex &index, bool *bIsSimulated = nullptr) const;
 };
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 29106776a..51882f070 100755
--- 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
@@ -41,12 +41,12 @@ bool MissionPlanDialog::init(LtsSession::LtsSession *session)
 
   if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
   {
-    ERROR_LOG() << " failed to get ppmDtc";
+    ERROR_LOG(m_logger) << " failed to get ppmDtc";
     return false;
   }
   if (!m_session->getFtc<ParticipantManagement::DataInterface>(m_ppmFtc))
   {
-    ERROR_LOG() << " failed to get ppmFtc";
+    ERROR_LOG(m_logger) << " failed to get ppmFtc";
     return false;
   }
 
@@ -143,7 +143,7 @@ MissionPlanDialog::WayPointsStatus MissionPlanDialog::wayPointCurrentStatus(cons
     return WayPointsStatus::Expired;
 
   
-  WARNING_LOG()<<" -- Status Wegpunktkette Abgebrochen muss definiert werden";
+  WARNING_LOG(m_logger)<<" -- Status Wegpunktkette Abgebrochen muss definiert werden";
 
   return state;
 }
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 ba6bcf3be..9a6e02f1d 100755
--- 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
@@ -74,22 +74,22 @@ bool MissionPlanEdit::init(const int missionPlanId, LtsSession::LtsSessionDataDd
 
   if (!m_session->getDtc<ProjectDataManagement::DataInterface>(m_pdmDtc))
   {
-    ERROR_LOG() << " failed to get pdmDtc";
+    ERROR_LOG(m_logger) << " failed to get pdmDtc";
     return false;
   }
   if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
   {
-    ERROR_LOG() << " failed to get ppmDtc";
+    ERROR_LOG(m_logger) << " failed to get ppmDtc";
     return false;
   }
   if (!m_session->getFtc<ParticipantManagement::DataInterface>(m_ppmFtc))
   {
-    ERROR_LOG() << " failed to get ppmFtc";
+    ERROR_LOG(m_logger) << " failed to get ppmFtc";
     return false;
   }
   if (!m_session->getForeignGuiInterface<ParticipantManagement::ForeignGuiComboboxInterface>(m_ppmCbxGui))
   {
-    ERROR_LOG() << " failed to get ppmCbxGui";
+    ERROR_LOG(m_logger) << " failed to get ppmCbxGui";
     return false;
   }
   
@@ -130,16 +130,16 @@ bool MissionPlanEdit::init(const int missionPlanId, LtsSession::LtsSessionDataDd
     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() << "idx changed! pId: " << pId << ", m_participant.id(): " << m_participant.id() << ", dpd.participantId(): " << dpd.participantId();
+    DEBUG_LOG(m_logger) << "idx changed! pId: " << pId << ", m_participant.id(): " << m_participant.id() << ", dpd.participantId(): " << dpd.participantId();
 
     if (dpd.participantId() < 1) 
     {
-      ERROR_LOG() << "no dynamic pdata yet for pId " << pId;
+      ERROR_LOG(m_logger) << "no dynamic pdata yet for pId " << pId;
       setReady(false);
       return;
     }
 
-    DEBUG_LOG() << "calling onDynamicParticipantDataChanged !";
+    DEBUG_LOG(m_logger) << "calling onDynamicParticipantDataChanged !";
     onDynamicParticipantDataChanged(dpd, DataModification::eAdded);
   });
   connect(m_ppmDtc.get(), &ParticipantManagement::Interface::Dtc::dynamicParticipantDataChanged,
@@ -217,11 +217,11 @@ void MissionPlanEdit::onDynamicParticipantDataChanged(const ParticipantManagemen
 {
   if (data.participantId() != m_participant.id() && data.participantId() != 0)
   {
-    ERROR_LOG() << "### " << data.participantId() << " != " << m_participant.id() << " (" << (int)modType << ")";
+    ERROR_LOG(m_logger) << "### " << data.participantId() << " != " << m_participant.id() << " (" << (int)modType << ")";
     return;
   }
 
-  DEBUG_LOG() << "### " << data.participantId() << " == " << m_participant.id() << " (" << (int)modType << ") !!!";
+  DEBUG_LOG(m_logger) << "### " << data.participantId() << " == " << m_participant.id() << " (" << (int)modType << ") !!!";
 
   
   
@@ -246,7 +246,7 @@ void MissionPlanEdit::onDynamicParticipantDataChanged(const ParticipantManagemen
   youngestState.stateTime(0);
   for (const auto &si : history)
   {
-    DEBUG_LOG() << "StateInformation "
+    DEBUG_LOG(m_logger) << "StateInformation "
                          << " time=" << si.stateTime()
                          << " vulnerabilityBits=" << si.vulnerabilityBits()
                          << " vulnerabilityKindId=" << si.vulnerabilityKindId();
@@ -299,7 +299,7 @@ void MissionPlanEdit::onModifyMissionPlanReply(const Core::FunctionReplyObject &
 
 void MissionPlanEdit::onSetMissionActionFulfilledReply(const Core::FunctionReplyObject &replyObject)
 {
-  DEBUG_LOG()<<" -- MissionPlanEdit - onSetMissionActionFulfilledReply: "<<replyObject.error();
+  DEBUG_LOG(m_logger)<<" -- MissionPlanEdit - onSetMissionActionFulfilledReply: "<<replyObject.error();
 }
 
 QStringList MissionPlanEdit::tableColLabelList() const
@@ -586,7 +586,7 @@ void MissionPlanEdit::setUASCharges()
     
     if (!m_pdmDtc->isUasDroppable(chargeType.id(),0,0))
       continue;
-    DEBUG_LOG() << " fillCharges"
+    DEBUG_LOG(m_logger) << " fillCharges"
                         << ", id=" << chargeType.id()
                         << ", name= " << chargeType.name();
 
@@ -754,7 +754,7 @@ void MissionPlanEdit::onGetPolyline()
 
 void MissionPlanEdit::onPolylineData(const QPolygonF &polyline)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " numberOfPoints: " << polyline.size();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " numberOfPoints: " << polyline.size();
 
   if (polyline.size() < 2)
     return;
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 7ecda25ea..f1a552a5f 100755
--- 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
@@ -141,7 +141,7 @@ void MissionPlanModel::onMissionPlanChanged(const ParticipantManagement::Mission
 {
   const int id = data.id();
   int row = findRowForId(id);
-  DEBUG_LOG()<<"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/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 7d02ea479..436ed0c3b 100755
--- 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
@@ -44,11 +44,11 @@ bool AssignCodificationDataTable::init(const std::shared_ptr<CodificationManagem
                                        const std::shared_ptr<ParticipantManagement::Interface::Dtc>  &ppmDtc,
                                        LtsSession::LtsSession *session)
 {
-  DEBUG_LOG() << "AssignCodificationDataTable::init()";
+  DEBUG_LOG(m_logger) << "AssignCodificationDataTable::init()";
 
   if (!dtc || !ftc || !session || !ppmDtc)
   {
-    ERROR_LOG() << "AssignCodificationDataTable::init() Invalid shared_ptr!";
+    ERROR_LOG(m_logger) << "AssignCodificationDataTable::init() Invalid shared_ptr!";
     return false;
   }
 
@@ -64,7 +64,7 @@ bool AssignCodificationDataTable::init(const std::shared_ptr<CodificationManagem
 
   QMap<qint32, ParticipantManagement::Party> userVisibleParties; 
   m_ppmDtc->visibleParties(userVisibleParties, LtsSessionData::LtsSessionData::getInstance()->getVisibleParties(m_session->exerciseId()));
-  DEBUG_LOG() << "Number of parties visible to the user in the exercise: " << userVisibleParties.size();
+  DEBUG_LOG(m_logger) << "Number of parties visible to the user in the exercise: " << userVisibleParties.size();
 
   for (const ParticipantManagement::Party &party : std::as_const(userVisibleParties))  
   {
@@ -92,7 +92,7 @@ bool AssignCodificationDataTable::init(const std::shared_ptr<CodificationManagem
       cb->addItem(m_model->data(m_model->index(row, CodificationDataOverviewModel::Identifier), Qt::DisplayRole).toString(),
                   m_model->data(m_model->index(row, CodificationDataOverviewModel::Id), Qt::DisplayRole));
 
-      DEBUG_LOG() << "Init Combobox[" << row << "]: PartyId: " << party.id()
+      DEBUG_LOG(m_logger) << "Init Combobox[" << row << "]: PartyId: " << party.id()
                           << " Identifier: " << m_model->data(m_model->index(row, CodificationDataOverviewModel::Identifier), Qt::DisplayRole).toString()
                           << " CodTabId: "   << m_model->data(m_model->index(row, CodificationDataOverviewModel::Id), Qt::DisplayRole).toInt();
     }
@@ -104,17 +104,17 @@ bool AssignCodificationDataTable::init(const std::shared_ptr<CodificationManagem
     {
       tableId = 0;
       int assignedPartyId = m_model->data(m_model->index(row, CodificationDataOverviewModel::PartyIdHiddenColumn), Qt::DisplayRole).toInt();
-      DEBUG_LOG() << "Assignment[" << row <<  "]:  assignedPartyId: " << assignedPartyId;
+      DEBUG_LOG(m_logger) << "Assignment[" << row <<  "]:  assignedPartyId: " << assignedPartyId;
 
       if (party.id() == assignedPartyId)
       {
         tableId = m_model->data(m_model->index(row, CodificationDataOverviewModel::Id), Qt::DisplayRole).toInt();
-        DEBUG_LOG() << "Assignment[" << row <<  "]:  assignedPartyId: " << assignedPartyId
+        DEBUG_LOG(m_logger) << "Assignment[" << row <<  "]:  assignedPartyId: " << assignedPartyId
                             << " tableId: " << tableId;
         break;
       }
     }
-    DEBUG_LOG() << "Assignment currentIndex: " << cb->findData(tableId);
+    DEBUG_LOG(m_logger) << "Assignment currentIndex: " << cb->findData(tableId);
     cb->setCurrentIndex(cb->findData(tableId));
 
     m_ui->partyLayout->addWidget(cb, i, 1, 1, 1);
@@ -128,7 +128,7 @@ bool AssignCodificationDataTable::init(const std::shared_ptr<CodificationManagem
 
 bool AssignCodificationDataTable::apply()
 {
-  DEBUG_LOG() << "AssignCodificationDataTable::apply()";
+  DEBUG_LOG(m_logger) << "AssignCodificationDataTable::apply()";
 
   removeAllAssignments();
 
@@ -138,7 +138,7 @@ bool AssignCodificationDataTable::apply()
     int partyId = cb->property("partyId").toInt();
     int tableId = cb->currentData().toInt();
 
-    DEBUG_LOG() << "Assignments: partyId: " << partyId
+    DEBUG_LOG(m_logger) << "Assignments: partyId: " << partyId
                         << " codTableId: " << tableId;
 
     if (tableId < 1)
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 df7a29f13..3705711cd 100755
--- 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
@@ -49,6 +49,8 @@ private Q_SLOTS:
   bool apply() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
 
   bool removeAllAssignments();
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 29fecfaf1..44b3809fd 100755
--- 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
@@ -15,7 +15,7 @@ AuthenticationCodeModel::AuthenticationCodeModel(QObject *parent)
   , m_isEditMode(false)
 {
   memset(m_matrix, 0, sizeof m_matrix);
-  DEBUG_LOG() << "ctor AuthenticationCodeModel";
+  DEBUG_LOG(m_logger) << "ctor AuthenticationCodeModel";
 
 } 
 
@@ -24,11 +24,11 @@ bool AuthenticationCodeModel::init(const std::shared_ptr<CodificationManagement:
                                    int codificationDataId,
                                    bool isEditMode)
 {
-  DEBUG_LOG() << "AuthenticationCodeModel::init()";
+  DEBUG_LOG(m_logger) << "AuthenticationCodeModel::init()";
   if (!dtc)
     return false;
 
-  DEBUG_LOG() << "AuthenticationCodeModel::init()...";
+  DEBUG_LOG(m_logger) << "AuthenticationCodeModel::init()...";
 
   m_dtc = dtc;
   m_codificationDataId = codificationDataId;
@@ -73,12 +73,12 @@ void AuthenticationCodeModel::resetMatrix()
 
 bool AuthenticationCodeModel::setMatrixValuesCSV(const QString &csvData)
 {
-  DEBUG_LOG() << "setMatrixValuesCSV: " << csvData;
+  DEBUG_LOG(m_logger) << "setMatrixValuesCSV: " << csvData;
 
   const QVector<QStringRef> slRows = csvData.splitRef(QLatin1Char('\n'));
   if (slRows.size() != rowCount())
   {
-    ERROR_LOG() << "Invalid row data count." << " codificationDataId: " << m_codificationDataId
+    ERROR_LOG(m_logger) << "Invalid row data count." << " codificationDataId: " << m_codificationDataId
                         << " Soll/Ist: " << rowCount() - 1 << "/" << slRows.size();
     return false;
   }
@@ -88,7 +88,7 @@ bool AuthenticationCodeModel::setMatrixValuesCSV(const QString &csvData)
     const QVector<QStringRef> slColumns = slRows[row].split(QLatin1Char(';'));
     if (slColumns.size() != columnCount())
     {
-      ERROR_LOG() << "Invalid column data count." << " codificationDataId: " << m_codificationDataId
+      ERROR_LOG(m_logger) << "Invalid column data count." << " codificationDataId: " << m_codificationDataId
                           << " Soll/Ist: " << columnCount() - 1 << "/" << slColumns.size();
       return false;
     }
@@ -194,7 +194,7 @@ QVariant AuthenticationCodeModel::data(const QModelIndex &index, int role) const
 
 bool AuthenticationCodeModel::setData(const QModelIndex &index, const QVariant &value, int role)
 {
-  DEBUG_LOG() << "setData() row/col: " << index.row() << "/" << index.column()
+  DEBUG_LOG(m_logger) << "setData() row/col: " << index.row() << "/" << index.column()
                       << " char:" << value.toString() << " int:" << value.toInt();
 
   bool bOk;
@@ -202,7 +202,7 @@ bool AuthenticationCodeModel::setData(const QModelIndex &index, const QVariant &
 
   if ((!bOk) || (val < 0) || (val > 99))
   {
-    ERROR_LOG() << "setData() row/col: " << index.row() << "/" << index.column()
+    ERROR_LOG(m_logger) << "setData() row/col: " << index.row() << "/" << index.column()
                         << " Invalid Input! " << value.toString() << " Required input value in the range 0-99.";
     return false;
   }
@@ -236,7 +236,7 @@ void AuthenticationCodeModel::onCodificationDataChanged(const CodificationManage
 {
   const int id = data.id();
 
-  DEBUG_LOG() << "onCodificationDataChanged for CodificationData id: " << id
+  DEBUG_LOG(m_logger) << "onCodificationDataChanged for CodificationData id: " << id
                       << " - AuthenticationCodeMatrix data: " << data.authenticationTableMatirx().c_str()
                       << " - modType: " << (int)modType;
 
@@ -245,7 +245,7 @@ void AuthenticationCodeModel::onCodificationDataChanged(const CodificationManage
 
   if (modType == DataModification::eRemoved)
   {
-    WARNING_LOG() << "CodificationData was removed. id: " << id << " ToDo: 'ShowCodificationData' Tab loeschen !?";
+    WARNING_LOG(m_logger) << "CodificationData was removed. id: " << id << " ToDo: 'ShowCodificationData' Tab loeschen !?";
     
     resetMatrix();
     return;
@@ -253,7 +253,7 @@ void AuthenticationCodeModel::onCodificationDataChanged(const CodificationManage
 
   if (modType == DataModification::eModified)
   {
-    DEBUG_LOG() << "CodificationData was modifed. id: " << id << " - " << data.note();
+    DEBUG_LOG(m_logger) << "CodificationData was modifed. id: " << id << " - " << data.note();
 
     QString qs =  QString::fromStdString(data.authenticationTableMatirx());
     setMatrixValuesCSV(qs);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_authentication_code_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_authentication_code_model.h
index c423fdfa1..607bc8e96 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_authentication_code_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_authentication_code_model.h
@@ -81,6 +81,8 @@ private:
 
   
 
+
+NGL::INGLLogger &m_logger;
   void setMatrix(const QVector <int> &data);
 
   int m_matrix[13][5];                    
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 b5fd7cf20..b84aef337 100755
--- 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
@@ -6,18 +6,17 @@
 
 using namespace CodificationManagement;
 
-CodeTableEditDelegate::CodeTableEditDelegate(QWidget *parent, TableType tableType)
-  : QItemDelegate(parent)
-  , m_tableType(tableType)
-{
-  DEBUG_LOG() << "CodeTableEditDelegate::ctor()";
+CodeTableEditDelegate::CodeTableEditDelegate(QWidget *parent, TableType tableType) : QItemDelegate(parent)
+  , m_tableType(tableType),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  DEBUG_LOG(m_logger) << "CodeTableEditDelegate::ctor()";
 } 
 
 
 QWidget *CodeTableEditDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option,
                                              const QModelIndex &index) const
 {
-  DEBUG_LOG() << "CodeTableEditDelegate::createEditor() TableType: " << m_tableType
+  DEBUG_LOG(m_logger) << "CodeTableEditDelegate::createEditor() TableType: " << m_tableType
                       << " rox/column: " << index.row() << "/" << index.column() ;
 
   Q_UNUSED(option)
@@ -76,7 +75,7 @@ void CodeTableEditDelegate::setEditorData(QWidget *editor, const QModelIndex &in
   QVariant v = index.data(Qt::EditRole);
   le->setText(v.toString());
 
-  DEBUG_LOG() << "CodeTableEditDelegate::setEditorData() TableType: " << m_tableType
+  DEBUG_LOG(m_logger) << "CodeTableEditDelegate::setEditorData() TableType: " << m_tableType
                       << " rox/column: " << index.row() << "/" << index.column()
                       << " Input: " << v.toString();
 
@@ -90,7 +89,7 @@ void CodeTableEditDelegate::setModelData(QWidget *editor, QAbstractItemModel *mo
   if (!le)
     return;
 
-  DEBUG_LOG() << "CodeTableEditDelegate::setModelData() TableType: " << m_tableType
+  DEBUG_LOG(m_logger) << "CodeTableEditDelegate::setModelData() TableType: " << m_tableType
                       << " rox/column: " << index.row() << "/" << index.column()
                       << " Input: " << le->text();
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_code_table_edit_delegate.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_code_table_edit_delegate.h
index bf6c8ead5..6d7b2a407 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_code_table_edit_delegate.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_code_table_edit_delegate.h
@@ -43,6 +43,8 @@ public:
                     const QModelIndex &index) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   TableType             m_tableType;
 };
 
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 fa9d4241b..1e1456eca 100755
--- 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
@@ -37,7 +37,7 @@ CodificationDataOverviewModel::CodificationDataOverviewModel(QObject *parent)
 bool CodificationDataOverviewModel::initModel(const std::shared_ptr<CodificationManagement::Interface::Dtc> &codDtc,
                                               const std::shared_ptr<ParticipantManagement::Interface::Dtc> &ppmDtc)
 {
-  DEBUG_LOG() << "CodificationDataModel::initModel()";
+  DEBUG_LOG(m_logger) << "CodificationDataModel::initModel()";
 
   if (!codDtc || !ppmDtc)
     return false;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_overview_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_overview_model.h
index b83f00703..3bcf414b6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_overview_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_overview_model.h
@@ -51,6 +51,8 @@ public:
   friend class CodificationDataOverviewProxyModel;
 
 private:
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<CodificationManagement::Interface::Dtc> m_codDtc;
   std::shared_ptr<ParticipantManagement::Interface::Dtc>  m_ppmDtc;
 };
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 63bea9d51..6898628c4 100755
--- 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
@@ -131,7 +131,7 @@ void CodificationDataOverviewView::onShowCodificationData()
 
   CodificationManagement::CodificationData codificationData = m_model->getRowData(row);
 
-  DEBUG_LOG() << "--- onShowCodificationData() "
+  DEBUG_LOG(m_logger) << "--- onShowCodificationData() "
                       << " id: " << codificationData.id();
 
   CodificationDataTableView *dialog = new CodificationDataTableView;
@@ -145,7 +145,7 @@ void CodificationDataOverviewView::onShowCodificationData()
 
 void CodificationDataOverviewView::onAddCodificationData()
 {
-  DEBUG_LOG() << "--- onAddCodificationData() ";
+  DEBUG_LOG(m_logger) << "--- onAddCodificationData() ";
 
   CodificationDataTableEditView *dialog = new CodificationDataTableEditView(this);
   dialog->init(m_dtc, m_ftc, m_session, 0);
@@ -165,7 +165,7 @@ void CodificationDataOverviewView::onEditCodificationData()
 
   CodificationManagement::CodificationData codificationData = m_model->getRowData(row);
 
-  DEBUG_LOG() << "--- onEditCodificationData() "
+  DEBUG_LOG(m_logger) << "--- onEditCodificationData() "
                       << " id: " << codificationData.id();
 
   CodificationDataTableEditView *dialog = new CodificationDataTableEditView(this);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_overview_view.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_overview_view.h
index 90b4304a0..72d7cf413 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_overview_view.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_overview_view.h
@@ -40,6 +40,9 @@ public:
 
 
 private:
+
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void onSelectionChanged();
   void onShowCodificationData();
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 3d24adf8b..7ad1df115 100755
--- 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
@@ -53,11 +53,11 @@ bool CodificationDataTableEditView::init(const std::shared_ptr<CodificationManag
                                          LtsSession::LtsSession *session,
                                          int codificationDataId)
 {
-  DEBUG_LOG() << "CodificationDataTableEditView::init()  codificationDataId: "  << codificationDataId;
+  DEBUG_LOG(m_logger) << "CodificationDataTableEditView::init()  codificationDataId: "  << codificationDataId;
 
   if (!dtc || !ftc || !session)
   {
-    ERROR_LOG() << "CodificationDataTableEditView::init() Invalid shared_ptr!";
+    ERROR_LOG(m_logger) << "CodificationDataTableEditView::init() Invalid shared_ptr!";
     return false;
   }
 
@@ -125,7 +125,7 @@ bool CodificationDataTableEditView::init(const std::shared_ptr<CodificationManag
 
 void CodificationDataTableEditView::onLoadCodificationData()
 {
-  DEBUG_LOG() << "CodificationDataTableEditView::onLoadCodificationData()";
+  DEBUG_LOG(m_logger) << "CodificationDataTableEditView::onLoadCodificationData()";
 
   QString note;
   CSVImport csvImport(m_numCodeModel, m_authenticationCodeModel, m_logisticalTermsModel,
@@ -135,7 +135,7 @@ void CodificationDataTableEditView::onLoadCodificationData()
 
   if (result == CSVImport::LoadOk)
   {
-    DEBUG_LOG() << "Load CSV data ok!";
+    DEBUG_LOG(m_logger) << "Load CSV data ok!";
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("Load CSV data ok. The loaded data must be taken over with the 'Apply' or 'Add' button."), tr("CSV Import Info"));
     m_ui->pteNote->setPlainText(note);
 
@@ -153,14 +153,14 @@ void CodificationDataTableEditView::onLoadCodificationData()
     m_phraseTableModel->resetMatrix();
     m_ui->pteNote->clear();
 
-    ERROR_LOG() << "Load CSV data failed!";
+    ERROR_LOG(m_logger) << "Load CSV data failed!";
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("Load CSV data failed!"), tr("CSV Import Info"));
     return;
   }
 
   if (result == CSVImport::UserAbort)
   {
-    DEBUG_LOG() << "Load CSV data abort by user";
+    DEBUG_LOG(m_logger) << "Load CSV data abort by user";
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("Load CSV data abort by user"), tr("CSV Import Info"));
   }
 } 
@@ -168,34 +168,34 @@ void CodificationDataTableEditView::onLoadCodificationData()
 
 void CodificationDataTableEditView::onSaveCodificationData()
 {
-  DEBUG_LOG() << "CodificationDataTableEditView::onSaveCodificationData()";
+  DEBUG_LOG(m_logger) << "CodificationDataTableEditView::onSaveCodificationData()";
 
   CSVExport csvExport(m_numCodeModel, m_authenticationCodeModel, m_logisticalTermsModel,
                       m_phraseTableModel, m_ui->pteNote->toPlainText(), this);
 
   if (!csvExport.writeCSVData())
-    ERROR_LOG() << "Write CSV data to file failed! id:" << m_codificationDataId;
+    ERROR_LOG(m_logger) << "Write CSV data to file failed! id:" << m_codificationDataId;
   else
-    DEBUG_LOG() << "Write CSV data to file ok! id:" << m_codificationDataId;
+    DEBUG_LOG(m_logger) << "Write CSV data to file ok! id:" << m_codificationDataId;
 } 
 
 
 void CodificationDataTableEditView::loadCodificationDataFromDatabase()
 {
   m_lastDdsCodificationData = m_dtc->codificationData(m_codificationDataId);
-  DEBUG_LOG() << "Load from database: ---";
-  DEBUG_LOG() << "NumCodeHorizontalHeader: " << m_lastDdsCodificationData.numeralCodeTableColumnIndex();
-  DEBUG_LOG() << "NumCodeVerticalHeader: " << m_lastDdsCodificationData.numeralCodeTableRowIndex();
+  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() << "AuthenticationMatrix: " << m_lastDdsCodificationData.authenticationTableMatirx();
+  DEBUG_LOG(m_logger) << "AuthenticationMatrix: " << m_lastDdsCodificationData.authenticationTableMatirx();
 
-  DEBUG_LOG() << "LogisticalTermsHorizontalHeader: " << m_lastDdsCodificationData.logisticalTermTableColumnIndex();
-  DEBUG_LOG() << "LogisticalTermsVerticalHeader: " << m_lastDdsCodificationData.logisticalTermTableRowIndex();
-  DEBUG_LOG() << "LogisticalTermsMatrix :" << m_lastDdsCodificationData.logisticalTermTableMatrix();
+  DEBUG_LOG(m_logger) << "LogisticalTermsHorizontalHeader: " << m_lastDdsCodificationData.logisticalTermTableColumnIndex();
+  DEBUG_LOG(m_logger) << "LogisticalTermsVerticalHeader: " << m_lastDdsCodificationData.logisticalTermTableRowIndex();
+  DEBUG_LOG(m_logger) << "LogisticalTermsMatrix :" << m_lastDdsCodificationData.logisticalTermTableMatrix();
 
-  DEBUG_LOG() << "PhraseTable :" << m_lastDdsCodificationData.phraseTable();
+  DEBUG_LOG(m_logger) << "PhraseTable :" << m_lastDdsCodificationData.phraseTable();
 
-  DEBUG_LOG() << "Note: " << m_lastDdsCodificationData.note();
+  DEBUG_LOG(m_logger) << "Note: " << m_lastDdsCodificationData.note();
 
   return;
 } 
@@ -400,7 +400,7 @@ void CodificationDataTableEditView::onPrint()
 
 bool CodificationDataTableEditView::apply()
 {
-  DEBUG_LOG() << "CodificationDataTableEditView::onOkayCodificationData()";
+  DEBUG_LOG(m_logger) << "CodificationDataTableEditView::onOkayCodificationData()";
 
   
   
@@ -416,28 +416,28 @@ bool CodificationDataTableEditView::apply()
   modifiedCodificationData.numeralCodeTableColumnIndex(m_numCodeModel->getHorizontalHeaderCSVString().toStdString());
   modifiedCodificationData.numeralCodeTableRowIndex(m_numCodeModel->getVerticalHeaderCSVString().toStdString()) ;
 
-  DEBUG_LOG() << "onOkayCodificationData() HH: " << m_numCodeModel->getHorizontalHeaderCSVString();
-  DEBUG_LOG() << "onOkayCodificationData() VH: " << m_numCodeModel->getVerticalHeaderCSVString();
+  DEBUG_LOG(m_logger) << "onOkayCodificationData() HH: " << m_numCodeModel->getHorizontalHeaderCSVString();
+  DEBUG_LOG(m_logger) << "onOkayCodificationData() VH: " << m_numCodeModel->getVerticalHeaderCSVString();
 
   
   modifiedCodificationData.authenticationTableMatirx(m_authenticationCodeModel->getMatrixDataCSVString().toStdString());
-  DEBUG_LOG() << "onOkayCodificationData() authMatrix: " << m_authenticationCodeModel->getMatrixDataCSVString();
+  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());
-  DEBUG_LOG() << "onOkayCodificationData() HH: " << m_logisticalTermsModel->getHorizontalHeaderCSVString();
-  DEBUG_LOG() << "onOkayCodificationData() VH: " << m_logisticalTermsModel->getVerticalHeaderCSVString();
-  DEBUG_LOG() << "onOkayCodificationData() logTermsMatrix: " << m_logisticalTermsModel->getMatrixDataCSVString();
+  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());
-  DEBUG_LOG() << "onOkayCodificationData() phraseTable: " << m_phraseTableModel->getMatrixDataCSVString();
+  DEBUG_LOG(m_logger) << "onOkayCodificationData() phraseTable: " << m_phraseTableModel->getMatrixDataCSVString();
 
   
   modifiedCodificationData.note(m_ui->pteNote->toPlainText().toStdString());
-  DEBUG_LOG() << "CodificationDataTableEditView::onOkayCodificationData()";
+  DEBUG_LOG(m_logger) << "CodificationDataTableEditView::onOkayCodificationData()";
 
   modifiedCodificationData.identifier(m_ui->leIdentifier->text().toStdString());
   modifiedCodificationData.validityTime(m_ui->dteValidityTime->msecsSinceEpoch());
@@ -463,16 +463,16 @@ void CodificationDataTableEditView::onExportButtonClicked()
 
   int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Text, m_session->exerciseId(), byteArray);
   if (fileId > 0)
-    DEBUG_LOG() << "Saved file with id = " << fileId;
+    DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
   else
-    ERROR_LOG() << "Could not save file in library ";
+    ERROR_LOG(m_logger) << "Could not save file in library ";
 
 }
 
 
 void CodificationDataTableEditView::onImportButtonClicked()
 {
-  DEBUG_LOG() << " onImportButtonClicked() ";
+  DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
   QString note;
   CSVImport csvImport(m_numCodeModel, m_authenticationCodeModel, m_logisticalTermsModel,
                       m_phraseTableModel, &note, this);
@@ -485,7 +485,7 @@ void CodificationDataTableEditView::onImportButtonClicked()
     {
       
 
-      INFO_LOG() << "--- onImportButtonClicked() ";
+      INFO_LOG(m_logger) << "--- onImportButtonClicked() ";
       csvImport.loadCSVDataByteArray(content);
       m_ui->pteNote->setPlainText(note);
     }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_table_edit_view.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_table_edit_view.h
index dd83392f0..c5ab0eae5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_table_edit_view.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_table_edit_view.h
@@ -64,6 +64,9 @@ private slots:
 
 
 private:
+
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void loadCodificationDataFromDatabase();
 
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 33269a8f8..db2805f3b 100755
--- 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
@@ -56,7 +56,7 @@ bool CodificationDataTableView::init(const std::shared_ptr<CodificationManagemen
                                      int partyId,
                                      int codificationDataId)
 {
-  DEBUG_LOG() << "CodificationDataTableView::init()";
+  DEBUG_LOG(m_logger) << "CodificationDataTableView::init()";
 
   m_dtc = dtc;
   m_ftc = ftc;
@@ -66,14 +66,14 @@ bool CodificationDataTableView::init(const std::shared_ptr<CodificationManagemen
 
   if (!m_dtc || !m_ftc || !m_session)
   {
-    ERROR_LOG() << "CodificationDataTableView::init() Invalid shared_ptr!";
+    ERROR_LOG(m_logger) << "CodificationDataTableView::init() Invalid shared_ptr!";
     return false;
   }
 
   if (codificationDataId < 0)
   {
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("Invalid codification Data Id. Probably the table is not assigned to any party."));
-    ERROR_LOG() << "CodificationDataTableView::init() Invalid codificationDataId: " << codificationDataId;
+    ERROR_LOG(m_logger) << "CodificationDataTableView::init() Invalid codificationDataId: " << codificationDataId;
     return false;
   }
 
@@ -112,22 +112,22 @@ bool CodificationDataTableView::init(const std::shared_ptr<CodificationManagemen
 
 void CodificationDataTableView::loadCodificationDataFromDatabase()
 {
-  DEBUG_LOG() << "CodificationDataTableView::loadCodificationDataFromDatabase()";
+  DEBUG_LOG(m_logger) << "CodificationDataTableView::loadCodificationDataFromDatabase()";
 
   m_lastDdsCodificationData = m_dtc->codificationData(m_codificationDataId);
-  DEBUG_LOG() << "Load from database: ";
-  DEBUG_LOG() << "NumCodeHorizontalHeader: " << m_lastDdsCodificationData.numeralCodeTableColumnIndex();
-  DEBUG_LOG() << "NumCodeVerticalHeader: " << m_lastDdsCodificationData.numeralCodeTableRowIndex();
+  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() << "LogisticalTermsHorizontalHeader: " << m_lastDdsCodificationData.logisticalTermTableColumnIndex();
-  DEBUG_LOG() << "LogisticalTermsVerticalHeader: " << m_lastDdsCodificationData.logisticalTermTableRowIndex();
-  DEBUG_LOG() << "LogisticalTermsMatrix: " << m_lastDdsCodificationData.logisticalTermTableMatrix();
+  DEBUG_LOG(m_logger) << "LogisticalTermsHorizontalHeader: " << m_lastDdsCodificationData.logisticalTermTableColumnIndex();
+  DEBUG_LOG(m_logger) << "LogisticalTermsVerticalHeader: " << m_lastDdsCodificationData.logisticalTermTableRowIndex();
+  DEBUG_LOG(m_logger) << "LogisticalTermsMatrix: " << m_lastDdsCodificationData.logisticalTermTableMatrix();
 
-  DEBUG_LOG() << "AuthenticationMatrix: " << m_lastDdsCodificationData.authenticationTableMatirx();
+  DEBUG_LOG(m_logger) << "AuthenticationMatrix: " << m_lastDdsCodificationData.authenticationTableMatirx();
 
-  DEBUG_LOG() << "PhraseTable: " << m_lastDdsCodificationData.phraseTable();
+  DEBUG_LOG(m_logger) << "PhraseTable: " << m_lastDdsCodificationData.phraseTable();
 
-  DEBUG_LOG() << "Note: " << m_lastDdsCodificationData.note();
+  DEBUG_LOG(m_logger) << "Note: " << m_lastDdsCodificationData.note();
 
   return;
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_table_view.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_table_view.h
index 524a99d98..c994dd012 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_table_view.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_codification_data_table_view.h
@@ -47,6 +47,8 @@ private Q_SLOTS:
                                  DataModification modType);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void loadCodificationDataFromDatabase();
   void onPrint();
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 ef2e2e6ae..9292f563d 100755
--- 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
@@ -20,14 +20,13 @@ CSVExport::CSVExport(const NumeralCodeModel *numCodeModel,
                      const LogisticalTermsModel *logisticalTermsModel,
                      const PhraseTableModel *phraseTableModel,
                      const QString &note,
-                     QWidget *parent)
-  : QWidget(parent)
+                     QWidget *parent) : QWidget(parent)
   , m_numCodeModel(numCodeModel)
   , m_authenticationCodeModel(authenticationCodeModel)
   , m_logisticalTermsModel(logisticalTermsModel)
   , m_phraseTableModel(phraseTableModel)
-  , m_note(note)
-{
+  , m_note(note),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 } 
 
 
@@ -74,7 +73,7 @@ QByteArray CSVExport::exportToByteArray() const
 
 bool CSVExport::writeCSVData()
 {
-  DEBUG_LOG() << "writeCSVData()";
+  DEBUG_LOG(m_logger) << "writeCSVData()";
 
   QFileDialog dialog;
   dialog.setNameFilter(tr("CSV File (*.csv)"));
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_export.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_export.h
index 1049b4cec..b50493660 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_export.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_export.h
@@ -35,6 +35,9 @@ private Q_SLOTS:
 
 
 private:
+
+
+NGL::INGLLogger &m_logger;
   const NumeralCodeModel         *m_numCodeModel;
   const AuthenticationCodeModel  *m_authenticationCodeModel;
   const LogisticalTermsModel     *m_logisticalTermsModel;
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 c1bbbb98e..38e79ba51 100755
--- 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
@@ -22,14 +22,13 @@ CSVImport::CSVImport(NumeralCodeModel *numCodeModel,
                      LogisticalTermsModel *logisticalTermsModel,
                      PhraseTableModel *phraseTableModel,
                      QString *note,
-                     QWidget *parent)
-  : QWidget(parent)
+                     QWidget *parent) : QWidget(parent)
   , m_numCodeModel(numCodeModel)
   , m_authenticationCodeModel(authenticationCodeModel)
   , m_logisticalTermsModel(logisticalTermsModel)
   , m_phraseTableModel(phraseTableModel)
-  , m_note(note)
-{
+  , m_note(note),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 } 
 
 
@@ -78,7 +77,7 @@ CSVImport::CSVImportResult CSVImport::loadCSVDataByteArray(QByteArray content)
 
       if (qbaLine == "<Numeral Code Horizontal Header>\n")
       {
-        DEBUG_LOG() << "found " << qbaLine;
+        DEBUG_LOG(m_logger) << "found " << qbaLine;
         qba = &qbaNumCodeHorizontalHeader;
         desiredCvsSeperatorsPerLine = 12;
         ++csvKeywordCount;
@@ -87,7 +86,7 @@ CSVImport::CSVImportResult CSVImport::loadCSVDataByteArray(QByteArray content)
 
       if (qbaLine == "<Numeral Code Vertical Header>\n")
       {
-        DEBUG_LOG() << "found " << qbaLine;
+        DEBUG_LOG(m_logger) << "found " << qbaLine;
         qba = &qbaNumCodeVerticalHeader;
         desiredCvsSeperatorsPerLine = 0;
         ++csvKeywordCount;
@@ -96,7 +95,7 @@ CSVImport::CSVImportResult CSVImport::loadCSVDataByteArray(QByteArray content)
 
       if (qbaLine == "<Authentication Code Matrix>\n")
       {
-        DEBUG_LOG() << "found " << qbaLine;
+        DEBUG_LOG(m_logger) << "found " << qbaLine;
         qba = &qbaAuthenticationCodeMatrix;
         desiredCvsSeperatorsPerLine = 4;
         ++csvKeywordCount;
@@ -105,7 +104,7 @@ CSVImport::CSVImportResult CSVImport::loadCSVDataByteArray(QByteArray content)
 
       if (qbaLine == "<Logistical Terms Table Horizontal Header>\n")
       {
-        DEBUG_LOG() << "found " << qbaLine;
+        DEBUG_LOG(m_logger) << "found " << qbaLine;
         qba = &qbaLogTermsTableHorizontalHeader;
         desiredCvsSeperatorsPerLine = 4;
         ++csvKeywordCount;
@@ -114,7 +113,7 @@ CSVImport::CSVImportResult CSVImport::loadCSVDataByteArray(QByteArray content)
 
       if (qbaLine == "<Logistical Terms Table Vertical Header>\n")
       {
-        DEBUG_LOG() << "found " << qbaLine;
+        DEBUG_LOG(m_logger) << "found " << qbaLine;
         qba = &qbaLogTermsTableVerticalHeader;
         desiredCvsSeperatorsPerLine = 0;
         ++csvKeywordCount;
@@ -123,7 +122,7 @@ CSVImport::CSVImportResult CSVImport::loadCSVDataByteArray(QByteArray content)
 
       if (qbaLine == "<Logistical Terms Table Matrix>\n")
       {
-        DEBUG_LOG() << "found " << qbaLine;
+        DEBUG_LOG(m_logger) << "found " << qbaLine;
         qba = &qbaLogTermsTableMatrix;
         desiredCvsSeperatorsPerLine = 4;
         ++csvKeywordCount;
@@ -132,7 +131,7 @@ CSVImport::CSVImportResult CSVImport::loadCSVDataByteArray(QByteArray content)
 
       if (qbaLine == "<Phrase Table Matrix>\n")
       {
-        DEBUG_LOG() << "found " << qbaLine;
+        DEBUG_LOG(m_logger) << "found " << qbaLine;
         qba = &qbaPhraseTableMatrix;
         desiredCvsSeperatorsPerLine = 1;
         ++csvKeywordCount;
@@ -141,7 +140,7 @@ CSVImport::CSVImportResult CSVImport::loadCSVDataByteArray(QByteArray content)
 
       if (qbaLine == "<Note>\n")
       {
-        DEBUG_LOG() << "found " << qbaLine;
+        DEBUG_LOG(m_logger) << "found " << qbaLine;
         qba = &qbaNote;
         desiredCvsSeperatorsPerLine = 0;
         ++csvKeywordCount;
@@ -230,23 +229,23 @@ CSVImport::CSVImportResult CSVImport::loadCSVDataByteArray(QByteArray content)
 
   if (csvKeywordCount != 8)
   {
-    ERROR_LOG() << "Load csv data failed! Invalid csvKeywordCount. Soll/Ist: 8/" << csvKeywordCount;
+    ERROR_LOG(m_logger) << "Load csv data failed! Invalid csvKeywordCount. Soll/Ist: 8/" << csvKeywordCount;
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("Load csv data failed! Invalid number of cvs keywords."), tr("CSV Load Error"));
     return CSVImportResult::LoadFailed;
   }
 
   
-  DEBUG_LOG() << "Load csv ready... ";
-  DEBUG_LOG() << "\n-----------start  show load csv data blocks -------------------------\n";
-  DEBUG_LOG() << "\n<Block ... <Numeral Code Horizontal Header>: \"" << qbaNumCodeHorizontalHeader << "\"\n";
-  DEBUG_LOG() << "\n<Block ... <Numeral Code Vertical Header>: \"" << qbaNumCodeVerticalHeader << "\"\n";
-  DEBUG_LOG() << "\n<Block ... <Authentication Code Matrix>: \"" << qbaAuthenticationCodeMatrix << "\"\n";
-  DEBUG_LOG() << "\n<Block ... <Logistical Terms Table Horizontal Header>: \"" << qbaLogTermsTableHorizontalHeader << "\"\n";
-  DEBUG_LOG() << "\n<Block ... <Logistical Terms Table Vertical Header>: \"" << qbaLogTermsTableVerticalHeader << "\"\n";
-  DEBUG_LOG() << "\n<Block ... <Logistical Terms Table Matrix>: \"" << qbaLogTermsTableMatrix << "\"\n";
-  DEBUG_LOG() << "\n<Block ... <Phrase Table Matrix>: \"" << qbaPhraseTableMatrix << "\"\n";
-  DEBUG_LOG() << "\n<Block ... <Note>: \"" << qbaNote << "\"\n";
-  DEBUG_LOG() << "\n-----------end of show load csv data blocks -------------------------\n";
+  DEBUG_LOG(m_logger) << "Load csv ready... ";
+  DEBUG_LOG(m_logger) << "\n-----------start  show load csv data blocks -------------------------\n";
+  DEBUG_LOG(m_logger) << "\n<Block ... <Numeral Code Horizontal Header>: \"" << qbaNumCodeHorizontalHeader << "\"\n";
+  DEBUG_LOG(m_logger) << "\n<Block ... <Numeral Code Vertical Header>: \"" << qbaNumCodeVerticalHeader << "\"\n";
+  DEBUG_LOG(m_logger) << "\n<Block ... <Authentication Code Matrix>: \"" << qbaAuthenticationCodeMatrix << "\"\n";
+  DEBUG_LOG(m_logger) << "\n<Block ... <Logistical Terms Table Horizontal Header>: \"" << qbaLogTermsTableHorizontalHeader << "\"\n";
+  DEBUG_LOG(m_logger) << "\n<Block ... <Logistical Terms Table Vertical Header>: \"" << qbaLogTermsTableVerticalHeader << "\"\n";
+  DEBUG_LOG(m_logger) << "\n<Block ... <Logistical Terms Table Matrix>: \"" << qbaLogTermsTableMatrix << "\"\n";
+  DEBUG_LOG(m_logger) << "\n<Block ... <Phrase Table Matrix>: \"" << qbaPhraseTableMatrix << "\"\n";
+  DEBUG_LOG(m_logger) << "\n<Block ... <Note>: \"" << qbaNote << "\"\n";
+  DEBUG_LOG(m_logger) << "\n-----------end of show load csv data blocks -------------------------\n";
 
   
   qbaNumCodeHorizontalHeader = qbaNumCodeHorizontalHeader.trimmed(); 
@@ -305,7 +304,7 @@ CSVImport::CSVImportResult CSVImport::loadCSVDataByteArray(QByteArray content)
 
 CSVImport::CSVImportResult CSVImport::loadCSVData()
 {
-  DEBUG_LOG() << "loadCSVData()";
+  DEBUG_LOG(m_logger) << "loadCSVData()";
 
   QFileDialog dialog;
   dialog.setNameFilter(tr("CSV File (*.csv)"));
@@ -340,12 +339,12 @@ CSVImport::CSVImportResult CSVImport::loadCSVData()
 bool CSVImport::checkNumCodeHorizontalHeader(const QByteArray &qbaNumCodeHorizontalHeader)
 {
   
-  DEBUG_LOG() << "Data: \"" << qbaNumCodeHorizontalHeader << "\"";
-  DEBUG_LOG() << "Data.size: Soll/Ist: 13 + 12 = 25/" << qbaNumCodeHorizontalHeader.size();
+  DEBUG_LOG(m_logger) << "Data: \"" << qbaNumCodeHorizontalHeader << "\"";
+  DEBUG_LOG(m_logger) << "Data.size: Soll/Ist: 13 + 12 = 25/" << qbaNumCodeHorizontalHeader.size();
 
   if (qbaNumCodeHorizontalHeader.size() == 25)
     return true;
-  ERROR_LOG() << "Load csv data 'Numeral Code Horizontal Header' failed!";
+  ERROR_LOG(m_logger) << "Load csv data 'Numeral Code Horizontal Header' failed!";
   LtsWidgets::LtsMessageDialog::showMessage(this, tr("Load csv data 'Numeral Code Horizontal Header' failed!"), tr("CSV Load Error"));
   return false;
 } 
@@ -354,12 +353,12 @@ bool CSVImport::checkNumCodeHorizontalHeader(const QByteArray &qbaNumCodeHorizon
 bool CSVImport::checkNumCodeVerticalHeader(const QByteArray &qbaNumCodeVerticalHeader)
 {
   
-  DEBUG_LOG() << "Data: \"" << qbaNumCodeVerticalHeader << "\"";
-  DEBUG_LOG() << "Data.size: Soll/Ist: 13 + 12 = 25/" << qbaNumCodeVerticalHeader.size();
+  DEBUG_LOG(m_logger) << "Data: \"" << qbaNumCodeVerticalHeader << "\"";
+  DEBUG_LOG(m_logger) << "Data.size: Soll/Ist: 13 + 12 = 25/" << qbaNumCodeVerticalHeader.size();
 
   if (qbaNumCodeVerticalHeader.size() == 25)
     return true;
-  ERROR_LOG() << "Load csv data 'Numeral Code Vertical Header' failed!";
+  ERROR_LOG(m_logger) << "Load csv data 'Numeral Code Vertical Header' failed!";
   LtsWidgets::LtsMessageDialog::showMessage(this, tr("Load csv data 'Numeral Code Vertical Header' failed!"), tr("CSV Load Error"));
   return false;
 } 
@@ -368,7 +367,7 @@ bool CSVImport::checkNumCodeVerticalHeader(const QByteArray &qbaNumCodeVerticalH
 bool CSVImport::checkAuthenticationCodeMatrix(QByteArray &qbaAuthenticationCodeMatrix)
 {
   
-  DEBUG_LOG() << "Data: \"" << qbaAuthenticationCodeMatrix << "\"";
+  DEBUG_LOG(m_logger) << "Data: \"" << qbaAuthenticationCodeMatrix << "\"";
 
   QByteArray qbaOutMatrix;
 
@@ -389,13 +388,13 @@ bool CSVImport::checkAuthenticationCodeMatrix(QByteArray &qbaAuthenticationCodeM
 
   qbaAuthenticationCodeMatrix = qbaOutMatrix;
 
-  DEBUG_LOG() << "Data.size: Soll/Ist: 13 * (5*2 + 4 + 1) -1 = 194 /" << qbaAuthenticationCodeMatrix.size();
+  DEBUG_LOG(m_logger) << "Data.size: Soll/Ist: 13 * (5*2 + 4 + 1) -1 = 194 /" << qbaAuthenticationCodeMatrix.size();
 
   if (qbaAuthenticationCodeMatrix.size() == 194)
     return true;
   else
   {
-    ERROR_LOG() << "Load csv data 'Authentication Code Matrix' failed!";
+    ERROR_LOG(m_logger) << "Load csv data 'Authentication Code Matrix' failed!";
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("Load csv data 'Authentication Code Matrix' failed!"), tr("CSV Load Error"));
     return false;
   }
@@ -405,14 +404,14 @@ bool CSVImport::checkAuthenticationCodeMatrix(QByteArray &qbaAuthenticationCodeM
 bool CSVImport::checkLogTermsTableHorizontalHeader(const QByteArray &qbaLogTermsTableHorizontalHeader)
 {
   
-  DEBUG_LOG() << "Data: \"" << qbaLogTermsTableHorizontalHeader << "\"";
-  DEBUG_LOG() << "Data.size: Soll/Ist: 5 + 4 = 9/" << qbaLogTermsTableHorizontalHeader.size();
+  DEBUG_LOG(m_logger) << "Data: \"" << qbaLogTermsTableHorizontalHeader << "\"";
+  DEBUG_LOG(m_logger) << "Data.size: Soll/Ist: 5 + 4 = 9/" << qbaLogTermsTableHorizontalHeader.size();
 
   if (qbaLogTermsTableHorizontalHeader.size() == 9)
     return true;
   else
   {
-    ERROR_LOG() << "Load csv data 'Logistical Terms Table Horizontal Header' failed!";
+    ERROR_LOG(m_logger) << "Load csv data 'Logistical Terms Table Horizontal Header' failed!";
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("Load csv data 'Logistical Terms Table Horizontal Header' failed!"), tr("CSV Load Error"));
     return false;
   }
@@ -422,14 +421,14 @@ bool CSVImport::checkLogTermsTableHorizontalHeader(const QByteArray &qbaLogTerms
 bool CSVImport::checkLogTermsTableVerticalHeader(const QByteArray &qbaLogTermsTableVerticalHeader)
 {
   
-  DEBUG_LOG() << "Data: \"" << qbaLogTermsTableVerticalHeader << "\"";
-  DEBUG_LOG() << "Data.size: Soll/Ist: 5 + 4 = 9/" << qbaLogTermsTableVerticalHeader.size();
+  DEBUG_LOG(m_logger) << "Data: \"" << qbaLogTermsTableVerticalHeader << "\"";
+  DEBUG_LOG(m_logger) << "Data.size: Soll/Ist: 5 + 4 = 9/" << qbaLogTermsTableVerticalHeader.size();
 
   if (qbaLogTermsTableVerticalHeader.size() == 9)
     return true;
   else
   {
-    ERROR_LOG() << "Load csv data 'Logistical Terms Table Vertical Header' failed!";
+    ERROR_LOG(m_logger) << "Load csv data 'Logistical Terms Table Vertical Header' failed!";
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("Load csv data 'Logistical Terms Table Vertical Header' failed!"), tr("CSV Load Error"));
     return false;
   }
@@ -439,12 +438,12 @@ bool CSVImport::checkLogTermsTableVerticalHeader(const QByteArray &qbaLogTermsTa
 bool CSVImport::checkLogTermsTableMatrix(const QByteArray &qbaLogTermsTableMatrix)
 {
   
-  DEBUG_LOG() << "Data: \"" << qbaLogTermsTableMatrix << "\"";
+  DEBUG_LOG(m_logger) << "Data: \"" << qbaLogTermsTableMatrix << "\"";
 
   
   QStringList qsl = m_logisticalTermsModel->splitQuotedStringToRows(QString::fromLatin1(qbaLogTermsTableMatrix));
 
-  DEBUG_LOG() << "Line entry size: Soll/Ist: 5/" << qsl.size();
+  DEBUG_LOG(m_logger) << "Line entry size: Soll/Ist: 5/" << qsl.size();
 
   
   if (qsl.size() == 5)
@@ -464,7 +463,7 @@ bool CSVImport::checkLogTermsTableMatrix(const QByteArray &qbaLogTermsTableMatri
         
         if (qsEntry.size() > 10)
         {
-          ERROR_LOG() << "Load csv data 'Logistical Terms Table Matrix' failed! Maximum number of 10 characters per entry line exceeded in cell " << i + 1;
+          ERROR_LOG(m_logger) << "Load csv data 'Logistical Terms Table Matrix' failed! Maximum number of 10 characters per entry line exceeded in cell " << i + 1;
           LtsWidgets::LtsMessageDialog::showMessage(this, tr("Load csv data 'Logistical Terms Table Matrix' failed! Maximum number of 10 characters per entry line exceeded."), tr("CSV Load Error"));
           return false;
         }
@@ -476,7 +475,7 @@ bool CSVImport::checkLogTermsTableMatrix(const QByteArray &qbaLogTermsTableMatri
         
         if ((qsEntry.size() > 21) || (qsEntry.indexOf(QLatin1Char('\n')) > 10))
         {
-          ERROR_LOG() << "Load csv data 'Logistical Terms Table Matrix' failed! Maximum number of 10 characters per entry line exceeded in cell " << i + 1;
+          ERROR_LOG(m_logger) << "Load csv data 'Logistical Terms Table Matrix' failed! Maximum number of 10 characters per entry line exceeded in cell " << i + 1;
           LtsWidgets::LtsMessageDialog::showMessage(this, tr("Load csv data 'Logistical Terms Table Matrix' failed! Maximum number of 10 characters per entry line exceeded."), tr("CSV Load Error"));
           return false;
         }
@@ -486,7 +485,7 @@ bool CSVImport::checkLogTermsTableMatrix(const QByteArray &qbaLogTermsTableMatri
   }
   else
   {
-    ERROR_LOG() << "Load csv data 'Logistical Terms Table Matrix' failed!";
+    ERROR_LOG(m_logger) << "Load csv data 'Logistical Terms Table Matrix' failed!";
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("Load csv data 'Logistical Terms Table Matrix' failed!"), tr("CSV Load Error"));
     return false;
   }
@@ -496,14 +495,14 @@ bool CSVImport::checkLogTermsTableMatrix(const QByteArray &qbaLogTermsTableMatri
 bool CSVImport::checkPhraseTableMatrix(const QByteArray &qbaPhraseTableMatrix)
 {
   
-  DEBUG_LOG() << "Data: \"" << qbaPhraseTableMatrix << "\"";
+  DEBUG_LOG(m_logger) << "Data: \"" << qbaPhraseTableMatrix << "\"";
 
   const QList<QByteArray> qbaLinesList = qbaPhraseTableMatrix.split('\n');
 
   
   if (qbaLinesList.size() != 13)
   {
-    ERROR_LOG() << "Load csv data 'Phrase Table Matrix' failed! Invalid Line entry size: Soll/Ist: 13/" << qbaLinesList.size();
+    ERROR_LOG(m_logger) << "Load csv data 'Phrase Table Matrix' failed! Invalid Line entry size: Soll/Ist: 13/" << qbaLinesList.size();
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("Load csv data 'Phrase Table Matrix' failed! Invalid Line entry size."), tr("CSV Load Error"));
     return false;
   }
@@ -516,7 +515,7 @@ bool CSVImport::checkPhraseTableMatrix(const QByteArray &qbaPhraseTableMatrix)
     {
       if (qbaLine.at(0).isEmpty() || qbaLine.at(1).isEmpty() || qbaLine.at(0).size() > 15 || qbaLine.at(1).size() > 15)
       {
-        ERROR_LOG() << "Load csv data 'Phrase Table Matrix' failed! Invalid number of entrys or entry size is < 1  or >> 15. ";
+        ERROR_LOG(m_logger) << "Load csv data 'Phrase Table Matrix' failed! Invalid number of entrys or entry size is < 1  or >> 15. ";
         LtsWidgets::LtsMessageDialog::showMessage(this, tr("Load csv data 'Phrase Table Matrix' failed! Invalid number of entrys or entry size is less than 1 or greater 15."), tr("CSV Load Error"));
         return false;
       }
@@ -525,7 +524,7 @@ bool CSVImport::checkPhraseTableMatrix(const QByteArray &qbaPhraseTableMatrix)
     }
     else
     {
-      ERROR_LOG() << "Load csv data 'Phrase Table Matrix' failed! Invalid number of entrys or empty entry per line. ";
+      ERROR_LOG(m_logger) << "Load csv data 'Phrase Table Matrix' failed! Invalid number of entrys or empty entry per line. ";
       LtsWidgets::LtsMessageDialog::showMessage(this, tr("Load csv data 'Phrase Table Matrix' failed! Invalid number of entrys or empty entry per line."), tr("CSV Load Error"));
       return false;
     }
@@ -558,7 +557,7 @@ bool CSVImport::removeRedundantCvsSeperators(QByteArray &qbaLine, int desiredVal
 
   if (seperatorCnt < desiredValue)
   {
-    ERROR_LOG() << "Seperator values less than desired values.";
+    ERROR_LOG(m_logger) << "Seperator values less than desired values.";
     return false;
   }
 
@@ -567,7 +566,7 @@ bool CSVImport::removeRedundantCvsSeperators(QByteArray &qbaLine, int desiredVal
     qbaLine.remove(qbaLine.lastIndexOf(';'), 1);
     --seperatorCnt;
   }
-  DEBUG_LOG() << "+++Data: \"" << qbaLine << "\"" << " Soll/Ist:: " << desiredValue << "/"  << seperatorCnt;
+  DEBUG_LOG(m_logger) << "+++Data: \"" << qbaLine << "\"" << " Soll/Ist:: " << desiredValue << "/"  << seperatorCnt;
   return true;
 } 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_import.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_import.h
index 55f749638..918dfccc7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_import.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_csv_import.h
@@ -42,6 +42,8 @@ public:
   CSVImportResult loadCSVDataByteArray(QByteArray content);
 
 private:
+
+NGL::INGLLogger &m_logger;
   bool checkNumCodeHorizontalHeader(const QByteArray &qbaNumCodeHorizontalHeader);
   bool checkNumCodeVerticalHeader(const QByteArray &qbaNumCodeVerticalHeader);
   bool checkAuthenticationCodeMatrix(QByteArray &qbaAuthenticationCodeMatrix);
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 cd72f4d7d..c35ab0e5e 100755
--- 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
@@ -18,7 +18,7 @@ LogisticalTermsModel::LogisticalTermsModel(QWidget *parent)
   , m_codificationDataId(0)
   , m_isEditMode(false)
 {
-  DEBUG_LOG() << "ctor LogisticalTermsModel";
+  DEBUG_LOG(m_logger) << "ctor LogisticalTermsModel";
   m_matrix.resize(s_matrixCount);
   for (int i = 0; i < s_matrixCount; ++i)
     m_matrix[i].resize(s_matrixCount);
@@ -30,11 +30,11 @@ bool LogisticalTermsModel::init(const std::shared_ptr<CodificationManagement::In
                                 int codificationDataId,
                                 bool isEditMode)
 {
-  DEBUG_LOG() << "LogisticalTerms::init()";
+  DEBUG_LOG(m_logger) << "LogisticalTerms::init()";
   if (!dtc)
     return false;
 
-  DEBUG_LOG() << "LogisticalTermsModel::init()...";
+  DEBUG_LOG(m_logger) << "LogisticalTermsModel::init()...";
 
   m_dtc = dtc;
   m_codificationDataId = codificationDataId;
@@ -82,7 +82,7 @@ bool LogisticalTermsModel::setColumnSelectionValuesCSV(const QString &csvData)
 
   if (slColumns.size() != m_ColumnSelectionValues.size())
   {
-    ERROR_LOG() << "Invalid column data count." << " codificationDataId: " << m_codificationDataId
+    ERROR_LOG(m_logger) << "Invalid column data count." << " codificationDataId: " << m_codificationDataId
                         << " Soll/Ist: " << m_ColumnSelectionValues.size() << "/" << slColumns.size();
     m_ColumnSelectionValues.fill(QLatin1Char(' '));
     return false;
@@ -93,7 +93,7 @@ bool LogisticalTermsModel::setColumnSelectionValuesCSV(const QString &csvData)
     const QStringRef &qs = slColumns.at(i);
     if (qs.size() != 1)
     {
-      ERROR_LOG() << "Invalid column data value at id: " << i
+      ERROR_LOG(m_logger) << "Invalid column data value at id: " << i
                           << " codificationDataId: " << m_codificationDataId;
       return false;
     }
@@ -113,7 +113,7 @@ bool LogisticalTermsModel::setRowSelectionValuesCSV(const QString &csvData)
 
   if (slRows.size() != m_RowSelectionValues.size())
   {
-    ERROR_LOG() << "Invalid row data count." << " codificationDataId: " << m_codificationDataId
+    ERROR_LOG(m_logger) << "Invalid row data count." << " codificationDataId: " << m_codificationDataId
                         << " Soll/Ist: " << m_RowSelectionValues.size() << "/" << slRows.size()
                         << " Default values will be used. ";
     m_RowSelectionValues.fill(QLatin1Char(' '));
@@ -125,7 +125,7 @@ bool LogisticalTermsModel::setRowSelectionValuesCSV(const QString &csvData)
     const QStringRef &qs = slRows.at(i);
     if (qs.size() != 1)
     {
-      ERROR_LOG() << "Invalid row data value at id: " << i
+      ERROR_LOG(m_logger) << "Invalid row data value at id: " << i
                           << " codificationDataId: " << m_codificationDataId;
       return false;
     }
@@ -138,20 +138,20 @@ bool LogisticalTermsModel::setRowSelectionValuesCSV(const QString &csvData)
 
 bool LogisticalTermsModel::setMatrixValuesCSV(const QString &csvData)
 {
-  DEBUG_LOG() << "setMatrixValuesCSV: " << csvData;
+  DEBUG_LOG(m_logger) << "setMatrixValuesCSV: " << csvData;
 
   const QStringList slRows = splitQuotedStringToRows(csvData);
 
   if (slRows.isEmpty())
   {
-    ERROR_LOG() << "split quoted csv data failed! " << " codificationDataId: " << m_codificationDataId
+    ERROR_LOG(m_logger) << "split quoted csv data failed! " << " codificationDataId: " << m_codificationDataId
                         << " csvData: " << csvData;
     return false;
   }
 
   if (slRows.size() != m_matrix.size())
   {
-    ERROR_LOG() << "Invalid row data count." << " codificationDataId: " << m_codificationDataId
+    ERROR_LOG(m_logger) << "Invalid row data count." << " codificationDataId: " << m_codificationDataId
                         << " Soll/Ist: " << m_matrix.size() << "/" << slRows.size();
     return false;
   }
@@ -161,7 +161,7 @@ bool LogisticalTermsModel::setMatrixValuesCSV(const QString &csvData)
     const QVector<QStringRef> slColumns = slRows[row].splitRef(QLatin1Char(';'));
     if (slColumns.size() != m_matrix.size())
     {
-      ERROR_LOG() << "Invalid column data count." << " codificationDataId: " << m_codificationDataId
+      ERROR_LOG(m_logger) << "Invalid column data count." << " codificationDataId: " << m_codificationDataId
                           << " Soll/Ist: " << m_matrix.size() << "/" << slColumns.size();
       return false;
     }
@@ -217,7 +217,7 @@ QString LogisticalTermsModel::getMatrixDataCSVString() const
   }
 
   const QString qs(slRows.join(QLatin1Char('\n')));
-  DEBUG_LOG() << "getMatrixDataCSVString() : " << qs;
+  DEBUG_LOG(m_logger) << "getMatrixDataCSVString() : " << qs;
   return qs;
 } 
 
@@ -336,7 +336,7 @@ QVariant LogisticalTermsModel::data(const QModelIndex &index, int role) const
 
 bool LogisticalTermsModel::setData(const QModelIndex &index, const QVariant &value, int role)
 {
-  DEBUG_LOG() << "setData() row/col: " << index.row() << "/" << index.column()
+  DEBUG_LOG(m_logger) << "setData() row/col: " << index.row() << "/" << index.column()
                       << " value:" << value.toString();
 
   const QString qs = value.toString();
@@ -393,7 +393,7 @@ void LogisticalTermsModel::onCodificationDataChanged(const CodificationManagemen
 {
   const int id = data.id();
 
-  DEBUG_LOG() << "onCodificationDataChanged for CodificationData id: " << id
+  DEBUG_LOG(m_logger) << "onCodificationDataChanged for CodificationData id: " << id
                       << " - NumCodeColumnIdx data: " << data.numeralCodeTableColumnIndex().c_str()
                       << " - NumCodeRowIdx data: " << data.numeralCodeTableRowIndex().c_str()
                       << " - modType: " << modType;
@@ -403,7 +403,7 @@ void LogisticalTermsModel::onCodificationDataChanged(const CodificationManagemen
 
   if (modType == DataModification::eRemoved)
   {
-    WARNING_LOG() << "CodificationData was removed. id: " << id << " ToDo: 'ShowCodificationData' Tab loeschen !?";
+    WARNING_LOG(m_logger) << "CodificationData was removed. id: " << id << " ToDo: 'ShowCodificationData' Tab loeschen !?";
     
     resetMatrix();
     setColumnSelectionValuesCSV(QString());
@@ -413,7 +413,7 @@ void LogisticalTermsModel::onCodificationDataChanged(const CodificationManagemen
 
   if (modType == DataModification::eModified)
   {
-    DEBUG_LOG() << "CodificationData was modifed. id: " << id << " - " << data.note();
+    DEBUG_LOG(m_logger) << "CodificationData was modifed. id: " << id << " - " << data.note();
 
     QString qs =  QString::fromStdString(data.logisticalTermTableColumnIndex());
     setColumnSelectionValuesCSV(qs);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_logistical_terms_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_logistical_terms_model.h
index 662c4b78f..605e2ea39 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_logistical_terms_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_logistical_terms_model.h
@@ -110,6 +110,17 @@ private Q_SLOTS:
 
 private:
 
+
+
+
+
+
+
+
+
+
+
+NGL::INGLLogger &m_logger;
   QVector<QVector<QString>> m_matrix;      
 
   QVector <QChar> m_RowSelectionValues;    
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 9ae1465a8..3e52d267f 100755
--- 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
@@ -69,7 +69,7 @@ bool NumeralCodeModel::setColumnSelectionValuesCSV(const QString &csvData)
 
   if (slColumns.size() != columnCount() - 1)
   {
-    ERROR_LOG() << "Invalid column data count." << " codificationDataId: " << m_codificationDataId
+    ERROR_LOG(m_logger) << "Invalid column data count." << " codificationDataId: " << m_codificationDataId
                         << " Soll/Ist: " << columnCount() - 1 << "/" << slColumns.size();
     return false;
   }
@@ -79,7 +79,7 @@ bool NumeralCodeModel::setColumnSelectionValuesCSV(const QString &csvData)
     const QStringRef &qs = slColumns.at(i);
     if (qs.size() != 1)
     {
-      ERROR_LOG() << "Invalid column data value at id: " << i
+      ERROR_LOG(m_logger) << "Invalid column data value at id: " << i
                           << " codificationDataId: " << m_codificationDataId;
       return false;
     }
@@ -97,7 +97,7 @@ bool NumeralCodeModel::setRowSelectionValuesCSV(const QString &csvData)
 
   if (slRows.size() != rowCount() - 1)
   {
-    ERROR_LOG() << "Invalid row data count." << " codificationDataId: " << m_codificationDataId
+    ERROR_LOG(m_logger) << "Invalid row data count." << " codificationDataId: " << m_codificationDataId
                         << " Soll/Ist: " << rowCount() - 1 << "/" << slRows.size()
                         << " Default values will be used. ";
     return false;
@@ -108,7 +108,7 @@ bool NumeralCodeModel::setRowSelectionValuesCSV(const QString &csvData)
     const QStringRef &qs = slRows.at(i);
     if (qs.size() != 1)
     {
-      ERROR_LOG() << "Invalid row data value at id: " << i
+      ERROR_LOG(m_logger) << "Invalid row data value at id: " << i
                           << " codificationDataId: " << m_codificationDataId;
       return false;
     }
@@ -278,7 +278,7 @@ QVariant NumeralCodeModel::data(const QModelIndex &index, int role) const
 
 bool NumeralCodeModel::setData(const QModelIndex &index, const QVariant &value, int role)
 {
-  DEBUG_LOG() << "setData() row/col: " << index.row() << "/" << index.column()
+  DEBUG_LOG(m_logger) << "setData() row/col: " << index.row() << "/" << index.column()
                       << " char:" << value.toString();
 
   if (value.toString().contains(QLatin1Char('\"')) || value.toString().contains(QLatin1Char(';')))
@@ -400,7 +400,7 @@ void NumeralCodeModel::onCodificationDataChanged(const CodificationManagement::C
 {
   const int id = data.id();
 
-  DEBUG_LOG() << "onCodificationDataChanged for CodificationData id: " << id
+  DEBUG_LOG(m_logger) << "onCodificationDataChanged for CodificationData id: " << id
                       << " - NumCodeColumnIdx data: " << data.numeralCodeTableColumnIndex().c_str()
                       << " - NumCodeRowIdx data: " << data.numeralCodeTableRowIndex().c_str()
                       << " - modType: " << (int)modType;
@@ -410,7 +410,7 @@ void NumeralCodeModel::onCodificationDataChanged(const CodificationManagement::C
 
   if (modType == DataModification::eRemoved)
   {
-    WARNING_LOG() << "CodificationData was removed. id: " << id << " ToDo: 'ShowCodificationData' Tab loeschen !?";
+    WARNING_LOG(m_logger) << "CodificationData was removed. id: " << id << " ToDo: 'ShowCodificationData' Tab loeschen !?";
     setColumnSelectionValuesCSV(QString());
     setRowSelectionValuesCSV(QString());
     return;
@@ -418,7 +418,7 @@ void NumeralCodeModel::onCodificationDataChanged(const CodificationManagement::C
 
   if (modType == DataModification::eModified)
   {
-    DEBUG_LOG() << "CodificationData was modifed. id: " << id << " - " << data.note();
+    DEBUG_LOG(m_logger) << "CodificationData was modifed. id: " << id << " - " << data.note();
 
     QString qs = QString::fromStdString(data.numeralCodeTableColumnIndex());
     setColumnSelectionValuesCSV(qs);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_numeral_code_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_numeral_code_model.h
index a1bcae09a..07f349685 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_numeral_code_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_numeral_code_model.h
@@ -89,6 +89,8 @@ private:
 
   
 
+
+NGL::INGLLogger &m_logger;
   void initMatrix();
 
   QVector <QChar> m_MatrixNumeralSet;      
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 513277cda..5096b262f 100755
--- 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
@@ -15,7 +15,7 @@ PhraseTableModel::PhraseTableModel(QWidget *parent)
   , m_codificationDataId(0)
   , m_isEditMode(false)
 {
-  DEBUG_LOG() << "ctor PhraseTableModel";
+  DEBUG_LOG(m_logger) << "ctor PhraseTableModel";
 
 } 
 
@@ -24,7 +24,7 @@ bool PhraseTableModel::init(const std::shared_ptr<CodificationManagement::Interf
                                 int codificationDataId,
                                 bool isEditMode)
 {
-  DEBUG_LOG() << "PhraseTableModel::init()";
+  DEBUG_LOG(m_logger) << "PhraseTableModel::init()";
   if (!dtc)
     return false;
 
@@ -74,12 +74,12 @@ void PhraseTableModel::resetMatrix()
 
 bool PhraseTableModel::setMatrixValuesCSV(const QString &csvData)
 {
-  DEBUG_LOG() << "setMatrixValuesCSV() data: " << csvData;
+  DEBUG_LOG(m_logger) << "setMatrixValuesCSV() data: " << csvData;
 
   const QVector<QStringRef> slRows = csvData.splitRef(QLatin1Char('\n'));
   if (slRows.count() != rowCount())
   {
-    ERROR_LOG() << "Invalid row data count." << " codificationDataId: " << m_codificationDataId
+    ERROR_LOG(m_logger) << "Invalid row data count." << " codificationDataId: " << m_codificationDataId
                         << " Soll/Ist: " << rowCount() << "/" << slRows.size();
     return false;
   }
@@ -89,7 +89,7 @@ bool PhraseTableModel::setMatrixValuesCSV(const QString &csvData)
     const QStringList slColumns = splitQuotedString(QLatin1Char(';'), slRows[row].toString());
     if (slColumns.count() != columnCount())
     {
-      ERROR_LOG() << "Invalid column data count." << " codificationDataId: " << m_codificationDataId
+      ERROR_LOG(m_logger) << "Invalid column data count." << " codificationDataId: " << m_codificationDataId
                           << " Soll/Ist: " << columnCount() << "/" << slColumns.size();
       return false;
     }
@@ -196,7 +196,7 @@ QVariant PhraseTableModel::data(const QModelIndex &index, int role) const
 
 bool PhraseTableModel::setData(const QModelIndex &index, const QVariant &value, int role)
 {
-  DEBUG_LOG() << "setData() row/col: " << index.row() << "/" << index.column()
+  DEBUG_LOG(m_logger) << "setData() row/col: " << index.row() << "/" << index.column()
                       << " value:" << value.toString();
 
   
@@ -249,7 +249,7 @@ void PhraseTableModel::onCodificationDataChanged(const CodificationManagement::C
 {
   const int id = data.id();
 
-  DEBUG_LOG() << "onCodificationDataChanged for CodificationData id: " << id
+  DEBUG_LOG(m_logger) << "onCodificationDataChanged for CodificationData id: " << id
                       << " - PhraseTableModel data: " << data.phraseTable().c_str()
                       << " - modType: " << (int)modType;
 
@@ -258,7 +258,7 @@ void PhraseTableModel::onCodificationDataChanged(const CodificationManagement::C
 
   if (modType == DataModification::eRemoved)
   {
-    WARNING_LOG() << "CodificationData was removed. id: " << id << " ToDo: 'ShowCodificationData' Tab loeschen !?";
+    WARNING_LOG(m_logger) << "CodificationData was removed. id: " << id << " ToDo: 'ShowCodificationData' Tab loeschen !?";
     
     resetMatrix();
     return;
@@ -266,7 +266,7 @@ void PhraseTableModel::onCodificationDataChanged(const CodificationManagement::C
 
   if (modType == DataModification::eModified)
   {
-    DEBUG_LOG() << "CodificationData was modifed. id: " << id << " - " << data.note();
+    DEBUG_LOG(m_logger) << "CodificationData was modifed. id: " << id << " - " << data.note();
 
     QString qs =  QString::fromStdString(data.phraseTable());
     setMatrixValuesCSV(qs);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_phrase_table_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_phrase_table_model.h
index f3b703576..0ef6069f2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_phrase_table_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_phrase_table_model.h
@@ -80,6 +80,8 @@ private Q_SLOTS:
 private:
   
 
+
+NGL::INGLLogger &m_logger;
   QStringList splitQuotedString(const QChar &sep, const QString &inString);
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/cod_numeral_code_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/cod_numeral_code_model.cpp
index e279560d1..977e6f3c8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/cod_numeral_code_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/cod_numeral_code_model.cpp
@@ -270,7 +270,7 @@ QVariant NumeralCodeModel::data(const QModelIndex &index, int role) const
 
 bool NumeralCodeModel::setData(const QModelIndex &index, const QVariant &value, int role)
 {
-  DEBUG_LOG() << "setData() row/col: " << index.row() << "/" << index.column()
+  DEBUG_LOG(m_logger) << "setData() row/col: " << index.row() << "/" << index.column()
                       << " char:" << value.toString();
 
   QString tmp = value.toString();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/cod_numeral_code_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/cod_numeral_code_model.h
index 41189c1c2..9e178443e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/cod_numeral_code_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/cod_numeral_code_model.h
@@ -74,6 +74,8 @@ private:
 
   
 
+
+NGL::INGLLogger &m_logger;
   bool initMatrix();
 
   QVector <char> m_MatrixNumeralSet;      
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/maindialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/maindialog.cpp
index eb05f58c1..018711807 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/maindialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/maindialog.cpp
@@ -10,12 +10,11 @@
 #include <NGLLogger/NGLLoggerBootstrap.h>
 
 
-MainDialog::MainDialog(QWidget *parent)
-  : QDialog(parent)
+MainDialog::MainDialog(QWidget *parent) : QDialog(parent)
   , m_ui(new Ui::MainDialog)
   , m_numCodeModel(new NumeralCodeModel(parent))
-  .getNGLLogger("COD_Test_NumeralCodeTableMainDialog"))
-{
+  .getNGLLogger("COD_Test_NumeralCodeTableMainDialog")),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_ui->setupUi(this);
 } 
 
@@ -139,7 +138,7 @@ void MainDialog::onPbSetHorizontalHeaderCSV()
   
   csvVec.remove(columnSelectionValues.size() * 2 - 1);
 
-  DEBUG_LOG() << "onPbSetHorizontalHeaderCSV() "
+  DEBUG_LOG(m_logger) << "onPbSetHorizontalHeaderCSV() "
                       << " csvVec.size(): " << csvVec.size();
 
   m_numCodeModel->setColumnSelectionValuesCSV(csvVec);
@@ -178,7 +177,7 @@ void MainDialog::onPbSetVerticalHeaderCSV()
   
   csvVec.remove(rowSelectionValues.size() * 2 - 1);
 
-  DEBUG_LOG() << "onPbSetVerticalHeaderCSV() "
+  DEBUG_LOG(m_logger) << "onPbSetVerticalHeaderCSV() "
                       << " csvVec.size(): " << csvVec.size();
 
   m_numCodeModel->setRowSelectionValuesCSV(csvVec);
@@ -199,7 +198,7 @@ void MainDialog::getNumeralCodeHeader()
   for (int i = 0; i < qVecVH.size(); ++i)
     qbaVH.append(qVecVH.at(i));
 
-  DEBUG_LOG() << "getNumeralCodeHeader()"
+  DEBUG_LOG(m_logger) << "getNumeralCodeHeader()"
                       << " HH: " << qbaHH << " size: " << qbaHH.size()
                       << " VH: " << qbaVH << " size: " << qbaVH.size();
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/maindialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/maindialog.h
index 864b03e64..374b2703b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/maindialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/maindialog.h
@@ -41,6 +41,7 @@ private Q_SLOTS:
   void getNumeralCodeHeader();
 
 private:
+  NGL::INGLLogger &m_logger;
   Ui::MainDialog       *m_ui;
   NumeralCodeModel     *m_numCodeModel;
 };
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 0d6c9a149..f8f00accc 100755
--- 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
@@ -96,7 +96,7 @@ void SoundAreaEditDialog::onPlaySound(SoundManagement::SoundCategory category, i
 
 void SoundAreaEditDialog::onStopAllSounds()
 {
-  DEBUG_LOG() << "onStopAllSounds";
+  DEBUG_LOG(m_logger) << "onStopAllSounds";
 
   QList<int32_t> egcuIds; 
 
@@ -105,13 +105,13 @@ void SoundAreaEditDialog::onStopAllSounds()
   {
     if (!m_egcuCheckBoxes.value(egcu)->isChecked())
       continue;
-    DEBUG_LOG() << "onStopAllSounds add egcu=" << egcu;
+    DEBUG_LOG(m_logger) << "onStopAllSounds add egcu=" << egcu;
     egcuIds.append(egcu);
   }
 
   for (const auto &egcu : std::as_const(egcuIds))
   {
-    DEBUG_LOG() << "onStopAllSounds egcu=" << egcu;
+    DEBUG_LOG(m_logger) << "onStopAllSounds egcu=" << egcu;
     SoundManagement::StopAllSoundsRequest req(egcu);
 
 m_somFtc->stopAllSoundsRequest(req, nullptr);
@@ -125,7 +125,7 @@ m_somFtc->stopAllSoundsRequest(req, nullptr);
 
 bool SoundAreaEditDialog::init(LtsSession::LtsSessionDataDds *session)
 {
-  DEBUG_LOG() << "init";
+  DEBUG_LOG(m_logger) << "init";
 
   m_session = session;
 
@@ -133,19 +133,19 @@ bool SoundAreaEditDialog::init(LtsSession::LtsSessionDataDds *session)
   std::shared_ptr<InfrastructureManagement::Interface::Dtc> ismDtc;
   if (!m_session->getDtc<InfrastructureManagement::DataInterface>(ismDtc))
   {
-    ERROR_LOG() << "connection to ISM-DTC failed";
+    ERROR_LOG(m_logger) << "connection to ISM-DTC failed";
     return false;
   }
 
   if (!m_session->getDtc<EffectManagement::DataInterface>(m_somDtc))
   {
-    ERROR_LOG() << "connection to SOM-DTC failed";
+    ERROR_LOG(m_logger) << "connection to SOM-DTC failed";
     return false;
   }
 
   if (!m_session->getFtc<EffectManagement::DataInterface>(m_somFtc))
   {
-    ERROR_LOG() << "connection to SOM-FTC failed";
+    ERROR_LOG(m_logger) << "connection to SOM-FTC failed";
     return false;
   }
 
@@ -244,7 +244,7 @@ bool SoundAreaEditDialog::init(LtsSession::LtsSessionDataDds *session)
 
   m_buttonBox->connectButton(LtsWidgets::DialogButton::Hide, this, &SoundAreaEditDialog::onStopAllSounds);
 
-  DEBUG_LOG() << "init successful";
+  DEBUG_LOG(m_logger) << "init successful";
   return true;
 }
 } 
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 1e7e734f9..56c0c0b39 100755
--- 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
@@ -96,6 +96,8 @@ signals:
   void finished(const QString &msg);
 
 private:
+
+NGL::INGLLogger &m_logger;
   Core::FunctionReplyObject m_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 a974c7efe..e02a6aab9 100755
--- 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
@@ -24,9 +24,8 @@ namespace EffectManagement
 QIcon SoundAreaEditPlaylistDelegate::s_iconInf = QIcon(QStringLiteral("icon:infinity.svg"));
 
 
-SoundAreaEditPlaylistDelegate::SoundAreaEditPlaylistDelegate(QObject *parent)
-  : QStyledItemDelegate(parent)
-{
+SoundAreaEditPlaylistDelegate::SoundAreaEditPlaylistDelegate(QObject *parent) : QStyledItemDelegate(parent),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 
@@ -97,7 +96,7 @@ void SoundAreaPlaylistModel::onTimeout()
 
 bool SoundAreaPlaylistModel::init(std::shared_ptr<SoundManagement::Interface::Dtc> &somDtc)
 {
-  DEBUG_LOG() << "init";
+  DEBUG_LOG(m_logger) << "init";
 
   const QMap<int32_t, SoundManagement::SoundState> soundStates = somDtc->soundStates();
   for (const auto &data : std::as_const(soundStates))
@@ -120,7 +119,7 @@ bool SoundAreaPlaylistModel::init(std::shared_ptr<SoundManagement::Interface::Dt
   connect(m_timer, &QTimer::timeout, this, &SoundAreaPlaylistModel::onTimeout);
   m_timer->start(1000);
 
-  DEBUG_LOG() << "init successful";
+  DEBUG_LOG(m_logger) << "init successful";
   return true;
 }
 
@@ -147,14 +146,14 @@ bool SoundAreaPlaylistModel::addActiveSound(SoundState data)
 
   if (row != -1)
   {
-    ERROR_LOG() << "'" << name << "' is already active";
+    ERROR_LOG(m_logger) << "'" << name << "' is already active";
     return false;
   }
 
   data.status(SoundState::Status::Active);
   insertRow(data);
 
-  DEBUG_LOG() << "adding '" << name << "' to active Sounds";
+  DEBUG_LOG(m_logger) << "adding '" << name << "' to active Sounds";
   return true;
 }
 
@@ -230,7 +229,7 @@ bool SoundAreaPlaylistModel::onDataChanged(const SoundState &data, DataModificat
     return addActiveSound(data);
 
   case DataModification::eModified:
-    WARNING_LOG() << "handling eModified for sound states not implemented yet";
+    WARNING_LOG(m_logger) << "handling eModified for sound states not implemented yet";
     return false;
 
   case DataModification::eRemoved:
@@ -238,7 +237,7 @@ bool SoundAreaPlaylistModel::onDataChanged(const SoundState &data, DataModificat
     idx = SoundAreaPlaylistModel::index(m_vecData.indexOf(data), 0);
     if (row == -1)
     {
-      ERROR_LOG() << "'" << m_helper->soundName(data.category(), data.soundId()) << "' is neither scheduled nor active";
+      ERROR_LOG(m_logger) << "'" << m_helper->soundName(data.category(), data.soundId()) << "' is neither scheduled nor active";
       return false;
     } 
     return removeActiveSound(idx);
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 0fd2147ca..0843b8bb3 100755
--- 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
@@ -40,6 +40,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   static QIcon s_iconInf;
 
 }; 
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 95c5cd895..9a9ec17df 100755
--- 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
@@ -92,11 +92,10 @@ void SpinBoxDelegate::updateEditorGeometry(QWidget *editor, const QStyleOptionVi
 
 
 
-SoundTreeItem::SoundTreeItem(const QVector<QVariant> &data, const SoundKey &key, SoundTreeItem *parent)
-  : m_parent(parent)
+SoundTreeItem::SoundTreeItem(const QVector<QVariant> &data, const SoundKey &key, SoundTreeItem *parent) : m_parent(parent)
   , m_data(data)
-  , m_soundKey(key)
-{
+  , m_soundKey(key),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 SoundTreeItem::~SoundTreeItem()
@@ -208,7 +207,7 @@ bool SoundAreaTreeModel::onToggleLoop(const QModelIndex &index)
 
 bool SoundAreaTreeModel::init(const std::shared_ptr<SoundManagement::Interface::Dtc> &somDtc)
 {
-  DEBUG_LOG() << "init";
+  DEBUG_LOG(m_logger) << "init";
 
   
   SoundKey key;
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 545ddad9e..5d5c40e91 100755
--- 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
@@ -66,6 +66,8 @@ public:
   QString toString() const;
 
 private:
+
+NGL::INGLLogger &m_logger;
   QVector<SoundTreeItem *> m_children;
   SoundTreeItem           *m_parent{nullptr};
   QVector<QVariant>        m_data;
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 1c39b9e86..afc7bb1fb 100755
--- 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
@@ -16,10 +16,9 @@ namespace EffectManagement
 
 
 
-SoundAreaHelper::SoundAreaHelper(SoundAreaHelper *helper)
-  : m_ismDtc(helper->ismDtc())
-  , m_somDtc(helper->somDtc())
-{
+SoundAreaHelper::SoundAreaHelper(SoundAreaHelper *helper) : m_ismDtc(helper->ismDtc())
+  , m_somDtc(helper->somDtc()),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   QMap<int32_t, InfrastructureManagement::InstrumentationAsset> assets = m_ismDtc->instrumentationAssets();
   for (const auto &asset : std::as_const(assets))
     if (asset.mountingPointTypeId() == InfrastructureManagement::MountingPointType_def::EffectGenerationControlUnit)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_helper.h
index 277d75c14..94d395a75 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_helper.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_helper.h
@@ -79,6 +79,8 @@ public:
   static SoundManagement::SoundCategory soundCategory(const int &i);
 
 private:
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<InfrastructureManagement::Interface::Dtc> m_ismDtc;
   std::shared_ptr<SoundManagement::Interface::Dtc>          m_somDtc;
 
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 48db7cf9d..cdcd1d28b 100755
--- 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
@@ -100,7 +100,7 @@ void SoundAreaSelectDialog::onStopAllSounds()
 
 bool SoundAreaSelectDialog::init(LtsSession::LtsSessionDataDds *session, const QString &menuGroup)
 {
-  DEBUG_LOG() << "init";
+  DEBUG_LOG(m_logger) << "init";
 
   m_session = session;
   setMenuGroup(menuGroup);
@@ -110,25 +110,25 @@ bool SoundAreaSelectDialog::init(LtsSession::LtsSessionDataDds *session, const Q
 
   if (!m_session->getDtc<InfrastructureManagement::DataInterface>(ismDtc))
   {
-    ERROR_LOG() << "connection to ISM-DTC failed";
+    ERROR_LOG(m_logger) << "connection to ISM-DTC failed";
     return false;
   } 
 
   if (!m_session->getDtc<EffectManagement::DataInterface>(somDtc))
   {
-    ERROR_LOG() << "connection to SOM-DTC failed";
+    ERROR_LOG(m_logger) << "connection to SOM-DTC failed";
     return false;
   } 
 
   if (!m_session->getFtc<EffectManagement::DataInterface>(m_somFtc))
   {
-    ERROR_LOG() << "connection to SOM-FTC failed";
+    ERROR_LOG(m_logger) << "connection to SOM-FTC failed";
     return false;
   } 
 
   if (!m_model->init(ismDtc, somDtc))
   {
-    ERROR_LOG() << "sound area select model initialization failed";
+    ERROR_LOG(m_logger) << "sound area select model initialization failed";
     return false;
   } 
 
@@ -149,7 +149,7 @@ bool SoundAreaSelectDialog::init(LtsSession::LtsSessionDataDds *session, const Q
   connect(m_ui->tvSoundlist, &QTableView::clicked, this, &SoundAreaSelectDialog::onSelectSoundArea);
   m_buttonBox->connectButton(LtsWidgets::DialogButton::Edit, this, &SoundAreaSelectDialog::onStopAllSounds);
 
-  DEBUG_LOG() << "init successful";
+  DEBUG_LOG(m_logger) << "init successful";
   return true;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_select_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_select_dialog.h
index 207a62092..b58c295de 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_select_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_select_dialog.h
@@ -62,6 +62,8 @@ public:
   bool init(LtsSession::LtsSessionDataDds *session, const QString &menuGroup);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void onStopAllSoundsReply(const Core::FunctionReplyObject &replyObject) override final;
 
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 6524121cb..8a2c4add9 100755
--- 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
@@ -18,9 +18,8 @@ namespace EffectManagement
 
 
 
-SoundAreaSelectDelegate::SoundAreaSelectDelegate(QObject *parent)
-  : QItemDelegate(parent)
-{
+SoundAreaSelectDelegate::SoundAreaSelectDelegate(QObject *parent) : QItemDelegate(parent),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 
@@ -77,7 +76,7 @@ bool SoundAreaSelectModel::onSoundStateChanged(const SoundManagement::SoundState
       case DataModification::eAdded:
         if (it != soundArea.activeSounds.end()) 
         {
-          DEBUG_LOG() << "'" << m_helper->soundName(data.category(), data.soundId()) << "' is already active";
+          DEBUG_LOG(m_logger) << "'" << m_helper->soundName(data.category(), data.soundId()) << "' is already active";
           return false;
         } 
         else
@@ -93,7 +92,7 @@ bool SoundAreaSelectModel::onSoundStateChanged(const SoundManagement::SoundState
       case DataModification::eRemoved:
         if (it == soundArea.activeSounds.end()) 
         {
-          DEBUG_LOG() << "'" << m_helper->soundName(data.category(), data.soundId()) << "' is not active";
+          DEBUG_LOG(m_logger) << "'" << m_helper->soundName(data.category(), data.soundId()) << "' is not active";
           return false;
         } 
         else
@@ -123,7 +122,7 @@ bool SoundAreaSelectModel::onSoundStateChanged(const SoundManagement::SoundState
 bool SoundAreaSelectModel::init(const std::shared_ptr<InfrastructureManagement::Interface::Dtc> &ismDtc,
                                 const std::shared_ptr<SoundManagement::Interface::Dtc>          &somDtc)
 {
-  DEBUG_LOG() << "init";
+  DEBUG_LOG(m_logger) << "init";
 
   m_ismDtc = ismDtc;
   m_somDtc = somDtc;
@@ -154,7 +153,7 @@ bool SoundAreaSelectModel::init(const std::shared_ptr<InfrastructureManagement::
     onSoundStateChanged(soundState, DataModification::eAdded);
   });
 
-  DEBUG_LOG() << "init successful";
+  DEBUG_LOG(m_logger) << "init successful";
   return true;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_select_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_select_model.h
index 9cfe68b60..b1527dcc7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_select_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_select_model.h
@@ -72,6 +72,8 @@ public:
   QVariant data(const QModelIndex &index, int role) const override;
 
 protected:
+
+NGL::INGLLogger &m_logger;
   bool onDataChanged(const SoundArea &data, DataModification modType) override;
 
 private:
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 62a9fb06a..6042e8981 100755
--- 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,9 +14,8 @@ 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)
-{
+SwitchItemDelegate::SwitchItemDelegate(QObject *parent) : QStyledItemDelegate(parent),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 void SwitchItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_switch_item_delegate.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_switch_item_delegate.h
index 5017a561c..056a815c5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_switch_item_delegate.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_switch_item_delegate.h
@@ -26,6 +26,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
 
 private:
+
+NGL::INGLLogger &m_logger;
   static const QIcon s_iconOn;
   static const QIcon s_iconOff;
 }; 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/efm_sound_management_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/efm_sound_management_dialog.h
index 4c8a22ec7..a2d6d0f37 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/efm_sound_management_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/efm_sound_management_dialog.h
@@ -59,6 +59,8 @@ public:
   bool init(LtsSession::LtsSessionDataDds *session, const QString &menuGroup);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void onControlSoundReply(const Core::FunctionReplyObject &replyObject) override final;
   void retranslate() override;
   bool apply() override;
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 a6a536c3d..83406957f 100755
--- 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
@@ -57,11 +57,11 @@ bool FiringExplosion::init(const std::shared_ptr<EffectShowClient::Interface::Dt
                            const std::shared_ptr<EffectShowClient::Interface::Ftc> &ftc,
                            LtsSession::LtsSession *session, bool freeForm)
 {
-  DEBUG_LOG() << "FiringExplosion::init()";
+  DEBUG_LOG(m_logger) << "FiringExplosion::init()";
 
   if (!dtc || !ftc)
   {
-    ERROR_LOG() << "FiringExplosion::init() Invalid shared_ptr!";
+    ERROR_LOG(m_logger) << "FiringExplosion::init() Invalid shared_ptr!";
     return false;
   }
 
@@ -72,7 +72,7 @@ bool FiringExplosion::init(const std::shared_ptr<EffectShowClient::Interface::Dt
   m_safetyConfirmationWidget = new SafetyConfirmationWidget(this);
   if (!m_safetyConfirmationWidget->init(m_ftc))
   {
-    ERROR_LOG() << "Can't create SafetiConfirmationWidget";
+    ERROR_LOG(m_logger) << "Can't create SafetiConfirmationWidget";
     return false;
   }
   m_ui->mainVertLayout->insertWidget(3, m_safetyConfirmationWidget);
@@ -180,7 +180,7 @@ void FiringExplosion::onOperatingConditionEntityChanged(const OperatingCondition
 void FiringExplosion::onApply()
 {
   if (!statusChangedForManuallyEffectShow(EffectShowStatus_e::Apply))
-    ERROR_LOG() << "Apply failed";
+    ERROR_LOG(m_logger) << "Apply failed";
 }
 
 void FiringExplosion::onFire()
@@ -192,7 +192,7 @@ void FiringExplosion::onFire()
     rc = statusChangedForManuallyEffectShow(EffectShowStatus_e::Fire);
 
   if (!rc)
-    ERROR_LOG() << "Firing Explosion Order Execution failed";
+    ERROR_LOG(m_logger) << "Firing Explosion Order Execution failed";
 }
 void FiringExplosion::onInterrupt()
 {
@@ -203,7 +203,7 @@ void FiringExplosion::onInterrupt()
     rc = statusChangedForManuallyEffectShow(EffectShowStatus_e::Interrupt);
 
   if (!rc)
-    ERROR_LOG() << "Firing Explosion Order Execution failed";
+    ERROR_LOG(m_logger) << "Firing Explosion Order Execution failed";
 }
 
 void FiringExplosion::onAbort()
@@ -328,7 +328,7 @@ bool FiringExplosion::statusChangedForOrderedEffectShow(EffectShowStatus_e statu
       oc = EffectShowManagement::OrderConfirmation_e_def::InterruptExecution;
       break;
     default:
-      DEBUG_LOG() << "FiringExplosion::statusChangedForOrderedEffectShow switch is defaulting, should not happen I guess...";
+      DEBUG_LOG(m_logger) << "FiringExplosion::statusChangedForOrderedEffectShow switch is defaulting, should not happen I guess...";
       break;
     }
     orderModifyRequest.orderConfirmation(oc);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_explosion.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_explosion.h
index 61f3489bb..e25453a50 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_explosion.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_explosion.h
@@ -46,6 +46,8 @@ public:
             bool freeForm = false);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void onOrderModifyReply(const Core::FunctionReplyObject &replyObject) override { m_requestHelper->requestReply(replyObject); }
   void onManuallyExplosionReply(const Core::FunctionReplyObject &replyObject) override { m_requestHelper->requestReply(replyObject); }
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 78fe2e49d..25ea646fa 100755
--- 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
@@ -27,7 +27,7 @@ FiringSmoke::FiringSmoke(QWidget *parent)
   , m_firingClearanceCountDown(0)
   , m_endOfFiringClearanceCountDown(0)
 {
-  DEBUG_LOG() << "FiringSmoke::FiringSmoke()";
+  DEBUG_LOG(m_logger) << "FiringSmoke::FiringSmoke()";
 
   m_ui->setupUi(this);
   m_smokeState = new SmokeState(this);
@@ -49,11 +49,11 @@ bool FiringSmoke::init(const std::shared_ptr<EffectShowClient::Interface::Dtc> &
                        const std::shared_ptr<EffectShowClient::Interface::Ftc> &ftc,
                        LtsSession::LtsSession *session, bool freeForm)
 {
-  DEBUG_LOG() << "FiringSmoke::init()";
+  DEBUG_LOG(m_logger) << "FiringSmoke::init()";
 
   if (!dtc || !ftc)
   {
-    ERROR_LOG() << "FiringSmoke::init() Invalid shared_ptr!";
+    ERROR_LOG(m_logger) << "FiringSmoke::init() Invalid shared_ptr!";
     return false;
   }
 
@@ -183,7 +183,7 @@ void FiringSmoke::onMeteoTimerTimeout()
 void FiringSmoke::onApply()
 {
   if (!statusChangedForManuallyEffectShow(EffectShowStatus_e::Apply))
-    ERROR_LOG() << "Firing Smoke Apply failed";
+    ERROR_LOG(m_logger) << "Firing Smoke Apply failed";
 }
 
 
@@ -281,7 +281,7 @@ bool FiringSmoke::statusChangedForOrderedEffectShow(EffectShowStatus_e status)
       oc = EffectShowManagement::OrderConfirmation_e_def::OrderCarriedOut;
       break;
     default:
-      DEBUG_LOG() << "FiringSmoke::statusChangedForOrderedEffectShow switch is defaulting, should not happen I guess...";
+      DEBUG_LOG(m_logger) << "FiringSmoke::statusChangedForOrderedEffectShow switch is defaulting, should not happen I guess...";
       break;
     }
     orderModifyRequest.orderConfirmation(oc);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_smoke.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_smoke.h
index 639408e91..adae18556 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_smoke.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_smoke.h
@@ -46,6 +46,8 @@ public:
             bool freeForm = false);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void onOrderModifyReply(const Core::FunctionReplyObject &replyObject) override { m_requestHelper->requestReply(replyObject); }
   void onManuallySmokeReply(const Core::FunctionReplyObject &replyObject) override { m_requestHelper->requestReply(replyObject); }
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 2288e1a15..bbdea16ed 100755
--- 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
@@ -58,11 +58,11 @@ OperatingCondition::~OperatingCondition()
 bool OperatingCondition::init(const std::shared_ptr<EffectShowClient::Interface::Dtc> &dtc,
                               const std::shared_ptr<EffectShowClient::Interface::Ftc> &ftc)
 {
-  DEBUG_LOG() << "OperatingCondition::init()";
+  DEBUG_LOG(m_logger) << "OperatingCondition::init()";
 
   if (!dtc || !ftc)
   {
-    ERROR_LOG() << "OperatingCondition::init() Invalid shared_ptr!";
+    ERROR_LOG(m_logger) << "OperatingCondition::init() Invalid shared_ptr!";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_operating_condition.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_operating_condition.h
index 095c44a92..c6bef8845 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_operating_condition.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_operating_condition.h
@@ -41,6 +41,7 @@ public:
   bool init(const std::shared_ptr<EffectShowClient::Interface::Dtc> &dtc,
             const std::shared_ptr<EffectShowClient::Interface::Ftc> &ftc);
 private:
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void onSendAmmunitionReply(const Core::FunctionReplyObject &replyObject) override { m_requestHelper->requestReply(replyObject); }
   void onSendReadinessReply(const Core::FunctionReplyObject &replyObject) override { m_requestHelper->requestReply(replyObject); }
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 899b10b2e..1a66c9dc1 100755
--- 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
@@ -28,11 +28,11 @@ OrderEdit::~OrderEdit()
 
 bool OrderEdit::init(const std::shared_ptr<EffectShowClient::Interface::Ftc> &ftc, EffectShowManagement::OrderConfirmation_e order)
 {
-  DEBUG_LOG() << "OrderEdit::init()";
+  DEBUG_LOG(m_logger) << "OrderEdit::init()";
 
   if (!ftc)
   {
-    ERROR_LOG() << "OrderEdit::init() Invalid shared_ptr!";
+    ERROR_LOG(m_logger) << "OrderEdit::init() Invalid shared_ptr!";
     return false;
   }
 
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 2e01e141b..f77ff8ac8 100755
--- 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
@@ -33,6 +33,8 @@ public:
   bool apply() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   bool checkForAnswerUiRequirement() const;
   void showOrder();
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 01e145c5c..59b3d7c14 100755
--- 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
@@ -124,7 +124,7 @@ bool OrderList::init(bool isEffectShow,
     m_ui->widget->hideColumn(EffectShowClient::OrderModel::Volley);
     m_ui->widget->hideColumn(EffectShowClient::OrderModel::ShotsInTotal);
   }
-  DEBUG_LOG() << "esc Order is visible:" <<  m_sitMapGuiIfc->isEscOrderPositionVisible();
+  DEBUG_LOG(m_logger) << "esc Order is visible:" <<  m_sitMapGuiIfc->isEscOrderPositionVisible();
   m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Load, m_sitMapGuiIfc->isEscOrderPositionVisible());
   m_buttonBox->setButtonVisible(LtsWidgets::DialogButton::Show, m_isEffectShow);
 
@@ -174,7 +174,7 @@ void OrderList::onEditOrder()
   const EffectShowClient::Order order = m_model->getRowData(row);
 
 
-  DEBUG_LOG() << "--- onEditOrder() ";
+  DEBUG_LOG(m_logger) << "--- onEditOrder() ";
   if (order.orderConfirmation() == EffectShowManagement::OrderConfirmation_e_def::OrderCarriedOut)
     return;
   bool fireReadinessEnable = true;
@@ -265,7 +265,7 @@ void OrderList::onRemoveEscOrderPosition()
   m_sitMapGuiIfc->escOrderPosition_remove();
 
   m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Load, false);
-  DEBUG_LOG() << "esc Order row selected:" <<  m_ui->widget->selectionModel()->selectedRows().size();
+  DEBUG_LOG(m_logger) << "esc Order row selected:" <<  m_ui->widget->selectionModel()->selectedRows().size();
 
   m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Add, m_ui->widget->selectionModel()->selectedRows().size() > 0);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_list.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_list.h
index da7244899..df316b810 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_list.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_list.h
@@ -41,6 +41,8 @@ public:
             const std::shared_ptr<TrainingAreaBaseOC::Interface::Dtc> &dtcTabOC);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void onSelectionChanged();
   void onEditOrder();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_model.h
index 3fbfe2f6d..5c26731f6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_model.h
@@ -51,6 +51,8 @@ private slots:
   void onOwnPositionChanged(const TrainingAreaBaseOC::OwnPosition &data);
 
 private:
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<EffectShowClient::Interface::Dtc>   m_dtc;
   std::shared_ptr<TrainingAreaBaseOC::Interface::Dtc> m_dtcTabOC;
   TrainingAreaBaseOC::OwnPosition m_ownPosition;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_list.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_list.h
index c486b8b11..39c3882d6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_list.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_list.h
@@ -30,6 +30,8 @@ public:
   bool init(LtsSession::LtsSession *session);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void onSelectionChanged();
   void onShowEffectShowActor();
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 56007e68d..7236e287c 100755
--- 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
@@ -24,6 +24,8 @@ public:
   EffectShowActorProxyModel(EffectShowActorModel *sourceModel, EffectShowModel *effectShowModel, QObject *parent);
 
 protected:
+
+NGL::INGLLogger &m_logger;
   bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
 
   EffectShowModel      *m_effectShowModel;
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 94be021d6..75beda4b6 100755
--- 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
@@ -95,11 +95,11 @@ bool EffectShowActorRelocationEdit::init(LtsSession::LtsSession *session,
                                          EffectShowModel *model,                                         
                                          int rowToCopy)
 {
-  DEBUG_LOG() << "EffectShowActorRelocationEdit::init()";
+  DEBUG_LOG(m_logger) << "EffectShowActorRelocationEdit::init()";
 
   if (!session)
   {
-    ERROR_LOG() << "EffectShowActorRelocationEdit::init() Invalid shared_ptr!";
+    ERROR_LOG(m_logger) << "EffectShowActorRelocationEdit::init() Invalid shared_ptr!";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_edit.h
index 69718c344..83e8b157a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_edit.h
@@ -47,6 +47,8 @@ private slots:
   void onEffectShowVehicleStatusChanged(const EffectShowVehicleStatus &data, const DataModification &modType);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void onEffectShowActorRelocationModifyReply(const Core::FunctionReplyObject &replyObject) override { m_requestHelper->requestReply(replyObject); }
 
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 e394bf893..9d70ff1cd 100755
--- 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
@@ -92,7 +92,7 @@ void EffectShowActorRelocationList::onSelectionChanged()
 
 void EffectShowActorRelocationList::onAddEffectShowActorRelocation()
 {
-  DEBUG_LOG() << "--- onAddEffectShowActorRelocation() ";
+  DEBUG_LOG(m_logger) << "--- onAddEffectShowActorRelocation() ";
   EffectShowActorRelocationEdit *dialog = new EffectShowActorRelocationEdit(this);
   if (m_ui->widget->currentIndex().row() >= 0)
     dialog->init(m_session, m_effectShowModel, m_ui->widget->currentIndex().row());
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 517942c5a..1b5adc500 100755
--- 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
@@ -33,6 +33,8 @@ public:
   bool init(LtsSession::LtsSession *session);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void onSelectionChanged();
   void onAddEffectShowActorRelocation();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_model.h
index 481f8989b..67ece18ef 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_relocation_model.h
@@ -39,6 +39,8 @@ public:
   QVector<EffectShowManagement::EffectShowActorRelocation>::const_iterator getItEnd() const { return m_vecData.end(); }
 
 private:
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<EffectShowManagement::Interface::Dtc> m_dtc;
 
   EffectShowModel *m_effectShowModel;
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 6722ceaf9..b548d9e58 100755
--- 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
@@ -54,12 +54,12 @@ bool EffectShowEdit::init(LtsSession::LtsSession *session,
   if (!session->getForeignGuiInterface(m_esmActorCbx))
     return false;
 
-  DEBUG_LOG() << "EffectShowEdit::init()";
+  DEBUG_LOG(m_logger) << "EffectShowEdit::init()";
   m_model   = model;
 
   AreaEffectSimulation::AesItem aesItem;
   bool foundItem = m_aesDtc->aesItemFromId(m_effectShow.idAreaEffectSimulation(), aesItem);
-  DEBUG_LOG() << ", found :" << foundItem
+  DEBUG_LOG(m_logger) << ", found :" << foundItem
                        << ", idAreaEffectSimulation :" << m_effectShow.idAreaEffectSimulation()
                        << ", aesItem.id() :" << aesItem.id()
                        << ", esmParticipantId: " << m_effectShow.esmParticipantId();
@@ -174,7 +174,7 @@ void EffectShowEdit::updateActorComboBox(const Core::GeoPosition &coordGeo)
   bool ok;
 
   int esmParticipantId = m_ui->cbEffectShowActor->currentData().toInt(&ok);
-  DEBUG_LOG() << "currentIndex: " << m_ui->cbEffectShowActor->currentIndex()
+  DEBUG_LOG(m_logger) << "currentIndex: " << m_ui->cbEffectShowActor->currentIndex()
                        << ", currentText: " << m_ui->cbEffectShowActor->currentText()
                        << ", esmParticipantId: " << esmParticipantId
                        << ", ok: " << ok;
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 c6b7bbbb2..40947a2ce 100755
--- 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
@@ -43,6 +43,8 @@ public:
   bool apply() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void showEffectShow();
   void onEffectShowModifyReply(const Core::FunctionReplyObject &replyObject) override { m_requestHelper->requestReply(replyObject); }
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 8c0c009d9..e645f0d65 100755
--- 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
@@ -117,7 +117,7 @@ void EffectShowList::onEditEffectShow()
 
   EffectShowManagement::EffectShow effectShow = m_model->getRowData(row);
 
-  DEBUG_LOG() << "--- onEffectShow() "
+  DEBUG_LOG(m_logger) << "--- onEffectShow() "
                       << " id: " << effectShow.id()
                       << " position: " << effectShow.position();
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_list.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_list.h
index 947c19686..4f2771c15 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_list.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_list.h
@@ -41,6 +41,8 @@ private slots:
   void setShowExpired(bool show);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void onSelectionChanged();
   void onEditEffectShow();
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 b22e69350..5f5cb3c5d 100755
--- 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
@@ -297,7 +297,7 @@ bool EffectShowModel::hasVehicleReportedOperationalToday(int equipmentNum) const
   
   if (vehicleStatus.operational())
   {
-    DEBUG_LOG() << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
+    DEBUG_LOG(m_logger) << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
                         << vehicleStatus.esmParticipantId() << " is operational.";
     return true;
   } 
@@ -305,7 +305,7 @@ bool EffectShowModel::hasVehicleReportedOperationalToday(int equipmentNum) const
   
   if (!m_effectShowVehicleLastTimeOperational.contains(equipmentNum))
   {
-    DEBUG_LOG() << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
+    DEBUG_LOG(m_logger) << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
                         << vehicleStatus.esmParticipantId() << " has not reported operational at any time.";
     return false;
   } 
@@ -313,10 +313,10 @@ bool EffectShowModel::hasVehicleReportedOperationalToday(int equipmentNum) const
   
   bool bRet = QDateTime().addMSecs(m_effectShowVehicleLastTimeOperational[equipmentNum]).date() == QDate::currentDate();
   if (bRet)
-    DEBUG_LOG() << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
+    DEBUG_LOG(m_logger) << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
                         << vehicleStatus.esmParticipantId() << " is not operational, but has reported operational today.";
   else
-    DEBUG_LOG() << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
+    DEBUG_LOG(m_logger) << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
                         << vehicleStatus.esmParticipantId() << " is not operational and has not reported operational today.";
   return bRet;
 }
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 9aef18314..97dde4e0b 100755
--- 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
@@ -98,6 +98,8 @@ public:
   void updateAll();
 
 private:
+
+NGL::INGLLogger &m_logger;
   bool onEffectShowVehicleStatusChanged(const EffectShowManagement::EffectShowVehicleStatus &data, DataModification modType);
 
 signals:
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 5281d15b3..3c188ccc3 100755
--- 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
@@ -15,8 +15,8 @@ namespace Evaluations
 
 
 
-TopicEditorEvaluationModel::TopicEditorEvaluationModel(QObject *parent)
-  : NGLTreeModel(parent, new NGLTreeItem(QVariant()), { tr("Id"), tr("Name"), tr("Weight"), tr("Start Time"), tr("Situation"), tr("Video"), tr("Audio") })
+TopicEditorEvaluationModel::TopicEditorEvaluationModel(QObject *parent) : NGLTreeModel(parent, new NGLTreeItem(QVariant()),,
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) { tr("Id"), tr("Name"), tr("Weight"), tr("Start Time"), tr("Situation"), tr("Video"), tr("Audio") })
 {}
 
 
@@ -120,7 +120,7 @@ bool TopicEditorEvaluationModel::initModel(const std::shared_ptr<Interface::Dtc>
 {
   if (!dtc)
     return false;
-  DEBUG_LOG() << "initModel Folder";
+  DEBUG_LOG(m_logger) << "initModel Folder";
 
   NGLTreeModel::resetModel();
 
@@ -144,7 +144,7 @@ bool TopicEditorEvaluationModel::initModel(const std::shared_ptr<Interface::Dtc>
 
     if (!parentItemIndexCache.contains(parentId))
     {
-      ERROR_LOG() << "Invalid folder structure";
+      ERROR_LOG(m_logger) << "Invalid folder structure";
       return false;
     }
     else
@@ -156,7 +156,7 @@ bool TopicEditorEvaluationModel::initModel(const std::shared_ptr<Interface::Dtc>
       data.setValue(crit);
       onInsertRow(rowPos, pIndex, data);
       parentItemIndexCache.insert(criteriumId+10000, index(rowPos, 0, pIndex));
-      DEBUG_LOG() << "Added to tree (criterium id, parent id) : (" << criteriumId << ", " << parentId << ")";
+      DEBUG_LOG(m_logger) << "Added to tree (criterium id, parent id) : (" << criteriumId << ", " << parentId << ")";
     }
 
     for (QMap<qint32, Evaluations::EvaluationElement>::const_iterator iter2 = elemMap.constBegin();
@@ -170,7 +170,7 @@ bool TopicEditorEvaluationModel::initModel(const std::shared_ptr<Interface::Dtc>
 
       if (!parentItemIndexCache.contains(parentId))
       {
-        ERROR_LOG() << "Invalid folder structure";
+        ERROR_LOG(m_logger) << "Invalid folder structure";
         return false;
       }
       else
@@ -183,7 +183,7 @@ bool TopicEditorEvaluationModel::initModel(const std::shared_ptr<Interface::Dtc>
         onInsertRow(rowPos, pIndex, data);
         int elementId = elem.id();
         parentItemIndexCache.insert(elementId,index(rowPos, 0, pIndex));
-        DEBUG_LOG() << "Added to tree (element id, parent id) : (" << elementId << ", " << parentId << ")";
+        DEBUG_LOG(m_logger) << "Added to tree (element id, parent id) : (" << elementId << ", " << parentId << ")";
       }
     }
   }
@@ -194,7 +194,7 @@ bool TopicEditorEvaluationModel::initModel(const std::shared_ptr<Interface::Dtc>
 
 bool TopicEditorEvaluationModel::onInsertRow(int &row, const QModelIndex &parent, const QVariant &data)
 {
-  DEBUG_LOG() << "onInsertRow";
+  DEBUG_LOG(m_logger) << "onInsertRow";
 
   row = rowCount(parent);
   NGLTreeItem *item = new NGLTreeItem(data, QIcon());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/evl_topic_editor_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/evl_topic_editor_model.h
index 0a65f88fe..2a12b6b8b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/evl_topic_editor_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/evl_topic_editor_model.h
@@ -47,6 +47,8 @@ public slots:
   bool onInsertRow(int &row, const QModelIndex &parent, const QVariant &data);
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
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 e814b4908..1dd45e99a 100755
--- 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
@@ -59,13 +59,13 @@ bool EvaluationTopicEditor::fetchInterfaces()
 {
   if (!m_session->getDtc<Evaluations::DataInterface>(m_evlDtc))
   {
-    ERROR_LOG() << "Failed to retrieve Evl Dtc";
+    ERROR_LOG(m_logger) << "Failed to retrieve Evl Dtc";
     return false;
   }
 
   if (!m_session->getForeignGuiInterface<OperatorManagement::ForeignGuiComboboxInterface>(m_opmCbxIfc))
   {
-    ERROR_LOG() << "Failed to retrieve Evl ForeignGuiInterface";
+    ERROR_LOG(m_logger) << "Failed to retrieve Evl ForeignGuiInterface";
     return false;
   }
 
@@ -74,7 +74,7 @@ bool EvaluationTopicEditor::fetchInterfaces()
   
   initOperatorComboBox();
 
-  DEBUG_LOG() << "fillOperatorComboBox m_operatorId = " << m_operatorId;
+  DEBUG_LOG(m_logger) << "fillOperatorComboBox m_operatorId = " << m_operatorId;
   return true;
 }
 
@@ -83,19 +83,19 @@ bool EvaluationTopicEditor::fetchInterfaces()
 
 void EvaluationTopicEditor::updateInternalData()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   if (!hasTopicDataProperties())
     return;
 
   m_operatorId = getTopicDataValue(QStringLiteral("operatorId")).toInt();
-  DEBUG_LOG() << "operator id = " << m_operatorId;
+  DEBUG_LOG(m_logger) << "operator id = " << m_operatorId;
 
   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() << "element id = " << m_evlElement.id();
+  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());
@@ -156,8 +156,8 @@ bool EvaluationTopicEditor::apply2()
   setTopicDataProperty(QStringLiteral("audio"), m_evlElement.audio());
   setTopicDataProperty(QStringLiteral("video"), m_evlElement.video());
 
-  DEBUG_LOG() << "operator id = " << m_operatorId << ", element id = " << m_evlElement.id();
-  DEBUG_LOG() << "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())
   {
@@ -184,7 +184,7 @@ bool EvaluationTopicEditor::apply2()
     data.duration = m_evlElement.duration();
     data.properties = m_topicData.properties;
 
-    DEBUG_LOG() << "topicData - properties: " << QJsonDocument(m_topicData.properties).toJson(QJsonDocument::Compact);
+    DEBUG_LOG(m_logger) << "topicData - properties: " << QJsonDocument(m_topicData.properties).toJson(QJsonDocument::Compact);
 
     emit topicEditorRequested(data);
   }
@@ -221,7 +221,7 @@ bool EvaluationTopicEditor::apply2()
 void EvaluationTopicEditor::onOperatorChanged()
 {
   m_operatorId = m_ui->cbxOperator->currentData().toInt();
-  DEBUG_LOG() << "operator id = " << m_operatorId;
+  DEBUG_LOG(m_logger) << "operator id = " << m_operatorId;
 
   m_model->initModel(m_evlDtc, m_operatorId);
   m_ui->trvEvaluations->expandAll();
@@ -232,11 +232,11 @@ void EvaluationTopicEditor::onSelectionChanged(const QItemSelection &selected, c
   Q_UNUSED(selected);
   Q_UNUSED(deselected);
 
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   QModelIndex index = m_ui->trvEvaluations->currentIndex();
   m_evlElement = m_model->getEvaluationElement(index);
-  DEBUG_LOG() << "element id = " << m_evlElement.id();
+  DEBUG_LOG(m_logger) << "element id = " << 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/TopicEditor/topic_editor.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/topic_editor.h
index 35e433573..775dfa9bd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/topic_editor.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/TopicEditor/topic_editor.h
@@ -32,6 +32,8 @@ public:
   bool fetchInterfaces();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void updateInternalData() override final;
   void retranslate() override final;
 
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 2816c0afb..9823dc2f3 100755
--- 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
@@ -25,7 +25,7 @@ CriteriumDialog::CriteriumDialog(const QString &menuGroup, LtsSession::LtsSessio
   , m_ownEvaluationElements(ownEvlElements)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
 {
-  DEBUG_LOG() << "CriteriumDialog ctor";
+  DEBUG_LOG(m_logger) << "CriteriumDialog ctor";
   m_ui->setupUi(this);
   m_buttonBox->connectButton(LtsWidgets::DialogButton::Print, this, &CriteriumDialog::onPrint);
 
@@ -89,13 +89,13 @@ void CriteriumDialog::tableColumnOrganiserSetting()
 
 void CriteriumDialog::slotAdd()
 {
-  DEBUG_LOG() << "CriteriumDialog::slotAdd";
+  DEBUG_LOG(m_logger) << "CriteriumDialog::slotAdd";
   editCriterium(0 );
 }
 
 void CriteriumDialog::slotEdit()
 {
-  DEBUG_LOG() << "CriteriumDialog::slotEdit";
+  DEBUG_LOG(m_logger) << "CriteriumDialog::slotEdit";
 
   const QModelIndex srcIdx = m_ui->widget->currentIndex();
   editCriterium(m_model->getRowData(srcIdx.row()).id() );
@@ -103,20 +103,20 @@ void CriteriumDialog::slotEdit()
 
 void CriteriumDialog::slotRemove()
 {
-  DEBUG_LOG() << "CriteriumDialog::slotRemove";
+  DEBUG_LOG(m_logger) << "CriteriumDialog::slotRemove";
   const QModelIndex selIndex = m_ui->widget->currentIndex();
   if (!selIndex.isValid())
     return;
 
   Core::RemoveElementRequest req(m_model->getRowData(selIndex.row()).id());
-  DEBUG_LOG() << "Removing criterium id = " << req.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())
-    ERROR_LOG() << "Failed to remove criterium";
+    ERROR_LOG(m_logger) << "Failed to remove criterium";
 }
 
 
@@ -145,7 +145,7 @@ bool CriteriumDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
                            int exerciseId,
                            int currentOperatorId)
 {
-  DEBUG_LOG() << "CriteriumDialog::init";
+  DEBUG_LOG(m_logger) << "CriteriumDialog::init";
   m_dtc = dtc;
   m_ftc = ftc;
   m_opmCbxDtc = opmCbxDtc;
@@ -175,7 +175,7 @@ bool CriteriumDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
   for (auto i = criteria.constBegin(); i != criteria.constEnd(); ++i)
   {
     const EvaluationCriterium &p = (*i);
-    DEBUG_LOG() << "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, Qt::UniqueConnection);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_dialog.h
index f763c18f5..58170e2aa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_dialog.h
@@ -56,6 +56,8 @@ public:
             int currentOperatorId);
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void onEvlCriteriumModifyReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
   void onEvlCriteriumRemoveReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
   void onPrint();
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 6cb8baa0b..cf7b23640 100755
--- 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
@@ -20,7 +20,7 @@ CriteriumEditDialog::CriteriumEditDialog(QWidget *parent)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_ui(new Ui::CriteriumEditDialog)
 {
-  DEBUG_LOG() << "CriteriumEditDialog ctor";
+  DEBUG_LOG(m_logger) << "CriteriumEditDialog ctor";
 
   m_ui->setupUi(this);
 
@@ -43,7 +43,7 @@ bool CriteriumEditDialog::init(int criteriumId,
                                const std::shared_ptr<Interface::Ftc> &ftc,
                                const std::shared_ptr<OperatorManagement::ForeignGuiComboboxInterface> &opmCbxDtc)
 {
-  DEBUG_LOG() << "CriteriumEditDialog::init";
+  DEBUG_LOG(m_logger) << "CriteriumEditDialog::init";
   m_criteriumId = criteriumId;
   m_dtc = dtc;
   m_ftc = ftc;
@@ -123,9 +123,9 @@ void CriteriumEditDialog::onExportButtonClicked()
 
   int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
   if (fileId > 0)
-    DEBUG_LOG() << "Saved file with id = " << fileId;
+    DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
   else
-    ERROR_LOG() << "Could not save file in library ";
+    ERROR_LOG(m_logger) << "Could not save file in library ";
 }
 
 void CriteriumEditDialog::onImportButtonClicked()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_edit_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_edit_dialog.h
index b7001e9bc..aec14a418 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_edit_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_edit_dialog.h
@@ -44,6 +44,8 @@ public:
             const std::shared_ptr<OperatorManagement::ForeignGuiComboboxInterface> &opmCbxDtc);
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void onEvlCriteriumModifyReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
   void onEvlCriteriumRemoveReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
 
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 b57c9251b..c2bd0df9f 100755
--- 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
@@ -31,7 +31,7 @@ ElementEditDialog::ElementEditDialog(QWidget *)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_ui(new Ui::ElementEditDialog)
 {
-  DEBUG_LOG() << "ElementEditDialog ctor";
+  DEBUG_LOG(m_logger) << "ElementEditDialog ctor";
 
   m_ui->setupUi(this);
 
@@ -73,7 +73,7 @@ bool ElementEditDialog::init(int elementId,
                              const std::shared_ptr<FilterManagement::ForeignFltBuildingComponentGuiInterface> &fltBuildingComponentIfc,
                              LtsSession::LtsSession *session)
 {
-  DEBUG_LOG() << "ElementEditDialog::init";
+  DEBUG_LOG(m_logger) << "ElementEditDialog::init";
   m_elementId = elementId;
   m_criteriumId = criteriumId;
   m_exerciseId = exerciseId;
@@ -97,7 +97,7 @@ bool ElementEditDialog::init(int 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()));
-    ERROR_LOG() << "set start time label to " << m_ui->lblStartTime->text();
+    ERROR_LOG(m_logger) << "set start time label to " << m_ui->lblStartTime->text();
     m_startTime = eval.timestamp();
 
     m_ui->cbSituation->setChecked(eval.situation());
@@ -169,7 +169,7 @@ bool ElementEditDialog::apply()
     if (m_session->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(sitMapIfc))
       root[QStringLiteral("settings")] = sitMapIfc->operatorMapSettings();
     else
-      ERROR_LOG() << "sit map ifc not available, can't save map settings :(";
+      ERROR_LOG(m_logger) << "sit map ifc not available, can't save map settings :(";
 
     root[QStringLiteral("filters")] = getFilterSettings();
 
@@ -199,7 +199,7 @@ bool ElementEditDialog::apply()
 
 void ElementEditDialog::fillPhasesComboBox()
 {
-  DEBUG_LOG() << "fillPhasesComboBox";
+  DEBUG_LOG(m_logger) << "fillPhasesComboBox";
   QSignalBlocker blocker(m_ui->cbxPhase);
   m_ui->cbxPhase->clear();
   m_ui->cbxPhase->addItem(tr("<not set>"), 0);
@@ -218,7 +218,7 @@ void ElementEditDialog::fillPhasesComboBox()
 
 void ElementEditDialog::onCheckBoxClicked()
 {
-  INFO_LOG() << "onCheckBoxClicked";
+  INFO_LOG(m_logger) << "onCheckBoxClicked";
   if (m_startTime > 0)
     return;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_edit_element_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_edit_element_dialog.h
index 47f1c45bd..5f213072a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_edit_element_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_edit_element_dialog.h
@@ -57,6 +57,8 @@ public:
             LtsSession::LtsSession *session);
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void onEvlElementModifyReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
   void onEvlElementRemoveReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
 
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 4f9827b55..f5982c77c 100755
--- 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
@@ -18,7 +18,7 @@ ElementDialog::ElementDialog(QWidget *parent)
   , m_ui(new Ui::ElementDialog) 
   , m_requestHelper(new LtsUtils::RequestHelper(this))
 {
-  DEBUG_LOG() << "ElementDialog ctor";
+  DEBUG_LOG(m_logger) << "ElementDialog ctor";
   m_ui->setupUi(this);
 
   setOnlineHelpFilename(QStringLiteral("Situation-Own_Evaluation_Criteria"));
@@ -46,14 +46,14 @@ void ElementDialog::enaDisa()
 
 void ElementDialog::slotAdd()
 {
-  DEBUG_LOG() << "ElementDialog::slotAdd";
+  DEBUG_LOG(m_logger) << "ElementDialog::slotAdd";
 
   addElementEditDialog();
 }
 
 void ElementDialog::slotEdit()
 {
-  DEBUG_LOG() << "ElementDialog::slotEdit";
+  DEBUG_LOG(m_logger) << "ElementDialog::slotEdit";
 
   addElementEditDialog(m_model->getRowData(m_ui->widget->currentIndex().row()).id() );
 }
@@ -75,19 +75,19 @@ void ElementDialog::tableColumnOrganiserSetting()
 
 void ElementDialog::slotRemove()
 {
-  DEBUG_LOG() << "ElementDialog::slotRemove";
+  DEBUG_LOG(m_logger) << "ElementDialog::slotRemove";
   QModelIndex selIndex = m_ui->widget->currentIndex();
   if (!selIndex.isValid())
     return;
 
   m_requestHelper->startSingleRequest([this]()
   {
-    DEBUG_LOG() << "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);
   });
 
   if (m_requestHelper->failed())
-    ERROR_LOG() << "Failed to remove criterium";
+    ERROR_LOG(m_logger) << "Failed to remove criterium";
 }
 
 QString ElementDialog::dialogIdentifier()
@@ -107,7 +107,7 @@ bool ElementDialog::init(int criteriumId,
                          const std::shared_ptr<FilterManagement::ForeignFltBuildingComponentGuiInterface> &fltBuildingComponentIfc,
                          LtsSession::LtsSession *session)
 {
-  DEBUG_LOG() << "ElementDialog::init";
+  DEBUG_LOG(m_logger) << "ElementDialog::init";
   m_criteriumId = criteriumId;
   m_exerciseId  = exerciseId;
   m_dtc = dtc;
@@ -135,7 +135,7 @@ bool ElementDialog::init(int criteriumId,
 
   auto cb = [this](const Evaluations::EvaluationElement &e)
   {
-    DEBUG_LOG() << "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_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_element_dialog.h
index 66776c36e..ad1c3866d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_element_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_element_dialog.h
@@ -54,6 +54,8 @@ public:
   static QString dialogIdentifier();
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void onEvlElementModifyReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
   void onEvlElementRemoveReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
 
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 6c46de958..f5048daef 100755
--- 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
@@ -47,7 +47,7 @@ bool ElementDialogModel::initModel(const std::shared_ptr<Interface::Dtc> &dtc,
   };
   dtc->evaluationElements(cb);
 
-  INFO_LOG() << "initModel - #EvalElements: " << m_vecData.size();
+  INFO_LOG(m_logger) << "initModel - #EvalElements: " << m_vecData.size();
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_element_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_element_model.h
index 822c36a75..5e3c1a5d9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_element_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_element_model.h
@@ -45,6 +45,8 @@ public:
   QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<AudioVideoManagement::ForeignDataInterface> m_avmDataIfc;
   std::shared_ptr<ExerciseManagement::Interface::Dtc> m_exmDtc;
   friend class ElementDialogProxyModel;
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 5a9ebe38f..215205e98 100755
--- 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
@@ -29,7 +29,7 @@ bool CriteriumDialogModel::initModel(const std::shared_ptr<Interface::Dtc> &dtc,
           this, &CriteriumDialogModel::onDataChanged);
   dtc->evaluationCriteriums([this](const EvaluationCriterium & e) { insertRow(e); });
 
-  INFO_LOG() << "initModel - #EvalCriteria: " << m_vecData.size();
+  INFO_LOG(m_logger) << "initModel - #EvalCriteria: " << m_vecData.size();
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_model.h
index 1667291de..0d9a94f72 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CriteriumEdit/evl_model.h
@@ -36,6 +36,8 @@ public:
 
 protected:
 
+
+NGL::INGLLogger &m_logger;
 private:
   std::shared_ptr<OperatorManagement::Interface::Dtc> m_opmDtc;
   friend class CriteriumFilterModel;
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 f72e98aff..5ca5a39ca 100755
--- 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
@@ -116,7 +116,7 @@ void SanNineLinerDialog::onEditSanNineLiner()
 
   if (san.id() <= 0)
     return;
-  DEBUG_LOG() << "current SanNineLinerId: " << san.id();
+  DEBUG_LOG(m_logger) << "current SanNineLinerId: " << san.id();
 
   SanNineLinerEditDialog *dialog = new SanNineLinerEditDialog(this);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_dialog.h
index 1cd11236b..d034dd54e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_dialog.h
@@ -38,6 +38,7 @@ private slots:
   void onRemoveSanNineLiner();
 
 private:
+  NGL::INGLLogger &m_logger;
   void retranslate() override;
   void onSanNineLinerRemoveReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
   void tableColumnOrganiserSetting() override;
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 6da8288d9..59adfb68f 100755
--- 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
@@ -37,7 +37,7 @@ bool SanNineLinerDialogModel::initModel(const std::shared_ptr<Evaluations::Inter
     insertRow(san);
   });
 
-  INFO_LOG() << "initModel - #sanNineLiner: " << m_vecData.size();
+  INFO_LOG(m_logger) << "initModel - #sanNineLiner: " << m_vecData.size();
   return true;
 }
 
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 c659ad8f3..55b18b9cf 100755
--- 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
@@ -33,6 +33,7 @@ public:
   QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override final;
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<Evaluations::Interface::Dtc> m_evlDtc;
   friend class SanNineLinerProxyModel;
 };
@@ -45,6 +46,7 @@ public:
 
   void setSourceModel(QAbstractItemModel *sourceModel) override;
 private:
+  NGL::INGLLogger &m_logger;
   SanNineLinerDialogModel *m_sourceModel{nullptr};
 };
 }
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 4329e7223..7ec7a0f57 100755
--- 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
@@ -108,7 +108,7 @@ bool SanNineLinerEditDialog::init(LtsSession::LtsSessionDataDds *session,
     
     QVector<Database::SanCategoryLine> linesCategory = SanCategoryLine::fromJson(data.lines(), data.id());
 
-    INFO_LOG() << "linesCategory size: " << linesCategory.size();
+    INFO_LOG(m_logger) << "linesCategory size: " << linesCategory.size();
 
     for (const Database::SanCategoryLine &cl : std::as_const(linesCategory))
     {
@@ -117,7 +117,7 @@ bool SanNineLinerEditDialog::init(LtsSession::LtsSessionDataDds *session,
       QLineEdit *leLineAmount = findChild<QLineEdit*>(leName);
       if (leLineAmount)
       {
-        INFO_LOG() << "leName: " << leName << ", amount: " << cl.amount;
+        INFO_LOG(m_logger) << "leName: " << leName << ", amount: " << cl.amount;
         leLineAmount->setText(QString::number(cl.amount));
 
         continue;
@@ -128,7 +128,7 @@ bool SanNineLinerEditDialog::init(LtsSession::LtsSessionDataDds *session,
       QRadioButton *rbCategory = findChild<QRadioButton*>(rbName);
       if (rbCategory)
       {
-        INFO_LOG() << "rbName: " << rbName;
+        INFO_LOG(m_logger) << "rbName: " << rbName;
         rbCategory->setChecked(true);
         continue;
       }
@@ -139,7 +139,7 @@ bool SanNineLinerEditDialog::init(LtsSession::LtsSessionDataDds *session,
       QCheckBox *cbxCategory = findChild<QCheckBox*>(cbxName);
       if (cbxCategory)
       {
-        INFO_LOG() << "cbxName: " << cbxName;
+        INFO_LOG(m_logger) << "cbxName: " << cbxName;
         cbxCategory->setChecked(true);
       }
     }
@@ -250,7 +250,7 @@ bool SanNineLinerEditDialog::apply()
   if (request.id() <= 0)
   {
     m_sanNineLinerId = m_requestHelper->getRepliedId();
-    ERROR_LOG() << "Created new san nine liner with id " << m_sanNineLinerId;
+    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/SanNineLinerEdit/san_nine_liner_edit_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_edit_dialog.h
index 119ce8959..a7c0cae9d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_edit_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/san_nine_liner_edit_dialog.h
@@ -46,6 +46,7 @@ public:
 
 protected:
 
+  NGL::INGLLogger &m_logger;
   void onSanNineLinerModifyReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
 
 private slots:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_comments.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_comments.h
index 51c2151fb..c1f2d9a0d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_comments.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_comments.h
@@ -34,6 +34,8 @@ private slots:
   void onCommentChanged(const Evaluations::EvaluationComment &data, DataModification modType);
 
 private:
+
+NGL::INGLLogger &m_logger;
   bool insertComment(const Evaluations::EvaluationComment &c);
   void retranslate() override;
   bool eventFilter(QObject *object, QEvent *event) override;
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 2c9ed3a4c..c1b192250 100755
--- 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
@@ -301,7 +301,7 @@ void EditSchemaDialog::onNotifyAboutSchema(const Evaluations::EvaluationSchema &
 
   if (jError.error != QJsonParseError::NoError)
   {
-    WARNING_LOG() << "Could not parse schema with database id " << data.id();
+    WARNING_LOG(m_logger) << "Could not parse schema with database id " << data.id();
     return;
   }
 
@@ -348,7 +348,7 @@ void EditSchemaDialog::loadSchema(qint32 schemaId)
 
     if (jError.error != QJsonParseError::NoError)
     {
-      WARNING_LOG() << "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;
     }
 
@@ -903,12 +903,12 @@ void EditSchemaDialog::onLoadFromLibrary()
     const QJsonDocument doc(QJsonDocument::fromJson(content, &jError));
     if (jError.error != QJsonParseError::NoError)
     {
-      WARNING_LOG() << "Could not parse schema !";
+      WARNING_LOG(m_logger) << "Could not parse schema !";
       return;
     }
     if (!m_pModel->fromQJsonDocument(doc))
     {
-      WARNING_LOG() << "Could not load schema !";
+      WARNING_LOG(m_logger) << "Could not load schema !";
       return;
     }
 
@@ -929,11 +929,11 @@ bool EditSchemaDialog::onSaveToLibrary()
   int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::EvaluationSchema, m_session->exerciseId(), byteArray);
   if (fileId > 0)
   {
-    DEBUG_LOG() << "Saved file with id = " << fileId;
+    DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
     return true;
   }
   else
-    ERROR_LOG() << "Could not save file in library ";
+    ERROR_LOG(m_logger) << "Could not save file in library ";
 
   return false;
 }
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 9604cb13a..1402be97b 100755
--- 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
@@ -49,6 +49,8 @@ public:
   void retranslate() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   void onSendEvaluationReply(const Core::FunctionReplyObject &replyObject) override final;
 
   void onEvlCommentModifyReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_treemodel_general.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_treemodel_general.h
index 73de6d54d..15136cf1f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_treemodel_general.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_edit_treemodel_general.h
@@ -27,5 +27,7 @@ public:
   void removeRow(const QModelIndex &idx, bool deleteRootAllowed = false);
 
 protected:
+
+NGL::INGLLogger &m_logger;
 };
 }
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 984642b2b..34d13f2fe 100755
--- 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
@@ -128,7 +128,7 @@ QJsonDocument TreeModelSchema::toJsonDocument() const
   {
     Q_UNUSED(idx);
     Evaluations::ElementData e = v.value<Evaluations::ElementData>();
-    INFO_LOG() << "toJsonDocument: Name: " << e.getText() << ", elementId: " << e.m_id << ", parent id: " << e.m_parentId;
+    INFO_LOG(m_logger) << "toJsonDocument: Name: " << e.getText() << ", elementId: " << e.m_id << ", parent id: " << e.m_parentId;
 
     QJsonObject obj;
     obj[QStringLiteral("id")] = e.m_id;
@@ -172,7 +172,7 @@ bool TreeModelSchema::fromQJsonDocument(const QJsonDocument &doc)
     
 
     m_elementId = std::max(m_elementId, d.m_id);
-    INFO_LOG() << "fromQJsonDocument: " << d.getText() << ", own id = " << d.m_id << ", parent id = " << d.m_parentId;
+    INFO_LOG(m_logger) << "fromQJsonDocument: " << d.getText() << ", own id = " << d.m_id << ", parent id = " << d.m_parentId;
   }
 
   ++m_elementId;
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 9b26a42b3..233e071ba 100755
--- 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
@@ -9,10 +9,9 @@
 namespace Evaluations
 {
 EvlNewCommentDialog::EvlNewCommentDialog(const std::shared_ptr<OperatorManagement::Interface::Dtc> &opmDtc,
-                                         QWidget *parent)
-  : QDialog(parent),
-    m_ui(new Ui::EvlNewCommentDialog)
-{
+                                         QWidget *parent) : QDialog(parent),
+    m_ui(new Ui::EvlNewCommentDialog),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_ui->setupUi(this);
   setWindowFlags(Qt::Tool);
   m_ui->m_ltsComboBox_ReceiverOperator->addItem(tr("All (Default)"), 0);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_new_comment_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_new_comment_dialog.h
index dc63e184f..a0bca7769 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_new_comment_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SchemaEdit/evl_new_comment_dialog.h
@@ -32,6 +32,8 @@ private slots:
   void onTextChanged();
 
 private:
+
+NGL::INGLLogger &m_logger;
   Ui::EvlNewCommentDialog *m_ui{nullptr};
   const int m_maxChars{255};
 };
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 828720de4..932aa8a94 100755
--- 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
@@ -165,7 +165,7 @@ void ExerciseManagementDialog::onEditExercise()
 
   if (ex.id() <= 0)
     return;
-  DEBUG_LOG() << "current EXId: " << ex.id();
+  DEBUG_LOG(m_logger) << "current EXId: " << ex.id();
 
   ExerciseManagementEditDialog *dialog = new ExerciseManagementEditDialog(this);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_dialog.h
index 4b1927766..0374c3d7f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_dialog.h
@@ -42,6 +42,8 @@ private slots:
   void onRemoveExercise();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void onExerciseRemoveReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
   void onFolderRemoveReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
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 269df3c1f..dde63d7e5 100755
--- 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
@@ -83,7 +83,7 @@ bool ExerciseManagementDialogModel::initModel(const std::shared_ptr<ExerciseMana
       addImagePreload(ex.id());
   });
 
-  INFO_LOG() << "initModel - #exercises: " << m_vecData.size();
+  INFO_LOG(m_logger) << "initModel - #exercises: " << m_vecData.size();
   return true;
 }
 
@@ -144,7 +144,7 @@ GetExerciseImageRequester *ExerciseManagementDialogModel::createGetExerciseImage
       for (const std::string &arg : std::as_const(reply.errorParams()))
         msg = msg.arg(QString::fromStdString(arg));
 
-      ERROR_LOG() << "image preload failed: " << msg;
+      ERROR_LOG(m_logger) << "image preload failed: " << msg;
     }
 
     QTimer::singleShot(1, this, &ExerciseManagementDialogModel::preloadNextImage); 
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 a4c8f3bf5..81e4107b9 100755
--- 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
@@ -37,6 +37,8 @@ class GetExerciseImageRequester
   Q_OBJECT
 
 private:
+
+NGL::INGLLogger &m_logger;
   GetExerciseImageRequester() = default;
 
 public:
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 fb1805bf1..e92cad06e 100755
--- 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
@@ -330,7 +330,7 @@ void ExerciseManagementEditDialog::onGetExerciseImageReply(const GetExerciseImag
   for (const std::string &arg : std::as_const(reply.errorParams()))
     msg = msg.arg(QString::fromStdString(arg));
 
-  ERROR_LOG() << "loading exercise image failed: " << msg;
+  ERROR_LOG(m_logger) << "loading exercise image failed: " << msg;
   
 
   
@@ -440,7 +440,7 @@ void ExerciseManagementEditDialog::onEditVisibleParties()
 
   if (operatorId <= 0 || isChecked == false || !visibleParties) 
     return;
-  DEBUG_LOG() << "current Operator Id: " << operatorId;
+  DEBUG_LOG(m_logger) << "current Operator Id: " << operatorId;
 
 
   ExerciseEditPartyDialog *dialog = new ExerciseEditPartyDialog(operatorId, m_exerciseId, m_menuGroup, this);
@@ -459,7 +459,7 @@ void ExerciseManagementEditDialog::onEditExercisePhase()
 
   if (exPhase.id() <= 0)
     return;
-  DEBUG_LOG() << "current exPhase Id: " << exPhase.id();
+  DEBUG_LOG(m_logger) << "current exPhase Id: " << exPhase.id();
 
   ExerciseManagementPhaseEditDialog *dialog = new ExerciseManagementPhaseEditDialog(this);
 
@@ -471,21 +471,21 @@ void ExerciseManagementEditDialog::onEditExercisePhase()
 
 void ExerciseManagementEditDialog::onExport()
 {
-  DEBUG_LOG() << "onExport";
+  DEBUG_LOG(m_logger) << "onExport";
 
   const QByteArray byteArray = exerciseToJson();
-  DEBUG_LOG() << "Exporting: " << byteArray;
+  DEBUG_LOG(m_logger) << "Exporting: " << byteArray;
 
   int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, 0, byteArray);
   if (fileId > 0)
-    DEBUG_LOG() << "Saved file with id = " << fileId;
+    DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
   else
-    ERROR_LOG() << "Could not save file in library ";
+    ERROR_LOG(m_logger) << "Could not save file in library ";
 }
 
 void ExerciseManagementEditDialog::onImport()
 {
-  DEBUG_LOG() << "onImport";
+  DEBUG_LOG(m_logger) << "onImport";
 
   QByteArray content;
   int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, 0, JsonKeys::XMLTYPEVALUE());
@@ -504,7 +504,7 @@ void ExerciseManagementEditDialog::onImport()
     else
     {
       ExerciseModifyRequest req = jsonToExercise(content);
-      DEBUG_LOG() << "Importing: " << req;
+      DEBUG_LOG(m_logger) << "Importing: " << req;
 
       m_ui->pteForces->setPlainText(QString::fromStdString(req.forces()));
       m_ui->pteDescription->setPlainText(QString::fromStdString(req.description()));
@@ -893,7 +893,7 @@ bool ExerciseManagementEditDialog::apply()
 
     int newExId = m_requestHelper->getRepliedId();
 
-    DEBUG_LOG() << "Created new exercise with id " << newExId;
+    DEBUG_LOG(m_logger) << "Created new exercise with id " << newExId;
 
     if (newExId > 0)
     {
@@ -905,7 +905,7 @@ bool ExerciseManagementEditDialog::apply()
         return m_ftc->exerciseImageModifyRequest(exImgRequest, this);
       })) 
       {
-        WARNING_LOG() << "Unable to set default exercise picture";
+        WARNING_LOG(m_logger) << "Unable to set default exercise picture";
         LtsWidgets::LtsMessageDialog::showMessage(this, tr("Unable to set default exercise picture"));
       }
 
@@ -915,7 +915,7 @@ bool ExerciseManagementEditDialog::apply()
       
       if (!createFolders(newExId))
       {
-        WARNING_LOG() << "Unable to create exercise folders in document library.";
+        WARNING_LOG(m_logger) << "Unable to create exercise folders in document library.";
         LtsWidgets::LtsMessageDialog::showMessage(this, tr("Unable to create exercise folders in document library."));
       }
 
@@ -944,7 +944,7 @@ void ExerciseManagementEditDialog::sendModifiedOperators(int thisExerciseId)
   std::shared_ptr<OperatorManagement::Interface::Ftc> opmFtc;
   if (!m_session->getFtc<OperatorManagement::DataInterface>(opmFtc))
   {
-    ERROR_LOG() << "Cannot change add/remove Operators to/from Exercise as the OPM-FTC could not be fetched." ;
+    ERROR_LOG(m_logger) << "Cannot change add/remove Operators to/from Exercise as the OPM-FTC could not be fetched." ;
     return;
   }
 
@@ -970,10 +970,10 @@ void ExerciseManagementEditDialog::sendModifiedOperators(int thisExerciseId)
     req.visibleExercises() = user.exerciseIds();
     req.visiblePartiesByExercise() = user.visiblePartiesByExercise();
 
-    DEBUG_LOG() << "Adding request: " << req;
+    DEBUG_LOG(m_logger) << "Adding request: " << req;
     m_requestHelper->addRequest([this, req, opmFtc]()
     {
-      DEBUG_LOG() << "Executing request: " << req;
+      DEBUG_LOG(m_logger) << "Executing request: " << req;
       return opmFtc->operatorCreateModifyRequest(req, this);
     });
 
@@ -991,7 +991,7 @@ bool ExerciseManagementEditDialog::createFolders(int newExId)
   if (folderId <= 0)
     return false;
 
-  DEBUG_LOG() << "Exercise Folder created with id = " << folderId;
+  DEBUG_LOG(m_logger) << "Exercise Folder created with id = " << folderId;
 
   
   folderName = QStringLiteral("Documents") ;
@@ -1000,7 +1000,7 @@ bool ExerciseManagementEditDialog::createFolders(int newExId)
   if (subFolderId <= 0)
     return false;
 
-  DEBUG_LOG() << "Sub Folder Documents created with id = " << subFolderId;
+  DEBUG_LOG(m_logger) << "Sub Folder Documents created with id = " << subFolderId;
 
   
   QStringList folderNames;
@@ -1008,7 +1008,7 @@ bool ExerciseManagementEditDialog::createFolders(int newExId)
   folderNames << QStringLiteral("Incidents") << QStringLiteral("Instructions");
 
   bool ok = createExerciseFolders(subFolderId, folderNames);
-  DEBUG_LOG() << "Created sub-folders Documents: " << ok;
+  DEBUG_LOG(m_logger) << "Created sub-folders Documents: " << ok;
 
   
   LtsUtils::ProjectSettings *ps = LtsUtils::ProjectSettings::getInstance();
@@ -1019,7 +1019,7 @@ bool ExerciseManagementEditDialog::createFolders(int newExId)
     
     folderName = QStringLiteral("Phase Documents");
     int folderPhaseDocsId = createFolder(subFolderId, folderName);
-    DEBUG_LOG() << "Phase Documents Folder created with id = " << folderPhaseDocsId;
+    DEBUG_LOG(m_logger) << "Phase Documents Folder created with id = " << folderPhaseDocsId;
 
     
     if (folderPhaseDocsId > 0)
@@ -1027,14 +1027,14 @@ bool ExerciseManagementEditDialog::createFolders(int newExId)
       int phId = m_dtc->exercise(newExId).activePhaseId();
       const QString &phaseName = m_flmDtc->getPhaseFolderName(phId);
       int folderPhaseId = createFolder(folderPhaseDocsId, phaseName);
-      DEBUG_LOG() << "Phase Folder created with id = " << folderPhaseId;
+      DEBUG_LOG(m_logger) << "Phase Folder created with id = " << folderPhaseId;
     }
   }
 
   
   folderName = QStringLiteral("Markers");
   subFolderId = createFolder(folderId, folderName);
-  DEBUG_LOG() << "Markers Folder created with id = " << subFolderId;
+  DEBUG_LOG(m_logger) << "Markers Folder created with id = " << subFolderId;
 
   FileManagement::PathCreateRequest req;
   req.parentId(folderId);
@@ -1045,25 +1045,25 @@ bool ExerciseManagementEditDialog::createFolders(int newExId)
 
   bool success = m_flmFtc->pathCreateRequest(req);
   if (!success)
-    ERROR_LOG() << "Planning/TNE Lists could not be created";
+    ERROR_LOG(m_logger) << "Planning/TNE Lists could not be created";
 
   
   req.path({"Tactical Plans", "BDA"});
   success = m_flmFtc->pathCreateRequest(req);
   if (!success)
-    ERROR_LOG() << "Tactical Plans/BDA could not be created";
+    ERROR_LOG(m_logger) << "Tactical Plans/BDA could not be created";
 
   req.path({"Tactical Plans", "HQ Data"});
   success = m_flmFtc->pathCreateRequest(req);
 
   if (!success)
-    ERROR_LOG() << "Tactical Plans/HQ Data could not be created";
+    ERROR_LOG(m_logger) << "Tactical Plans/HQ Data could not be created";
 
   
   folderNames.clear();
   folderNames <<  QStringLiteral("Reports") << QStringLiteral("Snapshots");
   ok = createExerciseFolders(folderId, folderNames);
-  DEBUG_LOG() << "Created last exercise documents: " << ok;
+  DEBUG_LOG(m_logger) << "Created last exercise documents: " << ok;
 
   return true;
 }
@@ -1086,7 +1086,7 @@ int ExerciseManagementEditDialog::createFolder(int parentFolderId, const QString
     return m_flmFtc->folderModifyRequest(req, this);
   });
 
-  DEBUG_LOG() << "Created folder id = " << m_requestHelper->getRepliedId();
+  DEBUG_LOG(m_logger) << "Created folder id = " << m_requestHelper->getRepliedId();
 
   return m_requestHelper->getRepliedId();
 }
@@ -1239,13 +1239,13 @@ ExerciseModifyRequest ExerciseManagementEditDialog::jsonToExercise(const QByteAr
 
 void ExerciseManagementEditDialog::onCreateFolders()
 {
-  DEBUG_LOG() << "onCreateFolders";
+  DEBUG_LOG(m_logger) << "onCreateFolders";
   if (m_exerciseId > 0 && getExerciseFolder() <= 0 )
   {
     bool ok = createFolders(m_exerciseId);
     if (!ok)
     {
-      WARNING_LOG() << "Could not create exercise folders";
+      WARNING_LOG(m_logger) << "Could not create exercise folders";
       LtsWidgets::LtsMessageDialog::showMessage(this, tr("Could not create exercise folders"));
     }
     else
@@ -1262,7 +1262,7 @@ int ExerciseManagementEditDialog::getExerciseFolder()
     return 0;
 
   const int folderId = m_flmDtc->getExerciseFolderId(m_exerciseId);
-  DEBUG_LOG() << "getExerciseFolder: folderId = " << folderId;
+  DEBUG_LOG(m_logger) << "getExerciseFolder: folderId = " << folderId;
   return folderId;
 }
 
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 007679f0e..53104744c 100755
--- 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
@@ -78,6 +78,8 @@ public:
   ~ExerciseManagementEditDialog();
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void onExerciseCreateReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
   void onExerciseModifyReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
   void onExerciseImageModifyReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); imageModifyError(); }
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 348835574..00f1c19cb 100755
--- 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
@@ -90,7 +90,7 @@ bool ExerciseEditPartyDialog::init(LtsSession::LtsSessionDataDds *session)
 
 bool ExerciseEditPartyDialog::operatorUpdateVisiblePartiesByExercise(const OperatorManagement::OperatorUpdateVisiblePartiesByExerciseRequest &req)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   return m_requestHelper->startSingleRequest([this, req]()
   {
     return m_opmFtc->operatorUpdateVisiblePartiesByExerciseRequest(req, this);
@@ -143,7 +143,7 @@ void ExerciseEditPartyDialog::setAdlerVisiblePartiesUncheckable()
 
 bool ExerciseEditPartyDialog::apply()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   if (m_operatorId <= 0) 
     return true;
@@ -163,9 +163,9 @@ bool ExerciseEditPartyDialog::apply()
 
   const QVector<int> hiddenPartyIds = m_visiblePartiesModel->getUncheckedIds();
   for (const int visible : visiblePartyIds)
-    DEBUG_LOG() << "visible party: " << visible;
+    DEBUG_LOG(m_logger) << "visible party: " << visible;
   for (const int hidden : hiddenPartyIds)
-    DEBUG_LOG() << "hidden party: " << hidden;
+    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()));
@@ -173,7 +173,7 @@ bool ExerciseEditPartyDialog::apply()
 
   req.properties(adlerVisiblePartiesToJson().toStdString());
 
-  DEBUG_LOG() << "----------------- opId: " << req.id() << ", exId:" << req.exerciseId() << ", req.hiddenParties.size:" << hiddenPartyIds.size()
+  DEBUG_LOG(m_logger) << "----------------- opId: " << req.id() << ", exId:" << req.exerciseId() << ", req.hiddenParties.size:" << hiddenPartyIds.size()
                       << "adlerVisibleParties: " << req.properties();
 
   return operatorUpdateVisiblePartiesByExercise(req);
@@ -206,7 +206,7 @@ void ExerciseEditPartyDialog::onSwitchCheckbox(const QModelIndex &index)
     return;
   }
 
-  DEBUG_LOG() <<  Q_FUNC_INFO << "index.row():" << index.row();
+  DEBUG_LOG(m_logger) <<  Q_FUNC_INFO << "index.row():" << index.row();
 
   const QPair<bool, ParticipantManagement::Party> row = m_visiblePartiesModel->getRowData(index.row());
   QPair<bool, ParticipantManagement::Party> rowAdler = m_adlerVisiblePartiesModel->getRowData(index.row());
@@ -222,7 +222,7 @@ void ExerciseEditPartyDialog::onDoubleClicked(const QModelIndex &index)
     return;
   }
 
-  DEBUG_LOG() <<  Q_FUNC_INFO << "index.row():" << index.row();
+  DEBUG_LOG(m_logger) <<  Q_FUNC_INFO << "index.row():" << index.row();
 
   
   bool isChecked = m_visiblePartiesModel->getRowData(index.row()).first;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_party_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_party_dialog.h
index 9576a3af2..a8b350689 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_party_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_party_dialog.h
@@ -42,6 +42,8 @@ public:
   void onOperatorUpdateVisiblePartiesByExerciseReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   bool apply() override final;
   QByteArray adlerVisiblePartiesToJson() const;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_phase_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_phase_dialog.h
index c024c7f66..f3a79efef 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_phase_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_phase_dialog.h
@@ -43,6 +43,8 @@ signals:
   void sendData(const ExerciseManagement::ExercisePhase &data);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   bool apply() override final;
 
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 c247fccc6..416349fe2 100755
--- 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
@@ -110,7 +110,7 @@ void ExerciseManagementOperatorEdit::sendModifiedOperators(int thisExerciseId)
   std::shared_ptr<OperatorManagement::Interface::Ftc> opmFtc;
   if (!m_session->getFtc<OperatorManagement::DataInterface>(opmFtc))
   {
-    ERROR_LOG() << "Cannot change add/remove Operators to/from Exercise as the OPM-FTC could not be fetched." ;
+    ERROR_LOG(m_logger) << "Cannot change add/remove Operators to/from Exercise as the OPM-FTC could not be fetched." ;
     return;
   }
 
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 925424fcb..5806a3d76 100755
--- 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
@@ -94,7 +94,7 @@ void ExerciseManagementPhaseEdit::onEditExercisePhase()
 
   if (exPhase.id() <= 0)
     return;
-  DEBUG_LOG() << "current exPhase Id: " << exPhase.id();
+  DEBUG_LOG(m_logger) << "current exPhase Id: " << exPhase.id();
 
   ExerciseManagementPhaseEditDialog *dialog = new ExerciseManagementPhaseEditDialog(this);
 
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 74aeb77d1..8355b42f4 100755
--- 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
@@ -30,7 +30,7 @@ bool ExercisePhaseModel::initModel(int exerciseId, const std::shared_ptr<Exercis
 
   
   m_exmDtc->exercisePhases([this](const ExercisePhase &item) { insertRow(item); });
-  INFO_LOG() << "initModel - #exercise phases: " << m_vecData.size();
+  INFO_LOG(m_logger) << "initModel - #exercise phases: " << m_vecData.size();
   return true;
 }
 
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 6edb723ff..5f70f099a 100755
--- 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
@@ -36,6 +36,8 @@ public:
   QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override final;
 
 protected:
+
+NGL::INGLLogger &m_logger;
   bool isFiltered(const ExercisePhase &data, DataModification modType) const override
   {
     if (data.exerciseId() != m_exerciseId)
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 65041a2fd..b0387b442 100755
--- 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
@@ -31,7 +31,7 @@ bool FlmHqReportConverter::init(LtsSession::LtsSession *session, int currentPart
 {
   if (session == nullptr)
   {
-    ERROR_LOG() << "Got invalid session";
+    ERROR_LOG(m_logger) << "Got invalid session";
 
     return false;
   }
@@ -40,28 +40,28 @@ bool FlmHqReportConverter::init(LtsSession::LtsSession *session, int currentPart
 
   if (!m_session->getDtc<DataInterface>(m_flmDtc))
   {
-    ERROR_LOG() << "Could not get FLM Dtc.";
+    ERROR_LOG(m_logger) << "Could not get FLM Dtc.";
 
     return false;
   }
 
   if (!m_session->getFtc<DataInterface>(m_flmFtc))
   {
-    ERROR_LOG() << "Could not get FLM Ftc.";
+    ERROR_LOG(m_logger) << "Could not get FLM Ftc.";
 
     return false;
   }
 
   if (!session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
   {
-    ERROR_LOG() << "Could not get PPM Dtc.";
+    ERROR_LOG(m_logger) << "Could not get PPM Dtc.";
 
     return false;
   }
 
   if (!m_flmFtc->enableFileContentModify())
   {
-    ERROR_LOG() << "Could enable fileContentModify.";
+    ERROR_LOG(m_logger) << "Could enable fileContentModify.";
 
     return false;
   }
@@ -104,7 +104,7 @@ void FlmHqReportConverter::processCollectedHqs()
     
     for (int id : reportIds)
     {
-      DEBUG_LOG() << "Request File with ID: " << id << " from plan with ID: " << planId;
+      DEBUG_LOG(m_logger) << "Request File with ID: " << id << " from plan with ID: " << planId;
       FileManagement::GetFileContentDataRequest request(id);
       m_flmFtc->getFileContentDataRequest(request, this);
     }
@@ -128,16 +128,16 @@ void FlmHqReportConverter::onGetFileContentDataReply(
 
   if (reply.errorString().size() > 0)
   {
-    ERROR_LOG() << "Got onGetFileContentDataReply error: " << reply.errorString();
+    ERROR_LOG(m_logger) << "Got onGetFileContentDataReply error: " << reply.errorString();
     return;
   }
 
   int id = static_cast<int>(reply.id());
   int planId = -1;
 
-  DEBUG_LOG() << "Reply File with ID: " << id << " from plan with ID: " << planId;
+  DEBUG_LOG(m_logger) << "Reply File with ID: " << id << " from plan with ID: " << planId;
 
-  INFO_LOG() << "Got reply with id " << id << " and errorString " << reply.errorString();
+  INFO_LOG(m_logger) << "Got reply with id " << id << " and errorString " << reply.errorString();
 
   QByteArray fileContent = QByteArray(reinterpret_cast<const char*>(reply.content().data()), reply.content().size());
 
@@ -146,7 +146,7 @@ void FlmHqReportConverter::onGetFileContentDataReply(
   HqReportData data = m_parser.parse(fileContent);
   data.contentFileId = id;
 
-  DEBUG_LOG() << "Party: " << m_partyId << " has Color: "<< QColor::fromRgb(QRgb(m_ppmDtc->party(m_partyId).color())).value();
+  DEBUG_LOG(m_logger) << "Party: " << m_partyId << " has Color: "<< QColor::fromRgb(QRgb(m_ppmDtc->party(m_partyId).color())).value();
 
   data.partyColor = QColor::fromRgb(QRgb(m_ppmDtc->party(m_partyId).color()));
 
@@ -161,36 +161,36 @@ void FlmHqReportConverter::onGetFileContentDataReply(
 
   m_convertedHqToPlanIds[planId].append(data);
 
-  DEBUG_LOG() << "Content size: " << reply.content().size();
+  DEBUG_LOG(m_logger) << "Content size: " << reply.content().size();
 
   checkIfAllFinished();
 }
 
 void FlmHqReportConverter::onFileContentModifyReply(const Core::FunctionReplyObject &reply)
 {
-  DEBUG_LOG() << "Got FileContentModify Reply: " << reply.translated();
+  DEBUG_LOG(m_logger) << "Got FileContentModify Reply: " << reply.translated();
 
   if (reply.error())
   {
-    ERROR_LOG() << "Error while insert HX Message: " << reply.translated()
+    ERROR_LOG(m_logger) << "Error while insert HX Message: " << reply.translated()
                         << ", error: " << reply.error();
   }
 }
 
 void FlmHqReportConverter::onFileContentRemoveReply(const Core::FunctionReplyObject &reply)
 {
-  DEBUG_LOG() << "Got FileContentRemove Reply: " << reply.translated();
+  DEBUG_LOG(m_logger) << "Got FileContentRemove Reply: " << reply.translated();
 
   if (reply.error())
   {
-    ERROR_LOG() << "Error while insert HX Message: " << reply.translated()
+    ERROR_LOG(m_logger) << "Error while insert HX Message: " << reply.translated()
                         << ", error: " << reply.error();
   }
 }
 
 void FlmHqReportConverter::onRequestsFinished()
 {
-  DEBUG_LOG() << "ALL REQUESTS FINISHED";
+  DEBUG_LOG(m_logger) << "ALL REQUESTS FINISHED";
 
   for (auto it = m_convertedHqToPlanIds.constBegin(); it != m_convertedHqToPlanIds.constEnd(); ++it)
   {
@@ -199,7 +199,7 @@ void FlmHqReportConverter::onRequestsFinished()
 
     for (auto &reportData : reportDatas)
     {
-      DEBUG_LOG() << "createGeometryFromReport :" <<  reportData.art;
+      DEBUG_LOG(m_logger) << "createGeometryFromReport :" <<  reportData.art;
       createGeometryFromReport(reportData);
     }
 
@@ -207,7 +207,7 @@ void FlmHqReportConverter::onRequestsFinished()
 
     FileManagement::FileContentModifyRequest data;
 
-    DEBUG_LOG() << "FILE CONTENT: " << flc.name() << " " << flc.folderId();
+    DEBUG_LOG(m_logger) << "FILE CONTENT: " << flc.name() << " " << flc.folderId();
 
     data.id(flc.id());
     data.name(flc.name());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_converter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_converter.h
index bc7201f25..047892758 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_converter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_converter.h
@@ -43,6 +43,7 @@ private:
   void checkIfAllFinished();
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onGetFileContentDataReply(const FileManagement::GetFileContentDataReply &reply) override;
   void onFileContentModifyReply(const Core::FunctionReplyObject &reply) override;
   void onFileContentRemoveReply(const Core::FunctionReplyObject &reply) override;
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 c51be66a3..7decc347b 100755
--- 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
@@ -40,7 +40,7 @@ bool HQReportEdit::init(LtsSession::LtsSession *session, int partyId)
 {
   if (session == nullptr)
   {
-    ERROR_LOG() << "Got invalid session";
+    ERROR_LOG(m_logger) << "Got invalid session";
 
     return false;
   }
@@ -51,35 +51,35 @@ bool HQReportEdit::init(LtsSession::LtsSession *session, int partyId)
 
   if (!m_session->getForeignGuiInterface<ParticipantManagement::ForeignGuiComboboxInterface>(partyCboInterface))
   {
-    ERROR_LOG() << "Could not get Party Combobox Interface.";
+    ERROR_LOG(m_logger) << "Could not get Party Combobox Interface.";
 
     return false;
   }
 
   if (!partyCboInterface->fillPartyComboBox(m_ui->cboParties) || m_ui->cboParties->count() == 0)
   {
-    ERROR_LOG() << "Could not fill Parties.";
+    ERROR_LOG(m_logger) << "Could not fill Parties.";
 
     return false;
   }
 
   if (!m_session->getDtc<DataInterface>(m_flmDtc))
   {
-    ERROR_LOG() << "Could not get FLM Dtc.";
+    ERROR_LOG(m_logger) << "Could not get FLM Dtc.";
 
     return false;
   }
 
   if (!m_session->getFtc<DataInterface>(m_flmFtc))
   {
-    ERROR_LOG() << "Could not get FLM Ftc.";
+    ERROR_LOG(m_logger) << "Could not get FLM Ftc.";
 
     return false;
   }
 
   if (!m_flmFtc->enableFileContentModify())
   {
-    ERROR_LOG() << "Could enable fileContentModify.";
+    ERROR_LOG(m_logger) << "Could enable fileContentModify.";
 
     return false;
   }
@@ -100,7 +100,7 @@ bool HQReportEdit::init(LtsSession::LtsSession *session, int partyId)
 
     if (!planModel->init(m_session, partyFolderId, FileType::inner_enum::TacticalPlan))
     {
-      WARNING_LOG() << "Could not init planModel for partyId " << partyId;
+      WARNING_LOG(m_logger) << "Could not init planModel for partyId " << partyId;
 
       delete planModel;
       planModel = nullptr;
@@ -114,7 +114,7 @@ bool HQReportEdit::init(LtsSession::LtsSession *session, int partyId)
 
     if (!hqReportModel->init(m_session, hqReportFolderId, FileType::inner_enum::AdlerJson))
     {
-      WARNING_LOG() << "Could not init hqReportModel for partyId " << partyId;
+      WARNING_LOG(m_logger) << "Could not init hqReportModel for partyId " << partyId;
 
       delete planModel;
       planModel = nullptr;
@@ -145,7 +145,7 @@ bool HQReportEdit::init(LtsSession::LtsSession *session, int partyId)
 
   if (!m_flmFtc->enableFileContentModify())
   {
-    ERROR_LOG() << "Could enable fileContentModify.";
+    ERROR_LOG(m_logger) << "Could enable fileContentModify.";
 
     return false;
   }
@@ -188,7 +188,7 @@ void HQReportEdit::createModels(const int partyId)
   const int partyFolderId = m_flmDtc->getPartyFolderId(m_session->exerciseId(), partyId);
   if (partyFolderId == 0)
   {
-    WARNING_LOG() << "No partyFolderId found for partyId " << partyId;
+    WARNING_LOG(m_logger) << "No partyFolderId found for partyId " << partyId;
     return;
   }
 
@@ -197,7 +197,7 @@ void HQReportEdit::createModels(const int partyId)
   auto *planModel = new FlmHQReportModel(m_ui->listViewPlan);
   if (!planModel->init(m_session, partyFolderId, FileType::inner_enum::TacticalPlan))
   {
-    WARNING_LOG() << "Could not init planModel for partyId " << partyId;
+    WARNING_LOG(m_logger) << "Could not init planModel for partyId " << partyId;
     delete planModel;
     return;
   }
@@ -205,7 +205,7 @@ void HQReportEdit::createModels(const int partyId)
   auto *hqReportModel = new FlmHQReportModel(m_ui->listViewMessage);
   if (!hqReportModel->init(m_session, hqReportFolderId, FileType::inner_enum::AdlerJson))
   {
-    WARNING_LOG() << "Could not init hqReportModel for partyId " << partyId;
+    WARNING_LOG(m_logger) << "Could not init hqReportModel for partyId " << partyId;
     delete planModel;
     delete hqReportModel;
     return;
@@ -238,7 +238,7 @@ bool HQReportEdit::apply()
 
   if (hqRepConv->init(m_session, currentPartyId))
   {
-    DEBUG_LOG() << "Add HQ to Converter";
+    DEBUG_LOG(m_logger) << "Add HQ to Converter";
 
     hqRepConv->addHqToPlanIds(allHqToPlanIds);
 
@@ -258,7 +258,7 @@ void HQReportEdit::onPartyChanged(int index)
 
   if (!m_planModels.contains(currentPartyId) || !m_hqModels.contains(currentPartyId))
   {
-    INFO_LOG() << "Models for party" << currentPartyId << "not found. Attempting to create...";
+    INFO_LOG(m_logger) << "Models for party" << currentPartyId << "not found. Attempting to create...";
     createModels(currentPartyId);
   }
 
@@ -284,7 +284,7 @@ void HQReportEdit::onPartyChanged(int index)
   }
   else
   {
-    ERROR_LOG() << "Failed to switch to party" << currentPartyId << ": Models still missing.";
+    ERROR_LOG(m_logger) << "Failed to switch to party" << currentPartyId << ": Models still missing.";
   }
 }
 void HQReportEdit::onCreateNewPlanClicked()
@@ -294,7 +294,7 @@ void HQReportEdit::onCreateNewPlanClicked()
 
   if (!ok)
   {
-    DEBUG_LOG() << "No name for new plan entered.";
+    DEBUG_LOG(m_logger) << "No name for new plan entered.";
 
     return;
   }
@@ -303,7 +303,7 @@ void HQReportEdit::onCreateNewPlanClicked()
 
   if (planModel == nullptr)
   {
-    ERROR_LOG() << "Could not create plan --> no plan model present.";
+    ERROR_LOG(m_logger) << "Could not create plan --> no plan model present.";
 
     return;
   }
@@ -312,14 +312,14 @@ void HQReportEdit::onCreateNewPlanClicked()
 
   if (geometryModel == nullptr)
   {
-    ERROR_LOG() << "Could not create plan --> not possible to create GeometryModel.";
+    ERROR_LOG(m_logger) << "Could not create plan --> not possible to create GeometryModel.";
 
     return;
   }
 
   if (m_session == nullptr)
   {
-    ERROR_LOG() << "Could not create plan --> not possible to create GeometryModel.";
+    ERROR_LOG(m_logger) << "Could not create plan --> not possible to create GeometryModel.";
 
     return;
   }
@@ -345,7 +345,7 @@ void HQReportEdit::onCreateNewPlanClicked()
                                        {
                                          const QString errorMessage = tr("Could not save plan: %1").arg(QString::fromStdString(reply.str()));
 
-                                         ERROR_LOG() << errorMessage;
+                                         ERROR_LOG(m_logger) << errorMessage;
 
                                          new LtsWidgets::LtsMessageDialogNew(this, errorMessage, tr("Save failed"));
                                        }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_edit.h
index 5cd11980a..bc521ef32 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_edit.h
@@ -48,6 +48,8 @@ class HQReportEdit : public LtsWidgets::LtsDialog
   void onShiftClicked();
 
   private:
+
+  NGL::INGLLogger &m_logger;
   Ui::HQReportEdit *m_ui;
   QString m_menuGroup;
   LtsSession::LtsSession *m_session{nullptr};
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_json_parser.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_json_parser.cpp
index 753d8ab9c..dcca1abf8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_json_parser.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_json_parser.cpp
@@ -6,7 +6,7 @@ FlmHqReportJsonParser::FlmHqReportJsonParser() : m_logger(getLogger("HQReportPar
 
 HqReportData FlmHqReportJsonParser::parse(const QByteArray &data)
 {
-  DEBUG_LOG() << "START PARSING";
+  DEBUG_LOG(m_logger) << "START PARSING";
   QJsonDocument doc = QJsonDocument::fromJson(data);
   QJsonObject obj = doc.object();
   HqReportData report;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_json_parser.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_json_parser.h
index 16bd25b38..30b0b974c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_json_parser.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_json_parser.h
@@ -55,5 +55,6 @@ public:
   QString parseHqReportTime(const QJsonObject &obj);
 
 private:
+  NGL::INGLLogger &m_logger;
 };  
 }  
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 ce02f1dde..7efe456f9 100755
--- 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
@@ -5,23 +5,22 @@
 
 namespace FileManagement
 {
-FlmHQReportModel::FlmHQReportModel(QObject *parent)
-  : QAbstractListModel(parent)
-{  
+FlmHQReportModel::FlmHQReportModel(QObject *parent) : QAbstractListModel(parent),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {  
 }
 
 bool FlmHQReportModel::init(LtsSession::LtsSession *session, int contentFolderId, const FileType &fileType)
 {
   if (!session)
   {
-    ERROR_LOG() << "Got invalid Session";
+    ERROR_LOG(m_logger) << "Got invalid Session";
 
     return false;
   }
 
   if (!session->getDtc<FileManagement::DataInterface>(m_flmDtc))
   {
-    ERROR_LOG() << "Could not get FLM Dtc";
+    ERROR_LOG(m_logger) << "Could not get FLM Dtc";
 
     return false;
   }
@@ -251,7 +250,7 @@ void FlmHQReportModel::clearMovedData()
 
 QString FlmHQReportModel::createText(int dataIndex) const
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " dataIndex: " << dataIndex;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " dataIndex: " << dataIndex;
 
   if (dataIndex < 0 || dataIndex >= m_data.size())
     return QString();
@@ -260,7 +259,7 @@ QString FlmHQReportModel::createText(int dataIndex) const
 
   if (!m_movedData.contains(data.id))
   {
-    DEBUG_LOG() << "No moved data for " << data.name;
+    DEBUG_LOG(m_logger) << "No moved data for " << data.name;
     return data.name;
   }
 
@@ -277,7 +276,7 @@ QString FlmHQReportModel::createText(int dataIndex) const
 
 void FlmHQReportModel::addMovedData(int dataIndex, const HQData &movedData)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " dataIndex: " << dataIndex << ", movedData.id: " << movedData.id << ", movedData.name: " << movedData.name;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " dataIndex: " << dataIndex << ", movedData.id: " << movedData.id << ", movedData.name: " << movedData.name;
 
   if (dataIndex < 0 || dataIndex >= m_data.size())
     return;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_model.h
index 4321c9f1f..5923959c6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_model.h
@@ -73,6 +73,8 @@ public:
   void clearMovedData();
 
 private:
+
+NGL::INGLLogger &m_logger;
   QString createText(int dataIndex) const;
   void addMovedData(int dataIndex, const HQData &movedData);
 
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 60c6d61ca..68994e65c 100755
--- 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
@@ -100,24 +100,24 @@ void FileTopicEditor::updatePreview()
 
   if (m_userText.isEmpty()) 
   {
-    DEBUG_LOG() << "file id = " << m_fileId;
+    DEBUG_LOG(m_logger) << "file id = " << m_fileId;
     m_fileContent = m_dtc->fileContent(m_fileId);
     m_fileName = QString::fromStdString(m_fileContent.name());
     m_ui->leFileName->setText(m_fileName);
-    DEBUG_LOG() << "file name = " << m_fileName;
+    DEBUG_LOG(m_logger) << "file name = " << m_fileName;
 
     if (m_topicData.topicType == TopicEditorBase::TopicType::Pdf)
     {
-      DEBUG_LOG() << "zoom level = " << m_zoomLevel;
+      DEBUG_LOG(m_logger) << "zoom level = " << m_zoomLevel;
       m_ui->zoomSlider->setValue(m_zoomLevel);
 
-      DEBUG_LOG() << "rotation = " << m_rotation;
+      DEBUG_LOG(m_logger) << "rotation = " << m_rotation;
       m_ui->sbRotation->setValue(m_rotation);
 
       const int pageNo = m_pageNo;  
       m_ui->sbPageNo->setRange(1, m_previewPlaybackWidget->getNumPages());
       m_pageNo = pageNo;
-      DEBUG_LOG() << "page no = " << m_pageNo;
+      DEBUG_LOG(m_logger) << "page no = " << m_pageNo;
       m_ui->sbPageNo->setValue(m_pageNo);
 
       m_ui->sbPageNo->setEnabled(true);
@@ -140,13 +140,13 @@ bool FileTopicEditor::fetchInterfaces()
 {
   if (!m_session->getForeignGuiInterface<FileManagement::ForeignGuiInterface>(m_guiIfc))
   {
-    ERROR_LOG() << "Failed to retrieve Flm ForeignGuiInterface";
+    ERROR_LOG(m_logger) << "Failed to retrieve Flm ForeignGuiInterface";
     return false;
   }
 
   if (!m_session->getDtc<FileManagement::DataInterface>(m_dtc))
   {
-    ERROR_LOG() << "Failed to retrieve Flm Dtc";
+    ERROR_LOG(m_logger) << "Failed to retrieve Flm Dtc";
     return false;
   }
 
@@ -386,13 +386,13 @@ void FileTopicEditor::onSelectFile()
   }
   else
   {
-    ERROR_LOG() << "Cannot load file from library";
+    ERROR_LOG(m_logger) << "Cannot load file from library";
   }
 }
 
 void FileTopicEditor::onZoomSliderChanged()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   m_zoomLevel = m_ui->zoomSlider->value();
   m_ui->zoomSlider->setToolTip(tr("Zoom %1 %").arg(m_zoomLevel));
@@ -402,7 +402,7 @@ void FileTopicEditor::onZoomSliderChanged()
 
 void FileTopicEditor::onPageNoChanged(int pageNo)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "page no = " << pageNo;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "page no = " << pageNo;
 
   m_pageNo = pageNo;
   m_ui->sbPageNo->setValue(m_pageNo);
@@ -453,7 +453,7 @@ void FileTopicEditor::onEnterText()
 
 void FileTopicEditor::onRotationChanged(int rotation)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " rotation = " << rotation;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " rotation = " << rotation;
 
   m_rotation = rotation;
   m_ui->sbRotation->setValue(m_rotation);
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 cb2811755..de83f2eea 100755
--- 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
@@ -38,6 +38,8 @@ public:
   bool fetchInterfaces();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void updateInternalData() override final;
   void retranslate() override final;
 
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 e13499b46..01b641477 100755
--- 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
@@ -87,10 +87,10 @@ bool FileManagementDialogWidget::init(LtsSession::LtsSession *session,
                                       int folderId,
                                       const QString &xmlType)
 {
-  DEBUG_LOG() << "Start init FileManagementDialogWidget";
+  DEBUG_LOG(m_logger) << "Start init FileManagementDialogWidget";
   if (!session)
   {
-    ERROR_LOG() << "Failed to init FileManagementDialogWidget";
+    ERROR_LOG(m_logger) << "Failed to init FileManagementDialogWidget";
     return false;
   }
 
@@ -146,7 +146,7 @@ bool FileManagementDialogWidget::init(LtsSession::LtsSession *session,
                                         << tr("Name"));
   
 
-  DEBUG_LOG() << "Start init model folder";
+  DEBUG_LOG(m_logger) << "Start init model folder";
   m_modelFolder->init(m_session, m_isAdminMode);
   int opId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
   if (m_dialogMode == FileDialogMode::Admin) 
@@ -159,7 +159,7 @@ bool FileManagementDialogWidget::init(LtsSession::LtsSession *session,
   
   m_modelFile = new DialogModelFile(this);
 
-  DEBUG_LOG() << "Start init model file content";
+  DEBUG_LOG(m_logger) << "Start init model file content";
   
   auto predicate = [this](const FileManagement::FileContent &fc, const QString &xmlType)
   {
@@ -196,7 +196,7 @@ bool FileManagementDialogWidget::init(LtsSession::LtsSession *session,
   
   if (m_dialogMode == FileDialogMode::OpenFile || m_dialogMode == FileDialogMode::SaveFile)
   {
-    DEBUG_LOG() << "Init dialog for open/save modal dialog";
+    DEBUG_LOG(m_logger) << "Init dialog for open/save modal dialog";
 
     
     connect(m_ui->widgetFiles, &LtsDataView::LtsDataView::signalDoubleClicked, this, &FileManagementDialogWidget::onSelectFile);
@@ -306,7 +306,7 @@ bool FileManagementDialogWidget::init(LtsSession::LtsSession *session,
   
   if (m_dialogMode == FileDialogMode::SaveFile)
   {
-    DEBUG_LOG() << "DialogMode Save";
+    DEBUG_LOG(m_logger) << "DialogMode Save";
     m_ui->leFile->setEnabled(true);
     connect(m_ui->leFile, &QLineEdit::textChanged, this, &FileManagementDialogWidget::saveFileName);
   }
@@ -333,7 +333,7 @@ bool FileManagementDialogWidget::init(LtsSession::LtsSession *session,
 
 void FileManagementDialogWidget::saveFileName(const QString &name)
 {
-  DEBUG_LOG() << "Saving: " << name;
+  DEBUG_LOG(m_logger) << "Saving: " << name;
 
   m_fileName            = name;
   m_selectedFileContent = m_modelFile->findFileFromName(name);
@@ -431,9 +431,9 @@ void FileManagementDialogWidget::enaDisa()
     m_selectedFolderId = 0;
   }
 
-  DEBUG_LOG() << "enableRemoveFolder=" << enableRemoveFolder;
-  DEBUG_LOG() << "enableEditFolder=" << enableEditFolder;
-  DEBUG_LOG() << "userHasRightsToEditFolder=" << userHasRightsToEditFolder;
+  DEBUG_LOG(m_logger) << "enableRemoveFolder=" << enableRemoveFolder;
+  DEBUG_LOG(m_logger) << "enableEditFolder=" << enableEditFolder;
+  DEBUG_LOG(m_logger) << "userHasRightsToEditFolder=" << userHasRightsToEditFolder;
 
   m_actionAddFolder->setEnabled(enableAddFolder && userHasRightsToEditFolder);
   m_actionRemoveFolder->setEnabled(enableRemoveFolder && userHasRightsToEditFolder);
@@ -539,7 +539,7 @@ void FileManagementDialogWidget::enaDisa()
 
 bool FileManagementDialogWidget::isFolderRemovable(const QModelIndex &idx) const
 {
-  DEBUG_LOG() << "isFolderRemovable index = " << idx.row();
+  DEBUG_LOG(m_logger) << "isFolderRemovable index = " << idx.row();
 
   if (!idx.isValid())
     return false;
@@ -578,7 +578,7 @@ void FileManagementDialogWidget::onReject()
 
 void FileManagementDialogWidget::onAddFolder()
 {
-  DEBUG_LOG() << "onAddFolder";
+  DEBUG_LOG(m_logger) << "onAddFolder";
 
   QModelIndex selIndex = selectedIndexViewFolder();
   if (!selIndex.isValid())
@@ -603,7 +603,7 @@ void FileManagementDialogWidget::onAddFolder()
 
 void FileManagementDialogWidget::onPasteFolder()
 {
-  DEBUG_LOG() << "onPasteFolder";
+  DEBUG_LOG(m_logger) << "onPasteFolder";
 
   QModelIndex selIndex = selectedIndexViewFolder();
   if (!selIndex.isValid())
@@ -626,7 +626,7 @@ void FileManagementDialogWidget::onPasteFolder()
 
 void FileManagementDialogWidget::onPasteFile()
 {
-  DEBUG_LOG() << "onPasteFile";
+  DEBUG_LOG(m_logger) << "onPasteFile";
 
   if (m_selectedFolderId > 0 && m_copyFile.id() > 0)
   {
@@ -697,7 +697,7 @@ void FileManagementDialogWidget::onPasteFile()
 
 void FileManagementDialogWidget::onRemoveFolder()
 {
-  DEBUG_LOG() << "onRemoveFolder id = " << m_selectedFolderId;
+  DEBUG_LOG(m_logger) << "onRemoveFolder id = " << m_selectedFolderId;
 
   QModelIndex selIndex = selectedIndexViewFolder();
   if (!selIndex.isValid())
@@ -715,7 +715,7 @@ void FileManagementDialogWidget::onRemoveFolder()
   
   if (isFolderRemovable(selIndex))
   {
-    DEBUG_LOG() << "Removing folder id = " << m_selectedFolderId;
+    DEBUG_LOG(m_logger) << "Removing folder id = " << m_selectedFolderId;
 
     Core::RemoveElementRequest req(m_selectedFolderId);
     m_requestHelper->startSingleRequest([req, this]()
@@ -723,21 +723,21 @@ void FileManagementDialogWidget::onRemoveFolder()
       return m_ftc->folderRemoveRequest(req, this);
     });
     if (m_requestHelper->failed())
-      ERROR_LOG() << "Failed to remove folder id = " << m_selectedFolderId;
+      ERROR_LOG(m_logger) << "Failed to remove folder id = " << m_selectedFolderId;
   }
 }
 
 
 void FileManagementDialogWidget::removeCurrentRowFolder()
 {
-  DEBUG_LOG() << "removeCurrentRowFolder";
+  DEBUG_LOG(m_logger) << "removeCurrentRowFolder";
 
   QModelIndex selIndex = selectedIndexViewFolder();
   NGLTreeItem *item = m_modelFolder->privateData(selIndex);
   FileManagement::Folder fld = item->data().value<FileManagement::Folder>();
   bool isRootFolder = (fld.id() == 0);
 
-  DEBUG_LOG() << "isRootFolder = " << isRootFolder;
+  DEBUG_LOG(m_logger) << "isRootFolder = " << isRootFolder;
 
   if (!selIndex.isValid() || isRootFolder)
     return;
@@ -754,7 +754,7 @@ QString FileManagementDialogWidget::getTemplateFile(const QString &fileName)
 
 void FileManagementDialogWidget::onRefreshFolders()
 {
-  DEBUG_LOG() << "onRefreshFolders";
+  DEBUG_LOG(m_logger) << "onRefreshFolders";
 
   m_modelFolder->initModel(m_session->exerciseId(), m_isAdminMode);
   m_ui->tvFolder->expandAll();
@@ -766,7 +766,7 @@ void FileManagementDialogWidget::onRefreshFolders()
 
 void FileManagementDialogWidget::onCopyFolder()
 {
-  DEBUG_LOG() << "onCopyFolder";
+  DEBUG_LOG(m_logger) << "onCopyFolder";
 
   QModelIndex selIndex = selectedIndexViewFolder();
   NGLTreeItem *item = m_modelFolder->privateData(selIndex);
@@ -779,7 +779,7 @@ void FileManagementDialogWidget::onCopyFolder()
 
 void FileManagementDialogWidget::onCopyFile()
 {
-  DEBUG_LOG() << "onCopyFile";
+  DEBUG_LOG(m_logger) << "onCopyFile";
 
   m_copyFile = m_modelFile->getRowData(m_ui->widgetFiles->currentIndex().row());
 
@@ -791,7 +791,7 @@ void FileManagementDialogWidget::onCopyFile()
 
 void FileManagementDialogWidget::onCutFolder()
 {
-  DEBUG_LOG() << "onCutFolder";
+  DEBUG_LOG(m_logger) << "onCutFolder";
 
   QModelIndex selIndex = selectedIndexViewFolder();
   NGLTreeItem *item = m_modelFolder->privateData(selIndex);
@@ -806,7 +806,7 @@ void FileManagementDialogWidget::onCutFolder()
 
 void FileManagementDialogWidget::onCutFile()
 {
-  DEBUG_LOG() << "onCutFile";
+  DEBUG_LOG(m_logger) << "onCutFile";
 
   m_copyFile = m_modelFile->getRowData(m_ui->widgetFiles->currentIndex().row());
 
@@ -820,7 +820,7 @@ void FileManagementDialogWidget::onCutFile()
 
 void FileManagementDialogWidget::onEditFolder()
 {
-  DEBUG_LOG() << "onEditFolder Id = " << m_selectedFolderId;
+  DEBUG_LOG(m_logger) << "onEditFolder Id = " << m_selectedFolderId;
 
   if (!m_actionRenameFolder->isEnabled())
     return;
@@ -862,7 +862,7 @@ void FileManagementDialogWidget::onRemoveFile()
     return; 
   }
 
-  DEBUG_LOG() << "onRemoveFile";
+  DEBUG_LOG(m_logger) << "onRemoveFile";
 
   FileManagement::FileContent data = m_modelFile->getRowData(selIndex.row());
   Core::RemoveElementRequest req(data.id());
@@ -872,7 +872,7 @@ void FileManagementDialogWidget::onRemoveFile()
   });
 
   if (m_requestHelper->failed())
-    ERROR_LOG() << "Failed to remove file content";
+    ERROR_LOG(m_logger) << "Failed to remove file content";
   else
     reInitModelFile();
 }
@@ -884,7 +884,7 @@ void FileManagementDialogWidget::onDeleteFile()
   if (!selIndex.isValid())
     return;
 
-  DEBUG_LOG() << "onDeleteFile";
+  DEBUG_LOG(m_logger) << "onDeleteFile";
 
   m_requestHelper->startSingleRequest([this]()
   {
@@ -893,7 +893,7 @@ void FileManagementDialogWidget::onDeleteFile()
     if (data.fileStatus() == FileManagement::FileStatus::Deleted)
       return int64_t(0);
 
-    DEBUG_LOG() << "Deleting file id = " << data.id();
+    DEBUG_LOG(m_logger) << "Deleting file id = " << data.id();
 
     FileManagement::FileContentChangeStatusRequest req;
     req.id(data.id());
@@ -906,7 +906,7 @@ void FileManagementDialogWidget::onDeleteFile()
   });
 
   if (m_requestHelper->failed())
-    ERROR_LOG() << "Failed to change status file content";
+    ERROR_LOG(m_logger) << "Failed to change status file content";
   else
     reInitModelFile();
 }
@@ -921,7 +921,7 @@ void FileManagementDialogWidget::reInitModelFile(bool restoreSelected)
     if (selIndex.isValid())
     {
       selectedFileId = m_modelFile->getRowData(selIndex.row()).id();
-      ERROR_LOG() << "Selected file id = " << selectedFileId;
+      ERROR_LOG(m_logger) << "Selected file id = " << selectedFileId;
     }
   }
   else
@@ -938,7 +938,7 @@ void FileManagementDialogWidget::reInitModelFile(bool restoreSelected)
 
   if (restoreSelected && selectedFileId > 0)
   {
-    DEBUG_LOG() << "Restoring selection on file " << selectedFileId;
+    DEBUG_LOG(m_logger) << "Restoring selection on file " << selectedFileId;
     QModelIndex idx = m_modelFile->findIndexForId(selectedFileId);
     if (idx.isValid())
       m_ui->widgetFiles->setCurrentIndex(idx);
@@ -952,7 +952,7 @@ void FileManagementDialogWidget::onRestoreFile()
   if (!selIndex.isValid())
     return;
 
-  DEBUG_LOG() << "onRestoreFile";
+  DEBUG_LOG(m_logger) << "onRestoreFile";
 
   m_requestHelper->startSingleRequest([this]()
   {
@@ -961,7 +961,7 @@ void FileManagementDialogWidget::onRestoreFile()
     if (data.fileStatus() == FileManagement::FileStatus::Valid)
       return int64_t(0);
 
-    DEBUG_LOG() << "Deleting file id = " << data.id();
+    DEBUG_LOG(m_logger) << "Deleting file id = " << data.id();
 
     FileManagement::FileContentChangeStatusRequest req;
     req.id(data.id());
@@ -974,7 +974,7 @@ void FileManagementDialogWidget::onRestoreFile()
   });
 
   if (m_requestHelper->failed())
-    ERROR_LOG() << "Failed to change status file content";
+    ERROR_LOG(m_logger) << "Failed to change status file content";
   else
     reInitModelFile();
 }
@@ -982,7 +982,7 @@ void FileManagementDialogWidget::onRestoreFile()
 
 void FileManagementDialogWidget::onEditFile()
 {
-  DEBUG_LOG() << "onEditFileContent";
+  DEBUG_LOG(m_logger) << "onEditFileContent";
 
   if (!m_actionEditFile->isEnabled())
     return;
@@ -992,7 +992,7 @@ void FileManagementDialogWidget::onEditFile()
     return;
 
   FileManagement::FileContent data = m_modelFile->getRowData(m_ui->widgetFiles->currentIndex().row());
-  DEBUG_LOG() << "onEditFileContent Id = " << data.id();
+  DEBUG_LOG(m_logger) << "onEditFileContent Id = " << data.id();
 
   m_getContent->getContent(data.id(), m_content);
 
@@ -1015,7 +1015,7 @@ void FileManagementDialogWidget::onEditFile()
 
 void FileManagementDialogWidget::onImportFile()
 {
-  DEBUG_LOG() << "onImportFile";
+  DEBUG_LOG(m_logger) << "onImportFile";
 
   
   const QStringList filter(
@@ -1057,7 +1057,7 @@ void FileManagementDialogWidget::onImportFile()
   QFile file(fileName);
   if (!file.open(QIODevice::ReadOnly))
   {
-    ERROR_LOG() << "Cannot read file " << fileName;
+    ERROR_LOG(m_logger) << "Cannot read file " << fileName;
     return;
   }
   QByteArray fileContent = file.readAll();
@@ -1098,7 +1098,7 @@ void FileManagementDialogWidget::onImportFile()
     phId = 0;
   }
 
-  DEBUG_LOG() << "Exercise id = " << exId << ", phase Id = " << phId;
+  DEBUG_LOG(m_logger) << "Exercise id = " << exId << ", phase Id = " << phId;
 
   if (exId > 0)
     data.exerciseId(exId);
@@ -1150,7 +1150,7 @@ void FileManagementDialogWidget::createNewOfficeFile(const QString &fileName)
   QFile file(absFilePath);
   if (!file.open(QIODevice::ReadOnly))
   {
-    ERROR_LOG() << "Cannot read file " << absFilePath;
+    ERROR_LOG(m_logger) << "Cannot read file " << absFilePath;
     return;
   }
   QByteArray fileContent = file.readAll();
@@ -1271,7 +1271,7 @@ void FileManagementDialogWidget::onNewFileFromTemplate()
 
 void FileManagementDialogWidget::onFolderSelectionChanged()
 {
-  DEBUG_LOG() << "onFolderSelectionChanged";
+  DEBUG_LOG(m_logger) << "onFolderSelectionChanged";
   enaDisa();
 
   reInitModelFile();
@@ -1352,7 +1352,7 @@ void FileManagementDialogWidget::fileContextMenuRequested(const QPoint &position
 
 void FileManagementDialogWidget::onFolderChanged(const FileManagement::Folder &data, DataModification modType)
 {
-  DEBUG_LOG() << "onFolderChanged: folder name = " << data.name();
+  DEBUG_LOG(m_logger) << "onFolderChanged: folder name = " << data.name();
   
 
   Q_UNUSED(data);
@@ -1388,12 +1388,12 @@ FileManagement::FileType FileManagementDialogWidget::getFileType(const QString &
 
 void FileManagementDialogWidget::onPreviewFile()
 {
-  DEBUG_LOG() << "onPreviewFile";
+  DEBUG_LOG(m_logger) << "onPreviewFile";
 
   QModelIndex selIndex = m_ui->widgetFiles->currentIndex();
   if (!selIndex.isValid())
   {
-    ERROR_LOG() << "No valid selected file for preview!";
+    ERROR_LOG(m_logger) << "No valid selected file for preview!";
     return;
   }
 
@@ -1499,25 +1499,25 @@ QString FileManagementDialogWidget::getFileTypeStr(FileManagement::FileType file
 
 void FileManagementDialogWidget::onExportFile()
 {
-  DEBUG_LOG() << "onExportFile(): fileName = " << m_fileName;
+  DEBUG_LOG(m_logger) << "onExportFile(): fileName = " << m_fileName;
 
   
   static QString defaultPath = QDir::homePath() + QStringLiteral("/scanner/");
-  DEBUG_LOG() << "onExportFile(): old path = " << defaultPath;
+  DEBUG_LOG(m_logger) << "onExportFile(): old path = " << defaultPath;
 
   QString folderName = QFileDialog::getExistingDirectory(this,
                                                          tr("Save file from library to local Workstation"),
                                                          defaultPath,
                                                          QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
-  DEBUG_LOG() << "onExportFile(): folderName = " << folderName;
+  DEBUG_LOG(m_logger) << "onExportFile(): folderName = " << folderName;
   if (folderName.isEmpty())
   {
-    DEBUG_LOG() << "onExportFile(): folderName.isEmpty()";
+    DEBUG_LOG(m_logger) << "onExportFile(): folderName.isEmpty()";
     return;
   }
 
   m_getContent->getContent(m_selectedFileContent.id(), m_content);
-  DEBUG_LOG() << "onExportFile(): Save File to '" << folderName << "/" << m_fileName << "'"
+  DEBUG_LOG(m_logger) << "onExportFile(): Save File to '" << folderName << "/" << m_fileName << "'"
                       << " fileType = " << m_selectedFileContent.fileType()
                       << " getFileTypeStr = " << getFileTypeStr(m_selectedFileContent.fileType())
                       << " exportFileName = " << m_selectedFileContent.exportFileName()
@@ -1532,14 +1532,14 @@ void FileManagementDialogWidget::onExportFile()
 
   if (file.exists())
   {
-    DEBUG_LOG() << "onExportFile(): File already exists (" << completeFileName << ") in folder " << folderName;
+    DEBUG_LOG(m_logger) << "onExportFile(): File already exists (" << completeFileName << ") in folder " << folderName;
     if (LtsWidgets::LtsMessageDialog::showMessage(this, tr("Yes - overwrite file.<br>"
                                                            "No - do not overwrite file.<br>"),
                                                   tr("Do you want to overwrite the existing file?"),
                                                   LtsWidgets::Behaviour::Modal,
                                                   LtsWidgets::Button::Yes | LtsWidgets::Button::No) != LtsWidgets::Button::Yes)
     {
-      DEBUG_LOG() << "onExportFile(): File exists, will not be overwritten (" << completeFileName << ") in folder " << folderName;
+      DEBUG_LOG(m_logger) << "onExportFile(): File exists, will not be overwritten (" << completeFileName << ") in folder " << folderName;
       return;
     }
   }
@@ -1548,13 +1548,13 @@ void FileManagementDialogWidget::onExportFile()
   file.write(LtsUtils::toQByteArray(m_content));
   file.close();
 
-  DEBUG_LOG() << "onExportFile(): Exported file " << completeFileName << " in folder " << folderName;
+  DEBUG_LOG(m_logger) << "onExportFile(): Exported file " << completeFileName << " in folder " << folderName;
 }
 
 
 void FileManagementDialogWidget::onSelectFile()
 {
-  DEBUG_LOG() << "onSelectFile";
+  DEBUG_LOG(m_logger) << "onSelectFile";
 
   QModelIndex selIndex = m_ui->widgetFiles->currentIndex();
 
@@ -1563,18 +1563,18 @@ void FileManagementDialogWidget::onSelectFile()
 
   m_selectedFileContent = m_modelFile->getRowData(selIndex.row());
 
-  DEBUG_LOG() << "Selected file content id = " << m_selectedFileContent.id();
+  DEBUG_LOG(m_logger) << "Selected file content id = " << m_selectedFileContent.id();
   emit accepted();
 }
 
 
 void FileManagementDialogWidget::onChooseFileName()
 {
-  DEBUG_LOG() << "onChooseFileName";
+  DEBUG_LOG(m_logger) << "onChooseFileName";
 
   if ((FileDialogMode::SaveFile == m_dialogMode) && (!m_fileName.isEmpty()))
   {
-    DEBUG_LOG() << "Choosen file name = " << m_fileName;
+    DEBUG_LOG(m_logger) << "Choosen file name = " << m_fileName;
     emit accepted();
   }
 }
@@ -1583,7 +1583,7 @@ void FileManagementDialogWidget::onChooseFileName()
 void FileManagementDialogWidget::onFileChanged(const FileManagement::FileContent &data, DataModification modType)
 {
   bool condition = showFile(data, m_xmlType);
-  DEBUG_LOG() << "onFileChanged file name = " << data.name() << ", condition = " << condition << ", modType = " << modType;
+  DEBUG_LOG(m_logger) << "onFileChanged file name = " << data.name() << ", condition = " << condition << ", modType = " << modType;
 
   bool reInit = false;
   int row = 0;
@@ -1627,19 +1627,19 @@ bool FileManagementDialogWidget::showFile(const FileManagement::FileContent &fc,
 {
   if (fc.isDeleted())
   {
-    DEBUG_LOG() << "is deleted: " << fc.name().c_str();
+    DEBUG_LOG(m_logger) << "is deleted: " << fc.name().c_str();
     return false;
   }
 
   if (fc.folderId() != m_selectedFolderId)
   {
-    DEBUG_LOG() << "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()))
   {
-    DEBUG_LOG() << "file type does not match: " << fc.name().c_str();
+    DEBUG_LOG(m_logger) << "file type does not match: " << fc.name().c_str();
     return false;
   }
 
@@ -1647,7 +1647,7 @@ bool FileManagementDialogWidget::showFile(const FileManagement::FileContent &fc,
   {
     if (fc.fileStatus() != FileManagement::FileStatus::Valid)
     {
-      DEBUG_LOG() << "file status is not valid: " << fc.name().c_str();
+      DEBUG_LOG(m_logger) << "file status is not valid: " << fc.name().c_str();
       return false;
     }
 
@@ -1662,16 +1662,16 @@ bool FileManagementDialogWidget::showFile(const FileManagement::FileContent &fc,
     {
       const int operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
       
-      DEBUG_LOG() << "Filtering files on OperatorId = " << operatorId;
+      DEBUG_LOG(m_logger) << "Filtering files on OperatorId = " << operatorId;
       if (fc.operatorId() != operatorId)
       {
-        DEBUG_LOG() << "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() << "Filtering files on User Category";
+      DEBUG_LOG(m_logger) << "Filtering files on User Category";
       if (fc.fileCategory() != FileManagement::FileCategory::User)
       {
-        DEBUG_LOG() << "User category does not match: " << fc.name().c_str();
+        DEBUG_LOG(m_logger) << "User category does not match: " << fc.name().c_str();
 
 
       }
@@ -1680,7 +1680,7 @@ bool FileManagementDialogWidget::showFile(const FileManagement::FileContent &fc,
       {
         if (fc.exerciseId().is_set() && fc.exerciseId().get() != m_session->exerciseId())
         {
-          DEBUG_LOG() << "exercise does not match: " << fc.name().c_str() << " is: " << fc.exerciseId()
+          DEBUG_LOG(m_logger) << "exercise does not match: " << fc.name().c_str() << " is: " << fc.exerciseId()
                               << " should be " << m_session->exerciseId();
           return false;
         }
@@ -1691,19 +1691,19 @@ bool FileManagementDialogWidget::showFile(const FileManagement::FileContent &fc,
     if (fldPath.contains(FileManagement::MainFolder::ExerciseDocuments))
     {
       
-      DEBUG_LOG() << "Filtering files on Exercise Category";
+      DEBUG_LOG(m_logger) << "Filtering files on Exercise Category";
       if (fc.fileCategory() != FileManagement::FileCategory::Exercise)
       {
-        DEBUG_LOG() << "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)
       {
         
-        DEBUG_LOG() << "Filtering files on Exercise Category and exerciseId = " << m_session->exerciseId();
+        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())
         {
-          DEBUG_LOG() << "exercise does not match: " << fc.name().c_str() << " is: " << fc.exerciseId()
+          DEBUG_LOG(m_logger) << "exercise does not match: " << fc.name().c_str() << " is: " << fc.exerciseId()
                               << " should be " << m_session->exerciseId();
           return false;
         }
@@ -1716,7 +1716,7 @@ bool FileManagementDialogWidget::showFile(const FileManagement::FileContent &fc,
       const QString &prop = QString::fromStdString(fc.properties());
       if (!prop.contains(xmlType, Qt::CaseSensitive))
       {
-        DEBUG_LOG() << "XmlType not found " << xmlType;
+        DEBUG_LOG(m_logger) << "XmlType not found " << xmlType;
         return false;
       }
     }
@@ -1761,7 +1761,7 @@ FileManagementDialogTab::FileManagementDialogTab(const QString &menuGroup, QWidg
   if (menuGroup == tr("Exercise Documents"))
     
     setOnlineHelpFilename(QStringLiteral("Situation-Library_Organisation"));
-  DEBUG_LOG() << "Ctor FileManagementDialogTab";
+  DEBUG_LOG(m_logger) << "Ctor FileManagementDialogTab";
 
   LtsWidgets::DialogButton btnAddFolder    = LtsWidgets::DialogButton::Print;
   LtsWidgets::DialogButton btnEditFolder   = LtsWidgets::DialogButton::Import;
@@ -1857,7 +1857,7 @@ FileManagementDialog::FileManagementDialog(QWidget *parent)
   , m_buttonBox(new LtsWidgets::LtsDialogButtonBox(this))
   , m_dialogMode(FileDialogMode::OpenFile)
 {
-  DEBUG_LOG() << "Ctor FileManagementDialog";
+  DEBUG_LOG(m_logger) << "Ctor FileManagementDialog";
 
   LtsWidgets::DialogButton btnAddFolder    = LtsWidgets::DialogButton::Print;
   LtsWidgets::DialogButton btnSelectFile   = LtsWidgets::DialogButton::Load;
@@ -1888,11 +1888,11 @@ bool FileManagementDialogTab::init(LtsSession::LtsSession *session,
                                    const int &folderId,
                                    const QString &buttonName)
 {
-  DEBUG_LOG() << "Start init FileManagementDialogTab";
+  DEBUG_LOG(m_logger) << "Start init FileManagementDialogTab";
 
   if (!m_editItemWidget->init(session, dlgMode, fileTypes, folderId))
   {
-    ERROR_LOG() << "Init FileManagementDialogTab failed!";
+    ERROR_LOG(m_logger) << "Init FileManagementDialogTab failed!";
     return false;
   }
 
@@ -1937,12 +1937,12 @@ bool FileManagementDialog::init(LtsSession::LtsSession *session,
                                 int folderId,
                                 const QString &xmlType)
 {
-  DEBUG_LOG() << "Start init FileManagementDialog";
-  DEBUG_LOG() << "Initial folder to select: " << folderId;
+  DEBUG_LOG(m_logger) << "Start init FileManagementDialog";
+  DEBUG_LOG(m_logger) << "Initial folder to select: " << folderId;
 
   if (!m_editItemWidget->init(session, dlgMode, fileTypes, folderId, xmlType))
   {
-    ERROR_LOG() << "Init FileManagementDialogWidget failed!";
+    ERROR_LOG(m_logger) << "Init FileManagementDialogWidget failed!";
     return false;
   }
 
@@ -1981,7 +1981,7 @@ void FileManagementDialog::accept()
 
 void FileManagementDialog::enaDisa()
 {
-  DEBUG_LOG() << "FileManagementDialog::enaDisa()";
+  DEBUG_LOG(m_logger) << "FileManagementDialog::enaDisa()";
 
   LtsWidgets::DialogButton btnAddFolder    = LtsWidgets::DialogButton::Print;
   m_buttonBox->setButtonEnabled(btnAddFolder, false);
@@ -1997,8 +1997,8 @@ void FileManagementDialog::enaDisa()
   if (m_dialogMode == FileDialogMode::OpenFile && idxFile.isValid())
     m_buttonBox->setButtonEnabled(btnSelectFile, true);
 
-  DEBUG_LOG() << "DialogMode: " << (int)m_dialogMode;
-  DEBUG_LOG() << "FileName: " << m_editItemWidget->m_fileName;
+  DEBUG_LOG(m_logger) << "DialogMode: " << (int)m_dialogMode;
+  DEBUG_LOG(m_logger) << "FileName: " << m_editItemWidget->m_fileName;
 
   if (m_dialogMode == FileDialogMode::SaveFile && !m_editItemWidget->m_fileName.isEmpty())
     m_buttonBox->setButtonEnabled(btnSelectFile, true);
@@ -2007,7 +2007,7 @@ void FileManagementDialog::enaDisa()
 
 void FileManagementDialogTab::enaDisa()
 {
-  DEBUG_LOG() << "FileManagementDialogTab::enaDisa()";
+  DEBUG_LOG(m_logger) << "FileManagementDialogTab::enaDisa()";
 
   LtsWidgets::DialogButton btnAddFolder    = LtsWidgets::DialogButton::Print;
   LtsWidgets::DialogButton btnEditFolder   = LtsWidgets::DialogButton::Import;
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 cc4f6c977..0ae5d0bd2 100755
--- 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
@@ -66,7 +66,7 @@ bool DialogModelFile::initModel(LtsSession::LtsSession *session,
     insertRow(fc);
   };
   m_flmDtc->fileContents(files);
-  DEBUG_LOG() << "initModel - #Files: " << m_vecData.size();
+  DEBUG_LOG(m_logger) << "initModel - #Files: " << m_vecData.size();
   return true;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_file.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_file.h
index 2f6b4564a..733d1eaa0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_file.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_file.h
@@ -54,6 +54,8 @@ public:
   FileManagement::FileContent findFileFromName(const QString &fileName) const;
 
 private:
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<FileManagement::Interface::Dtc> m_flmDtc;
   std::shared_ptr<OperatorManagement::Interface::Dtc> m_opmDtc;
   std::shared_ptr<ExerciseManagement::Interface::Dtc> m_exmDtc;
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 672eb44c7..d22da6671 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
@@ -179,7 +179,7 @@ bool DialogModelFolder::isRowRemovable(const NGLTreeItem *parentItem) const
 
 bool DialogModelFolder::initModel(int exerciseId, bool isAdminMode)
 {
-  DEBUG_LOG() << "initModel Folder";
+  DEBUG_LOG(m_logger) << "initModel Folder";
 
   NGLTreeModel::resetModel();
 
@@ -199,7 +199,7 @@ bool DialogModelFolder::initModel(int exerciseId, bool isAdminMode)
       int exId = folderName.remove(0, 4).toInt();
       if ((exerciseId > 0 && exId != exerciseId) || exId != m_exmDtc->exercise(exId).id())
       {
-        DEBUG_LOG() << "Excluded exercise id " << exId << ", folder id " << data.id();
+        DEBUG_LOG(m_logger) << "Excluded exercise id " << exId << ", folder id " << data.id();
         idsToExclude.append(data.id());
       }
     }
@@ -229,8 +229,8 @@ bool DialogModelFolder::initModel(int exerciseId, bool isAdminMode)
 
     if (!parentItemIndexCache.contains(parentId))
     {
-      WARNING_LOG() << "Invalid folder structure, parent may be hidden: " << parentId;
-      WARNING_LOG() << "Folder " << fld.name() << ", hidden: " << fld.isHidden();
+      WARNING_LOG(m_logger) << "Invalid folder structure, parent may be hidden: " << parentId;
+      WARNING_LOG(m_logger) << "Folder " << fld.name() << ", hidden: " << fld.isHidden();
     }
     else
     {
@@ -238,7 +238,7 @@ bool DialogModelFolder::initModel(int exerciseId, bool isAdminMode)
       int rowPos = -1;
       onInsertRow(rowPos, pIndex, fld);
       parentItemIndexCache.insert(folderId, index(rowPos, 0, pIndex));
-      DEBUG_LOG() << "Added to tree (folder id, parent id) : (" << folderId << ", " << parentId << ")";
+      DEBUG_LOG(m_logger) << "Added to tree (folder id, parent id) : (" << folderId << ", " << parentId << ")";
     }
   }
 
@@ -248,7 +248,7 @@ bool DialogModelFolder::initModel(int exerciseId, bool isAdminMode)
 
 bool DialogModelFolder::onInsertRow(int &row, const QModelIndex &parent, const FileManagement::Folder &folderData)
 {
-  DEBUG_LOG() << "onInsertRow";
+  DEBUG_LOG(m_logger) << "onInsertRow";
 
   row = rowCount(parent);
   QVariant data;
@@ -267,7 +267,7 @@ bool DialogModelFolder::onInsertRow(int &row, const QModelIndex &parent, const F
 
 bool DialogModelFolder::onUpdateRow(const QModelIndex &index, const FileManagement::Folder &folderData)
 {
-  DEBUG_LOG() << "onUpdateRow";
+  DEBUG_LOG(m_logger) << "onUpdateRow";
 
   QVariant data;
   data.setValue(folderData);
@@ -282,7 +282,7 @@ bool DialogModelFolder::onUpdateRow(const QModelIndex &index, const FileManageme
 
 bool DialogModelFolder::onDeleteRow(const QModelIndex &idx, bool isFirstItem)
 {
-  DEBUG_LOG() << "onDeleteRow";
+  DEBUG_LOG(m_logger) << "onDeleteRow";
 
   while (rowCount(idx) > 0)
     onDeleteRow(NGLTreeModel::index(0, 0, idx), 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 63c2df837..85879e895 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
@@ -63,6 +63,8 @@ Q_SIGNALS:
   void internalDataChanged();
 
 private:
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<FileManagement::Interface::Dtc> m_flmDtc;
   std::shared_ptr<FileManagement::Interface::Ftc> m_flmFtc;
   std::shared_ptr<ExerciseManagement::Interface::Dtc> m_exmDtc;
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 a7dafec46..6b7003361 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
@@ -69,7 +69,7 @@ bool FileContentEditDialog::init(LtsSession::LtsSession *session,
 {
   if (!session)
   {
-    ERROR_LOG() << "Failed to init FileContentEditDialog";
+    ERROR_LOG(m_logger) << "Failed to init FileContentEditDialog";
     return false;
   }
 
@@ -144,7 +144,7 @@ bool FileContentEditDialog::init(LtsSession::LtsSession *session,
 
 void FileContentEditDialog::getMetaData()
 {
-  DEBUG_LOG() << "getMetaData";
+  DEBUG_LOG(m_logger) << "getMetaData";
 
   m_ui->cbExercises->setCurrentIndex(0);
   m_ui->cbExercises->setEnabled(false);
@@ -186,7 +186,7 @@ void FileContentEditDialog::getMetaData()
 
 void FileContentEditDialog::setMetaData()
 {
-  DEBUG_LOG() << "setMetaData";
+  DEBUG_LOG(m_logger) << "setMetaData";
 
   m_editData.name(m_ui->leName->text().toStdString());
   m_editData.fileType(static_cast<FileManagement::FileType::type>(m_ui->cbFileType->currentData().toInt()));
@@ -219,7 +219,7 @@ void FileContentEditDialog::setMetaData()
 
 void FileContentEditDialog::onAddItem()
 {
-  DEBUG_LOG() << "onAddItem";
+  DEBUG_LOG(m_logger) << "onAddItem";
 
   setMetaData();
 
@@ -249,7 +249,7 @@ void FileContentEditDialog::onAddItem()
     m_editData.exerciseId();
     m_editData.phaseId();
   }
-  DEBUG_LOG() << "onAddItem: Content size = " << m_content.size();
+  DEBUG_LOG(m_logger) << "onAddItem: Content size = " << m_content.size();
   data.content(m_content);
 
   data.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
@@ -266,7 +266,7 @@ void FileContentEditDialog::onAddItem()
 
 void FileContentEditDialog::onEditItem()
 {
-  DEBUG_LOG() << "onEditItem";
+  DEBUG_LOG(m_logger) << "onEditItem";
 
   setMetaData();
 
@@ -300,10 +300,10 @@ void FileContentEditDialog::onEditItem()
   data.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
   data.lastModified(QDateTime::currentMSecsSinceEpoch());
 
-  DEBUG_LOG() << "onEditItem: Content size = " << m_content.size();
+  DEBUG_LOG(m_logger) << "onEditItem: Content size = " << m_content.size();
   data.content(m_content);
 
-  DEBUG_LOG() << "Modify FileContent id = " << data.id();
+  DEBUG_LOG(m_logger) << "Modify FileContent id = " << data.id();
 
   if (!m_requestHelper->startSingleRequest([ = ]()
 {
@@ -318,7 +318,7 @@ void FileContentEditDialog::onEditItem()
 
 void FileContentEditDialog::onComboFileTypeChanged(int crt)
 {
-  DEBUG_LOG() << "onComboFileTypeChanged crt = " << crt;
+  DEBUG_LOG(m_logger) << "onComboFileTypeChanged crt = " << crt;
   m_ui->cbFileType->setCurrentIndex(crt);
   m_editData.fileType(static_cast<FileManagement::FileType::type>(m_ui->cbFileType->currentData().toInt()));
 }
@@ -326,7 +326,7 @@ void FileContentEditDialog::onComboFileTypeChanged(int crt)
 
 void FileContentEditDialog::onComboFileStatusChanged(int crt)
 {
-  DEBUG_LOG() << "onComboFileStatusChanged crt = " << crt;
+  DEBUG_LOG(m_logger) << "onComboFileStatusChanged crt = " << crt;
   m_ui->cbFileStatus->setCurrentIndex(crt);
   m_editData.fileStatus(static_cast<FileManagement::FileStatus::type>(m_ui->cbFileStatus->currentData().toInt()));
 }
@@ -334,7 +334,7 @@ void FileContentEditDialog::onComboFileStatusChanged(int crt)
 
 void FileContentEditDialog::onComboFileCategoryChanged(int crt)
 {
-  DEBUG_LOG() << "onComboFileCategoryChanged crt = " << crt;
+  DEBUG_LOG(m_logger) << "onComboFileCategoryChanged crt = " << crt;
   m_ui->cbFileCategory->setCurrentIndex(crt);
   m_editData.fileCategory(static_cast<FileManagement::FileCategory::type>(m_ui->cbFileCategory->currentData().toInt()));
 
@@ -346,7 +346,7 @@ void FileContentEditDialog::onComboFileCategoryChanged(int crt)
 
 void FileContentEditDialog::onComboExerciseChanged(int crt)
 {
-  DEBUG_LOG() << "onComboExerciseChanged crt = " << crt;
+  DEBUG_LOG(m_logger) << "onComboExerciseChanged crt = " << crt;
   m_ui->cbExercises->setCurrentIndex(crt);
   if (m_ui->cbExercises->currentData().toInt() > 0)
   {
@@ -365,7 +365,7 @@ void FileContentEditDialog::onComboExerciseChanged(int crt)
 
 void FileContentEditDialog::onComboPhaseChanged(int crt)
 {
-  DEBUG_LOG() << "onComboPhaseChanged crt = " << 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());
@@ -376,7 +376,7 @@ void FileContentEditDialog::onComboPhaseChanged(int crt)
 
 void FileContentEditDialog::fillExercisesComboBox()
 {
-  DEBUG_LOG() << "fillExercisesComboBox";
+  DEBUG_LOG(m_logger) << "fillExercisesComboBox";
   QSignalBlocker blocker(m_ui->cbExercises);
   m_ui->cbExercises->clear();
   m_ui->cbExercises->addItem(tr("<not set>"), 0);
@@ -390,14 +390,14 @@ void FileContentEditDialog::fillExercisesComboBox()
 
 void FileContentEditDialog::fillPhasesComboBox()
 {
-  DEBUG_LOG() << "fillPhasesComboBox";
+  DEBUG_LOG(m_logger) << "fillPhasesComboBox";
   QSignalBlocker blocker(m_ui->cbPhases);
   m_ui->cbPhases->clear();
   m_ui->cbPhases->addItem(tr("<not set>"), 0);
   if (m_editData.exerciseId().is_set())
   {
     const int exId = m_editData.exerciseId().get();
-    DEBUG_LOG() << "ExId = " << exId;
+    DEBUG_LOG(m_logger) << "ExId = " << exId;
     if (exId > 0)
     {
       auto cbPhases = [this, exId] (const ExerciseManagement::ExercisePhase &ph)
@@ -415,7 +415,7 @@ void FileContentEditDialog::fillPhasesComboBox()
 
 void FileContentEditDialog::onPropertiesClicked()
 {
-  DEBUG_LOG() << "onPropertiesClicked";
+  DEBUG_LOG(m_logger) << "onPropertiesClicked";
   SetPropertiesDialog *dialog = new SetPropertiesDialog(m_ui->leProperties, this);
   dialog->init();
   dialog->setAttribute(Qt::WA_DeleteOnClose);
@@ -425,7 +425,7 @@ void FileContentEditDialog::onPropertiesClicked()
 
 void FileContentEditDialog::onCheckUsedStateChanged(int newState)
 {
-  DEBUG_LOG() << "onCheckUsedClicked: newState = " << newState;
+  DEBUG_LOG(m_logger) << "onCheckUsedClicked: newState = " << newState;
   if (newState == Qt::Checked)  
     m_editData.usedBy(1);
   else
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_file_content.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_file_content.h
index 52be8b448..38c162741 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_file_content.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_file_content.h
@@ -37,6 +37,8 @@ public:
             const std::vector<uint8_t> &content = {});
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void onFileContentModifyReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
 
 private:
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 5cf3a697a..d4217dbc1 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
@@ -94,7 +94,7 @@ void FolderEditDialog::onAddEditFolder()
   if (apply())
   {
     close();
-    DEBUG_LOG() << "Added / Edited folder " << m_editData.name();
+    DEBUG_LOG(m_logger) << "Added / Edited folder " << m_editData.name();
   }
 }
 
@@ -104,7 +104,7 @@ bool FolderEditDialog::apply()
   if (m_folderId > 0)
     
   {
-    DEBUG_LOG() << "Rename folder id = " << m_folderId;
+    DEBUG_LOG(m_logger) << "Rename folder id = " << m_folderId;
     m_requestHelper->addRequest([this]()
     {
       FolderModifyRequest req;
@@ -122,7 +122,7 @@ bool FolderEditDialog::apply()
   else
     
   {
-    DEBUG_LOG() << "Create new folder";
+    DEBUG_LOG(m_logger) << "Create new folder";
 
     FolderModifyRequest req;
     req.name(m_ui->leName->text().toStdString());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_folder.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_folder.h
index 0090dd511..5befdecf4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_folder.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_folder.h
@@ -36,6 +36,8 @@ public:
   bool apply();
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void onFolderModifyReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
 
 private Q_SLOTS:
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 1b657fee3..e531a5203 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
@@ -126,33 +126,33 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
 bool InterfaceImpl::fetchInterfaces()
 {
   
-  DEBUG_LOG() << "Fetching FLM interfaces for " << m_session->domainId() << ", " << m_session->exerciseId() << ", " << m_session->partitionId();
+  DEBUG_LOG(m_logger) << "Fetching FLM interfaces for " << m_session->domainId() << ", " << m_session->exerciseId() << ", " << m_session->partitionId();
   if (!m_session->getDtc<FileManagement::DataInterface>(m_dtc))
   {
-    DEBUG_LOG() << "getDtc for FileManagement::DataInterface failed.";
+    DEBUG_LOG(m_logger) << "getDtc for FileManagement::DataInterface failed.";
     return false;
   }
   if (!m_session->getFtc<FileManagement::DataInterface>(m_ftc))
   {
-    DEBUG_LOG() << "getFtc for FileManagement::DataInterface failed.";
+    DEBUG_LOG(m_logger) << "getFtc for FileManagement::DataInterface failed.";
     return false;
   }
   
   if (!m_session->getForeignGuiInterface<FileManagement::ForeignGuiComboboxInterface>(m_flmGuiCbxIfc))
   {
-    DEBUG_LOG() << "getForeignGuiInterface for FileManagement::ForeignGuiComboboxInterface failed.";
+    DEBUG_LOG(m_logger) << "getForeignGuiInterface for FileManagement::ForeignGuiComboboxInterface failed.";
     return false;
   }
 
   
   if (!m_session->getDtc<OperatorManagement::DataInterface>(m_opmDtc))
   {
-    DEBUG_LOG() << "getDtc for OperatorManagement::DataInterface failed.";
+    DEBUG_LOG(m_logger) << "getDtc for OperatorManagement::DataInterface failed.";
     return false;
   }
   if (!m_session->getDtc<ExerciseManagement::DataInterface>(m_exmDtc))
   {
-    DEBUG_LOG() << "getDtc for ExerciseManagement::DataInterface failed.";
+    DEBUG_LOG(m_logger) << "getDtc for ExerciseManagement::DataInterface failed.";
     return false;
   }
   return true;
@@ -177,13 +177,13 @@ QString InterfaceImpl::menuGroup() const
 
 LtsWidgets::LtsDialog *InterfaceImpl::onShowFileManagementDialog(QWidget *parent)
 {
-  DEBUG_LOG() << "onShowFileManagementDialog";
+  DEBUG_LOG(m_logger) << "onShowFileManagementDialog";
 
   FileManagementDialogTab *dialog = new FileManagementDialogTab(menuGroup(), parent);
 
   if (!dialog->init(m_session, FileDialogMode::User))
   {
-    ERROR_LOG() << "Failed to init dialog";
+    ERROR_LOG(m_logger) << "Failed to init dialog";
     dialog->deleteLater();
   }
 
@@ -195,13 +195,13 @@ LtsWidgets::LtsDialog *InterfaceImpl::onShowFileManagementDialog(QWidget *parent
 
 LtsWidgets::LtsDialog *InterfaceImpl::onShowFileManagementAdminDialog(QWidget *parent)
 {
-  DEBUG_LOG() << "onShowFileManagementDialog";
+  DEBUG_LOG(m_logger) << "onShowFileManagementDialog";
 
   FileManagementDialogTab *dialog = new FileManagementDialogTab(menuGroup(), parent);
 
   if (!dialog->init(m_session, FileDialogMode::Admin))
   {
-    ERROR_LOG() << "Failed to init dialog";
+    ERROR_LOG(m_logger) << "Failed to init dialog";
     dialog->deleteLater();
   }
 
@@ -212,12 +212,12 @@ LtsWidgets::LtsDialog *InterfaceImpl::onShowFileManagementAdminDialog(QWidget *p
 
 LtsWidgets::LtsDialog *InterfaceImpl::onShowHQReportDialog(QWidget *parent)
 {
-  DEBUG_LOG() << "onShowHQReportDialog";
+  DEBUG_LOG(m_logger) << "onShowHQReportDialog";
   HQReportEdit *dialog = new HQReportEdit(menuGroup(), parent);
 
   if (!dialog->init(m_session))
   {
-    ERROR_LOG() << "Failed to init dialog";
+    ERROR_LOG(m_logger) << "Failed to init dialog";
     dialog->deleteLater();
   }
   dialog->show();
@@ -239,13 +239,13 @@ void InterfaceImpl::onShowHQReportDialog(int partyId)
 
 LtsWidgets::LtsFramelessDialog *InterfaceImpl::onSelectFileDialog(QWidget *parent)
 {
-  DEBUG_LOG() << "onSelectFileDialog";
+  DEBUG_LOG(m_logger) << "onSelectFileDialog";
 
   FileManagementDialog *dialog = new FileManagementDialog(parent);
 
   if (!dialog->init(m_session, FileDialogMode::SaveFile, {FileType::Jpg, FileType::Png}, 6, tr("Save File")))
   {
-    ERROR_LOG() << "Failed to init dialog";
+    ERROR_LOG(m_logger) << "Failed to init dialog";
     dialog->deleteLater();
   }
 
@@ -266,11 +266,11 @@ int InterfaceImpl::saveFileContent(QWidget *parent,
   if (initialFolderId == 0 && exerciseId > 0)
     initialFolderId = m_dtc->getExerciseFolderId(exerciseId);
 
-  DEBUG_LOG() << "Initial folder Id = " << initialFolderId;
+  DEBUG_LOG(m_logger) << "Initial folder Id = " << initialFolderId;
 
   if (!dialog->init(m_session, FileManagement::FileDialogMode::SaveFile, QVector<FileType>() << targetFileType, initialFolderId))      
   {
-    ERROR_LOG() << "Failed to init save dialog";
+    ERROR_LOG(m_logger) << "Failed to init save dialog";
     delete dialog;
     return 0;
   }
@@ -279,7 +279,7 @@ int InterfaceImpl::saveFileContent(QWidget *parent,
   if (res != QDialog::Accepted)
   {
     delete dialog;
-    DEBUG_LOG() << "Save dialog closed by user";
+    DEBUG_LOG(m_logger) << "Save dialog closed by user";
     return 0;
   }
   const int folderId = dialog->getSelectedFolderId();
@@ -287,13 +287,13 @@ int InterfaceImpl::saveFileContent(QWidget *parent,
   const FileManagement::FileContent fileToModify = dialog->getSelectedFile();
   delete dialog;
 
-  INFO_LOG() << "FileToSave: Folder id = " << folderId
+  INFO_LOG(m_logger) << "FileToSave: Folder id = " << folderId
                      << ", File id = " << fileToModify.id()
                      << ", File name = " << fileName;
 
   if (folderId < 1 || fileName.isEmpty())
   {
-    DEBUG_LOG() << "Save dialog closed by user";
+    DEBUG_LOG(m_logger) << "Save dialog closed by user";
     return 0;
   }
 
@@ -306,7 +306,7 @@ int InterfaceImpl::saveFileContent(QWidget *parent,
                                                                                          , LtsWidgets::Button::Yes | LtsWidgets::Button::No));
     if (doNotOverwrite)
     {
-      DEBUG_LOG() << "File not overwritten as chosen by user";
+      DEBUG_LOG(m_logger) << "File not overwritten as chosen by user";
       return 0;
     }
   }
@@ -395,7 +395,7 @@ int InterfaceImpl::saveFileContent(QWidget *parent,
 
   int fileId = m_requestHelper->getRepliedId();
 
-  DEBUG_LOG() << "saveFileContent: File Id = " << fileId;
+  DEBUG_LOG(m_logger) << "saveFileContent: File Id = " << fileId;
 
   return fileId;
 }
@@ -492,7 +492,7 @@ bool InterfaceImpl::deleteFileContent(int fileId)
 
   if (fc.fileStatus() == FileManagement::FileStatus::Deleted)
   {
-    WARNING_LOG() << "File content already deleted for id = " << fileId;
+    WARNING_LOG(m_logger) << "File content already deleted for id = " << fileId;
     return true;  
   }
 
@@ -528,12 +528,12 @@ int InterfaceImpl::loadFileContent(QWidget *parent,
       initialFolderId = 1;
   }
 
-  DEBUG_LOG() << "Initial folder Id = " << initialFolderId;
+  DEBUG_LOG(m_logger) << "Initial folder Id = " << initialFolderId;
 
   QPointer<FileManagement::FileManagementDialog> dialog = new FileManagement::FileManagementDialog(parent);
   if (!dialog->init(m_session, FileManagement::FileDialogMode::OpenFile, fileTypes, initialFolderId, xmlType))
   {
-    ERROR_LOG() << "Failed to init open dialog";
+    ERROR_LOG(m_logger) << "Failed to init open dialog";
     delete dialog;
     return 0;
   }
@@ -548,7 +548,7 @@ int InterfaceImpl::loadFileContent(QWidget *parent,
   const int fileId = dialog->getSelectedFileId();
   delete dialog;
 
-  INFO_LOG() << "FileToLoad: File id = " << fileId;
+  INFO_LOG(m_logger) << "FileToLoad: File id = " << fileId;
 
   if (fileId < 1)
     return 0;
@@ -587,12 +587,12 @@ int InterfaceImpl::selectFileContent(QWidget *parent,
       initialFolderId = 1;
   }
 
-  DEBUG_LOG() << "Initial folder Id = " << initialFolderId;
+  DEBUG_LOG(m_logger) << "Initial folder Id = " << initialFolderId;
 
   QPointer<FileManagement::FileManagementDialog> dialog = new FileManagement::FileManagementDialog(parent);
   if (!dialog->init(m_session, FileManagement::FileDialogMode::OpenFile, fileTypes, initialFolderId))
   {
-    ERROR_LOG() << "Failed to init open dialog";
+    ERROR_LOG(m_logger) << "Failed to init open dialog";
     delete dialog;
     return 0;
   }
@@ -614,7 +614,7 @@ int InterfaceImpl::selectFileContent(QWidget *parent,
 
 bool InterfaceImpl::loadContent(int fileId, QByteArray &content, bool bQuiet)
 {
-  DEBUG_LOG() << "loadContent: File id = " << fileId;
+  DEBUG_LOG(m_logger) << "loadContent: File id = " << fileId;
 
   if (fileId < 1)
     return false;
@@ -652,7 +652,7 @@ QString InterfaceImpl::hasXmlType(const QByteArray &content) const
 {
   if (content.isEmpty())
   {
-    WARNING_LOG() << "Empty xml file content!";
+    WARNING_LOG(m_logger) << "Empty xml file content!";
     return QString();
   }
 
@@ -660,11 +660,11 @@ QString InterfaceImpl::hasXmlType(const QByteArray &content) const
   const QJsonDocument doc(QJsonDocument::fromJson(content, &parserError));
   if (parserError.error != QJsonParseError::NoError)
   {
-    WARNING_LOG() << "Error parsing json document: " << parserError.errorString();
+    WARNING_LOG(m_logger) << "Error parsing json document: " << parserError.errorString();
     return QString();
   }
 
-  DEBUG_LOG() << "json to parse: " << doc.toJson();
+  DEBUG_LOG(m_logger) << "json to parse: " << doc.toJson();
   const QJsonObject obj(doc.object());
 
   QString type = obj[QStringLiteral("XmlType")].toString();
@@ -714,7 +714,7 @@ bool InterfaceImpl::eventFilter(QObject *obj, QEvent *event)
     {
       QUrlQuery query(ev->url()); 
       const int partyId  = query.queryItemValue(QStringLiteral("party")).toInt();
-      DEBUG_LOG() << "[flm_explorer] partyId: " << partyId;
+      DEBUG_LOG(m_logger) << "[flm_explorer] partyId: " << partyId;
 
       onShowHQReportDialog(partyId);
       event->accept();
@@ -787,13 +787,13 @@ bool InterfaceImpl::TopicReplayInterface::playbackInit(const QJsonObject &attrib
 
   if (!m_previewWidget)
   {
-    ERROR_LOG() << "Preview widget not available for fileId = " << fileId;
+    ERROR_LOG(m_logger) << "Preview widget not available for fileId = " << fileId;
     return false;
   }
 
   if (!m_previewWidget->init(fc, pageNo, zoomLevel / 100., rotation, 0 , userText))
   {
-    ERROR_LOG() << "Preview widget cannot be initialized for fileId = " << fileId;
+    ERROR_LOG(m_logger) << "Preview widget cannot be initialized for fileId = " << fileId;
     return false;
   }
 
@@ -828,7 +828,7 @@ bool InterfaceImpl::TopicReplayInterface::exportTopic(const QJsonObject &attribu
 
 
   
-  DEBUG_LOG() << "Trying to export file with id " << fileId << " to " << strPathToFile;
+  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);
 
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 a7317297a..5e1f0f9d9 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
@@ -105,6 +105,8 @@ public:
   TopicEditorBase::TopicEditor *createTopicEditor(const TopicEditorBase::TopicData &data) override;
 
 protected:
+
+NGL::INGLLogger &m_logger;
   bool eventFilter(QObject *obj, QEvent *event) override;
 private:
   void onGetFileContentDataReply(const GetFileContentDataReply &reply) override { m_requestHelper->requestReply(reply); }
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 cda58cdf8..4e7f073a0 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
@@ -24,12 +24,12 @@ GetFileContent::~GetFileContent()
 
 bool GetFileContent::getContent(int fileContentId, std::vector<uint8_t> &content)
 {
-  DEBUG_LOG() << "New Get Content";
+  DEBUG_LOG(m_logger) << "New Get Content";
   auto handleContent = [this, &content](const Core::FunctionReply & baseReply)
   {
     const GetFileContentDataReply &reply = static_cast<const GetFileContentDataReply &>(baseReply);
     content = reply.content();
-    DEBUG_LOG() << "Content size: " << content.size();
+    DEBUG_LOG(m_logger) << "Content size: " << content.size();
   };
 
   auto sendReq = [this, fileContentId]()
@@ -41,11 +41,11 @@ bool GetFileContent::getContent(int fileContentId, std::vector<uint8_t> &content
 
   if (!m_requestHelper->startSingleRequest(sendReq, handleContent))
   {
-    ERROR_LOG() << "Cannot retrieve file content for id = " << fileContentId;
+    ERROR_LOG(m_logger) << "Cannot retrieve file content for id = " << fileContentId;
     return false;
   }
 
-  DEBUG_LOG() << "Content size: " << content.size();
+  DEBUG_LOG(m_logger) << "Content size: " << content.size();
   return true;
 }
 
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 0a4a63dd4..d76b71bcb 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
@@ -15,10 +15,9 @@
 namespace FileManagement
 {
 
-OfficeIntegration::OfficeIntegration(const FileManagement::FileContent &fileContent, QObject *parent)
-  : QObject(parent)
-  , m_selectedFileContent(fileContent)
-{}
+OfficeIntegration::OfficeIntegration(const FileManagement::FileContent &fileContent, QObject *parent) : QObject(parent)
+  , m_selectedFileContent(fileContent),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 OfficeIntegration::~OfficeIntegration()
 {
@@ -31,7 +30,7 @@ bool OfficeIntegration::openOfficeWindow()
   const bool bUseMSOffice = LtsUtils::ProjectSettings::getInstance()->value(QStringLiteral("Office"), QStringLiteral("Type")).toString() == QStringLiteral("MSOffice");
   const bool bRet =  bUseMSOffice ?  callWfica() :  callLibreOffice();
   if (!bRet)
-    ERROR_LOG() << m_errorString;
+    ERROR_LOG(m_logger) << m_errorString;
   return bRet;
 }
 
@@ -78,9 +77,9 @@ bool OfficeIntegration::callWfica()
            this, &OfficeIntegration::deleteLater);
   myProcess->start(program, arguments);
 
-  INFO_LOG() << "icaFile: =" << m_icaFile->fileName() <<
+  INFO_LOG(m_logger) << "icaFile: =" << m_icaFile->fileName() <<
                         ", args: '" << arguments.join(QLatin1Char(' '));
-  DEBUG_LOG() << "FileManagement::OfficeIntegration::callWfica(): " << myProcess->errorString();
+  DEBUG_LOG(m_logger) << "FileManagement::OfficeIntegration::callWfica(): " << myProcess->errorString();
   return true;
 }
 
@@ -94,7 +93,7 @@ bool OfficeIntegration::callLibreOffice()
   connString.replace(QStringLiteral("%DB_NAME%"), s->databaseName());
   connString.replace(QStringLiteral("%DB_HOST%"), s->databaseHostname());
 
-  DEBUG_LOG() << "DB connection string: " << connString;
+  DEBUG_LOG(m_logger) << "DB connection string: " << connString;
 
   QString program = QStringLiteral("java");
   QStringList arguments;
@@ -110,7 +109,7 @@ bool OfficeIntegration::callLibreOffice()
   connect(myProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), myProcess, &QProcess::deleteLater);
   connect(myProcess, &QProcess::errorOccurred, this, [this, myProcess](QProcess::ProcessError error)
   {
-    ERROR_LOG() << "FileManagement::OfficeIntegration::callLibreOffice(): " << error << " = " << myProcess->errorString();
+    ERROR_LOG(m_logger) << "FileManagement::OfficeIntegration::callLibreOffice(): " << error << " = " << myProcess->errorString();
   });
 
   myProcess->start(program, arguments);
@@ -129,7 +128,7 @@ void OfficeIntegration::startLibreOfficeServer()
            this, &OfficeIntegration::deleteLater);
   myProcess->start(program, arguments);
 
-  DEBUG_LOG() << "FileManagement::OfficeIntegration::startLibreOfficeServer(): " << myProcess->errorString();
+  DEBUG_LOG(m_logger) << "FileManagement::OfficeIntegration::startLibreOfficeServer(): " << myProcess->errorString();
 }
 
 QString OfficeIntegration::getParas() const
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_office_integration.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_office_integration.h
index 757120cb0..8bc645c08 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_office_integration.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_office_integration.h
@@ -21,6 +21,7 @@ public:
   bool openOfficeWindow();
   QString errorString() const { return m_errorString; }
 private:
+NGL::INGLLogger &m_logger;
   bool callWfica();
   bool callLibreOffice();
   void startLibreOfficeServer();
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 f5b8d5a56..49262e406 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
@@ -56,7 +56,7 @@ bool FileContentPreviewDialog::init(const FileContent &data)
 
   m_ui->lblTitle->setText(tr("Preview File Content: %1").arg(QString::fromStdString(data.name())));
 
-  DEBUG_LOG() << "Content size: " << m_content.size();
+  DEBUG_LOG(m_logger) << "Content size: " << m_content.size();
 
   switch (data.fileType().underlying())
   {
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 e85f06220..203a7acb3 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
@@ -14,12 +14,11 @@ namespace FileManagement
 static Poppler::Page::Rotation getRotationFromValue(int rotation);
 
 
-FileContentPreviewPlaybackWidget::FileContentPreviewPlaybackWidget(const std::shared_ptr<Interface::Ftc> &ftc, QWidget *parent)
-  : QWidget(parent)
+FileContentPreviewPlaybackWidget::FileContentPreviewPlaybackWidget(const std::shared_ptr<Interface::Ftc> &ftc, QWidget *parent) : QWidget(parent)
   , m_ui(new Ui::FileContentPreviewPlaybackWidget)
   , m_getContent(new FileManagement::GetFileContent(ftc, this))
-  , m_closeTimer(new QTimer(this))
-{
+  , m_closeTimer(new QTimer(this)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_ui->setupUi(this);
 
   m_ui->lblPixmap->setVisible(false);
@@ -71,13 +70,13 @@ bool FileContentPreviewPlaybackWidget::init(const FileContent &data, int pageNo,
   m_rotation = rotation;
   m_userText = userText;
 
-  DEBUG_LOG() << "FileContentPreviewPlaybackWidget::init - (fileId, pageNo, zoomFactor, rotation) = ("
+  DEBUG_LOG(m_logger) << "FileContentPreviewPlaybackWidget::init - (fileId, pageNo, zoomFactor, 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);
 
-  DEBUG_LOG() << "Content size: " << m_content.size() << ", " << m_pageNo;
+  DEBUG_LOG(m_logger) << "Content size: " << m_content.size() << ", " << m_pageNo;
 
   if (m_duration > 0)
     startTimer();
@@ -162,7 +161,7 @@ bool FileContentPreviewPlaybackWidget::init(const FileContent &data, int pageNo,
 bool FileContentPreviewPlaybackWidget::pauseTimer()
 {
   m_closeTimer.stop();
-  DEBUG_LOG() << "Timer stopped ";
+  DEBUG_LOG(m_logger) << "Timer stopped ";
   return true;
 }
 
@@ -172,7 +171,7 @@ bool FileContentPreviewPlaybackWidget::startTimer()
   m_closeTimer.setInterval(m_duration * 1000); 
   connect(&m_closeTimer, &QTimer::timeout, this, &FileContentPreviewPlaybackWidget::close);
   m_closeTimer.start();
-  DEBUG_LOG() << "Timer started interval = " << m_closeTimer.interval();
+  DEBUG_LOG(m_logger) << "Timer started interval = " << m_closeTimer.interval();
   return true;
 }
 
@@ -193,7 +192,7 @@ void FileContentPreviewPlaybackWidget::setPage(int pageNo)
 {
   if (m_pageNo == pageNo)
     return;
-  DEBUG_LOG() << "setPage = " << pageNo;
+  DEBUG_LOG(m_logger) << "setPage = " << pageNo;
   m_pageNo = pageNo;
   m_pdfWidget->setPage(pageNo);
   emit currentPageChanged(m_pageNo);
@@ -204,7 +203,7 @@ void FileContentPreviewPlaybackWidget::setZoomFactor(double zoomFactor)
 {
   if (qFuzzyCompare(m_zoomFactor, zoomFactor))
     return;
-  DEBUG_LOG() << "setZoomFactor = " << zoomFactor;
+  DEBUG_LOG(m_logger) << "setZoomFactor = " << zoomFactor;
   m_zoomFactor = zoomFactor;
   m_pdfWidget->setZoomFactor(zoomFactor);
 }
@@ -214,7 +213,7 @@ void FileContentPreviewPlaybackWidget::setRotation(int rotation)
 {
   if (m_rotation == rotation)
     return;
-  DEBUG_LOG() << "setRotation = " << rotation;
+  DEBUG_LOG(m_logger) << "setRotation = " << rotation;
   m_rotation = rotation;
   m_pdfWidget->setRotation(getRotationFromValue(m_rotation));
   emit rotationChanged(rotation);
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 84cc0259d..356145437 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
@@ -18,7 +18,7 @@ SetPropertiesDialog::SetPropertiesDialog(QLineEdit *lineEdit, QWidget *parent)
   , m_ui(new Ui::SetPropertiesDialog)
   , m_lineEdit(lineEdit)
 {
-  DEBUG_LOG() << "Ctor SetPropertiesDialog";
+  DEBUG_LOG(m_logger) << "Ctor SetPropertiesDialog";
   m_ui->setupUi(this);
 }
 
@@ -31,7 +31,7 @@ SetPropertiesDialog::~SetPropertiesDialog()
 
 void SetPropertiesDialog::init()
 {
-  DEBUG_LOG() << "Init SetPropertiesDialog";
+  DEBUG_LOG(m_logger) << "Init SetPropertiesDialog";
 
   connect(m_ui->buttonBox->getButton(LtsWidgets::DialogButton::Close), &QPushButton::clicked, this, &SetPropertiesDialog::close);
   m_ui->buttonBox->getButton(LtsWidgets::DialogButton::Apply)->hide();
@@ -50,13 +50,13 @@ void SetPropertiesDialog::init()
 
     if (error.error != QJsonParseError::NoError)
     {
-      ERROR_LOG() << error.errorString();
+      ERROR_LOG(m_logger) << error.errorString();
       return;
     }
 
     if (!doc.isObject())
     {
-      ERROR_LOG() << "Properties String is no JSON-Object";
+      ERROR_LOG(m_logger) << "Properties String is no JSON-Object";
       return;
     }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_set_properties_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_set_properties_dialog.h
index 1de3a558a..1d722cf34 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_set_properties_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_set_properties_dialog.h
@@ -31,6 +31,8 @@ private Q_SLOTS:
   void onAddClicked();
 
 private: 
+
+NGL::INGLLogger &m_logger;
   enum class PropValType
   {
     INT,
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 fe6ee6e46..79e374c42 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
@@ -79,10 +79,10 @@ bool AesDisplayFilterImpl::setFilterFromData(const AesFilter &filterData)
   const QJsonDocument doc(QJsonDocument::fromJson(content, &parserError));
   if (parserError.error != QJsonParseError::NoError)
   {
-    WARNING_LOG() << "Error parsing json document: " << parserError.errorString();
+    WARNING_LOG(m_logger) << "Error parsing json document: " << parserError.errorString();
     return false;
   }
-  DEBUG_LOG() << "json to parse: " << doc.toJson(QJsonDocument::Compact);
+  DEBUG_LOG(m_logger) << "json to parse: " << doc.toJson(QJsonDocument::Compact);
   const QJsonObject obj(doc.object());
 
   return setFilterFromData(obj);
@@ -158,7 +158,7 @@ bool AesDisplayFilterImpl::isVisible(AreaEffectSimulation::AesType aesType,
                                      qint64 effectDuration,
                                      qint64 currentTimeMSec) const
 {
-  DEBUG_LOG() << "visible check for " << aesType << " - state: " << aesState
+  DEBUG_LOG(m_logger) << "visible check for " << aesType << " - state: " << aesState
                       << ", charge: " << chargeTypeId << ", party: " << partyId
                       << ", isCentral: " << isCentral
                       << ", effectstart: " << effectStart
@@ -169,13 +169,13 @@ bool AesDisplayFilterImpl::isVisible(AreaEffectSimulation::AesType aesType,
   
   if ((partyId > -1) && (m_visiblePartiesCheck && !m_visiblePartiesCheck(partyId)))
   {
-    DEBUG_LOG() << "Operator is not allowed to see aes for party " << partyId;
+    DEBUG_LOG(m_logger) << "Operator is not allowed to see aes for party " << partyId;
     return false;
   }
 
   if ((partyId > -1) && (m_visiblePartiesCheck && !m_visiblePartiesCheck(partyId)))
   {
-    DEBUG_LOG() << "Operator is not allowed to see aes for party " << partyId;
+    DEBUG_LOG(m_logger) << "Operator is not allowed to see aes for party " << partyId;
     return false;
   }
 
@@ -183,7 +183,7 @@ bool AesDisplayFilterImpl::isVisible(AreaEffectSimulation::AesType aesType,
   
   if (it == m_effectStateMap.end())
   {
-    DEBUG_LOG() << "No filter entry for " << aesType << " - always visible";
+    DEBUG_LOG(m_logger) << "No filter entry for " << aesType << " - always visible";
     return true;
   }
 
@@ -191,14 +191,14 @@ bool AesDisplayFilterImpl::isVisible(AreaEffectSimulation::AesType aesType,
   
   if (ess.limitOnChargeTypes && chargeTypeId > 0)
   {
-    DEBUG_LOG() << "filtering for chargeType... ";
+    DEBUG_LOG(m_logger) << "filtering for chargeType... ";
     if (!ess.visibleChargeTypeIds.contains(chargeTypeId))
     {
-      DEBUG_LOG() << "... is NOT allowed";
+      DEBUG_LOG(m_logger) << "... is NOT allowed";
       return false;
     }
     else
-      DEBUG_LOG() << "... is allowed";
+      DEBUG_LOG(m_logger) << "... is allowed";
   }
 
   if (!displayCentralPeripheralHelper(ess, isCentral))
@@ -206,31 +206,31 @@ bool AesDisplayFilterImpl::isVisible(AreaEffectSimulation::AesType aesType,
 
   if (ess.limitOnParties && partyId > 0)
   {
-    DEBUG_LOG() << "filtering for partyId... ";
+    DEBUG_LOG(m_logger) << "filtering for partyId... ";
     if (!ess.visiblePartyIds.contains(partyId))
     {
-      DEBUG_LOG() << "... is NOT allowed";
+      DEBUG_LOG(m_logger) << "... is NOT allowed";
       return false;
     }
     else
-      DEBUG_LOG() << "... is allowed";
+      DEBUG_LOG(m_logger) << "... is allowed";
   }
 
 
-  DEBUG_LOG() << "filtering for state ... ";
+  DEBUG_LOG(m_logger) << "filtering for state ... ";
   switch (aesState)
   {
   case AreaEffectSimulation::AesEffectState_def::EsCreated:
   case AreaEffectSimulation::AesEffectState_def::EsReceived:
-    DEBUG_LOG() << "... created/received visible: " << ess.displayCreated;
+    DEBUG_LOG(m_logger) << "... created/received visible: " << ess.displayCreated;
     return ess.displayCreated;
   case AreaEffectSimulation::AesEffectState_def::EsPrepared:
   case AreaEffectSimulation::AesEffectState_def::EsFired:
-    DEBUG_LOG() << "... prepared/fired visible: " << ess.displayPrepared;
+    DEBUG_LOG(m_logger) << "... prepared/fired visible: " << ess.displayPrepared;
     return ess.displayPrepared;
   case AreaEffectSimulation::AesEffectState_def::EsActivated:
   case AreaEffectSimulation::AesEffectState_def::EsPaused:
-    DEBUG_LOG() << "... active/paused visible: " << ess.displayActivated;
+    DEBUG_LOG(m_logger) << "... active/paused visible: " << ess.displayActivated;
     return ess.displayActivated;
   case AreaEffectSimulation::AesEffectState_def::EsExpired:
   {
@@ -247,20 +247,20 @@ bool AesDisplayFilterImpl::isVisible(AreaEffectSimulation::AesType aesType,
       return false;
 
     const auto displayEnd = effectStart + effectDuration + ess.expiredAfterglowDurationMSec;
-    DEBUG_LOG() << "... expired visible: " << (currentTimeMSec < displayEnd)
+    DEBUG_LOG(m_logger) << "... expired visible: " << (currentTimeMSec < displayEnd)
                         << ", calc expiry time: " << displayEnd
                         << ", return: " << (currentTimeMSec < displayEnd);
     return (currentTimeMSec < displayEnd);
   }
   case AreaEffectSimulation::AesEffectState_def::EsRemoved:
-    DEBUG_LOG() << "... removed - NOT visible";
+    DEBUG_LOG(m_logger) << "... removed - NOT visible";
     return false;
   case AreaEffectSimulation::AesEffectState_def::EsUnknown:
   case AreaEffectSimulation::AesEffectState_def::EsError:
     break;  
   }
 
-  DEBUG_LOG() << "... unknown - visible";
+  DEBUG_LOG(m_logger) << "... unknown - visible";
   return true;
 }
 
@@ -347,7 +347,7 @@ AesDisplayFilterImpl::EffectStateStruct AesDisplayFilterImpl::effectStateFilter(
 {
 
     if (!m_effectStateMap.contains(aesType))
-      WARNING_LOG() << "AesType not found!!! " << aesType;
+      WARNING_LOG(m_logger) << "AesType not found!!! " << aesType;
 
   return m_effectStateMap.value(aesType);
 }
@@ -404,7 +404,7 @@ bool AesDisplayFilterImpl::parseFilterData(const QJsonObject &obj,
   const QJsonObject inner = obj.value(strType).toObject();
   if (inner.isEmpty())
     return false;
-  DEBUG_LOG() << "Parsing filter data for " << aesType
+  DEBUG_LOG(m_logger) << "Parsing filter data for " << aesType
                       << ", json: " << QJsonDocument(inner).toJson();
   EffectStateStruct &ess = m_effectStateMap[aesType];
   ess.displayCreated               = inner.value(QStringLiteral("created")).toBool(ess.displayCreated);
@@ -465,10 +465,10 @@ void AesDisplayFilterImpl::addFilterData(QJsonObject &obj, AreaEffectSimulation:
 
 void AesDisplayFilterImpl::callFilterChangedCb(AreaEffectSimulation::AesType aesType)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << ", call cbs, START, size=" << m_filterChangedCb.size();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << ", call cbs, START, size=" << m_filterChangedCb.size();
   for (auto *ptr : std::as_const(m_filterChangedCb)){
     ptr->onAesDisplayFilterChanged(aesType);
   }
-  DEBUG_LOG() << Q_FUNC_INFO << ", call cbs, END, size=" << m_filterChangedCb.size();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << ", call cbs, END, size=" << m_filterChangedCb.size();
 }
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/aes_display_filter_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/aes_display_filter_impl.h
index 83b38111d..4361cced9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/aes_display_filter_impl.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/aes_display_filter_impl.h
@@ -65,6 +65,7 @@ public:
   bool showExplosionClusterDetonationSphere() const override;
   bool showNotTriggeredCDMine() const override;
 protected:
+  NGL::INGLLogger &m_logger;
   bool showDetails2(AreaEffectSimulation::AesType aesType) const;
   bool showDetails3(AreaEffectSimulation::AesType aesType) const;
   bool showDetails4(AreaEffectSimulation::AesType aesType) const;
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 011fb3c86..da31b1264 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
@@ -18,15 +18,15 @@ BuildingComponentSettingsImpl::BuildingComponentSettingsImpl(const QString &work
   : BuildingComponentSettings()
   , m_workspaceId(workspaceId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, this=" << this;
   resetBuildingComponentSettings();
-  TRACE_LOG() << Q_FUNC_INFO << " END, this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, this=" << this;
 }
 
 BuildingComponentSettingsImpl::~BuildingComponentSettingsImpl()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, this=" << this;
-  TRACE_LOG() << Q_FUNC_INFO << " END, this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, this=" << this;
 }
 
 void BuildingComponentSettingsImpl::resetBuildingComponentSettings()
@@ -36,7 +36,7 @@ void BuildingComponentSettingsImpl::resetBuildingComponentSettings()
 
 bool BuildingComponentSettingsImpl::setBldCmpSettingsFromData(const BuildingComponentFilter &filterData)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, this=" << this;
 
   m_ddsFilterContent = filterData;
 
@@ -49,27 +49,27 @@ bool BuildingComponentSettingsImpl::setBldCmpSettingsFromData(const BuildingComp
   const QJsonDocument doc(QJsonDocument::fromJson(content, &parserError));
   if (parserError.error != QJsonParseError::NoError)
   {
-    WARNING_LOG() << "Error parsing json document: " << parserError.errorString();
+    WARNING_LOG(m_logger) << "Error parsing json document: " << parserError.errorString();
     return false;
   }
-  DEBUG_LOG() << "json to parse: " << doc.toJson();
+  DEBUG_LOG(m_logger) << "json to parse: " << doc.toJson();
   const QJsonObject obj(doc.object());
 
   if (obj.isEmpty())
     return false;
 
 
-  DEBUG_LOG() << "json to parse: " << doc.toJson();
+  DEBUG_LOG(m_logger) << "json to parse: " << doc.toJson();
   BldCmpSettings settings;
   if (!settingsFromJsonInternal(doc.object(), settings))
   {
-    ERROR_LOG() << "json to parse: " << doc.toJson();
+    ERROR_LOG(m_logger) << "json to parse: " << doc.toJson();
     return false;
   }
 
   setBldCmpSettings(settings); 
 
-  TRACE_LOG() << Q_FUNC_INFO << " END, this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, this=" << this;
   return true;
 }
 
@@ -105,11 +105,11 @@ QJsonObject BuildingComponentSettingsImpl::bldCmpSettingsToJson() const
 
 BuildingComponentFilter BuildingComponentSettingsImpl::bldCmpSettingsToData() const
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, this=" << this;
+  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());
-  TRACE_LOG() << Q_FUNC_INFO << " END, this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, this=" << this;
   return ret;
 }
 
@@ -142,7 +142,7 @@ bool BuildingComponentSettingsImpl::settingsFromJsonInternal(const QJsonObject &
 
 bool BuildingComponentSettingsImpl::setBldCmpSettings(const QJsonObject &obj)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, this=" << this;
   BldCmpSettings settings;
   if (!settingsFromJsonInternal(obj, settings))
     return false;
@@ -151,15 +151,15 @@ bool BuildingComponentSettingsImpl::setBldCmpSettings(const QJsonObject &obj)
 
 bool BuildingComponentSettingsImpl::setBldCmpSettings(const BuildingComponentSettings::BldCmpSettings &s)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, this=" << this << "; workspace " << m_workspaceId << "'";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, this=" << this << "; workspace " << m_workspaceId << "'";
 
   if (s == m_bldCmpSettings)
   {
-    DEBUG_LOG() << " Settings 's' and m_bldCmpSettings are equal -> return (workspace " << m_workspaceId << ")";
+    DEBUG_LOG(m_logger) << " Settings 's' and m_bldCmpSettings are equal -> return (workspace " << m_workspaceId << ")";
     return true;
   }
 
-  DEBUG_LOG() << " Settings 's' and m_bldCmpSettings are different -> update (workspace " << m_workspaceId << ")";
+  DEBUG_LOG(m_logger) << " Settings 's' and m_bldCmpSettings are different -> update (workspace " << m_workspaceId << ")";
 
   
   m_bldCmpSettings = s;        
@@ -185,13 +185,13 @@ bool BuildingComponentSettingsImpl::isChangedCallbackRegistered(BuildingComponen
 
 void BuildingComponentSettingsImpl::callSettingsChangedCb()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, this=" << this << "; workspace " << m_workspaceId << "'"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, this=" << this << "; workspace " << m_workspaceId << "'"
                       << " call cbs now: size=" << m_settingsChangedCb.size();
 
   for (auto *ptr : std::as_const(m_settingsChangedCb))
     ptr->onBuildingComponentSettingsChanged();
 
-  TRACE_LOG() << Q_FUNC_INFO << " END, this=" << this << "; workspace " << m_workspaceId << "'"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, this=" << this << "; workspace " << m_workspaceId << "'"
                       << " call cbs now: size=" << m_settingsChangedCb.size();
 }
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/building_cmpnt_settings_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/building_cmpnt_settings_impl.h
index ed5343011..6cb2477a4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/building_cmpnt_settings_impl.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/building_cmpnt_settings_impl.h
@@ -42,6 +42,8 @@ public:
   bool isChangedCallbackRegistered(SettingsChangedCallback *cb) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   void callSettingsChangedCb();
 
 private:
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 ff7594ff2..99fb611c6 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
@@ -21,7 +21,7 @@ SymbolAppearanceSettingsImpl::SymbolAppearanceSettingsImpl(const std::shared_ptr
   , m_dtcPpm(dtcPpm)
   , m_workspaceId(workspaceId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, this=" << this;
   if (m_dtcPpm)
   {
     connect(m_dtcPpm.get(), &ParticipantManagement::Interface::Dtc::participantChanged,
@@ -32,28 +32,28 @@ SymbolAppearanceSettingsImpl::SymbolAppearanceSettingsImpl(const std::shared_ptr
             this, &SymbolAppearanceSettingsImpl::onRebuildCollapsExpandFilter);
     m_dtcPpm->participants([this](const ParticipantManagement::Participant &p) {onParticipantChanged(p, ParticipantManagement::DataModification::eAdded);});
   }
-  TRACE_LOG() << Q_FUNC_INFO << " END, this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, this=" << this;
 }
 
 SymbolAppearanceSettingsImpl::~SymbolAppearanceSettingsImpl()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, this=" << this;
-  TRACE_LOG() << Q_FUNC_INFO << " END, this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, this=" << this;
 }
 
 void SymbolAppearanceSettingsImpl::resetSymbolAppearanceSettings()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, this=" << this;
   setSettings(Settings(), Part::All);
-  TRACE_LOG() << Q_FUNC_INFO << " END, this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, this=" << this;
 }
 
 bool SymbolAppearanceSettingsImpl::setSettingsFromData(const SymbolAppearance &data)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, this=" << this
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, this=" << this
                       << ", m_settingsChangedCb.size()=" << m_settingsChangedCb.size();
 
-  DEBUG_LOG() << " old symbolTransparency is " << m_settings.symbolSettings.symbolTransparency;
+  DEBUG_LOG(m_logger) << " old symbolTransparency is " << m_settings.symbolSettings.symbolTransparency;
 
   
   
@@ -74,33 +74,33 @@ bool SymbolAppearanceSettingsImpl::setSettingsFromData(const SymbolAppearance &d
   const QJsonDocument doc(QJsonDocument::fromJson(content, &parserError));
   if (parserError.error != QJsonParseError::NoError)
   {
-    WARNING_LOG() << "Error parsing json document: " << parserError.errorString();
+    WARNING_LOG(m_logger) << "Error parsing json document: " << parserError.errorString();
     return false;
   }
-  DEBUG_LOG() << "json to parse: " << doc.toJson();
+  DEBUG_LOG(m_logger) << "json to parse: " << doc.toJson();
   Settings settings;
   if (!settingsFromJsonInternal(doc.object(), settings))
     return false;
 
   m_settings.symbolSettings.symbolTransparency = -1.23;  
   setSettings(settings, Part::All);
-  TRACE_LOG() << Q_FUNC_INFO << " END, this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, this=" << this;
   return true;
 }
 
 bool SymbolAppearanceSettingsImpl::settingsFromJsonInternal(const QJsonObject &obj, Settings &settings) const
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, this=" << this;
   auto &sym = settings.symbolSettings;
 
   
   QJsonObject symApp = obj[QStringLiteral("SymbolAppearances")].toObject();
 
   sym.symbolScale = symApp[QStringLiteral("scale")].toDouble(sym.symbolScale);
-  DEBUG_LOG() << "set symbolScale to " << sym.symbolScale << " for workspace " << m_workspaceId;
+  DEBUG_LOG(m_logger) << "set symbolScale to " << sym.symbolScale << " for workspace " << m_workspaceId;
 
   sym.symbolTransparency = symApp[QStringLiteral("transparency")].toDouble(sym.symbolTransparency);
-  DEBUG_LOG() << "set symbolTransparency to " << sym.symbolTransparency << " for workspace " << m_workspaceId;
+  DEBUG_LOG(m_logger) << "set symbolTransparency to " << sym.symbolTransparency << " for workspace " << m_workspaceId;
 
   sym.symbolFireEventFlashingMSec = symApp[QStringLiteral("fireEventFlashing")].toDouble(sym.symbolFireEventFlashingMSec);
   sym.hitLineDisplayLengthMSec = symApp[QStringLiteral("hitLineDisplayLength")].toDouble(sym.hitLineDisplayLengthMSec);
@@ -147,7 +147,7 @@ bool SymbolAppearanceSettingsImpl::settingsFromJsonInternal(const QJsonObject &o
   settings.colExpand.hiddenParticipantIds = fromJsonArray(obj.value(QStringLiteral("colExpHidden")).toArray());
 
   settings.bIsValid = true;
-  TRACE_LOG() << Q_FUNC_INFO << " END, this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, this=" << this;
   return true;
 }
 
@@ -218,17 +218,17 @@ QJsonObject SymbolAppearanceSettingsImpl::settingsToJson() const
 
 SymbolAppearance SymbolAppearanceSettingsImpl::settingsToData() const
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, this=" << this;
+  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)));
-  TRACE_LOG() << Q_FUNC_INFO << " END, this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, this=" << this;
   return ret;
 }
 
 bool SymbolAppearanceSettingsImpl::setSettings(const QJsonObject &obj, Part part)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, this=" << this;
   Settings settings;
   if (!settingsFromJsonInternal(obj, settings))
     return false;
@@ -238,7 +238,7 @@ bool SymbolAppearanceSettingsImpl::setSettings(const QJsonObject &obj, Part part
 
 bool SymbolAppearanceSettingsImpl::setSettings(const Settings &s, Part part)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, this=" << this << ", part=" << (int)part;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, this=" << this << ", part=" << (int)part;
 
   bool bNeedRebuildCollapsExpandFilter = false;
   switch (part)
@@ -246,18 +246,18 @@ bool SymbolAppearanceSettingsImpl::setSettings(const Settings &s, Part part)
   case Part::All:
     if (s == m_settings)
     {
-      DEBUG_LOG() << " Settings 's' and m_settings are equal -> return (workspace " << m_workspaceId << ")";
+      DEBUG_LOG(m_logger) << " Settings 's' and m_settings are equal -> return (workspace " << m_workspaceId << ")";
       return true;
     }
     bNeedRebuildCollapsExpandFilter = s.colExpand != m_settings.colExpand;
     m_settings = s;
-    INFO_LOG() << "set symbol scale (?) of " << s.symbolSettings.symbolScale << " in workspace " << m_workspaceId;
+    INFO_LOG(m_logger) << "set symbol scale (?) of " << s.symbolSettings.symbolScale << " in workspace " << m_workspaceId;
     break;
   case Part::Symbol:
     if (s.symbolSettings == m_settings.symbolSettings)
       return true;
     m_settings.symbolSettings = s.symbolSettings;
-    INFO_LOG() << "set symbol scale of " << s.symbolSettings.symbolScale << " in workspace " << m_workspaceId;
+    INFO_LOG(m_logger) << "set symbol scale of " << s.symbolSettings.symbolScale << " in workspace " << m_workspaceId;
     break;
   case Part::Types:
     if (s.hiddenTypeFilter == m_settings.hiddenTypeFilter &&
@@ -287,18 +287,18 @@ bool SymbolAppearanceSettingsImpl::isParticipantVisibileCollapseExpand(int parti
 
 void SymbolAppearanceSettingsImpl::addChangedCallback(SettingsChangedCallback *cb)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << ", add cb=" << cb;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << ", add cb=" << cb;
   m_settingsChangedCb.removeAll(cb);  
   m_settingsChangedCb.push_back(cb);
-  DEBUG_LOG() << Q_FUNC_INFO << ", add cb=" << cb << " done";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << ", add cb=" << cb << " done";
 }
 
 
 void SymbolAppearanceSettingsImpl::removeChangedCallback(SettingsChangedCallback *cb)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << ", remove cb=" << cb << " current size=" << m_settingsChangedCb.size();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << ", remove cb=" << cb << " current size=" << m_settingsChangedCb.size();
   m_settingsChangedCb.removeAll(cb);
-  DEBUG_LOG() << Q_FUNC_INFO << ", remove cb=" << cb << " done, current size=" << m_settingsChangedCb.size();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << ", remove cb=" << cb << " done, current size=" << m_settingsChangedCb.size();
 }
 
 bool SymbolAppearanceSettingsImpl::isChangedCallbackRegistered(SymbolAppearanceSettings::SettingsChangedCallback *cb) const
@@ -308,10 +308,10 @@ bool SymbolAppearanceSettingsImpl::isChangedCallbackRegistered(SymbolAppearanceS
 
 void SymbolAppearanceSettingsImpl::callSettingsChangedCb(Part part)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << ", call cbs, START , part=" <<  (int)part << ", size=" << m_settingsChangedCb.size();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << ", call cbs, START , part=" <<  (int)part << ", size=" << m_settingsChangedCb.size();
   for (auto *ptr : std::as_const(m_settingsChangedCb))
     ptr->onSymbolAppearanceSettingsChanged(part);
-  DEBUG_LOG() << Q_FUNC_INFO << ", call cbs, END , part=" <<  (int)part << ", size=" << m_settingsChangedCb.size();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << ", call cbs, END , part=" <<  (int)part << ", size=" << m_settingsChangedCb.size();
 }
 
 SymbolAppearanceSettingsImpl::SymbolVisibility SymbolAppearanceSettingsImpl::readSymbolVisibility(const QJsonObject &obj,
@@ -398,7 +398,7 @@ void SymbolAppearanceSettingsImpl::onParticipantChanged(const ParticipantManagem
 
 void SymbolAppearanceSettingsImpl::onRebuildCollapsExpandFilter()
 {
-  DEBUG_LOG() << "Rebuilding CollapseExpand filter, participant2Superior size: " << m_participantId2SuperiorId.size();
+  DEBUG_LOG(m_logger) << "Rebuilding CollapseExpand filter, participant2Superior size: " << m_participantId2SuperiorId.size();
 
   QSet<int> filteredParticipantsColExp = m_settings.colExpand.hiddenParticipantIds;
   for (auto it = m_participantId2SuperiorId.begin(); it != m_participantId2SuperiorId.end(); ++it)
@@ -418,15 +418,15 @@ void SymbolAppearanceSettingsImpl::onRebuildCollapsExpandFilter()
     sl.reserve(20);
     for(int i : std::as_const(m_settings.colExpand.hiddenParticipantIds))
       sl += QString::number(i);
-    DEBUG_LOG() << "Hidden participant ids: " << sl.join(QLatin1Char(' '));
+    DEBUG_LOG(m_logger) << "Hidden participant ids: " << sl.join(QLatin1Char(' '));
     sl.clear();
     for(int i : std::as_const(m_settings.colExpand.collapsedParticipantIds))
       sl += QString::number(i);
-    DEBUG_LOG() << "Collapsed participant ids: " << sl.join(QLatin1Char(' '));
+    DEBUG_LOG(m_logger) << "Collapsed participant ids: " << sl.join(QLatin1Char(' '));
     sl.clear();
     for(int i : std::as_const(filteredParticipantsColExp))
       sl += QString::number(i);
-    DEBUG_LOG() << "Result: " << sl.join(QLatin1Char(' '));
+    DEBUG_LOG(m_logger) << "Result: " << sl.join(QLatin1Char(' '));
   }
 
   if (m_filteredParticipantsColExp == filteredParticipantsColExp)
@@ -446,7 +446,7 @@ bool SymbolAppearanceSettingsImpl::isInCollapsedTree(int participantId, QSet<int
   const int superiorId = m_participantId2SuperiorId.value(participantId);
   if (visitedIds.contains(superiorId))
   {
-    WARNING_LOG() << "Recursion detected - participant with id " << participantId << ", superiorId: " << superiorId;
+    WARNING_LOG(m_logger) << "Recursion detected - participant with id " << participantId << ", superiorId: " << superiorId;
     return false;
   }
   visitedIds.insert(superiorId);
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 ca1f8118b..80bf8ea80 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
@@ -49,6 +49,7 @@ public:
   int changedCallbackCount() { return m_settingsChangedCb.size() ;}
 
 private:
+  NGL::INGLLogger &m_logger;
   void callSettingsChangedCb(Part part);
   static SymbolVisibility readSymbolVisibility(const QJsonObject &obj,
                                                const QString &val,
@@ -61,8 +62,10 @@ private Q_SLOTS:
   void onParticipantChanged(const ParticipantManagement::Participant &data, ParticipantManagement::DataModification mod);
   void onRebuildCollapsExpandFilter();
 private:
+  NGL::INGLLogger &m_logger;
   bool isInCollapsedTree(int participantId, QSet<int> &visitedIds) const;
 private:
+  NGL::INGLLogger &m_logger;
   QVector<SettingsChangedCallback *> m_settingsChangedCb;
   
   QHash<int, int> m_participantId2SuperiorId;
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 7f89ea47c..e37f261c2 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
@@ -46,12 +46,12 @@ bool AesFilterDialog::init(LtsSession::LtsSession *session)
   m_session = session;
   if (!session->getForeignGuiInterface(m_fltIfc))
   {
-    WARNING_LOG() << "Can not get Foreign data interface for FilterManagement";
+    WARNING_LOG(m_logger) << "Can not get Foreign data interface for FilterManagement";
     return false;
   }
   if (!session->getFtc<FilterManagement::DataInterface>(m_fltFtc))
   {
-    WARNING_LOG() << "Can not get Foreign data interface for FilterManagement";
+    WARNING_LOG(m_logger) << "Can not get Foreign data interface for FilterManagement";
     return false;
   }
 
@@ -111,14 +111,14 @@ void AesFilterDialog::onAesFilterUpdateReply(const Core::FunctionReplyObject &re
 
 void AesFilterDialog::onUnknownChangesRecognized()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_unknowChangesNotifiyTimer->start();
-  DEBUG_LOG() << Q_FUNC_INFO << " END";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void AesFilterDialog::onProcessUnknownChanges()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   m_widget->updateGuiToFilter();
 
@@ -126,7 +126,7 @@ void AesFilterDialog::onProcessUnknownChanges()
   
   __unchange__();
 
-  DEBUG_LOG() << Q_FUNC_INFO << " END";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void AesFilterDialog::onLoadButtonClicked()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_filter_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_filter_dialog.h
index f2ea59ce8..eaa1397e8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_filter_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_filter_dialog.h
@@ -31,6 +31,8 @@ public:
   void retranslate() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   bool apply() override;
   void dialogCanceled() override;
 
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 3dca85c78..136b2827b 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
@@ -316,7 +316,7 @@ void AesFilterWidget::setFilter()
   for (const auto &p : m_checkBoxes)
   {
     const AesDisplayFilter::EffectStateStruct ess(m_filter->effectStateFilter(p.first));
-    DEBUG_LOG() << "Set Filter for  " << p.first << ": "
+    DEBUG_LOG(m_logger) << "Set Filter for  " << p.first << ": "
                         << ess.displayCreated << ", "
                         << ess.displayPrepared << ", "
                         << ess.displayActivated;
@@ -523,7 +523,7 @@ void AesFilterWidget::onSldMineAreaChanged()
 void AesFilterWidget::onSldAreaFireChanged()
 {
   onUpdateSliderTextAreaFire();
-  DEBUG_LOG()<<">> slider area fire changed";
+  DEBUG_LOG(m_logger)<<">> slider area fire changed";
   if(!m_filter)
     return;
   const AreaEffectSimulation::AesType t(AreaEffectSimulation::AesType::AtExplosionArea);
@@ -688,10 +688,10 @@ void AesFilterWidget::onChbTriggeredCDMineAreaClicked()
 void AesFilterWidget::onAesDisplayFilterChanged(AreaEffectSimulation::AesType aesType)
 {
   Q_UNUSED(aesType);
-  DEBUG_LOG() << Q_FUNC_INFO << " START, m_doUpdateViaCallback=" << m_doUpdateViaCallback;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, m_doUpdateViaCallback=" << m_doUpdateViaCallback;
   if (m_doUpdateViaCallback)
     emit unknownChangesRecognized();
-  DEBUG_LOG() << Q_FUNC_INFO << " END, m_doUpdateViaCallback=" << m_doUpdateViaCallback;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END, m_doUpdateViaCallback=" << m_doUpdateViaCallback;
 }
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_filter_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_filter_widget.h
index 239024d39..803bc5a58 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_filter_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/flt_aes_filter_widget.h
@@ -44,6 +44,8 @@ signals:
   void unknownChangesRecognized();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void setFilter();
 
 private slots:
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 d73034723..c13f2e29c 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
@@ -22,20 +22,20 @@ BuildingComponentFilterDialog::BuildingComponentFilterDialog(QWidget *parent)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_session(nullptr)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   connect(m_widget, &BuildingComponentSettingsWidget::changesMade, this, &BuildingComponentFilterDialog::slotChangesMade);
   QGridLayout *gl = new QGridLayout(this);
   gl->setMargin(0);
   gl->addWidget(m_widget, 0, 0);
 
   setOnlineHelpFilename(QStringLiteral("Situation-Situation_Filter"));
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 BuildingComponentFilterDialog::~BuildingComponentFilterDialog()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool BuildingComponentFilterDialog::init(LtsSession::LtsSession *session)
@@ -43,12 +43,12 @@ bool BuildingComponentFilterDialog::init(LtsSession::LtsSession *session)
   m_session = session;
   if (!session->getForeignGuiInterface(m_fltIfc))
   {
-    WARNING_LOG() << "Can not get Foreign data interface for FilterManagement";
+    WARNING_LOG(m_logger) << "Can not get Foreign data interface for FilterManagement";
     return false;
   }
   if (!session->getFtc<FilterManagement::DataInterface>(m_fltFtc))
   {
-    WARNING_LOG() << "Can not get Foreign data interface for FilterManagement";
+    WARNING_LOG(m_logger) << "Can not get Foreign data interface for FilterManagement";
     return false;
   }
 
@@ -58,7 +58,7 @@ bool BuildingComponentFilterDialog::init(LtsSession::LtsSession *session)
   std::shared_ptr<InfrastructureManagement::Interface::Dtc> m_ismDtc;
   if (!session->getDtc<InfrastructureManagement::DataInterface>(m_ismDtc))
   {
-    WARNING_LOG() << "Can not get Foreign data interface for FilterManagement";
+    WARNING_LOG(m_logger) << "Can not get Foreign data interface for FilterManagement";
     return false;
   }
 
@@ -110,7 +110,7 @@ void BuildingComponentFilterDialog::onBuildingComponentFilterUpdateReply(const C
 
 void BuildingComponentFilterDialog::onUnknownChangesRecognized()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   m_widget->updateGuiToFilter();
 
@@ -118,7 +118,7 @@ void BuildingComponentFilterDialog::onUnknownChangesRecognized()
   
   __unchange__();
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void BuildingComponentFilterDialog::onLoadButtonClicked()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_filter_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_filter_dialog.h
index 58e24580b..38e4cf594 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_filter_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_filter_dialog.h
@@ -31,6 +31,8 @@ public:
   void retranslate() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   bool apply() override;
   void dialogCanceled() override;
   void onBuildingComponentFilterUpdateReply(const Core::FunctionReplyObject &replyObject) override;
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 8a6338aea..68647f41a 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
@@ -46,7 +46,7 @@ BuildingComponentSettingsWidget::BuildingComponentSettingsWidget(QWidget *parent
   , m_ui(new Ui::BuildingComponentSettingsWidget)
   , m_doUpdateViaCallback(true)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_ui->setupUi(this);
 
   
@@ -75,7 +75,7 @@ BuildingComponentSettingsWidget::BuildingComponentSettingsWidget(QWidget *parent
     
     connect(cb , &QCheckBox::clicked, this, &BuildingComponentSettingsWidget::readUpdateFilterFromUi);
 
-    TRACE_LOG() << Q_FUNC_INFO << " STARTXXXX";
+    TRACE_LOG(m_logger) << Q_FUNC_INFO << " STARTXXXX";
 
     
     cb->setContextMenuPolicy(Qt::CustomContextMenu);
@@ -95,17 +95,17 @@ BuildingComponentSettingsWidget::BuildingComponentSettingsWidget(QWidget *parent
     }
   }
 
-  TRACE_LOG() << Q_FUNC_INFO << " END, m_checkBoxesComponents.size = " << m_checkBoxesComponents.size()
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, m_checkBoxesComponents.size = " << m_checkBoxesComponents.size()
                       << ", labelComponents.size()=" << labelComponents.size();
 }
 
 BuildingComponentSettingsWidget::~BuildingComponentSettingsWidget()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (m_buildingComponentSettings)
     m_buildingComponentSettings->removeChangedCallback(this);
   delete m_ui;
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool BuildingComponentSettingsWidget::init(const std::shared_ptr<BuildingComponentSettings> &filter,
@@ -113,7 +113,7 @@ bool BuildingComponentSettingsWidget::init(const std::shared_ptr<BuildingCompone
 {
   if (!ismDtc)
   {
-    WARNING_LOG() << "Can not get Foreign data interface for InfrastructureManagement";
+    WARNING_LOG(m_logger) << "Can not get Foreign data interface for InfrastructureManagement";
     return false;
   }
 
@@ -155,9 +155,9 @@ bool BuildingComponentSettingsWidget::init(const std::shared_ptr<BuildingCompone
 
   setBuildingComponentSettings();
 
-  TRACE_LOG() << Q_FUNC_INFO << " isChangedCallbackRegistered 1 =" << m_buildingComponentSettings->isChangedCallbackRegistered(this);
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " isChangedCallbackRegistered 1 =" << m_buildingComponentSettings->isChangedCallbackRegistered(this);
   m_buildingComponentSettings->addChangedCallback(this); 
-  TRACE_LOG() << Q_FUNC_INFO << " isChangedCallbackRegistered 2 =" << m_buildingComponentSettings->isChangedCallbackRegistered(this);
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " isChangedCallbackRegistered 2 =" << m_buildingComponentSettings->isChangedCallbackRegistered(this);
 
   return true;
 }
@@ -245,13 +245,13 @@ void BuildingComponentSettingsWidget::onBuildingComponentSettingsChanged()
 {
   
 
-  DEBUG_LOG() << Q_FUNC_INFO << " START, m_doUpdateViaCallback=" << m_doUpdateViaCallback;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, m_doUpdateViaCallback=" << m_doUpdateViaCallback;
   if (m_doUpdateViaCallback)
   {
     updateGuiToFilter();
     emit unknownChangesRecognized();
   }
-  DEBUG_LOG() << Q_FUNC_INFO << " END, m_doUpdateViaCallback=" << m_doUpdateViaCallback;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END, m_doUpdateViaCallback=" << m_doUpdateViaCallback;
 }
 
 void BuildingComponentSettingsWidget::updateGuiToFilter()
@@ -261,7 +261,7 @@ void BuildingComponentSettingsWidget::updateGuiToFilter()
 
 void BuildingComponentSettingsWidget::readUpdateFilterFromUi()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (!m_buildingComponentSettings || m_bIgnoreUiSignals)
     return;
 
@@ -307,7 +307,7 @@ void BuildingComponentSettingsWidget::onFloorUnselectAll()
 
 void BuildingComponentSettingsWidget::onFloorSelection(bool onOff)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START, m_checkBoxesFloors.size()=" << m_checkBoxesFloors.size();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, m_checkBoxesFloors.size()=" << m_checkBoxesFloors.size();
 
   for (QCheckBox *cb : std::as_const(m_checkBoxesFloors))
   {
@@ -331,7 +331,7 @@ void BuildingComponentSettingsWidget::onComponentUnselectAll()
 
 void BuildingComponentSettingsWidget::onComponentSelection(bool onOff)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START, m_checkBoxesComponents.size()=" << m_checkBoxesComponents.size();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, m_checkBoxesComponents.size()=" << m_checkBoxesComponents.size();
 
   
   for (QCheckBox* cb : std::as_const(m_checkBoxesComponents))
@@ -399,7 +399,7 @@ void BuildingComponentSettingsWidget::onDataChanged(const std::shared_ptr<Buildi
 {
   m_buildingComponentSettings = newFilter;
   m_originalBldCmp            = newFilter->bldCmpSettings();
-  DEBUG_LOG() << "onDataChanged ... "  << QJsonDocument(newFilter->bldCmpSettingsToJson()).toJson();
+  DEBUG_LOG(m_logger) << "onDataChanged ... "  << QJsonDocument(newFilter->bldCmpSettingsToJson()).toJson();
   setBuildingComponentSettings();
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_settings_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_settings_widget.h
index c36949ee7..3298b2536 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_settings_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_component_settings_widget.h
@@ -70,6 +70,8 @@ private slots:
   void onComponentSelection(bool onOff);
 
 private:
+
+NGL::INGLLogger &m_logger;
   bool setupFloorUi(const QVector<int> &floorIds);
   void setBuildingComponentSettings();
 
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 d19eb61d1..b7dfcd5b0 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
@@ -87,7 +87,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
 
 void InterfaceImpl::onBuildingComponentFilterChanged(const FilterManagement::BuildingComponentFilter &data, DataModification mod)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   auto it = m_buildingComponentFilterMap.find(FilterKey{data.operatorId(), data.ctx()});
   if (it != m_buildingComponentFilterMap.end())
@@ -108,13 +108,13 @@ void InterfaceImpl::onBuildingComponentFilterChanged(const FilterManagement::Bui
         m_buildingComponentFilterMap.erase(it);
     }
   }
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 
 std::shared_ptr<BuildingComponentSettings> InterfaceImpl::buildingComponentSettingsForOperator(int operatorId, const QString &context)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
                       << ", operatorId=" << operatorId
                       << ", context=" << context;
   std::shared_ptr<BuildingComponentSettingsImpl> ret;
@@ -159,7 +159,7 @@ std::shared_ptr<BuildingComponentSettings> InterfaceImpl::buildingComponentSetti
 
     m_buildingComponentFilterMap[FilterKey(operatorId, context.toStdString())] = ret;
   }
-  TRACE_LOG() << Q_FUNC_INFO << " END"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END"
                       << ", operatorId=" << operatorId
                       << ", context=" << context;
   return ret;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_components_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_components_gui_plugin.h
index 31b7e3380..416caf048 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_components_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/flt_building_components_gui_plugin.h
@@ -55,6 +55,8 @@ private slots:
 
 private:
   
+
+NGL::INGLLogger &m_logger;
   struct FilterKey
   {
     int operatorId = 0;
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 3fe557ab2..35fb323eb 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
@@ -68,30 +68,30 @@ bool FilterChangeDialog::init(LtsSession::LtsSession *session,
 
   if (!m_session)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no session";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no session";
     return false;
   }
 
   {
     int myOperatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
     int myScreenId = m_session->screenId();
-    DEBUG_LOG() << Q_FUNC_INFO << " my operatorId=" << myOperatorId << " my screenId=" << myScreenId;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " my operatorId=" << myOperatorId << " my screenId=" << myScreenId;
   }
 
 
   if (!m_session->getForeignGuiInterface(m_fltParticipantGuiIfc))
   {
-    WARNING_LOG() << "Can not get Foreign gui interface for FilterManagement/Participant";
+    WARNING_LOG(m_logger) << "Can not get Foreign gui interface for FilterManagement/Participant";
     return false;
   }
   if (!m_session->getForeignGuiInterface(m_fltAesIfc))
   {
-    WARNING_LOG() << "Can not get Foreign gui interface for FilterManagement/AES";
+    WARNING_LOG(m_logger) << "Can not get Foreign gui interface for FilterManagement/AES";
     return false;
   }
   if (!m_session->getForeignGuiInterface(m_fltBuildingComponentIfc))
   {
-    WARNING_LOG() << "Can not get Foreign gui interface for FilterManagement/BuildingComponent";
+    WARNING_LOG(m_logger) << "Can not get Foreign gui interface for FilterManagement/BuildingComponent";
     
   }
 
@@ -99,19 +99,19 @@ bool FilterChangeDialog::init(LtsSession::LtsSession *session,
 
   if (!m_session->getForeignGuiInterface<OperatorManagement::ForeignGuiComboboxInterface>(m_opmCbxDtc))
   {
-    DEBUG_LOG() << "getForeignGuiInterface for OperatorManagement failed.";
+    DEBUG_LOG(m_logger) << "getForeignGuiInterface for OperatorManagement failed.";
     return false;
   }
 
   if (!m_session->getFtc<FilterManagement::DataInterface>(m_fltFtc))
   {
-    DEBUG_LOG() << "getFtc for FilterManagement failed.";
+    DEBUG_LOG(m_logger) << "getFtc for FilterManagement failed.";
     return false;
   }
 
   if (!m_session->getDtc<FilterManagement::DataInterface>(m_fltDtc))
   {
-    DEBUG_LOG() << "getDtc for FilterManagement failed.";
+    DEBUG_LOG(m_logger) << "getDtc for FilterManagement failed.";
     return false;
   }
 
@@ -173,7 +173,7 @@ bool FilterChangeDialog::init(LtsSession::LtsSession *session,
                                                   currentAppId,
                                                   m_session->exerciseId(),
                                                   LtsSessionData::LtsSessionData::getInstance()->getOperatorId()))
-    ERROR_LOG() << Q_FUNC_INFO << " fillActiveAppOperatorComboBox failed";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " fillActiveAppOperatorComboBox failed";
 
   return true;
 }
@@ -181,7 +181,7 @@ bool FilterChangeDialog::init(LtsSession::LtsSession *session,
 void FilterChangeDialog::onOperatorChanged()
 {
   const int operatorId = m_ui->cbxOperator->currentData().toInt();
-  DEBUG_LOG() << Q_FUNC_INFO << " START, change to operatorId=" << operatorId
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, change to operatorId=" << operatorId
                       << ", m_session->exerciseId()=" << m_session->exerciseId();
   if (!m_opmCbxDtc)
     return;
@@ -214,7 +214,7 @@ void FilterChangeDialog::onOperatorChanged()
     FilterManagement::TriggerFilterData req;
     req.operatorId(operatorId);
     req.requestTime(m_session->partitionTime());
-    INFO_LOG() << Q_FUNC_INFO << "TriggerFilterData: " << req;
+    INFO_LOG(m_logger) << Q_FUNC_INFO << "TriggerFilterData: " << req;
     return m_fltFtc->triggerFilterDataUpdateRequest(req, this);
   };
   m_requestHelper->startSingleRequest(cb);
@@ -222,7 +222,7 @@ void FilterChangeDialog::onOperatorChanged()
   
   
 
-  DEBUG_LOG() << Q_FUNC_INFO << " END, change to operatorId=" << operatorId;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END, change to operatorId=" << operatorId;
 }
 
 
@@ -231,7 +231,7 @@ void FilterChangeDialog::onScreenChanged()
   m_ui->cbxScreenContainer->clear();
 
   const int screenId = m_ui->cbxScreen->currentData().toInt();
-  DEBUG_LOG() << Q_FUNC_INFO << " START, change to ScreenId=" << screenId;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, change to ScreenId=" << screenId;
 
   if (!m_opmCbxDtc)
     return;
@@ -289,23 +289,23 @@ void FilterChangeDialog::onScreenChanged()
 
   enableDisable();
 
-  DEBUG_LOG() << Q_FUNC_INFO << " END, change to ScreenId=" << screenId;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END, change to ScreenId=" << screenId;
 }
 
 
 void FilterChangeDialog::onScreenContainerChanged()
 {
   const int screenContainerId = m_ui->cbxScreen->currentData().toInt();
-  DEBUG_LOG() << Q_FUNC_INFO << " START, change to ScreenContainerId=" << screenContainerId;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, change to ScreenContainerId=" << screenContainerId;
   if (!m_opmCbxDtc)
     return;
   enableDisable();
-  DEBUG_LOG() << Q_FUNC_INFO << " END, change to ScreenContainerId=" << screenContainerId;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END, change to ScreenContainerId=" << screenContainerId;
 }
 
 void FilterChangeDialog::onFilterDataChanged(const FilterData &data, DataModification modType)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START, we got FilterData " << data
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, we got FilterData " << data
                       << ", modType " << modType;
 
   if ((modType != DataModification::eAdded) && (modType != DataModification::eModified))
@@ -320,7 +320,7 @@ void FilterChangeDialog::onFilterDataChanged(const FilterData &data, DataModific
   if (data.operatorId() != requestedOperatorId)
     return;
 
-  DEBUG_LOG() << Q_FUNC_INFO << " START, we got new FilterData for 'our' operator: " << data;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, we got new FilterData for 'our' operator: " << data;
 
   
 
@@ -329,7 +329,7 @@ void FilterChangeDialog::onFilterDataChanged(const FilterData &data, DataModific
 
   const int screenId = data.screenId();
   const int screenContainerId = data.screenContainerId();
-  DEBUG_LOG() << Q_FUNC_INFO
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO
                       << " insert " << " QPair<> "
                       << "(screenId, "  << screenId
                       << "(screenContainerId, "  << screenContainerId << ")"
@@ -338,7 +338,7 @@ void FilterChangeDialog::onFilterDataChanged(const FilterData &data, DataModific
 
   enableDisable();
 
-  DEBUG_LOG() << Q_FUNC_INFO << " END";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool FilterChangeDialog::apply()
@@ -348,7 +348,7 @@ bool FilterChangeDialog::apply()
 
   if (!m_filterDataPerScreen.contains(QPair<int,int>(screenId, screenContainerId)))
   {
-    ERROR_LOG() << Q_FUNC_INFO << " not found: "
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " not found: "
                         << " screenId="  << screenId
                         << ", screenContainerId="  << screenContainerId
                         << "; available screenId count = " << m_filterDataPerScreen.count();
@@ -366,7 +366,7 @@ bool FilterChangeDialog::apply()
   {
     if (fData.symbolAppearanceContent().size() <= 0)
     {
-      ERROR_LOG() << Q_FUNC_INFO << " FilterData (SymbolAppearance) is empty";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " FilterData (SymbolAppearance) is empty";
       return false;
     }
 
@@ -388,7 +388,7 @@ bool FilterChangeDialog::apply()
       s = impl.settings();                           
     }
 
-    DEBUG_LOG() << " set SymbolAppearance..."
+    DEBUG_LOG(m_logger) << " set SymbolAppearance..."
                         << " m_ui->cbSymbolappear->isChecked()=" << m_ui->cbSymbolappear->isChecked()
                         << " m_ui->cbTypeFilter->isChecked()=" << m_ui->cbTypeFilter->isChecked()
                         << " m_ui->cbCollapseExpand->isChecked()=" << m_ui->cbCollapseExpand->isChecked();
@@ -402,7 +402,7 @@ bool FilterChangeDialog::apply()
     auto cb = [this]() -> bool
     {
       const SymbolAppearance &symbolAppearance = m_symbolAppearanceSettings->settingsToData();
-      INFO_LOG() << "symbolAppearance content " << symbolAppearance.setContent();
+      INFO_LOG(m_logger) << "symbolAppearance content " << symbolAppearance.setContent();
       return m_fltFtc->symbolAppearanceUpdateRequest(symbolAppearance, this);
     };
     m_requestHelper->addRequest(cb);
@@ -415,7 +415,7 @@ bool FilterChangeDialog::apply()
   {
     if (fData.aesFilterContent().size() <= 0)
     {
-      ERROR_LOG() << Q_FUNC_INFO << " FilterData (AesFilter) is empty";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " FilterData (AesFilter) is empty";
       return false;
     }
 
@@ -431,7 +431,7 @@ bool FilterChangeDialog::apply()
     auto cb = [this]() -> bool
     {
       const AesFilter &aesFilter = m_aesDisplayFilter->filterToData();
-      INFO_LOG() << "AesFilter content " << aesFilter.setContent();
+      INFO_LOG(m_logger) << "AesFilter content " << aesFilter.setContent();
       return m_fltFtc->aesFilterUpdateRequest(aesFilter, this);
     };
     m_requestHelper->addRequest(cb);
@@ -444,7 +444,7 @@ bool FilterChangeDialog::apply()
   {
     if (fData.buildingComponentsFilterContent().size() <= 0)
     {
-      ERROR_LOG() << Q_FUNC_INFO << " FilterData (BuildingComponentFilter) is empty";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " FilterData (BuildingComponentFilter) is empty";
       return false;
     }
 
@@ -460,7 +460,7 @@ bool FilterChangeDialog::apply()
     auto cb = [this]() -> bool
     {
       const BuildingComponentFilter &filterData = m_buildingComponentSettings->bldCmpSettingsToData();
-      INFO_LOG() << "BuildingComponentFilter content " << filterData.setContent();
+      INFO_LOG(m_logger) << "BuildingComponentFilter content " << filterData.setContent();
       return m_fltFtc->buildingComponentFilterUpdateRequest(filterData, this);
     };
     m_requestHelper->addRequest(cb);
@@ -474,14 +474,14 @@ bool FilterChangeDialog::apply()
   {
     if (fData.operatorMapSettingsContent().size() <= 0)
     {
-      ERROR_LOG() << Q_FUNC_INFO << " FilterData (OperatorMapSettings) is empty";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " FilterData (OperatorMapSettings) is empty";
       return false;
     }
 
     std::shared_ptr<SituationMap::ForeignGuiInterface> sitMapIfc;
     if (!m_session->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(sitMapIfc))
     {
-      ERROR_LOG() << Q_FUNC_INFO << " no SituationMap::ForeignGuiInterface";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " no SituationMap::ForeignGuiInterface";
       return false;
     }
     sitMapIfc->setOperatorMapSettingsJson(QByteArray::fromRawData(fData.operatorMapSettingsContent().c_str(), fData.operatorMapSettingsContent().size()));
@@ -521,7 +521,7 @@ void FilterChangeDialog::enableDisable()
   {
     int myOperatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
     int myScreenId = m_session->screenId();
-    DEBUG_LOG() << Q_FUNC_INFO << " my operatorId=" << myOperatorId << " my screenId=" << myScreenId;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " my operatorId=" << myOperatorId << " my screenId=" << myScreenId;
   }
 
 
@@ -541,7 +541,7 @@ void FilterChangeDialog::enableDisable()
 
   dump();
 
-  DEBUG_LOG() << Q_FUNC_INFO << " cbxScreenId=" << cbxScreenId
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " cbxScreenId=" << cbxScreenId
                       << " cbxScreenContainerId=" << cbxScreenContainerId
                       << ", availableScreenId count=" << m_filterDataPerScreen.count()
                       << ", DialogButton::Ok: enabled=" << m_ui->buttonBox->getButton(LtsWidgets::DialogButton::Ok)->isEnabled();
@@ -549,11 +549,11 @@ void FilterChangeDialog::enableDisable()
 
 void FilterChangeDialog::dump()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " -------------------------";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " -------------------------";
   {
     int myOperatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
     int myScreenId = m_session->screenId();
-    DEBUG_LOG()<< ", myOperatorId=" << myOperatorId << ", myScreenId=" << myScreenId;
+    DEBUG_LOG(m_logger)<< ", myOperatorId=" << myOperatorId << ", myScreenId=" << myScreenId;
   }
 
 
@@ -561,7 +561,7 @@ void FilterChangeDialog::dump()
     const int cbxOperatorId             = m_ui->cbxOperator->currentData().toInt();
     const int cbxScreenId               = m_ui->cbxScreen->currentData().toInt();
     const int cbxScreenContainerId      = m_ui->cbxScreenContainer->currentData().toInt();
-    DEBUG_LOG()<< ", cbxOperatorId=" << cbxOperatorId << ", cbxScreenId=" << cbxScreenId << ", cbxScreenContainerId=" << cbxScreenContainerId;
+    DEBUG_LOG(m_logger)<< ", cbxOperatorId=" << cbxOperatorId << ", cbxScreenId=" << cbxScreenId << ", cbxScreenContainerId=" << cbxScreenContainerId;
   }
 
   QMapIterator<QPair<int , int >, FilterData> it(m_filterDataPerScreen);
@@ -569,9 +569,9 @@ void FilterChangeDialog::dump()
   {
     it.next();
     QPair<int,int> key = it.key();
-    DEBUG_LOG() << " ScreenId=" << key.first << ", ScreenContainerId=" << key.second;
+    DEBUG_LOG(m_logger) << " ScreenId=" << key.first << ", ScreenContainerId=" << key.second;
   }
-  DEBUG_LOG() << Q_FUNC_INFO << " -------------------------";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " -------------------------";
 }
 
 
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 78622cfd3..03f17e2ae 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
@@ -58,6 +58,8 @@ public:
   }
 
 private:
+
+NGL::INGLLogger &m_logger;
   bool apply();
   void onSymbolAppearanceUpdateReply(const Core::FunctionReplyObject &replyObject) override;
   void onAesFilterUpdateReply(const Core::FunctionReplyObject &replyObject) override;
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 37a371374..762686d21 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
@@ -117,7 +117,7 @@ void CollapseExpandParticipantDialog::onLoadButtonClicked()
 
 void CollapseExpandParticipantDialog::onDataChanged(const SymbolAppearance &data, DataModification modType)
 {
-  DEBUG_LOG() << "onDataChanged ... "  << data;
+  DEBUG_LOG(m_logger) << "onDataChanged ... "  << data;
   if (modType != DataModification::eRemoved &&
       data.operatorId() == LtsSessionData::LtsSessionData::getInstance()->getOperatorId())
   {
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 31562e916..7f3f06771 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
@@ -37,6 +37,7 @@ public:
   void retranslate() override;
   bool init(LtsSession::LtsSession *session);
 protected:
+NGL::INGLLogger &m_logger;
   bool apply() override;
   void dialogCanceled() override;
 private slots:
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 e21fad93d..bd87634c0 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
@@ -117,11 +117,11 @@ void CollapseExpandParticipantWidget::apply()
     sl.reserve(m_currentSymbolAppearance.colExpand.hiddenParticipantIds.size());
     for (int i : std::as_const(m_currentSymbolAppearance.colExpand.hiddenParticipantIds))
       sl += QString::number(i);
-    DEBUG_LOG() << "Hidden participant ids: " << sl.join(QLatin1Char(' '));
+    DEBUG_LOG(m_logger) << "Hidden participant ids: " << sl.join(QLatin1Char(' '));
     sl.clear();
     for (int i : std::as_const(m_currentSymbolAppearance.colExpand.collapsedParticipantIds))
       sl += QString::number(i);
-    DEBUG_LOG() << "Collapsed participant ids: " << sl.join(QLatin1Char(' '));
+    DEBUG_LOG(m_logger) << "Collapsed participant ids: " << sl.join(QLatin1Char(' '));
   }
 
   m_symbolAppearanceSettings->setSettings(m_currentSymbolAppearance, SymbolAppearanceSettings::Part::CollapseExpand);
@@ -250,7 +250,7 @@ void CollapseExpandParticipantWidget::onDataChanged(const std::shared_ptr<Symbol
 {
   m_originalSymbolAppearance = newFilter->settings();
   m_symbolAppearanceSettings = newFilter;
-  DEBUG_LOG() << "onDataChanged ... "  << QJsonDocument(newFilter->settingsToJson()).toJson();
+  DEBUG_LOG(m_logger) << "onDataChanged ... "  << QJsonDocument(newFilter->settingsToJson()).toJson();
   collapseExpand(m_ui->tvParticipants->rootIndex());
   m_model->setCheckStateForParticipants(m_originalSymbolAppearance.colExpand.hiddenParticipantIds, Qt::Unchecked);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_widget.h
index 5a283ff68..43bed7048 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_collapse_expand_participants_widget.h
@@ -61,6 +61,8 @@ private slots:
   void showContextMenu(const QPoint &position);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void collapseExpand(const QModelIndex &idx);
   QSet<int> collapsedParticipants(const QModelIndex &idx) const;
 private:
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 52f4563ac..26e41f961 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
@@ -122,7 +122,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
 
 void InterfaceImpl::onSymbolAppearanceChanged(const FilterManagement::SymbolAppearance &data, DataModification mod)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   auto it = m_symbolAppearanceMap.find(FilterKey{data.operatorId(), data.ctx()});
   if (it != m_symbolAppearanceMap.end())
@@ -143,13 +143,13 @@ void InterfaceImpl::onSymbolAppearanceChanged(const FilterManagement::SymbolAppe
         m_symbolAppearanceMap.erase(it);
     }
   }
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 
 std::shared_ptr<SymbolAppearanceSettings> InterfaceImpl::symbolAppearanceForOperator(int operatorId, const QString &context)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
                       << ", operatorId=" << operatorId
                       << ", context=" << context
                       << ", m_session->toString " << m_session->toString();
@@ -198,7 +198,7 @@ std::shared_ptr<SymbolAppearanceSettings> InterfaceImpl::symbolAppearanceForOper
 
     m_symbolAppearanceMap[FilterKey(operatorId, context.toStdString())] = ret;
   }
-  TRACE_LOG() << Q_FUNC_INFO << " END"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END"
                       << ", operatorId=" << operatorId
                       << ", context=" << context;
   return ret;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_participant_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_participant_gui_plugin.h
index 27a2c9bc0..c3590fa1a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_participant_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_participant_gui_plugin.h
@@ -53,6 +53,8 @@ private slots:
 
 private:
   
+
+NGL::INGLLogger &m_logger;
   struct FilterKey
   {
     int operatorId = 0;
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 860a8a59a..a3f876a86 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
@@ -37,14 +37,14 @@ SymbolAppearanceDialog::~SymbolAppearanceDialog()
 
 bool SymbolAppearanceDialog::init(LtsSession::LtsSession *session)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " m_session = " << session->toString();
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " m_session = " << session->toString();
   m_session = session;
 
   if (!session->getForeignGuiInterface(m_fltParticipantGuiIfc) ||
       !session->getDtc<FilterManagement::DataInterface>(m_fltDtc) ||
       !session->getFtc<FilterManagement::DataInterface>(m_fltFtc))
   {
-    WARNING_LOG() << "Can not use Filter Management";
+    WARNING_LOG(m_logger) << "Can not use Filter Management";
     return false;
   }
 
@@ -66,7 +66,7 @@ bool SymbolAppearanceDialog::init(LtsSession::LtsSession *session)
   std::shared_ptr<ParticipantManagement::Interface::Dtc> ppmDtc;
   if (!session->getDtc<ParticipantManagement::DataInterface>(ppmDtc))
   {
-    WARNING_LOG() << "Can not get data interface for ParticipantManagement";
+    WARNING_LOG(m_logger) << "Can not get data interface for ParticipantManagement";
     return false;
   }
   QMap<qint32, ParticipantManagement::Party> parties;
@@ -167,18 +167,18 @@ void SymbolAppearanceDialog::onExportButtonClicked()
   saveObject[QStringLiteral("content")] = s->settingsToJson();
 
   const QJsonDocument saveDoc(saveObject);
-  DEBUG_LOG() << "Saving: " << saveDoc.toJson();
+  DEBUG_LOG(m_logger) << "Saving: " << saveDoc.toJson();
 
   int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), saveDoc.toJson(QJsonDocument::Compact));
   if (fileId > 0)
-    DEBUG_LOG() << "Saved file with id = " << fileId;
+    DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
   else
-    ERROR_LOG() << "Could not save file in library ";
+    ERROR_LOG(m_logger) << "Could not save file in library ";
 }
 
 void SymbolAppearanceDialog::onImportButtonClicked()
 {
-  DEBUG_LOG() << " onImportButtonClicked() ";
+  DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
 
   QByteArray content;
   int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::FLTSymbolAppearance));
@@ -197,7 +197,7 @@ void SymbolAppearanceDialog::onImportButtonClicked()
     else
     {
       const QJsonDocument loadDoc(QJsonDocument::fromJson(content));
-      DEBUG_LOG() << "Loading: " << loadDoc.toJson();
+      DEBUG_LOG(m_logger) << "Loading: " << loadDoc.toJson();
       m_widget->filter()->setSettings(loadDoc.object().value(QStringLiteral("content")).toObject(),
                                       FilterManagement::SymbolAppearanceSettings::Part::Symbol);
       const SymbolAppearance symbolAppearance = m_widget->filter()->settingsToData();
@@ -214,7 +214,7 @@ void SymbolAppearanceDialog::onImportButtonClicked()
 
 void SymbolAppearanceDialog::onUnknownChangesRecognized()
 {
-  DEBUG_LOG() << " onUnknownChangesRecognized() ";
+  DEBUG_LOG(m_logger) << " onUnknownChangesRecognized() ";
 
   m_widget->updateGuiToFilter();
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_dialog.h
index 704cad23b..06b6986d9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_dialog.h
@@ -37,6 +37,8 @@ public:
   void retranslate() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   bool apply() override;
   void dialogCanceled() override;
   void onSymbolAppearanceUpdateReply(const Core::FunctionReplyObject &replyObject) override;
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 de66bc9a6..a8a53f225 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
@@ -367,13 +367,13 @@ void SymbolAppearanceWidget::onSymbolAppearanceSettingsChanged(SymbolAppearanceS
 {
   Q_UNUSED(part);
 
-  DEBUG_LOG() << Q_FUNC_INFO << " START, m_doUpdateViaCallback=" << m_doUpdateViaCallback;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, m_doUpdateViaCallback=" << m_doUpdateViaCallback;
   if (m_doUpdateViaCallback)
   {
     updateGuiToFilter();
     emit unknownChangesRecognized();
   }
-  DEBUG_LOG() << Q_FUNC_INFO << " END, m_doUpdateViaCallback=" << m_doUpdateViaCallback;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END, m_doUpdateViaCallback=" << m_doUpdateViaCallback;
 }
 
 void SymbolAppearanceWidget::updateGuiToFilter()
@@ -513,7 +513,7 @@ void SymbolAppearanceWidget::onDataChanged(const std::shared_ptr<SymbolAppearanc
 {
   m_originalSymbolAppearance = newFilter->settings();
   m_symbolAppearanceSettings = newFilter;
-  DEBUG_LOG() << "onDataChanged ... "  << QJsonDocument(newFilter->settingsToJson()).toJson();
+  DEBUG_LOG(m_logger) << "onDataChanged ... "  << QJsonDocument(newFilter->settingsToJson()).toJson();
   setSymbolAppearanceSettings();
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_widget.h
index 61925f33f..e606bbca8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_symbol_appearance_widget.h
@@ -68,6 +68,8 @@ private slots:
   void readUpdateFilterFromUi();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void setSymbolAppearanceSettings();
   void buildPartyTable(const QMap<int, ParticipantManagement::Party> &parties);
   static void fillCbSymbolVisibility(QComboBox *cbx, int defaultValue = 0);
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 456fa1946..ea894c723 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
@@ -55,13 +55,13 @@ bool TypeFilterDialog::init(LtsSession::LtsSession *session)
       !session->getDtc<FilterManagement::DataInterface>(m_fltDtc) ||
       !session->getFtc<FilterManagement::DataInterface>(m_fltFtc))
   {
-    WARNING_LOG() << "Can not use Filter Management";
+    WARNING_LOG(m_logger) << "Can not use Filter Management";
     return false;
   }
 
   if (!session->getDtc<ParticipantManagement::DataInterface>(ppmDtc))
   {
-    WARNING_LOG() << "Can not get data interface for Participant Management";
+    WARNING_LOG(m_logger) << "Can not get data interface for Participant Management";
     return false;
   }
 
@@ -167,18 +167,18 @@ void TypeFilterDialog::onExportButtonClicked()
   saveObject[QStringLiteral("content")] = s->settingsToJson();
 
   const QJsonDocument saveDoc(saveObject);
-  DEBUG_LOG() << "Saving: " << saveDoc.toJson();
+  DEBUG_LOG(m_logger) << "Saving: " << saveDoc.toJson();
 
   int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), saveDoc.toJson(QJsonDocument::Compact));
   if (fileId > 0)
-    DEBUG_LOG() << "Saved file with id = " << fileId;
+    DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
   else
-    ERROR_LOG() << "Could not save file in library ";
+    ERROR_LOG(m_logger) << "Could not save file in library ";
 }
 
 void TypeFilterDialog::onImportButtonClicked()
 {
-  DEBUG_LOG() << " onImportButtonClicked() ";
+  DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
 
   QByteArray content;
   int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::FLTTypeFilter));
@@ -197,7 +197,7 @@ void TypeFilterDialog::onImportButtonClicked()
     else
     {
       const QJsonDocument loadDoc(QJsonDocument::fromJson(content));
-      DEBUG_LOG() << "Loading: " << loadDoc.toJson();
+      DEBUG_LOG(m_logger) << "Loading: " << loadDoc.toJson();
       m_widget->filter()->setSettings(loadDoc.object().value(QStringLiteral("content")).toObject(),
                                       FilterManagement::SymbolAppearanceSettings::Part::Types);
       const SymbolAppearance symbolAppearance = m_widget->filter()->settingsToData();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_dialog.h
index 0ff806678..3e99e17f7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_dialog.h
@@ -31,6 +31,8 @@ public:
   void retranslate() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   bool apply() override;
   void dialogCanceled() override;
   void onSymbolAppearanceUpdateReply(const Core::FunctionReplyObject &replyObject) override;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_widget.h
index 58fc6c2ca..3cc749989 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_widget.h
@@ -46,6 +46,8 @@ Q_SIGNALS:
   void typeFilterChanged();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void initTypeClassElements(bool ocMode);
   void initStateElements();
   void setSymbolAppearanceSettings();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/InfoDialog/gim_info_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/InfoDialog/gim_info_dialog.h
index d83e72bd8..90d4d5b72 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/InfoDialog/gim_info_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/InfoDialog/gim_info_dialog.h
@@ -44,6 +44,8 @@ public:
             const std::shared_ptr<AdvancedSymbology::ForeignDataInterface> &asbIfc);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void showIedInfos();
   void setPosition(const IedPosition &pos);
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 33b05033c..0a70792e2 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
@@ -47,21 +47,21 @@ bool PairingEditDialog::init(LtsSession::LtsSessionDataDds *session)
   m_sessionData->getDtc<GuezIedManagement::DataInterface>(m_dtc);
   if (!m_dtc || !m_dtc->enableIed())
   {
-    ERROR_LOG() << "could not enable Ied DDS-objects in GuezIedManagement DTC ";
+    ERROR_LOG(m_logger) << "could not enable Ied DDS-objects in GuezIedManagement DTC ";
     return false;
   }
 
   m_sessionData->getFtc<GuezIedManagement::DataInterface>(m_ftc);
   if (!m_ftc || !m_ftc->enablePairIed())
   {
-    ERROR_LOG() << "could not enable pair Ied DDS-Function in GuezIedManagement FTC ";
+    ERROR_LOG(m_logger) << "could not enable pair Ied DDS-Function in GuezIedManagement FTC ";
     return false;
   }
 
   m_sessionData->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc);
   if (!m_ppmDtc || !m_ppmDtc->enableParticipant())
   {
-    ERROR_LOG() << "could not enable Participant DDS-objects in ParticipantManagement DTC ";
+    ERROR_LOG(m_logger) << "could not enable Participant DDS-objects in ParticipantManagement DTC ";
     return false;
   }
 
@@ -131,7 +131,7 @@ void PairingEditDialog::onIedChanged(const Ied &data, DataModification modType)
 
 void PairingEditDialog::onParticipantSelected(const QModelIndex &idx)
 {
-  DEBUG_LOG() << "Index of Item: " << idx.row() << " " << idx.column();
+  DEBUG_LOG(m_logger) << "Index of Item: " << idx.row() << " " << idx.column();
   if (checkSelectedParticipantType())
   {
     Ied ied = m_dtc->ied(m_ui->cbxIed->currentData().toInt());
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 e68dc8192..832bf31fb 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
@@ -51,6 +51,8 @@ private slots:
   void onPrint();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   bool apply() override final;
 
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 d4f4bc0f4..354f6cd80 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
@@ -94,7 +94,7 @@ void AssignGuezNasatPartDialog::retranslate()
 
 bool AssignGuezNasatPartDialog::apply()
 {
-  INFO_LOG() << "AssignGuezNasatPartDialog::apply()";
+  INFO_LOG(m_logger) << "AssignGuezNasatPartDialog::apply()";
   int32_t participantId = m_ui->cmbParticipants->currentData().toInt();
   int32_t nasatAircraftId = m_ui->cmbNasats->currentData().toInt();
 
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 07fa2edfd..d68eb9988 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
@@ -45,7 +45,7 @@ bool GuezNasatPartDialog::init(const std::shared_ptr<GuezNasat::Interface::Ftc>
   m_exmDtc = exmDtc;
   m_ppmDtc = ppmDtc;
 
-  INFO_LOG() << "GuezNasatPartDialog::init";
+  INFO_LOG(m_logger) << "GuezNasatPartDialog::init";
   m_nasatAircraftParticipantModel = new GuezNasat::NasatAircraftParticipantModel(this);
   m_nasatAircraftParticipantModel->initModel(m_dtc, m_exmDtc, m_ppmDtc, ppmGuiCbxIfc, m_session);
   m_ui->widget->setModel(m_nasatAircraftParticipantModel);
@@ -89,11 +89,11 @@ void GuezNasatPartDialog::retranslate()
 
 void GuezNasatPartDialog::onNewAircraftPart()
 {
-  INFO_LOG() << "onNewAircraft";
+  INFO_LOG(m_logger) << "onNewAircraft";
   AssignGuezNasatPartDialog *assignGuezNasatPartDialog = new AssignGuezNasatPartDialog(m_session->exerciseId(), this);
   if (!assignGuezNasatPartDialog->init(m_ftc, m_nasatAircraftParticipantModel))
   {
-    ERROR_LOG() << QLatin1String("Can't initialize AssignGuezNasatPartDialog!");
+    ERROR_LOG(m_logger) << QLatin1String("Can't initialize AssignGuezNasatPartDialog!");
     delete assignGuezNasatPartDialog;
     return;
   }
@@ -107,11 +107,11 @@ void GuezNasatPartDialog::onEditAircraftPart()
   const QModelIndex curIdx = m_ui->widget->currentIndex();
   if (!curIdx.isValid())
     return;
-  INFO_LOG() << "onEditAircraft";
+  INFO_LOG(m_logger) << "onEditAircraft";
   AssignGuezNasatPartDialog *assignGuezNasatPartDialog = new AssignGuezNasatPartDialog(m_session->exerciseId(), this);
   if (!assignGuezNasatPartDialog->init(m_ftc, m_nasatAircraftParticipantModel, m_nasatAircraftParticipantModel->getRowData(curIdx.row())))
   {
-    ERROR_LOG() << QLatin1String("Can't initialize assignGuezNasatPartDialog!");
+    ERROR_LOG(m_logger) << QLatin1String("Can't initialize assignGuezNasatPartDialog!");
     delete assignGuezNasatPartDialog;
     return;
   }
@@ -130,7 +130,7 @@ void GuezNasatPartDialog::onRemoveAircraftPart()
   const QModelIndex curIdx = m_ui->widget->currentIndex();
   if (!curIdx.isValid())
     return;
-  INFO_LOG() << "onRemoveNewAircraft";
+  INFO_LOG(m_logger) << "onRemoveNewAircraft";
 
   NasatAircraftParticipant req;
   req.id(m_nasatAircraftParticipantModel->getRowData(curIdx.row()).id());
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 66cb2048f..f56ac27e9 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
@@ -42,7 +42,7 @@ bool NasatAircraftModel::initModel(const std::shared_ptr<GuezNasat::Interface::D
 
 QVariant NasatAircraftModel::data(const QModelIndex &index, int role) const
 {
-  INFO_LOG() << "NasatAircraftModel::data";
+  INFO_LOG(m_logger) << "NasatAircraftModel::data";
 
   if (role != Qt::DisplayRole || !indexIsValid(index))
     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 1673ae897..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
@@ -33,6 +33,8 @@ public:
   QVariant data(const QModelIndex &, int) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<GuezNasat::Interface::Dtc> m_dtc;
 };
 } 
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 43b160130..022dd838a 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
@@ -39,7 +39,7 @@ bool NasatAircraftParticipantModel::initModel(const std::shared_ptr<GuezNasat::I
 
   
   const QMap<qint32, GuezNasat::NasatAircraftParticipant> nasatAircraftParticipants = m_dtc->nasatAircraftParticipants();
-  INFO_LOG() << "initModel - #NasatAircraftParticipantModel: " << nasatAircraftParticipants.size() ;
+  INFO_LOG(m_logger) << "initModel - #NasatAircraftParticipantModel: " << nasatAircraftParticipants.size() ;
 
   connect(m_dtc.get(), &Interface::Dtc::nasatAircraftParticipantChanged,
           this, &NasatAircraftParticipantModel::onNasatAircraftParticipantChanged);
@@ -83,7 +83,7 @@ bool NasatAircraftParticipantModel::initModel(const std::shared_ptr<GuezNasat::I
 
 QVariant NasatAircraftParticipantModel::data(const QModelIndex &index, int role) const
 {
-  INFO_LOG() << "NasatAircraftParticipantModel::data";
+  INFO_LOG(m_logger) << "NasatAircraftParticipantModel::data";
 
   if ((role != Qt::DisplayRole && role != Qt::DecorationRole) || !indexIsValid(index))
     return QVariant();
@@ -100,7 +100,7 @@ QVariant NasatAircraftParticipantModel::data(const QModelIndex &index, int role)
   switch (index.column())
   {
   case Id:
-    INFO_LOG() << "nasatAircraftParticipant.id()=" << nasatAircraftParticipant.id();
+    INFO_LOG(m_logger) << "nasatAircraftParticipant.id()=" << nasatAircraftParticipant.id();
     return nasatAircraftParticipant.id();
   case NasatAircreaftId:
     return nasatAircraftParticipant.nasatAircraftId();
@@ -158,7 +158,7 @@ void NasatAircraftParticipantModel::onNasatAircraftParticipantChanged(const Guez
 void NasatAircraftParticipantModel::onExerciseChanged(const ExerciseManagement::Exercise  &data,
                                                       const DataModification modType)
 {
-  INFO_LOG() << "onExerciseChanged: " << data << ", " << modType;
+  INFO_LOG(m_logger) << "onExerciseChanged: " << data << ", " << modType;
 
   switch (modType)
   {
@@ -175,7 +175,7 @@ void NasatAircraftParticipantModel::onExerciseChanged(const ExerciseManagement::
 void NasatAircraftParticipantModel::onTypeChanged(const ParticipantManagement::Type  &data,
                                                   const DataModification modType)
 {
-  INFO_LOG() << "onTypeChanged:" << data << ", " << modType;
+  INFO_LOG(m_logger) << "onTypeChanged:" << data << ", " << modType;
 
   switch (modType)
   {
@@ -192,7 +192,7 @@ void NasatAircraftParticipantModel::onTypeChanged(const ParticipantManagement::T
 void NasatAircraftParticipantModel::onParticipantChanged(const ParticipantManagement::Participant &data,
                                                          DataModification modType)
 {
-  INFO_LOG() << "onParticipantChanged: " << data << ", " << modType;
+  INFO_LOG(m_logger) << "onParticipantChanged: " << data << ", " << modType;
 
   if (data.isDeleted())
     modType = DataModification::eRemoved;
@@ -204,7 +204,7 @@ void NasatAircraftParticipantModel::onParticipantChanged(const ParticipantManage
   case DataModification::eModified:
   case DataModification::eAdded:
   {
-    DEBUG_LOG() << "DataModification::eAdded Participant"
+    DEBUG_LOG(m_logger) << "DataModification::eAdded Participant"
                         << " TypeId=" << data.typeId()
                         << " " << data.name();
 
@@ -228,7 +228,7 @@ void NasatAircraftParticipantModel::onParticipantChanged(const ParticipantManage
 void NasatAircraftParticipantModel::onNasatAircraftChanged(const GuezNasat::NasatAircraft &data,
                                                            const DataModification modType)
 {
-  DEBUG_LOG() << "onNasatAircraftChanged: " << data << ", " << modType;
+  DEBUG_LOG(m_logger) << "onNasatAircraftChanged: " << data << ", " << modType;
   switch (modType)
   {
   case DataModification::eRemoved:
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 c220d2a79..ee1b5bdcf 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
@@ -71,6 +71,8 @@ private slots:
                               const DataModification modType);
 
 private:
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<GuezNasat::Interface::Dtc> m_dtc;
   std::shared_ptr<ExerciseManagement::Interface::Dtc> m_exm_dtc;
   std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppm_dtc;
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 cbe92e068..810d67eb2 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
@@ -35,7 +35,7 @@ bool GuezNasatDialog::init(const std::shared_ptr<GuezNasat::Interface::Ftc> &ftc
   m_ftc = ftc;
   m_dtc = dtc;
 
-  INFO_LOG() << "GuezNasatDialog::init";
+  INFO_LOG(m_logger) << "GuezNasatDialog::init";
   m_nasatAircraftModel = new GuezNasat::NasatAircraftModel(this);
   m_nasatAircraftModel->initModel(m_dtc);
   m_ui->widget->setModel(m_nasatAircraftModel);
@@ -74,11 +74,11 @@ void GuezNasatDialog::retranslate()
 
 void GuezNasatDialog::onNewAircraft()
 {
-  INFO_LOG() << "onNewAircraft";
+  INFO_LOG(m_logger) << "onNewAircraft";
   NewGuezNasatDialog *newGuezNasatDialog = new NewGuezNasatDialog(this);
   if (!newGuezNasatDialog->init(m_ftc))
   {
-    ERROR_LOG() << "Can't initialize NewGuezNasatDialog!";
+    ERROR_LOG(m_logger) << "Can't initialize NewGuezNasatDialog!";
     delete newGuezNasatDialog;
     return;
   }
@@ -93,11 +93,11 @@ void GuezNasatDialog::onEditAircraft()
   if (!curIdx.isValid())
     return;
 
-  INFO_LOG() << "onEditAircraft";
+  INFO_LOG(m_logger) << "onEditAircraft";
   NewGuezNasatDialog *editGuezNasatDialog = new NewGuezNasatDialog(this);
   if (!editGuezNasatDialog->init(m_ftc, m_nasatAircraftModel->getRowData(curIdx.row())))
   {
-    ERROR_LOG() << "Can't initialize NewGuezNasatDialog!";
+    ERROR_LOG(m_logger) << "Can't initialize NewGuezNasatDialog!";
     delete editGuezNasatDialog;
     return;
   }
@@ -117,7 +117,7 @@ void GuezNasatDialog::onRemoveAircraft()
   if (!curIdx.isValid())
     return;
 
-  INFO_LOG() << "onRemoveNewAircraft";
+  INFO_LOG(m_logger) << "onRemoveNewAircraft";
   NasatAircraft req;
   req.id(m_nasatAircraftModel->getRowData(curIdx.row()).id());
 
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 fecc7ce50..1d325edcc 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
@@ -49,7 +49,7 @@ void ForeignInterfaceImpl::enableIsmForeignInterface() const
 
   if (!m_mountingPoints.isEmpty())
   {
-    DEBUG_LOG() << Q_FUNC_INFO << " START, ismDataDtc, m_exerciseId = " << m_exerciseId
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, ismDataDtc, m_exerciseId = " << m_exerciseId
                         << " already initialized -> return";
     return;
   }
@@ -117,7 +117,7 @@ MainSchedule ForeignInterfaceImpl::mainSchedule(int32_t scheduleId)
 
 void ForeignInterfaceImpl::setScheduleId(int32_t scheduleId)
 {
-  DEBUG_LOG() << "setScheduleId to: " << scheduleId
+  DEBUG_LOG(m_logger) << "setScheduleId to: " << scheduleId
                       << " (was " << m_scheduleId << ")";
 
   enableIsmForeignInterface();
@@ -183,7 +183,7 @@ void ForeignInterfaceImpl::onMainStructureElementChanged(const MainStructureElem
 
       const QJsonDocument doc(QJsonDocument::fromJson(content, &parserError));
       if (parserError.error != QJsonParseError::NoError)
-        WARNING_LOG() << "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());
@@ -221,7 +221,7 @@ void ForeignInterfaceImpl::onMainStructureElementChanged(const MainStructureElem
       if (realChange)
       {
         
-        DEBUG_LOG() << Q_FUNC_INFO << " m_bldgsInExcersise updated."
+        DEBUG_LOG(m_logger) << Q_FUNC_INFO << " m_bldgsInExcersise updated."
                             << " (mseId=" << mseId << " name=" << data.name();
         emit buildingsInCurrentExerciseChanged();
       }
@@ -247,7 +247,7 @@ void ForeignInterfaceImpl::onMainStructureElementChanged(const MainStructureElem
           
           
           if (!m_dtc->getStructureElementById(curPath[1], seFloor)) 
-            WARNING_LOG() << " getStructureElementById failed for " << curPath[1];
+            WARNING_LOG(m_logger) << " getStructureElementById failed for " << curPath[1];
 
         }
 
@@ -268,7 +268,7 @@ void ForeignInterfaceImpl::onMainStructureElementChanged(const MainStructureElem
             mountingPointRef.updateData(currentStructEle, floorId);
             emit mountingPointChanged(mountingPointRef, DataModification::eModified);
           } else {
-            DEBUG_LOG() << "New Mounting point with id " << currentStructEle.id()
+            DEBUG_LOG(m_logger) << "New Mounting point with id " << currentStructEle.id()
                                 << " and type " << currentStructEle.mountingPointTypeId()
                                 << " (type " << currentStructEle.mountingPointTypeId().underlying() << ")"
                                 << " subid: " << currentStructEle.mountingPointId() << this;
@@ -294,7 +294,7 @@ void ForeignInterfaceImpl::onMountingPointAssetChanged(const MountingPointAsset
 {
   const int32_t structureElementId = data.structureElementId();
 
-  DEBUG_LOG() << "onMountingPointAssetChanged se id: " << structureElementId << ", assetId: " << data.assetId();
+  DEBUG_LOG(m_logger) << "onMountingPointAssetChanged se id: " << structureElementId << ", assetId: " << data.assetId();
 
   
 
@@ -366,7 +366,7 @@ void ForeignInterfaceImpl::onMainScheduleChanged(const MainSchedule &data, DataM
 
 void ForeignInterfaceImpl::init()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START, ismDataDtc, m_exerciseId = " << m_exerciseId
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, ismDataDtc, m_exerciseId = " << m_exerciseId
                      << " - m_mountingPoints.size()=" << m_mountingPoints.size()
                      << ", (m_mountingPointAssetMap.size()=" << m_mountingPointAssetMap.size() << ")";
 
@@ -425,12 +425,12 @@ void ForeignInterfaceImpl::init()
   int firstBldg = -1;
   if (!m_bldgsInExcersise.isEmpty())
     firstBldg = *m_bldgsInExcersise.begin();
-  DEBUG_LOG() << Q_FUNC_INFO << ", exerciseId = " << m_exerciseId << ", bldgs in excersise = " << m_bldgsInExcersise.size()
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << ", exerciseId = " << m_exerciseId << ", bldgs in excersise = " << m_bldgsInExcersise.size()
                        << ", firstBldg: " << firstBldg;
 
-  DEBUG_LOG() << Q_FUNC_INFO << "XXXXX" << m_bldgsInExcersise.size();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "XXXXX" << m_bldgsInExcersise.size();
 
-  DEBUG_LOG() << Q_FUNC_INFO << " END, ismDataDtc, m_exerciseId = " << m_exerciseId
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END, ismDataDtc, m_exerciseId = " << m_exerciseId
                      << " - m_mountingPoints.size()=" << m_mountingPoints.size()
                      << ", (m_mountingPointAssetMap.size()=" << m_mountingPointAssetMap.size() << ")";
 }
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 f4eac987a..0feaf80f6 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
@@ -53,6 +53,8 @@ private Q_SLOTS:
   void onMainScheduleChanged(const InfrastructureManagement::MainSchedule &data, DataModification modType);
 
 private: 
+
+NGL::INGLLogger &m_logger;
   void init();
 
 private: 
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 e57d32742..c5011aba2 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
@@ -73,7 +73,7 @@ bool SetRecordingDialog::init(const std::shared_ptr<Interface::Dtc> &ismDtc, con
   if (!(m_ismDtc->enableMainStructureElement() &&
         m_ismFtc->enableMainStructureElementModify()))
   {
-    ERROR_LOG() << "Could not enable ISM topics";
+    ERROR_LOG(m_logger) << "Could not enable ISM topics";
     return false;
   }
 
@@ -88,7 +88,7 @@ bool SetRecordingDialog::init(const std::shared_ptr<Interface::Dtc> &ismDtc, con
   {
     delete m_model;
     m_model = nullptr;
-    ERROR_LOG() << "Could not init model";
+    ERROR_LOG(m_logger) << "Could not init model";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog.h
index 0161eae88..28fc79807 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog.h
@@ -41,6 +41,8 @@ public:
   void onDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles);
 
 private: 
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   bool apply() override final;
 
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 698c23d7f..d0a7b1fe2 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
@@ -13,8 +13,8 @@
 namespace InfrastructureManagement
 {
 
-SetRecordingDialogModel::SetRecordingDialogModel(QObject *parent)
-  : NGLTreeModel(parent, new NGLTreeItem(QVariant()), { tr("Name") })
+SetRecordingDialogModel::SetRecordingDialogModel(QObject *parent) : NGLTreeModel(parent, new NGLTreeItem(QVariant()),,
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) { tr("Name") })
 , m_dtc(nullptr)
 {
 }
@@ -53,7 +53,7 @@ bool SetRecordingDialogModel::initModel(const std::shared_ptr<Interface::Dtc> &d
   if (!(m_dtc->enableMainStructureElement() &&
         m_dtc->enableMountingPointAsset()))
   {
-    ERROR_LOG() << "Could not enable Datatopics";
+    ERROR_LOG(m_logger) << "Could not enable Datatopics";
     return false;
   }
 
@@ -62,7 +62,7 @@ bool SetRecordingDialogModel::initModel(const std::shared_ptr<Interface::Dtc> &d
   connect(m_dataInterface.get(), &ForeignDataInterface::mountingPointChanged,
           this, &SetRecordingDialogModel::onMountingPointChanged);
 
-  INFO_LOG() << "initModel successfull";
+  INFO_LOG(m_logger) << "initModel successfull";
 
   initData();
 
@@ -121,7 +121,7 @@ void SetRecordingDialogModel::initData()
     if(mapGroup.contains(groupId))
       continue;
     const QString sectionText = InfrastructureManagement::toString(static_cast<InfrastructureManagement::BuildingGroup_def::type>(groupId));
-    DEBUG_LOG()<<" >>  Adding section >> "<<sectionText;
+    DEBUG_LOG(m_logger)<<" >>  Adding section >> "<<sectionText;
     NGLTreeItem *sectionRoot = new NGLTreeItem(sectionText);
     mapGroup.insert(groupId, sectionRoot);
     m_rootItem->appendChild(mapGroup.value(groupId));
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_model.h
index c33ee6b47..92fdfcf43 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_model.h
@@ -55,6 +55,8 @@ public Q_SLOTS:
   void onMountingPointChanged(const MountingPoint &mountingPoint, DataModification modType);
 
 private: 
+
+NGL::INGLLogger &m_logger;
   static SimpleRecordingData toSimpleRecordingData(const MountingPoint &mountingPoint);
   static SimpleRecordingData toSimpleRecordingData(const StructureElement &mountingPoint);
   static bool hasCorrectType(const MountingPoint &mountingPoint);
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 b5d1357fd..f0f485596 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
@@ -56,19 +56,19 @@ bool ExerciseAssignmentDialog::init(const std::shared_ptr<Interface::Dtc> &ismDt
 
   if (!m_ismFtc->enableInstrumentationAssetModify())
   {
-    ERROR_LOG() << "Could not enable FT InstrumentationAssetModify of ISM";
+    ERROR_LOG(m_logger) << "Could not enable FT InstrumentationAssetModify of ISM";
     return false;
   }
 
   if (!m_ismFtc->enableMainStructureElementModify())
   {
-    ERROR_LOG() << "Could not enable FT MainStructureElementModify of ISM";
+    ERROR_LOG(m_logger) << "Could not enable FT MainStructureElementModify of ISM";
     return false;
   }
 
   if (!m_exmDtc->enableExercise())
   {
-    ERROR_LOG() << "Could not enable DT Exercise of EXM";
+    ERROR_LOG(m_logger) << "Could not enable DT Exercise of EXM";
     return false;
   }
 
@@ -83,7 +83,7 @@ bool ExerciseAssignmentDialog::init(const std::shared_ptr<Interface::Dtc> &ismDt
   m_model = new ExerciseAssignmentDialogModel(this);
   if (!m_model->initModel(m_ismDtc, m_exmDtc))
   {
-    ERROR_LOG() << "Could not init model";
+    ERROR_LOG(m_logger) << "Could not init model";
     delete m_model;
     m_model = nullptr;
     return false;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ExerciseAssignmentClassic/ism_exercise_assignment_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ExerciseAssignmentClassic/ism_exercise_assignment_dialog.h
index d38bc82bd..866fe9b27 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ExerciseAssignmentClassic/ism_exercise_assignment_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ExerciseAssignmentClassic/ism_exercise_assignment_dialog.h
@@ -45,6 +45,8 @@ private Q_SLOTS:
   void onPrint();
 
 private: 
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
 
 private: 
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 ad881c33f..252be9324 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
@@ -46,7 +46,7 @@ QVariant ExerciseAssignmentDialogModel::data(const QModelIndex &index, int role)
 
     if (parseError.error != QJsonParseError::NoError)
     {
-      INFO_LOG() << "Could not parse JSON props of building with ID "
+      INFO_LOG(m_logger) << "Could not parse JSON props of building with ID "
                          << currentMainStructureElement.id()
                          << ". Reason: "
                          << parseError.errorString()
@@ -83,13 +83,13 @@ bool ExerciseAssignmentDialogModel::initModel(const std::shared_ptr<Interface::D
 
   if (!m_dtc->enableInstrumentationAsset())
   {
-    ERROR_LOG() << "Could not enable Datatopic InstrumentationAsset of the Data Topic Client";
+    ERROR_LOG(m_logger) << "Could not enable Datatopic InstrumentationAsset of the Data Topic Client";
     return false;
   }
 
   if (!m_exmDtc->enableExercise())
   {
-    ERROR_LOG() << "Could not enable Topic Exercise from Exercise Management DTC";
+    ERROR_LOG(m_logger) << "Could not enable Topic Exercise from Exercise Management DTC";
     return false;
   }
 
@@ -102,7 +102,7 @@ bool ExerciseAssignmentDialogModel::initModel(const std::shared_ptr<Interface::D
   };
   m_dtc->mainStructureElements(cb);
 
-  INFO_LOG() << "initModel successful";
+  INFO_LOG(m_logger) << "initModel successful";
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ExerciseAssignmentClassic/ism_exercise_assignment_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ExerciseAssignmentClassic/ism_exercise_assignment_dialog_model.h
index 28bebbef7..0e4e954c2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ExerciseAssignmentClassic/ism_exercise_assignment_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ExerciseAssignmentClassic/ism_exercise_assignment_dialog_model.h
@@ -25,6 +25,8 @@ public:
   bool initModel(const std::shared_ptr<Interface::Dtc> &dtc, const std::shared_ptr<ExerciseManagement::Interface::Dtc> &exmDtc);
 
 protected:
+
+NGL::INGLLogger &m_logger;
   bool isFiltered(const InfrastructureManagement::MainStructureElement &data, DataModification modType) const override;
 
 private: 
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 6c0583ca3..388fa6d27 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
@@ -53,7 +53,7 @@ bool ApproachingPointsDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
   m_model = new ApproachingPointsDialogModel(this);
   if (!m_model->initModel(dtc))
   {
-    ERROR_LOG() << "Could not init model";
+    ERROR_LOG(m_logger) << "Could not init model";
     delete m_model;
     m_model = nullptr;
     return false;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_approaching_point_list_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_approaching_point_list_dialog.h
index d10348832..12149612d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_approaching_point_list_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_approaching_point_list_dialog.h
@@ -49,6 +49,8 @@ private Q_SLOTS:
   void onAddApproachingPoint();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void tableColumnOrganiserSetting() override;
 
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 f4b5e2c17..dd999c703 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
@@ -66,7 +66,7 @@ bool ApproachingPointsDialogModel::initModel(const std::shared_ptr<Interface::Dt
   };
   dtc->mainStructureElements(cb);
 
-  INFO_LOG() << "initModel successful";
+  INFO_LOG(m_logger) << "initModel successful";
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_approaching_point_list_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_approaching_point_list_dialog_model.h
index 24aeffc90..23dc7265a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_approaching_point_list_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_approaching_point_list_dialog_model.h
@@ -32,6 +32,8 @@ public:
   };
 
 protected:
+
+NGL::INGLLogger &m_logger;
   bool isFiltered(const InfrastructureManagement::MainStructureElement &data, DataModification modType) const override;
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_edit_approaching_point_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_edit_approaching_point_dialog.h
index 3f36d7529..9241f6585 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_edit_approaching_point_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ApproachingPoints/ism_edit_approaching_point_dialog.h
@@ -49,6 +49,8 @@ private slots:
   void getPosition();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void fillCbDepartureDirection();
   void setData(const MainStructureElement &approachingPoint);
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 99e616dc6..50747e7ef 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
@@ -265,7 +265,7 @@ InstrumentationAsset AssetListDialog::importData(const QVector<QStringRef> &segm
   {
     if (bOk)
       *bOk = false;
-    WARNING_LOG() << "Could not determine mounting point type from barcode: " << dmc.toString();
+    WARNING_LOG(m_logger) << "Could not determine mounting point type from barcode: " << dmc.toString();
   }
 
   return asset;
@@ -411,40 +411,40 @@ bool AssetListDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
 
   if (!m_ftc->enableStructureElementModify())
   {
-    ERROR_LOG() << "Could not enable FT StructureElementModify of ISM";
+    ERROR_LOG(m_logger) << "Could not enable FT StructureElementModify of ISM";
     return false;
   }
 
   if (!m_ftc->enableMountingPointAssetModify())
   {
-    ERROR_LOG() << "Could not enable FT MountingPointAssetModify of ISM";
+    ERROR_LOG(m_logger) << "Could not enable FT MountingPointAssetModify of ISM";
     return false;
   }
   if (!m_ftc->enableMountingPointAssetRemove())
   {
-    ERROR_LOG() << "Could not enable FT MountingPointAssetRemove of ISM";
+    ERROR_LOG(m_logger) << "Could not enable FT MountingPointAssetRemove of ISM";
     return false;
   }
   if (!m_ftc->enableInstrumentationAssetModify())
   {
-    ERROR_LOG() << "Could not enable FT InstrumentationAssetModify of ISM";
+    ERROR_LOG(m_logger) << "Could not enable FT InstrumentationAssetModify of ISM";
     return false;
   }
   if (!m_ftc->enableInstrumentationAssetUnmount())
   {
-    ERROR_LOG() << "Could not enable FT InstrumentationAssetUnmount of ISM";
+    ERROR_LOG(m_logger) << "Could not enable FT InstrumentationAssetUnmount of ISM";
     return false;
   }
 
   if (!m_cmoFtc->enableTriggerUpdate())
   {
-    ERROR_LOG() << "Could not enable FT TriggerUpdate of CMO";
+    ERROR_LOG(m_logger) << "Could not enable FT TriggerUpdate of CMO";
     return false;
   }
 
   if(m_ftc->enableInstrumentationAssetSetState() == false)
   {
-    ERROR_LOG()<<"Couldn't enable InstrumentationAssetSetState";
+    ERROR_LOG(m_logger)<<"Couldn't enable InstrumentationAssetSetState";
     return false;
   }
 
@@ -455,7 +455,7 @@ bool AssetListDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
 
   if (!m_model->initModel(m_dtc, m_cmoDtc))
   {
-    ERROR_LOG() << "Could not init model";
+    ERROR_LOG(m_logger) << "Could not init model";
     delete m_model;
     m_model = nullptr;
     return false;
@@ -610,7 +610,7 @@ void AssetListDialog::onImportClicked()
     QVector<QStringRef> segments = line.splitRef(QLatin1Char(';'));
     if (segments.size() < 10)
     {
-      WARNING_LOG() << "Skipping line '" << line << "' - to few data";
+      WARNING_LOG(m_logger) << "Skipping line '" << line << "' - to few data";
       continue;
     }
     const InstrumentationAsset ia = importData(segments, &bOk);
@@ -649,7 +649,7 @@ void AssetListDialog::onExportClicked()
   AssetFilterDialog *filterDialog = new AssetFilterDialog(m_model, this);
   if (!filterDialog->init(m_ui->assetListView->selectionModel()->selectedRows().size() > 0))
   {
-    ERROR_LOG() << "Unexpected error";
+    ERROR_LOG(m_logger) << "Unexpected error";
     return;
   }
   filterDialog->fillAssetComboBoxes();
@@ -678,7 +678,7 @@ void AssetListDialog::onUnmountButtonClicked()
         StructureElement se;
         if(m_dtc->getStructureElementInMntPointAssetByAssetId(asset.id(), se) == false)
         {
-          WARNING_LOG()<<" 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());
@@ -691,7 +691,7 @@ void AssetListDialog::onUnmountButtonClicked()
     if(m_requestHelper->hasRequests() &&
        m_requestHelper->startRequests() == false)
     {
-      ERROR_LOG()<<" Couldn't unmount selected assets";
+      ERROR_LOG(m_logger)<<" Couldn't unmount selected assets";
     }
 
     m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Load,false);
@@ -753,7 +753,7 @@ void AssetListDialog::onFilterSelected(const AssetFilterDialog::Export &exp, con
 
 void AssetListDialog::onCustomContextMenuRequested(const QPoint &globalPos, const QModelIndex &indexSrc)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START, indexSrc" << indexSrc.row();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, indexSrc" << indexSrc.row();
   if (!indexSrc.isValid())
     return;
 
@@ -777,7 +777,7 @@ void AssetListDialog::onReachabilityUpdateAction()
     if (bhasHostnameForTriggerUpdate)
     {
       m_hostsForUpdate.insert(QString::fromStdString(ia.hostname()));
-      DEBUG_LOG() << Q_FUNC_INFO << " trigger update for " << ia;
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " trigger update for " << ia;
     }
   } 
 
@@ -786,7 +786,7 @@ void AssetListDialog::onReachabilityUpdateAction()
 
 void AssetListDialog::onHostsForUpdateNotifyTimeout()
 {
-  INFO_LOG() << Q_FUNC_INFO << " START, hostsForUpdate.size() = " << m_hostsForUpdate.size();
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " START, hostsForUpdate.size() = " << m_hostsForUpdate.size();
 
   if (!m_cmoFtc)
     return;
@@ -794,7 +794,7 @@ void AssetListDialog::onHostsForUpdateNotifyTimeout()
     return;
 
   for (auto item : std::as_const(m_hostsForUpdate))
-    DEBUG_LOG() << Q_FUNC_INFO << " host = " << item;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " host = " << item;
 
   
   std::vector<std::string> hostnameStd;
@@ -806,7 +806,7 @@ void AssetListDialog::onHostsForUpdateNotifyTimeout()
   ComponentMonitor::TriggerUpdate request;
   request.hostnames(hostnameStd);
 
-  DEBUG_LOG() << Q_FUNC_INFO << " TriggerUpdate - request = " << request;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " TriggerUpdate - request = " << request;
 
   m_requestHelper->addRequest([request, this]()
   {
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 b10ecf8a0..c428f7710 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
@@ -74,6 +74,8 @@ public:
   void onInstrumentationAssetChanged();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   bool apply() override final;
   void tableColumnOrganiserSetting() override;
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 4bcda456f..8647dd61a 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
@@ -310,12 +310,12 @@ bool AssetListDialogModel::initModel(const std::shared_ptr<Interface::Dtc> &dtc,
 
   if (!m_dtc->enableInstrumentationAsset())
   {
-    ERROR_LOG() << "Could not enable Datatopic InstrumentationAsset of the Data Topic Client";
+    ERROR_LOG(m_logger) << "Could not enable Datatopic InstrumentationAsset of the Data Topic Client";
     return false;
   }
   if (!m_cmoDtc->enableComponentStatus())
   {
-    ERROR_LOG() << "Could not enable Datatopic enableComponentStatus of cmo";
+    ERROR_LOG(m_logger) << "Could not enable Datatopic enableComponentStatus of cmo";
     return false;
   }
 
@@ -366,7 +366,7 @@ bool AssetListDialogModel::initModel(const std::shared_ptr<Interface::Dtc> &dtc,
   connect(this, &AssetListDialogModel::modelReset, this, &AssetListDialogModel::onUpdateFilter);
   onUpdateFilter();
 
-  INFO_LOG() << "initModel successfull";
+  INFO_LOG(m_logger) << "initModel successfull";
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_edit_asset_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_edit_asset_dialog.h
index ad281b021..f9a1f4732 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_edit_asset_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_edit_asset_dialog.h
@@ -44,6 +44,7 @@ private slots:
   void slotSetAssetToDefect();
   void slotClose();
 private:
+NGL::INGLLogger &m_logger;
   bool apply(const InstrumentationAssetState newState) ;
 
   Ui::EditAssetDialog *m_ui;
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 2fb6756ad..26e2a01a9 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
@@ -45,13 +45,13 @@ void SetPropertiesDialog::init()
 
     if (error.error != QJsonParseError::NoError)
     {
-      ERROR_LOG() << error.errorString();
+      ERROR_LOG(m_logger) << error.errorString();
       return;
     }
 
     if (!doc.isObject())
     {
-      ERROR_LOG() << "Properties String is no JSON-Object";
+      ERROR_LOG(m_logger) << "Properties String is no JSON-Object";
       return;
     }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_set_properties_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_set_properties_dialog.h
index 17d8b7db8..2de74d816 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_set_properties_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_set_properties_dialog.h
@@ -25,6 +25,8 @@ public:
   ~SetPropertiesDialog();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void init();
 private Q_SLOTS:
   void onOkClicked();
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 157551d49..6ce7c4923 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
@@ -46,13 +46,13 @@ ExerciseAssignmentDialog::ExerciseAssignmentDialog(LtsSession::LtsSession *sessi
 
   if (!m_ftc->enableMainStructureElementModify())
   {
-    ERROR_LOG() << "Could not enable FT MainStructureElementModify of ISM";
+    ERROR_LOG(m_logger) << "Could not enable FT MainStructureElementModify of ISM";
     throw std::exception();
   }
 
   if (!exmDtc->enableExercise())
   {
-    ERROR_LOG() << "Could not enable DT Exercise of EXM";
+    ERROR_LOG(m_logger) << "Could not enable DT Exercise of EXM";
     throw std::exception();
   }
 
@@ -241,7 +241,7 @@ bool ExerciseAssignmentDialog::apply()
     }
     catch (...)
     {
-      ERROR_LOG() << "can't parse json for mseId " << ri.mseId << " and excId " << ri.exerciseId << " - using new json";
+      ERROR_LOG(m_logger) << "can't parse json for mseId " << ri.mseId << " and excId " << ri.exerciseId << " - using new json";
       Q_ASSERT(false);
     }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog.h
index 3721726f0..5cfd60555 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog.h
@@ -41,6 +41,8 @@ private slots:
   void onPrint();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void onMainStructureElementChanged(const InfrastructureManagement::MainStructureElement &mse, DataModification modType);
   void retranslate() override;
   bool apply() override;
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 534fe59f3..37b3aa07f 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
@@ -45,7 +45,7 @@ void ExerciseAssignmentDialogModel::addMse(int mseId, int sectionId, const QStri
       return;
     }
   }
-  ERROR_LOG() << "Did not find section with enum value " << sectionId;
+  ERROR_LOG(m_logger) << "Did not find section with enum value " << sectionId;
   return;
 }
 
@@ -244,14 +244,13 @@ 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_parentItem(parentItem),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 
 }
 
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 7e9323966..457bc48dc 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
@@ -35,6 +35,8 @@ signals:
   void doRefilter(const QSet<QModelIndex> &setToExpand);
 
 protected:
+
+NGL::INGLLogger &m_logger;
   bool          filterAcceptsRow(const int sourceRow, const QModelIndex &sourceParent) const override;
   bool          lessThan(const QModelIndex &left, const QModelIndex &rioght) const override;
   QVariant      headerData(int section, Qt::Orientation orientation, int role) const override;
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 4faebba52..8adf91f4e 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
@@ -65,7 +65,7 @@ bool MountingPointInfoDialog::init(const std::shared_ptr<InfrastructureManagemen
                                    const std::shared_ptr<ForeignDataInterface> &ismIfc,
                                    const std::shared_ptr<AudioVideoManagement::ForeignDataInterface> &avmIfc)
 {
-  DEBUG_LOG() << "Initializing MountingPointInfoDialog ...";
+  DEBUG_LOG(m_logger) << "Initializing MountingPointInfoDialog ...";
 
   disconnect();
   m_dtc = dtc;
@@ -216,11 +216,11 @@ bool MountingPointInfoDialog::init(const std::shared_ptr<InfrastructureManagemen
     break;
   case InfrastructureManagement::MountingPointType::Unknown:
   default:
-    WARNING_LOG() << "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;
   } 
 
-  DEBUG_LOG() << "Initializing MountingPointInfoDialog done :)";
+  DEBUG_LOG(m_logger) << "Initializing MountingPointInfoDialog done :)";
 
   return true;
 }
@@ -260,7 +260,7 @@ void MountingPointInfoDialog::onShowStream() const
 {
   if (!m_avmIfc)
   {
-    ERROR_LOG() << "m_avmIfc is not loaded.";
+    ERROR_LOG(m_logger) << "m_avmIfc is not loaded.";
     return;
   }
 
@@ -271,7 +271,7 @@ void MountingPointInfoDialog::onAnnouncement() const
 {
   if (!m_avmIfc)
   {
-    ERROR_LOG() << "m_avmIfc is not loaded.";
+    ERROR_LOG(m_logger) << "m_avmIfc is not loaded.";
     return;
   }
 
@@ -281,7 +281,7 @@ void MountingPointInfoDialog::onAnnouncement() const
 void MountingPointInfoDialog::showAsset(const InfrastructureManagement::InstrumentationAsset &asset)
 {
   removeAsset();
-  DEBUG_LOG() << "Showing new asset";
+  DEBUG_LOG(m_logger) << "Showing new asset";
 
   m_assetId = asset.id();
 
@@ -308,7 +308,7 @@ void MountingPointInfoDialog::showAsset(const InfrastructureManagement::Instrume
 
 void MountingPointInfoDialog::removeAsset()
 {
-  DEBUG_LOG() << "Removing asset information";
+  DEBUG_LOG(m_logger) << "Removing asset information";
 
   m_assetId = -1;
   m_ui->gbxAsset->hide();
@@ -322,7 +322,7 @@ void MountingPointInfoDialog::removeAsset()
 
 void MountingPointInfoDialog::addAssetProperty(const QString &propName, const QString &propValue)
 {
-  DEBUG_LOG() << "Adding asset property "
+  DEBUG_LOG(m_logger) << "Adding asset property "
                       << propName
                       << ':'
                       << propValue;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointInfo/ism_mounting_point_info_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointInfo/ism_mounting_point_info_dialog.h
index fd145c6b4..e4b47048f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointInfo/ism_mounting_point_info_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointInfo/ism_mounting_point_info_dialog.h
@@ -40,6 +40,8 @@ private Q_SLOTS:
   void onAnnouncement() const;
 
 private: 
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
 
   void showAsset(const InfrastructureManagement::InstrumentationAsset &asset);
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 f660fe1ca..0f47dbf13 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
@@ -70,17 +70,17 @@ MountingPointListDialog::MountingPointListDialog(const QString &menuGroup, QWidg
   , m_scheduleId(-1)
   , m_ui(new Ui::MountingPointListDialog)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   m_ui->setupUi(this);
   setOnlineHelpFilename(QStringLiteral("Ressourcen-Mounting_Point_List"));
   m_buttonBox->connectButton(LtsWidgets::DialogButton::Print, this, &MountingPointListDialog::onPrint);
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 MountingPointListDialog::~MountingPointListDialog()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_mapGuiInterface->removeObjectIndicator();
   m_mapGuiInterface->setSkipMapObjectSelectionDialog(false);
 
@@ -95,7 +95,7 @@ MountingPointListDialog::~MountingPointListDialog()
   delete m_ui;
   delete m_ddsSelector;
   delete m_requestHelper;
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void MountingPointListDialog::retranslate()
@@ -112,7 +112,7 @@ bool MountingPointListDialog::init(LtsSession::LtsSession *session,
                                    const std::shared_ptr<SituationMap::ForeignGuiInterface> &mapIfc,
                                    const std::shared_ptr<FilterManagement::ForeignFltBuildingComponentGuiInterface> fltBuildingComponentIfc)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_dtc             = dtc;
   m_ftc             = ftc;
   m_dataIfc         = dataInterface;
@@ -126,43 +126,43 @@ bool MountingPointListDialog::init(LtsSession::LtsSession *session,
 
   if (!m_ftc->enableInstrumentationAssetModify())
   {
-    ERROR_LOG() << "Could not enable FT InstrumentationAssetModify of ISM";
+    ERROR_LOG(m_logger) << "Could not enable FT InstrumentationAssetModify of ISM";
     return false;
   }
 
   if (!m_ftc->enableInstrumentationAssetModify())
   {
-    ERROR_LOG() << "Could not enable FT enableInstrumentationAssetModify of ISM";
+    ERROR_LOG(m_logger) << "Could not enable FT enableInstrumentationAssetModify of ISM";
     return false;
   }
 
   if (!m_ftc->enableInstrumentationAssetRemove())
   {
-    ERROR_LOG() << "Could not enable FT enableInstrumentationAssetRemove of ISM";
+    ERROR_LOG(m_logger) << "Could not enable FT enableInstrumentationAssetRemove of ISM";
     return false;
   }
 
   if (!m_ftc->enableInstrumentationAssetUnmount())
   {
-    ERROR_LOG() << "Could not enable FT enableInstrumentationAssetUnmount of ISM";
+    ERROR_LOG(m_logger) << "Could not enable FT enableInstrumentationAssetUnmount of ISM";
     return false;
   }
 
   if (!m_ftc->enableMountingPointAssetModify())
   {
-    ERROR_LOG() << "Could not enable FT MountingPointAssetModify of ISM";
+    ERROR_LOG(m_logger) << "Could not enable FT MountingPointAssetModify of ISM";
     return false;
   }
 
   if (!m_ftc->enableMountingPointAssetRemove())
   {
-    ERROR_LOG() << "Could not enable FT MountingPointAssetRemove of ISM";
+    ERROR_LOG(m_logger) << "Could not enable FT MountingPointAssetRemove of ISM";
     return false;
   }
 
   if (!m_ftc->enableStructureElementModify())
   {
-    ERROR_LOG() << "Could not enable FT enableStructureElementModify of ISM";
+    ERROR_LOG(m_logger) << "Could not enable FT enableStructureElementModify of ISM";
     return false;
   }
 
@@ -183,7 +183,7 @@ bool MountingPointListDialog::init(LtsSession::LtsSession *session,
   m_sourceModel->setMntPointFilterTypes(filters);
   if (!m_sourceModel->initModel(m_dtc, m_dataIfc))
   {
-    ERROR_LOG() << "Could not init model";
+    ERROR_LOG(m_logger) << "Could not init model";
     delete m_sourceModel;
     m_sourceModel = nullptr;
     return false;
@@ -255,7 +255,7 @@ bool MountingPointListDialog::init(LtsSession::LtsSession *session,
       m_buildingComponentSettings->addChangedCallback(this); 
     else
     {
-      ERROR_LOG() << Q_FUNC_INFO << " addChangedCallback fltBuildingComponentIfc failed";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " addChangedCallback fltBuildingComponentIfc failed";
   #ifdef LTS_DEBUG
       Q_ASSERT(false);
   #endif 
@@ -264,7 +264,7 @@ bool MountingPointListDialog::init(LtsSession::LtsSession *session,
     onBuildingComponentSettingsChanged();
   }else
   {
-    ERROR_LOG() << "No BuildingCOmponentIfc ";
+    ERROR_LOG(m_logger) << "No BuildingCOmponentIfc ";
   }
 
   
@@ -340,7 +340,7 @@ bool MountingPointListDialog::init(LtsSession::LtsSession *session,
           this, &MountingPointListDialog::onInfoMountButtonClicked, Qt::UniqueConnection);
   onUpdateInfoMountButtonAndBehaviour();
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
@@ -352,7 +352,7 @@ void MountingPointListDialog::getMountingPointPlanData(const QModelIndex &index,
   if (item->data().canConvert<SimpleMountingPointData>())
   {
     const SimpleMountingPointData &data = item->data().value<SimpleMountingPointData>();
-    DEBUG_LOG() << "Item: " << m_sourceModel->data(index, Qt::DisplayRole).toString()
+    DEBUG_LOG(m_logger) << "Item: " << m_sourceModel->data(index, Qt::DisplayRole).toString()
                         << ", Structure Element Id: " << data.id;
 
     if (mppMap.contains(data.id))
@@ -362,7 +362,7 @@ void MountingPointListDialog::getMountingPointPlanData(const QModelIndex &index,
     }
     else if (data.aimState != MountingPointState_def::Idle)
     {
-      DEBUG_LOG() << "Not available in Map. Desired: " << data.aimState;
+      DEBUG_LOG(m_logger) << "Not available in Map. Desired: " << data.aimState;
       modify.push_back(MountingPointPlan(data.id, data.aimState));
     }
   }
@@ -418,7 +418,7 @@ void MountingPointListDialog::onMountingPointAssetRemoveReply(const Core::Functi
 
 void MountingPointListDialog::onBuildingComponentSettingsChanged()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   
 
@@ -452,7 +452,7 @@ void MountingPointListDialog::onBuildingComponentSettingsChanged()
 
     m_sortProxyModel->setFloorFilter(visibleFloors);
   }
-  DEBUG_LOG() << Q_FUNC_INFO << " END";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool MountingPointListDialog::apply()
@@ -688,7 +688,7 @@ void MountingPointListDialog::onUnmountButtonClicked()
         });
 
         if (!ret)
-          WARNING_LOG()<<" 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);
       }
@@ -703,7 +703,7 @@ void MountingPointListDialog::onUnmountButtonClicked()
   }
   else
   {
-    ERROR_LOG()<<" Couldn't convert to SimpleMountingPointData: ";
+    ERROR_LOG(m_logger)<<" Couldn't convert to SimpleMountingPointData: ";
   }
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog.h
index 360380f9e..eae213ca5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog.h
@@ -107,6 +107,8 @@ private slots:
   void onUpdateInfoMountButtonAndBehaviour();
 
 private: 
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   bool apply() override final;
   bool isIncludedId(int32_t mountingPointId) const;
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 b04778618..965eede92 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
@@ -28,11 +28,11 @@ MountingPointListDialogModel::MountingPointListDialogModel(QObject *parent)
   , m_scheduleId(-1)
   , m_dataChangedTimer(new QTimer(this))
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_dataChangedTimer->setSingleShot(true);
   m_dataChangedTimer->setInterval(100);
   connect(m_dataChangedTimer, &QTimer::timeout, this, &MountingPointListDialogModel::emitDataChanged);
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 
@@ -87,11 +87,11 @@ QVariant MountingPointListDialogModel::data(const QModelIndex &index, int role)
     const SimpleMountingPointData itemData = item->data().value<SimpleMountingPointData>();
     if (itemData.mpType.underlying() == MountingPointType::Unknown)
     {
-      ERROR_LOG() << "unknown!!!";
+      ERROR_LOG(m_logger) << "unknown!!!";
       return QVariant(); 
     }
 
-    ERROR_LOG() << "mpType = " << itemData.mpType.underlying();
+    ERROR_LOG(m_logger) << "mpType = " << itemData.mpType.underlying();
     if(itemData.mpType == MountingPointType::OutdoorIPS)
       return MountingPointType::IndoorIPS;
 
@@ -113,14 +113,14 @@ QVariant MountingPointListDialogModel::data(const QModelIndex &index, int role)
 
 bool MountingPointListDialogModel::initModel(const std::shared_ptr<Interface::Dtc> &dtc, const std::shared_ptr<ForeignDataInterface> &dataInterface)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (m_dtc == dtc)
     return true;
 
   if (!(dtc->enableMainStructureElement() &&
         dtc->enableMountingPointAsset()))
   {
-    ERROR_LOG() << "Could not enable Datatopics";
+    ERROR_LOG(m_logger) << "Could not enable Datatopics";
     return false;
   }
   m_dtc = dtc;
@@ -131,14 +131,14 @@ bool MountingPointListDialogModel::initModel(const std::shared_ptr<Interface::Dt
   connect(m_dataInterface.get(), &ForeignDataInterface::mountingPointChanged,
           this, &MountingPointListDialogModel::onMountingPointChanged);
 
-  DEBUG_LOG() << "initModel successful";
+  DEBUG_LOG(m_logger) << "initModel successful";
 
   initData();
 
   beginResetModel();
   endResetModel();
 
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   return true;
 }
 
@@ -149,7 +149,7 @@ QModelIndex MountingPointListDialogModel::getIndexOfVisibleRootItem() const
 
 void MountingPointListDialogModel::initData()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
 #ifdef BENCHMARK
     QElapsedTimer elapsedTimer1;
@@ -265,9 +265,9 @@ void MountingPointListDialogModel::initData()
         parentIndex = m_mountingPointIndexes.value(path.at(path.size() - 2), indexFromItem(m_visRoot)); 
         if (!parentIndex.isValid())
         {
-          ERROR_LOG() << "Did not find parent for structure element with id " << currentElement.id() << " mseid: " << mse.id();
+          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() << "   se: " << se.id() << ", " << se.displayName() << ", " << se.name();
+            ERROR_LOG(m_logger) << "   se: " << se.id() << ", " << se.displayName() << ", " << se.name();
         }
       }
       else
@@ -294,7 +294,7 @@ void MountingPointListDialogModel::initData()
     qCritical() << " MountingPointListDialogModel::init-BENCHMARK: took " << elapsedTimer1.elapsed() << " [ms]";
 #endif 
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 QSet<int> MountingPointListDialogModel::getAvailableFloors() const
@@ -441,7 +441,7 @@ void MountingPointListDialogModel::onScheduleIdChanged(int32_t scheduleId)
   if (scheduleId == m_scheduleId)
     return;
 
-  DEBUG_LOG() << "onScheduleIdChanged: " << scheduleId;
+  DEBUG_LOG(m_logger) << "onScheduleIdChanged: " << scheduleId;
 
   m_scheduleId = scheduleId;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_model.h
index b44c42da0..ca1fe3a60 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_model.h
@@ -92,6 +92,8 @@ private slots:
   void emitDataChanged();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void initData();
   friend class MountingPointListSortModel;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointMapSelection/ism_selector.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointMapSelection/ism_selector.cpp
index 674524512..e6cbf971d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointMapSelection/ism_selector.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointMapSelection/ism_selector.cpp
@@ -21,7 +21,7 @@ MountingPointSelector::MountingPointSelector(const std::shared_ptr<Interface::Dt
 {
   if (!m_ftc->enableMountingPointPlanModify())
   {
-    ERROR_LOG() << "Could not enable FT MountingPointPlanModify of ISM";
+    ERROR_LOG(m_logger) << "Could not enable FT MountingPointPlanModify of ISM";
   }
 }
 
@@ -31,10 +31,10 @@ void MountingPointSelector::onMountingPointPlanModifyReply(const Core::FunctionR
   m_requestHelper->requestReply(replyObject);
 
   if (replyObject.error())
-    ERROR_LOG() << "MountingPointPlansRemove error: "
+    ERROR_LOG(m_logger) << "MountingPointPlansRemove error: "
                         << replyObject.str();
   else
-    DEBUG_LOG() << "MountingPointPlansRemove success";
+    DEBUG_LOG(m_logger) << "MountingPointPlansRemove success";
 }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointMapSelection/ism_selector.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointMapSelection/ism_selector.h
index 0c4edf7d5..3651b70f4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointMapSelection/ism_selector.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointMapSelection/ism_selector.h
@@ -28,6 +28,8 @@ public:
   void onMountingPointPlanModifyReply(const Core::FunctionReplyObject &replyObject) override final;
 
 protected: 
+
+NGL::INGLLogger &m_logger;
   void startModifyRequest(const std::vector<MountingPointPlan> &data);
 
 protected: 
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 6d40e6623..aa62b0c56 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
@@ -54,7 +54,7 @@ bool ConflictsDialog::init(LtsSession::LtsSession *session,
 
   if (m_scheduleId <= 0)
   {
-    ERROR_LOG() << "Invalid id for Instrumentation plan: " << m_scheduleId;
+    ERROR_LOG(m_logger) << "Invalid id for Instrumentation plan: " << m_scheduleId;
     return false;
   }
 
@@ -64,7 +64,7 @@ bool ConflictsDialog::init(LtsSession::LtsSession *session,
 
   if (!m_sourceModel->initModel(m_scheduleId, m_anotherScheduleId, m_dtc))
   {
-    ERROR_LOG() << "Could not init ConflictsDialogModel";
+    ERROR_LOG(m_logger) << "Could not init ConflictsDialogModel";
     delete m_sourceModel;
     m_sourceModel = nullptr;
     return false;
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 d06c01d6b..fee08649c 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
@@ -128,7 +128,7 @@ bool ConflictsDialogModel::initModel(int scheduleId,
   if (!(dtc->enableMainStructureElement() &&
         dtc->enableMainSchedule()))
   {
-    ERROR_LOG() << "Could not enable Data Topics";
+    ERROR_LOG(m_logger) << "Could not enable Data Topics";
     return false;
   }
 
@@ -302,7 +302,7 @@ void ConflictsDialogModel::initData()
 
         if (mountingPoint.mountingPointState() == compareMountingPointState)
         {
-          DEBUG_LOG() << "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;
         }
 
@@ -314,11 +314,11 @@ void ConflictsDialogModel::initData()
         mpData.conflictState  = compareMountingPointState;
         mpData.mpType         = currentElement.mountingPointTypeId();
 
-        DEBUG_LOG() << "## MP Id   = " << mpData.id;
-        DEBUG_LOG() << "## MP Name   = " << mpData.name;
-        DEBUG_LOG() << "## Aim state = " << mpData.aimState;
+        DEBUG_LOG(m_logger) << "## MP Id   = " << mpData.id;
+        DEBUG_LOG(m_logger) << "## MP Name   = " << mpData.name;
+        DEBUG_LOG(m_logger) << "## Aim state = " << mpData.aimState;
 
-        DEBUG_LOG() << "Adding mounting point id = " << mpData.id << " - " << mpData.name;
+        DEBUG_LOG(m_logger) << "Adding mounting point id = " << mpData.id << " - " << mpData.name;
 
         item = new NGLTreeItem(QVariant::fromValue(mpData));
       }
@@ -338,16 +338,16 @@ void ConflictsDialogModel::initData()
         parentIndex = m_mountingPointIndexes.value(path.at(path.size() - 2), indexFromItem(m_rootItem)); 
         if (!parentIndex.isValid())
         {
-          DEBUG_LOG() << "Did not find parent for structure element with id " << currentElement.id() << " mseid: " << mse.id();
+          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() << "   se: " << se.id() << ", " << se.displayName() << ", " << se.name();
+            DEBUG_LOG(m_logger) << "   se: " << se.id() << ", " << se.displayName() << ", " << se.name();
         }
       }
       else
       {
         
         parentIndex = groupIndex.isValid() ? groupIndex : indexFromItem(m_rootItem);
-        DEBUG_LOG() << "Insert row under root: " << currentElement.displayName();
+        DEBUG_LOG(m_logger) << "Insert row under root: " << currentElement.displayName();
       }
 
       insertRow(rowCount(parentIndex), parentIndex, item);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_model.h
index 203e7371a..7c6d4c5ee 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_model.h
@@ -70,6 +70,7 @@ public:
 public slots:
   void onConflictedDataChanged();
 private:
+NGL::INGLLogger &m_logger;
   void initData();
 
 
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 d316061fc..e4581f303 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
@@ -26,7 +26,7 @@ OverviewDialog::OverviewDialog(const QString &menuGroup, LtsSession::LtsSession
   , m_ui(new Ui::OverviewDialog)
   , m_menuGroup(menuGroup)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_ui->setupUi(this);
   m_timerUpdateView = new QTimer(this);
   m_timerUpdateView->setSingleShot(true);
@@ -36,19 +36,19 @@ OverviewDialog::OverviewDialog(const QString &menuGroup, LtsSession::LtsSession
   connect(m_ui->cbBasePlan, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &OverviewDialog::onCbBasePlanIndexChanged);
 
   setOnlineHelpFilename(QStringLiteral("Ressourcen-Overview"));
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 OverviewDialog::~OverviewDialog()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   delete m_ui;
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void OverviewDialog::aboutToClose()
 {
-  DEBUG_LOG() << "About to close";
+  DEBUG_LOG(m_logger) << "About to close";
   if (m_session->baseLayout()->getWidget(m_menuGroup, QStringLiteral("OverviewConflicts")))
     m_session->baseLayout()->getWidget(m_menuGroup, QStringLiteral("OverviewConflicts"))->closeRequest();
 }
@@ -69,7 +69,7 @@ bool OverviewDialog::init(int planId,
                           const std::shared_ptr<Interface::Ftc> &ftc,
                           const std::shared_ptr<ForeignDataInterface> &dataInterface)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_scheduleId = planId;
   m_dtc = dtc;
   m_ftc = ftc;
@@ -93,32 +93,32 @@ bool OverviewDialog::init(int planId,
 
 
   connect(m_timerUpdateView, &QTimer::timeout, this, &OverviewDialog::reloadModel);
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
 void OverviewDialog::setCbBasePlan()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_ui->cbBasePlan->clear();
   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());
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 
 void OverviewDialog::setCbComparePlan()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_ui->cbComparePlan->clear();
   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_def::Active ? QLatin1Literal("* ") : QLatin1Literal("  ")) +
                                  QString::fromStdString(ms.name()), ms.id());
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void OverviewDialog::onPrint()
@@ -150,7 +150,7 @@ void OverviewDialog::onPrint()
 
 void OverviewDialog::onScheduleIdChanged(int32_t scheduleId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (m_scheduleId == scheduleId)
     return;
   setCbComparePlan();
@@ -163,30 +163,30 @@ void OverviewDialog::onScheduleIdChanged(int32_t scheduleId)
     m_session->baseLayout()->getWidget(m_menuGroup, QStringLiteral("OverviewConflicts"))->closeRequest();
 
   retranslate();
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void OverviewDialog::onCbComparePlanIndexChanged(int index)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   Q_UNUSED(index);  
   updateOverviewData();
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void OverviewDialog::onCbBasePlanIndexChanged(int index)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   Q_UNUSED(index);
   updateOverviewData();
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void OverviewDialog::onPlansDataChanged()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   updateOverviewData(); 
   ConflictsDialog *dialog = static_cast<ConflictsDialog*>(m_session->baseLayout()->getWidget(m_menuGroup, QStringLiteral("OverviewConflicts")));
   if (dialog)
@@ -194,7 +194,7 @@ void OverviewDialog::onPlansDataChanged()
     dialog->updateModel();
   }
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void OverviewDialog::updateOverviewData()
@@ -204,7 +204,7 @@ void OverviewDialog::updateOverviewData()
 
 void OverviewDialog::reloadModel()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (m_model == nullptr)
     return;
 
@@ -217,7 +217,7 @@ void OverviewDialog::reloadModel()
   if (m_session->baseLayout()->getWidget(m_menuGroup, QStringLiteral("OverviewConflicts")))
     m_session->baseLayout()->getWidget(m_menuGroup, QStringLiteral("OverviewConflicts"))->closeRequest();
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 } 
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 51f377199..1ab1db4dd 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
@@ -31,7 +31,7 @@ OverviewDialogModel::OverviewDialogModel(QObject *parent)
   , m_comparedScheduleId(0)
   , m_dtc(nullptr)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   
 
@@ -53,7 +53,7 @@ OverviewDialogModel::OverviewDialogModel(QObject *parent)
   m_refMap[MountingPointType_def::IndoorCamera] = 2;
   m_refMap[MountingPointType_def::IndoorIPS] = 3;
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 QVariant OverviewDialogModel::data(const QModelIndex &index, int role) const
@@ -113,7 +113,7 @@ bool OverviewDialogModel::initModel(int32_t mainScheduleId,
                                     const std::shared_ptr<Interface::Dtc> &dtc,
                                     int32_t comparedScheduleId, int32_t basePlanId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_dtc            = dtc;
   m_loadedScheduleId = mainScheduleId;
   m_comparedScheduleId = comparedScheduleId;
@@ -124,19 +124,19 @@ bool OverviewDialogModel::initModel(int32_t mainScheduleId,
   if (!m_dtc->mainSchedules().contains(m_loadedScheduleId))
   {
     m_loadedScheduleId = -1;
-    ERROR_LOG() << "Invalid scheduleId =  " << mainScheduleId;
+    ERROR_LOG(m_logger) << "Invalid scheduleId =  " << mainScheduleId;
     return false;
   }
 
-  DEBUG_LOG() << "[INITIAL] loaded: "<<m_loadedScheduleId<<" cmp: "<<m_comparedScheduleId<<" sim: "<<m_basePlanId;
+  DEBUG_LOG(m_logger) << "[INITIAL] loaded: "<<m_loadedScheduleId<<" cmp: "<<m_comparedScheduleId<<" sim: "<<m_basePlanId;
 
   if (!initData())
   {
-    ERROR_LOG() << "Could not init data";
+    ERROR_LOG(m_logger) << "Could not init data";
     return false;
   }
 
-  DEBUG_LOG() << "initModel successful";
+  DEBUG_LOG(m_logger) << "initModel successful";
 
   
   connect(m_dtc.get(), &Interface::Dtc::mainStructureElementChanged,
@@ -146,13 +146,13 @@ bool OverviewDialogModel::initModel(int32_t mainScheduleId,
   connect(m_dtc.get(), &Interface::Dtc::instrumentationAssetChanged,
           this, &OverviewDialogModel::initData, Qt::UniqueConnection);
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
 bool OverviewDialogModel::initData()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
 #ifdef BENCHMARK
   QElapsedTimer elapsedTimer1;
@@ -173,9 +173,9 @@ bool OverviewDialogModel::initData()
   setNewData();
 
   for ( int mppId : std::as_const(m_conflictedStructureElementIds))
-    DEBUG_LOG() << "Conflicted structure element id = " << mppId;
+    DEBUG_LOG(m_logger) << "Conflicted structure element id = " << mppId;
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
@@ -213,7 +213,7 @@ bool OverviewDialogModel::hasConflictedMountingPoints()
 
 QHash<int, MountingPointPlan> OverviewDialogModel::mergePlans(const QHash<int, MountingPointPlan> &currPlan, const int cmpPlanId)
 {
-  DEBUG_LOG()<<"[MERGE PLANs] currPlanId: "<<m_loadedScheduleId<<" ; cmpPlanId: "<<cmpPlanId;
+  DEBUG_LOG(m_logger)<<"[MERGE PLANs] currPlanId: "<<m_loadedScheduleId<<" ; cmpPlanId: "<<cmpPlanId;
   QHash<int, MountingPointPlan> mergedPlan = currPlan;
   
   const auto msConst = m_dtc->mainSchedules();
@@ -243,7 +243,7 @@ QHash<int, MountingPointPlan> OverviewDialogModel::mergePlans(const QHash<int, M
         if ((basePlanMpp.mountingPointState() == MountingPointState::Equipped && currentMpp.mountingPointState() == MountingPointState::Empty) ||
             (basePlanMpp.mountingPointState() == MountingPointState::Empty    && currentMpp.mountingPointState() == MountingPointState::Equipped))
         {
-          DEBUG_LOG()<<" conflicted name: "<<currentMpp.structureElementId();
+          DEBUG_LOG(m_logger)<<" conflicted name: "<<currentMpp.structureElementId();
           mergedPlan[currentMpp.structureElementId()].mountingPointState(MountingPointState::Idle);
           m_conflictedStructureElementIds.insert(basePlanMpp.structureElementId());
         }
@@ -279,7 +279,7 @@ void OverviewDialogModel::setNewData()
   QHash<int , MountingPointPlan> baseMountingPointPlans;
 
   
-  DEBUG_LOG() << "We compare plan " << m_basePlanId << " with " << m_comparedScheduleId;
+  DEBUG_LOG(m_logger) << "We compare plan " << m_basePlanId << " with " << m_comparedScheduleId;
 
   baseMountingPointPlans.clear();
   m_conflictedStructureElementIds.clear();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog_model.h
index 3ad41322e..3c5cef044 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog_model.h
@@ -56,6 +56,8 @@ public:
   QMap<MountingPointType, int> getOtherActiveNeeded(const int &currPlanId);
 
 private: 
+
+NGL::INGLLogger &m_logger;
   QHash<int, MountingPointPlan> mergePlans(const QHash<int, MountingPointPlan> &currPlan, const int cmpPlanId);
   void setTotalCmpActiveNeed(const QMap<int, MountingPointPlan> &mergedPlan);
   MountingPointType getMountingPointTypeId(int structureElementId);
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 7e07cd4ea..4d9d4788c 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
@@ -27,7 +27,7 @@ OverviewMountingPointListDialog::OverviewMountingPointListDialog(const QString &
   , m_printMountingAction(new QAction(tr("To Mount"), this))
   , m_printUnmountingAction(new QAction(tr("To Unmount"), this))
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   setAttribute(Qt::WA_DeleteOnClose);
   m_ui->setupUi(this);
@@ -39,14 +39,14 @@ OverviewMountingPointListDialog::OverviewMountingPointListDialog(const QString &
   connect(m_actionMenu, &QMenu::triggered, this, &OverviewMountingPointListDialog::onPrint);
 
   m_buttonBox->setMenu(LtsWidgets::DialogButton::Print, m_actionMenu);
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 OverviewMountingPointListDialog::~OverviewMountingPointListDialog()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   delete m_ui;
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 
@@ -57,7 +57,7 @@ bool OverviewMountingPointListDialog::init(LtsSession::LtsSession *session,
                                    const std::shared_ptr<ForeignDataInterface> &dataInterface,
                                    int32_t scheduleId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, scheduleId=" << scheduleId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, scheduleId=" << scheduleId;
   m_dtc             = dtc;
   m_dataIfc         = dataInterface;
   m_session         = session;
@@ -68,30 +68,30 @@ bool OverviewMountingPointListDialog::init(LtsSession::LtsSession *session,
 
   if (!m_ftc->enableInstrumentationAssetModify())
   {
-    ERROR_LOG() << "Could not enable FT InstrumentationAssetModify of ISM";
+    ERROR_LOG(m_logger) << "Could not enable FT InstrumentationAssetModify of ISM";
     return false;
   }
 
   if (!m_ftc->enableMountingPointPlanModify())
   {
-    ERROR_LOG() << "Could not enable FT enableMountingPointPlansModify of ISM";
+    ERROR_LOG(m_logger) << "Could not enable FT enableMountingPointPlansModify of ISM";
     return false;
   }
 
-  DEBUG_LOG() << Q_FUNC_INFO << " new ViewMountingPointListModel...";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " new ViewMountingPointListModel...";
   delete m_sourceModel;
   m_sourceModel = new ViewMountingPointListModel(this);
 
   if (!m_sourceModel->initModel(m_dtc, m_dataIfc, m_scheduleId))
   {
-    ERROR_LOG() << "Could not init model";
+    ERROR_LOG(m_logger) << "Could not init model";
     delete m_sourceModel;
     m_sourceModel = nullptr;
     return false;
   }
 
   
-  DEBUG_LOG() << Q_FUNC_INFO << " new m_mountedPointSortProxyModel ...";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " new m_mountedPointSortProxyModel ...";
   delete m_mountedPointSortProxyModel;
   m_mountedPointSortProxyModel = new ViewMountingPointListSortModel(this);
   m_mountedPointSortProxyModel->setVisibleState(MountingPointState::Equipped);
@@ -103,7 +103,7 @@ bool OverviewMountingPointListDialog::init(LtsSession::LtsSession *session,
   m_ui->mountingPointListView->setSortingEnabled(true);
 
   
-  DEBUG_LOG() << Q_FUNC_INFO << " new m_unmountedPointSortProxyModel ...";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " new m_unmountedPointSortProxyModel ...";
   delete m_unmountedPointSortProxyModel;
   m_unmountedPointSortProxyModel = new ViewMountingPointListSortModel(this);
   m_unmountedPointSortProxyModel->setVisibleState(MountingPointState::Empty);
@@ -133,7 +133,7 @@ bool OverviewMountingPointListDialog::init(LtsSession::LtsSession *session,
 
 
   
-  DEBUG_LOG() << Q_FUNC_INFO << " filter... ...";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " filter... ...";
   const auto filters = { MountingPointType::BuildingSensorModule,
 
 
@@ -215,7 +215,7 @@ bool OverviewMountingPointListDialog::init(LtsSession::LtsSession *session,
   
   retranslate();
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
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 bb6e07466..a63df4dfe 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
@@ -28,11 +28,11 @@ ViewMountingPointListModel::ViewMountingPointListModel(QObject *parent)
   , m_dtc(nullptr)
   , m_dataChangedTimer(new QTimer(this))
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_dataChangedTimer->setSingleShot(true);
   m_dataChangedTimer->setInterval(100);
   connect(m_dataChangedTimer, &QTimer::timeout, this, &ViewMountingPointListModel::emitDataChanged);
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 
@@ -105,7 +105,7 @@ bool ViewMountingPointListModel::initModel(const std::shared_ptr<Interface::Dtc>
                                            const std::shared_ptr<ForeignDataInterface> &dataInterface,
                                            int32_t requestedScheduleId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, scheduleId=" << requestedScheduleId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, scheduleId=" << requestedScheduleId;
 
   if (m_dtc == dtc)
     return true;
@@ -113,7 +113,7 @@ bool ViewMountingPointListModel::initModel(const std::shared_ptr<Interface::Dtc>
   if (!(dtc->enableMainStructureElement() &&
         dtc->enableMountingPointAsset()))
   {
-    ERROR_LOG() << "Could not enable Datatopics";
+    ERROR_LOG(m_logger) << "Could not enable Datatopics";
     return false;
   }
   m_dtc = dtc;
@@ -132,11 +132,11 @@ bool ViewMountingPointListModel::initModel(const std::shared_ptr<Interface::Dtc>
   connect(m_dataInterface.get(), &ForeignDataInterface::mountingPointChanged,
           this, &ViewMountingPointListModel::onMountingPointChanged);
 
-  DEBUG_LOG() << "initModel successful";
+  DEBUG_LOG(m_logger) << "initModel successful";
 
   initData();
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
@@ -177,7 +177,7 @@ inline int getFakeBuildingGroupId(int seId)
 
 void ViewMountingPointListModel::initData()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, m_scheduleId=" << m_scheduleId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, m_scheduleId=" << m_scheduleId;
 
 
 #ifdef BENCHMARK
@@ -311,9 +311,9 @@ void ViewMountingPointListModel::initData()
         parentIndex = m_mountingPointIndexes.value(path.at(path.size() - 2), indexFromItem(m_visRoot)); 
         if (!parentIndex.isValid())
         {
-          ERROR_LOG() << "Did not find parent for structure element with id " << currentElement.id() << " mseid: " << mse.id();
+          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() << "   se: " << se.id() << ", " << se.displayName() << ", " << se.name();
+            ERROR_LOG(m_logger) << "   se: " << se.id() << ", " << se.displayName() << ", " << se.name();
         }
       }
       else
@@ -345,18 +345,18 @@ void ViewMountingPointListModel::initData()
   qCritical() << " ViewMountingPointListModel::initData-BENCHMARK: m_scheduleId=" << m_scheduleId << " took " << elapsedTimer1.elapsed() << " [ms]";
 #endif 
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool ViewMountingPointListModel::mountingPointHasAssetMounted(int32_t mountingPointId, const QMap<qint32, MountingPointAsset> &mountingPointAssetMap)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   for (const MountingPointAsset &mpa : mountingPointAssetMap)
   {
     if (mpa.structureElementId() == mountingPointId)
       return true;
   }
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return false;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_mounting_point_list_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_mounting_point_list_model.h
index 08409bd1e..0c42543ee 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_mounting_point_list_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_mounting_point_list_model.h
@@ -90,6 +90,8 @@ private Q_SLOTS:
   void emitDataChanged();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void initData();
   void initMountedData();
   void initUnmountedData();
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 16fa7730f..8c1339054 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
@@ -9,11 +9,10 @@
 namespace InfrastructureManagement
 {
 
-NewPlanDialog::NewPlanDialog(LtsSession::LtsSession *session, QWidget *parent)
-  : QDialog(parent)
+NewPlanDialog::NewPlanDialog(LtsSession::LtsSession *session, QWidget *parent) : QDialog(parent)
   , m_ui(new Ui::NewPlanDialog)
-  , m_session(session)
-{
+  , m_session(session),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   setWindowTitle(tr("Create New Plan"));
   m_ui->setupUi(this);
 
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 0d6d8d59a..494ff3552 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
@@ -29,6 +29,8 @@ public:
   bool getData(QString &name, qint64 &begin, qint64 &end, int &status);
 
 private:
+
+NGL::INGLLogger &m_logger;
   Ui::NewPlanDialog* m_ui;
   std::shared_ptr<ForeignGuiComboboxInterface> m_ismGuiCbx{nullptr};
   LtsSession::LtsSession *m_session{nullptr};
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 65fdc4d7c..bc10711e0 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
@@ -20,13 +20,12 @@
 namespace InfrastructureManagement
 {
 
-PlanChooser::PlanChooser(const std::shared_ptr<Interface::Dtc> &dtc, QWidget *parent)
-  : QDialog(parent)
+PlanChooser::PlanChooser(const std::shared_ptr<Interface::Dtc> &dtc, QWidget *parent) : QDialog(parent)
   , m_ui(new Ui::PlanChooser)
   , m_model(nullptr)
   , m_dtc(dtc)
-  , m_selected(false)
-{
+  , m_selected(false),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   LtsWidgets::LtsGlobalWaitDialog::getInstance()->setVisible(false);
 
   m_ui->setupUi(this);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/plan_chooser.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/plan_chooser.h
index d90d99f88..b61538e91 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/plan_chooser.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/plan_chooser.h
@@ -32,6 +32,8 @@ public:
   void selectPlan(int planId);
 
 private:
+
+NGL::INGLLogger &m_logger;
   Ui::PlanChooser *m_ui{nullptr};
   PlanDialogModel *m_model{nullptr};
   LtsSession::LtsSession *m_session{nullptr};
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 bc66ba0a1..6ab316a7d 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
@@ -47,7 +47,7 @@ bool ScheduleDifferencesListDialog::init(LtsSession::LtsSession *session,
 
   if (m_scheduleId <= 0)
   {
-    ERROR_LOG() << "Invalid id for Instrumentation plan: " << m_scheduleId;
+    ERROR_LOG(m_logger) << "Invalid id for Instrumentation plan: " << m_scheduleId;
     return false;
   }
 
@@ -57,7 +57,7 @@ bool ScheduleDifferencesListDialog::init(LtsSession::LtsSession *session,
 
   if (!m_sourceModel->initModel(m_scheduleId, m_dtc))
   {
-    ERROR_LOG() << "Could not init ScheduleDifferencesListDialogModel";
+    ERROR_LOG(m_logger) << "Could not init ScheduleDifferencesListDialogModel";
     delete m_sourceModel;
     m_sourceModel = nullptr;
     return false;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ScheduleDifferences_old/ism_schedule_differences_list_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ScheduleDifferences_old/ism_schedule_differences_list_model.cpp
index f68db10c3..56150d865 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ScheduleDifferences_old/ism_schedule_differences_list_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ScheduleDifferences_old/ism_schedule_differences_list_model.cpp
@@ -75,28 +75,28 @@ bool ScheduleDifferencesListDialogModel::initModel(int scheduleId,
   m_scheduleId = scheduleId;
   if (m_scheduleId <= 0)
   {
-    ERROR_LOG() << "Invalid scheduleId = " << m_scheduleId;
+    ERROR_LOG(m_logger) << "Invalid scheduleId = " << m_scheduleId;
     return false;
   }
 
   QList<MountingPointPlan> diff;
   bool isComplete = m_dtc->getScheduleDifferences(m_scheduleId, diff);
 
-  DEBUG_LOG() << "Plan id = " << m_scheduleId << ", Differences = " << diff.size();
+  DEBUG_LOG(m_logger) << "Plan id = " << m_scheduleId << ", Differences = " << diff.size();
 
   if (isComplete)
   {
-    WARNING_LOG() << "Instrumentation plan is complete. No differences to show.";
+    WARNING_LOG(m_logger) << "Instrumentation plan is complete. No differences to show.";
     return false;
   }
 
   for (const MountingPointPlan &mpp : std::as_const(diff))
   {
-    DEBUG_LOG() << "Adding to model MPP = " << mpp.id();
+    DEBUG_LOG(m_logger) << "Adding to model MPP = " << mpp.id();
     insertRow(mpp);
   }
 
-  DEBUG_LOG() << "initModel successful";
+  DEBUG_LOG(m_logger) << "initModel successful";
   return true;
 }
 
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 cf48017fd..bfbe386f5 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
@@ -29,7 +29,7 @@ PlanTimeLineDialog::PlanTimeLineDialog(LtsSession::LtsSession *session, const QS
   , m_ui(new Ui::PlanTimeLineDialog)
   , m_logger(getLogger(QStringLiteral("PlanTimeLineDialog")))
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " ";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " ";
 
   m_ui->setupUi(this);
 
@@ -52,7 +52,7 @@ PlanTimeLineDialog::~PlanTimeLineDialog()
 
 bool PlanTimeLineDialog::init(const std::shared_ptr<InfrastructureManagement::Interface::Dtc> &dtc, const std::shared_ptr<Interface::Ftc> &ftc, const std::shared_ptr<ForeignDataInterface> &dataInterface, InfrastructureManagement::ForeignResourceManagementGuiInterface *ismGuiIfc)
 {
-  DEBUG_LOG() << "Start init FileManagementDialogWidget...";
+  DEBUG_LOG(m_logger) << "Start init FileManagementDialogWidget...";
 
   m_dtc       = dtc;
   m_ftc       = ftc;
@@ -68,7 +68,7 @@ bool PlanTimeLineDialog::init(const std::shared_ptr<InfrastructureManagement::In
 
   if (!bRet)
   {
-    ERROR_LOG() << "Could not enable DTC/FTC from ISM";
+    ERROR_LOG(m_logger) << "Could not enable DTC/FTC from ISM";
     return false;
   }
 
@@ -85,7 +85,7 @@ bool PlanTimeLineDialog::init(const std::shared_ptr<InfrastructureManagement::In
   m_model = new PlanTimelineModel(m_ui->timeline->view(), this);
   if (!m_model->initModel(m_dtc, m_dataIfc))
   {
-    ERROR_LOG() << "Could not init model";
+    ERROR_LOG(m_logger) << "Could not init model";
     delete  m_model;
     m_model = nullptr;
     return false;
@@ -133,7 +133,7 @@ void PlanTimeLineDialog::setScheduleId(const int scheduleId)
     return;
   }
 
-  DEBUG_LOG() << "ism_plan_tln_dialog: setScheduleId = " << m_scheduleId;
+  DEBUG_LOG(m_logger) << "ism_plan_tln_dialog: setScheduleId = " << m_scheduleId;
 
   ismIfc->setScheduleId(m_scheduleId);
 
@@ -158,7 +158,7 @@ void PlanTimeLineDialog::onLoad()
   int scheduleId = m_model->getScheduleIdOfItem(m_selectedItem);
   if (scheduleId == -1)
   {
-    ERROR_LOG() << "onLoad failed: Could not find model for selected item:" << m_selectedItem;
+    ERROR_LOG(m_logger) << "onLoad failed: Could not find model for selected item:" << m_selectedItem;
     return;
   }
 
@@ -231,7 +231,7 @@ void PlanTimeLineDialog::onApply()
     int seId = m_model->getScheduleIdOfItem(itemId);
     if (seId == -1)
     {
-      WARNING_LOG() << "Could not find schedule for item id:" << itemId;
+      WARNING_LOG(m_logger) << "Could not find schedule for item id:" << itemId;
       continue;
     }
     InfrastructureManagement::MainSchedule mse = m_dtc->mainSchedule(seId);
@@ -311,13 +311,13 @@ void PlanTimeLineDialog::updateTimeLine()
 
   if (m_scheduleId == -1)
   {
-    ERROR_LOG() << "Invalid schedule id: timeline update aborted!";
+    ERROR_LOG(m_logger) << "Invalid schedule id: timeline update aborted!";
     return;
   }
 
   if (m_model!= nullptr && !m_model->updateModel())
   {
-    ERROR_LOG() << "Invalid model!";
+    ERROR_LOG(m_logger) << "Invalid model!";
     return;
   }
   resizeView();
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 5b3835cad..0c4f57c71 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
@@ -24,7 +24,7 @@ PlanTimelineModel::PlanTimelineModel(TimelineView *tlv, QObject *parent)
 
 bool PlanTimelineModel::initModel(const std::shared_ptr<InfrastructureManagement::Interface::Dtc> &dtc, const std::shared_ptr<ForeignDataInterface> &dataInterface)
 {
-  DEBUG_LOG() << "Start init FileManagement timeline model...";
+  DEBUG_LOG(m_logger) << "Start init FileManagement timeline model...";
 
   if (m_dtc == dtc)
     return true;
@@ -42,17 +42,17 @@ bool PlanTimelineModel::initModel(const std::shared_ptr<InfrastructureManagement
 
   if (!bRet)
   {
-    ERROR_LOG() << "Could not enable ISM DTC Main schedule or Structure elements";
+    ERROR_LOG(m_logger) << "Could not enable ISM DTC Main schedule or Structure elements";
     return false;
   }
 
   if (!setModel())
   {
-    ERROR_LOG() << "Could not set timeline model";
+    ERROR_LOG(m_logger) << "Could not set timeline model";
     return false;
   }
 
-  INFO_LOG() << "initModel successful";
+  INFO_LOG(m_logger) << "initModel successful";
 
   return true;
 }
@@ -62,7 +62,7 @@ bool PlanTimelineModel::setModel()
 {
   if (m_scheduleId == -1)
   {
-    WARNING_LOG() << "Invalid scheduleId " << m_scheduleId;
+    WARNING_LOG(m_logger) << "Invalid scheduleId " << m_scheduleId;
     return false;
   }
 
@@ -102,12 +102,12 @@ bool PlanTimelineModel::setModel()
       }
       catch (const std::exception &e)
       {
-        ERROR_LOG() << "## Unable to add item or track to model. Exception: " << e.what();
+        ERROR_LOG(m_logger) << "## Unable to add item or track to model. Exception: " << e.what();
         return false;
       }
     }
     else
-      WARNING_LOG() << "Time start/end not set for schedule id " << mse.id();
+      WARNING_LOG(m_logger) << "Time start/end not set for schedule id " << mse.id();
   }
   return true;
 
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 049496b3e..136b64762 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
@@ -69,7 +69,7 @@ bool BuildingMountPointDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
 
   if (!m_model->initModel(m_dtc))
   {
-    ERROR_LOG() << "Could not init model";
+    ERROR_LOG(m_logger) << "Could not init model";
     return false;
   }
 
@@ -94,7 +94,7 @@ bool BuildingMountPointDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
 
   if (!m_ftc->enableMainStructureElementModify())
   {
-    ERROR_LOG() << "Could not enable FT MainStructureElementModify of ISM";
+    ERROR_LOG(m_logger) << "Could not enable FT MainStructureElementModify of ISM";
     return false;
   }
 
@@ -217,7 +217,7 @@ bool BuildingMountPointDialog::exportData(const std::vector<StructureElement> &s
 
 void BuildingMountPointDialog::onExportClicked()
 {
-  DEBUG_LOG() << "**** onExportClicked() ";
+  DEBUG_LOG(m_logger) << "**** onExportClicked() ";
 
   const QModelIndexList indexList = m_ui->tvBuildings->selectionModel()->selectedRows();
   if (indexList.isEmpty())
@@ -251,14 +251,14 @@ void BuildingMountPointDialog::onExportClicked()
                                                         tr("CSV-Files (*.csv)"));
   if (!fileNameTemplate.contains(placeholder))
   {
-    ERROR_LOG() << "  no placeholder '" << placeholder << "'";
+    ERROR_LOG(m_logger) << "  no placeholder '" << placeholder << "'";
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("The name must have a placeholder (%1). Please try again.").arg(placeholder));
     return;
   }
   const QString &dir = QFileInfo(fileNameTemplate).absolutePath();
 
   fileNameTemplate.replace(placeholder, QStringLiteral("%1"));
-  DEBUG_LOG() << " fileNameTemplate after '" << fileNameTemplate << "'";
+  DEBUG_LOG(m_logger) << " fileNameTemplate after '" << fileNameTemplate << "'";
   for (auto idxItem : indexList)
   {
     const QModelIndex &idx = m_proxyModel->mapToSource(idxItem);
@@ -266,16 +266,16 @@ void BuildingMountPointDialog::onExportClicked()
     const QString bldgName = QString::fromStdString(m_model->getMainStructureElement(idx).name());
     if (bldgName.isEmpty())
     {
-      ERROR_LOG() << " bldgName is empty";
+      ERROR_LOG(m_logger) << " bldgName is empty";
       LtsWidgets::LtsMessageDialog::showMessage(this, tr("Name is empty").arg(dir));
       return;
     }
 
     const QString &fileName = QString(fileNameTemplate).arg(bldgName);
-    DEBUG_LOG() << " fileName '" << fileName << "'";
+    DEBUG_LOG(m_logger) << " fileName '" << fileName << "'";
 
     if (!exportData(structureElements, fileName))
-      ERROR_LOG() << " exportData failed bldgName " << bldgName;
+      ERROR_LOG(m_logger) << " exportData failed bldgName " << bldgName;
   } 
 
   LtsWidgets::LtsMessageDialog::showMessage(this,
@@ -312,7 +312,7 @@ void BuildingMountPointDialog::onExportAllClicked()
 
 void BuildingMountPointDialog::onImportClicked()
 {
-  DEBUG_LOG() << "**** onImportClicked() ";
+  DEBUG_LOG(m_logger) << "**** onImportClicked() ";
 
   QModelIndexList indexList = m_ui->tvBuildings->selectionModel()->selectedRows();
   if (indexList.isEmpty() || indexList.size() > 1)
@@ -342,7 +342,7 @@ void BuildingMountPointDialog::onImportClicked()
   int colBarcode = 0;
   int colMountingPointId = 1;
 
-  DEBUG_LOG() << "colBarcode: " << colBarcode
+  DEBUG_LOG(m_logger) << "colBarcode: " << colBarcode
                       << ", colMountingPointId: " << colMountingPointId;
 
   m_importedModelIndex = m_proxyModel->mapToSource(indexList.at(0));
@@ -358,7 +358,7 @@ void BuildingMountPointDialog::onImportClicked()
     if (colMountingPointId >= values.size() ||
         colBarcode >= values.size())
     {
-      WARNING_LOG() << "skipping line - to few data: '" << line << "'";
+      WARNING_LOG(m_logger) << "skipping line - to few data: '" << line << "'";
       continue;
     }
     QString newBarCode = values.at(colBarcode).toString();
@@ -378,7 +378,7 @@ void BuildingMountPointDialog::onImportClicked()
       barcodes.insert(curMountingPointId, newBarCode);
       prevMountingPointId = curMountingPointId;
     }
-    DEBUG_LOG() << "mountingPoint: " << curMountingPointId
+    DEBUG_LOG(m_logger) << "mountingPoint: " << curMountingPointId
                         << ", new barcode: " << newBarCode;
   }
   file.close();
@@ -432,7 +432,7 @@ bool BuildingMountPointDialog::apply()
 
 void BuildingMountPointDialog::onResetClicked()
 {
-  DEBUG_LOG() << "**** onResetClicked() ";
+  DEBUG_LOG(m_logger) << "**** onResetClicked() ";
 
   m_model->resetNewItems(m_importedModelIndex);
   m_model->resetNewBarcodes(m_importedModelIndex);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_dialog.h
index 804a3be5e..66f309e7f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_dialog.h
@@ -53,6 +53,8 @@ private slots:
   bool apply() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   bool exportData(const std::vector<StructureElement> &structureElements, const QString &fileName);
   void expandCollapseRecursivly(const QModelIndex &idx, bool bExpand);
 
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 246e917c0..6a8f0a016 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
@@ -356,7 +356,7 @@ void BuildingMountPointModel::modifyBuilding(const MainStructureElement &mse)
   if (!building)
   {
     
-    WARNING_LOG()<<">>> 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);
   }
@@ -383,7 +383,7 @@ void BuildingMountPointModel::modifyBuilding(const MainStructureElement &mse)
 
   if (!buildingSeId)
   {
-    ERROR_LOG() << "Found no structure element with type 'Building' in content: " << mse;
+    ERROR_LOG(m_logger) << "Found no structure element with type 'Building' in content: " << mse;
     return;
   }
 
@@ -480,7 +480,7 @@ void BuildingMountPointModel::removeBuildingByGroupId(const MainStructureElement
 
   if (bfound == false)
   {
-    ERROR_LOG()<<"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!";
   }
 
 }
@@ -527,7 +527,7 @@ void BuildingMountPointModel::insertChildren(int parentId,
     auto it = structureElements.constFind(childId);
     if (it == structureElements.constEnd())
     {
-      ERROR_LOG() << "Can not find structure element with id " << childId << " - ignoring";
+      ERROR_LOG(m_logger) << "Can not find structure element with id " << childId << " - ignoring";
       continue;
     }
     const StructureElement &data = it.value();
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 00664c687..7ee01ab97 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
@@ -23,6 +23,7 @@ struct StructureElementTreeItem : public NGLTreeItem
     return m_dispName;
   }
 private:
+NGL::INGLLogger &m_logger;
   mutable QString m_dispName;
 };
 
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 d2f4490d9..fe6920ec9 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
@@ -30,7 +30,7 @@ PlanDialog::PlanDialog(const QString &menuGroup, LtsSession::LtsSession * sessio
   , m_ui(new Ui::PlanDialog)
   , m_logger(getLogger(QStringLiteral("PlanDialog")))
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_ui->setupUi(this);
   m_buttonBox->connectButton(LtsWidgets::DialogButton::Print, this, &PlanDialog::onPrint);
   m_buttonBox->connectButton(LtsWidgets::DialogButton::Remove, this, &PlanDialog::onRemove);
@@ -47,14 +47,14 @@ PlanDialog::PlanDialog(const QString &menuGroup, LtsSession::LtsSession * sessio
   connect(m_ui->planView, &LtsDataView::LtsDataView::doubleClicked, this, &PlanDialog::onEdit);
 
   setOnlineHelpFilename(QStringLiteral("Ressourcen-Plans"));
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 PlanDialog::~PlanDialog()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   delete m_ui;
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void PlanDialog::retranslate()
@@ -74,7 +74,7 @@ bool PlanDialog::init(int scheduleId, const std::shared_ptr<Interface::Dtc> &dtc
                       const std::shared_ptr<ForeignDataInterface> &dataInterface,
                       ForeignResourceManagementGuiInterface *ismGuiIfc)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   m_scheduleId = scheduleId;
   m_dtc    = dtc;
@@ -96,7 +96,7 @@ bool PlanDialog::init(int scheduleId, const std::shared_ptr<Interface::Dtc> &dtc
 
   if (!bRet)
   {
-    ERROR_LOG() << "Could not enable DTC or FTC from ISM";
+    ERROR_LOG(m_logger) << "Could not enable DTC or FTC from ISM";
     return false;
   }
 
@@ -111,17 +111,17 @@ bool PlanDialog::init(int scheduleId, const std::shared_ptr<Interface::Dtc> &dtc
   connect(m_dataIfc.get(), &ForeignDataInterface::scheduleIdChanged, this, &PlanDialog::onScheduleIdchanged);
   m_ui->planView->setToolTip(tr("Current Instrumentation Plan Id = %1").arg(m_scheduleId));
 
-  DEBUG_LOG() << "m_scheduleId = " << m_scheduleId;
+  DEBUG_LOG(m_logger) << "m_scheduleId = " << m_scheduleId;
 
   setScheduleId(m_scheduleId);
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
 void PlanDialog::setScheduleId(const int scheduleId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_scheduleId = scheduleId;
 
   std::shared_ptr<InfrastructureManagement::ForeignDataInterface> ismIfc;
@@ -131,7 +131,7 @@ void PlanDialog::setScheduleId(const int scheduleId)
     return;
   }
 
-  DEBUG_LOG() << "setScheduleId = " << m_scheduleId;
+  DEBUG_LOG(m_logger) << "setScheduleId = " << m_scheduleId;
 
   ismIfc->setScheduleId(m_scheduleId);
 
@@ -144,7 +144,7 @@ void PlanDialog::setScheduleId(const int scheduleId)
 
   m_ui->planView->setToolTip(tr("Current Instrumentation Plan Id = %1").arg(m_scheduleId));
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void PlanDialog::onPrint()
@@ -154,11 +154,11 @@ void PlanDialog::onPrint()
 
 void PlanDialog::onMainScheduleChanged(const MainSchedule &data, DataModification modType)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_scheduleId = data.id();
   enaDisa();
   Q_UNUSED(modType);
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void PlanDialog::onScheduleIdchanged(int32_t id)
@@ -169,7 +169,7 @@ void PlanDialog::onScheduleIdchanged(int32_t id)
 
 void PlanDialog::onLoad()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   QModelIndexList indexList = m_ui->planView->selectedRows();
 
   if (indexList.size() == 0)
@@ -187,12 +187,12 @@ void PlanDialog::onLoad()
   setScheduleId(m_scheduleId);
   m_ismGuiIfc->setPlanId(m_scheduleId);
   enaDisa();
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void PlanDialog::onRemove()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   QModelIndexList indexList = m_ui->planView->selectedRows();
 
   if (indexList.size() == 0)
@@ -244,12 +244,12 @@ void PlanDialog::onRemove()
   {
     return m_ftc->mainScheduleRemoveRequest(rmReq, this);
   });
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void PlanDialog::enaDisa()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Add, true);
   m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Print, true);
 
@@ -272,12 +272,12 @@ void PlanDialog::enaDisa()
   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) );
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void PlanDialog::onEdit()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   QModelIndexList indexList = m_ui->planView->selectedRows();
   if (indexList.size() == 0)
     return;
@@ -286,7 +286,7 @@ void PlanDialog::onEdit()
   if (item.id() < 0 )
     return;
 
-  DEBUG_LOG() << "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))
@@ -296,12 +296,12 @@ void PlanDialog::onEdit()
   }
 
   addDialog(dialog, m_menuGroup, QStringLiteral("EditSchedule%1").arg(item.id()), LtsWidgets::LayoutArea::eDialogTab);
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void PlanDialog::onAdd()
 {
-  DEBUG_LOG() << "onAdd";
+  DEBUG_LOG(m_logger) << "onAdd";
   PlanEditDialog *dialog = new PlanEditDialog(this);
   if (!dialog->init(m_session, 0, m_dtc, m_ftc, m_ismGuiCbx))
   {
@@ -313,7 +313,7 @@ void PlanDialog::onAdd()
 
 void PlanDialog::onCheck()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   QModelIndexList indexList = m_ui->planView->selectedRows();
   if (indexList.size() == 0)
     return;
@@ -322,7 +322,7 @@ void PlanDialog::onCheck()
   if (item.id() < 0 )
     return;
 
-  DEBUG_LOG() << "show Differences schedule with id = " << item.id();
+  DEBUG_LOG(m_logger) << "show Differences schedule with id = " << item.id();
 
   
   
@@ -341,13 +341,13 @@ void PlanDialog::onCheck()
   }
 
   addDialog(dialog, m_menuGroup, QStringLiteral("ShowDifferences%1").arg(item.id()), LtsWidgets::LayoutArea::eDialogTab);
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 
 void PlanDialog::onCopy()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   QModelIndexList indexList = m_ui->planView->selectedRows();
   if (indexList.size() == 0)
     return;
@@ -356,7 +356,7 @@ void PlanDialog::onCopy()
   if (item.id() < 0 )
     return;
 
-  DEBUG_LOG() << "onCopy schedule with id = " << item.id();
+  DEBUG_LOG(m_logger) << "onCopy schedule with id = " << item.id();
 
   MainScheduleCopyRequest req;
   req.id(item.id());
@@ -366,7 +366,7 @@ void PlanDialog::onCopy()
     return m_ftc->mainScheduleCopyRequest(req, this);
   });
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 
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 0055fe1c7..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
@@ -50,6 +50,8 @@ public:
   void setScheduleId(const int scheduleId);
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void onMainScheduleRemoveReply(const Core::FunctionReplyObject &replyObject) override final
   {
     m_requestHelper->requestReply(replyObject);
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 0929f2305..0c06d4e0e 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
@@ -19,27 +19,27 @@ PlanDialogModel::PlanDialogModel(QObject *parent)
                                                     parent)
   , m_dtc(nullptr)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 
 PlanDialogModel::~PlanDialogModel()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 
 bool PlanDialogModel::initModel(const std::shared_ptr<Interface::Dtc> &dtc)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_dtc = dtc;
 
   connect(m_dtc.get(), &Interface::Dtc::mainScheduleChanged, this, &PlanDialogModel::onDataChanged);
   m_dtc->mainSchedules([this](const MainSchedule &ms){ onDataChanged(ms, DataModification::eAdded); });
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_dialog_model.h
index ce87da659..c7763f84c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_dialog_model.h
@@ -36,6 +36,8 @@ public:
   };
 
 private:
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<Interface::Dtc> m_dtc;
 };
 
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 085d05e84..8320d6417 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
@@ -47,6 +47,8 @@ public:
   ~PlanEditDialog();
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void onMainScheduleModifyReply(const Core::FunctionReplyObject &replyObject) override final  { m_requestHelper->requestReply(replyObject); }
   void enaDisa();
 
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 a4b3eb5f0..20ac177b5 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
@@ -25,7 +25,7 @@ MarkerManagementApplyFilter::MarkerManagementApplyFilter(LtsSession::LtsSession
   m_session->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(spSitMapGuiIfc);
   if (!spSitMapGuiIfc)
   {
-    ERROR_LOG() << "No spSitMapGuiIfc";
+    ERROR_LOG(m_logger) << "No spSitMapGuiIfc";
     return;
   }
   m_sitMapGuiIfc = spSitMapGuiIfc;
@@ -46,7 +46,7 @@ const QJsonObject MarkerManagementApplyFilter::getFilterParamsJson() const
       obj[QStringLiteral("SymbolAppearanceJson")] = symbolAppearanceSettings->settingsToJson();
     }
     else
-      WARNING_LOG() << "cannot get filter as SymApp filter ifc is missing";
+      WARNING_LOG(m_logger) << "cannot get filter as SymApp filter ifc is missing";
   }
 
   
@@ -59,7 +59,7 @@ const QJsonObject MarkerManagementApplyFilter::getFilterParamsJson() const
       obj[QStringLiteral("AesFilterJson")] = aesDisplayFilter->filterToJson();
     }
     else
-      WARNING_LOG() << "cannot get filter as aes filter ifc is missing";
+      WARNING_LOG(m_logger) << "cannot get filter as aes filter ifc is missing";
   }
 
   
@@ -72,7 +72,7 @@ const QJsonObject MarkerManagementApplyFilter::getFilterParamsJson() const
       obj[QStringLiteral("BuildingComponentSettingsJson")] = buildingComponentSettings->bldCmpSettingsToJson();
     }
     else
-      WARNING_LOG() << "cannot get filter as BldgCmpnt filter ifc is missing";
+      WARNING_LOG(m_logger) << "cannot get filter as BldgCmpnt filter ifc is missing";
   }
 
   return obj;
@@ -88,14 +88,14 @@ bool MarkerManagementApplyFilter::applyFilter(const QByteArray &filterContent)
 {
   if (filterContent.isEmpty())
   {
-    ERROR_LOG() << "filterContent is empty";
+    ERROR_LOG(m_logger) << "filterContent is empty";
     return false;
   }
   QJsonParseError parserError;
   const QJsonDocument jDoc(QJsonDocument::fromJson(filterContent, &parserError));
   if (parserError.error != QJsonParseError::NoError)
   {
-    ERROR_LOG() << "Error parsing json document: " << parserError.errorString();
+    ERROR_LOG(m_logger) << "Error parsing json document: " << parserError.errorString();
     return false;
   }
   return applyFilter(jDoc.object());
@@ -110,7 +110,7 @@ bool MarkerManagementApplyFilter::applyFilter(const QJsonObject &filterContent)
   {
     const QJsonObject innerObj = filterContent[QStringLiteral("AesFilterJson")].toObject();
     if (innerObj.isEmpty())
-      ERROR_LOG() << "inner content AesFilterJson is empty";
+      ERROR_LOG(m_logger) << "inner content AesFilterJson is empty";
     else
       aesFilter.content(QJsonDocument(innerObj).toJson().constData());
   }
@@ -123,7 +123,7 @@ bool MarkerManagementApplyFilter::applyFilter(const QJsonObject &filterContent)
   {
     QJsonObject innerObj = filterContent[QStringLiteral("SymbolAppearanceJson")].toObject();
     if (innerObj.isEmpty())
-      ERROR_LOG() << "inner content SymbolAppearanceJson is empty";
+      ERROR_LOG(m_logger) << "inner content SymbolAppearanceJson is empty";
     else
       symbolAppearance.content(QJsonDocument(innerObj).toJson().constData());
   }
@@ -136,7 +136,7 @@ bool MarkerManagementApplyFilter::applyFilter(const QJsonObject &filterContent)
   {
     QJsonObject innerObj = filterContent[QStringLiteral("BuildingComponentSettingsJson")].toObject();
     if (innerObj.isEmpty())
-      ERROR_LOG() << "inner content BuildingComponentSettingsJson is empty";
+      ERROR_LOG(m_logger) << "inner content BuildingComponentSettingsJson is empty";
     else
       buildingComponentFilter.content(QJsonDocument(innerObj).toJson().constData());
   }
@@ -187,7 +187,7 @@ bool MarkerManagementApplyFilter::applyFilter(const QJsonObject &filterContent)
     appearanceSettings->setSettingsFromData(symbolAppearance);
 
   }  else
-    WARNING_LOG() << "cannot set filter as at least one filter ifc is missing (fltParticipantIfc|fltIfcPtr)";
+    WARNING_LOG(m_logger) << "cannot set filter as at least one filter ifc is missing (fltParticipantIfc|fltIfcPtr)";
 
 
   
@@ -206,7 +206,7 @@ bool MarkerManagementApplyFilter::applyFilter(const QJsonObject &filterContent)
     buildingComponentSettings->setBldCmpSettingsFromData(buildingComponentFilter);
   }
   else
-    WARNING_LOG() << "cannot set filter as at least one filter ifc is missing (fltBldgCmpntIfc)";
+    WARNING_LOG(m_logger) << "cannot set filter as at least one filter ifc is missing (fltBldgCmpntIfc)";
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_apply_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_apply_filter.h
index 8a5b4cd0c..5ead92e50 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_apply_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/mrk_apply_filter.h
@@ -31,6 +31,8 @@ public:
   const QJsonObject getFilterParamsJson() const;
 
 private:
+
+NGL::INGLLogger &m_logger;
   LtsSession::LtsSession *m_session;
   
   std::weak_ptr<FilterManagement::ForeignFltParticipantGuiInterface>       m_fltParticipantIfc;
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 1943506dc..e02cba2aa 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
@@ -92,7 +92,7 @@ void MarkerManagementDialogModel::loadPreview(int fileContentId, int rowId)
   QByteArray byteArray;
   if (m_flmGui->loadContent(fileContentId, byteArray, true) && byteArray.size() > 0)
   {
-    DEBUG_LOG() << "m_previews.insert fileContentId=" << fileContentId
+    DEBUG_LOG(m_logger) << "m_previews.insert fileContentId=" << fileContentId
                         << " size Preview=" << byteArray.size();
     QString str = QStringLiteral("<html><center><img src='data:image/png;base64,%1'></center></html>").arg(QString::fromLatin1(byteArray.toBase64()));
     m_previews.insert(fileContentId, str);
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 bb6fe5bbb..e683585b0 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
@@ -56,6 +56,8 @@ private slots:
   void loadPreview(int fileContentId, int rowId);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void requestNextFileContent();
 
 private:
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 2be47d4cc..4445e3bf5 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
@@ -62,21 +62,21 @@ SnapshotTopicEditor::~SnapshotTopicEditor()
 
 void SnapshotTopicEditor::updateInternalData()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   m_ui->snapshotsDataView->selectionModel()->clear();
   m_snapshotId = m_topicData.properties.value(QStringLiteral("snapshotId")).toInt(0);
 
   if (m_snapshotId > 0) 
   {
-    DEBUG_LOG() << "snapshotId = " << m_snapshotId;
+    DEBUG_LOG(m_logger) << "snapshotId = " << m_snapshotId;
     QModelIndex idx = m_snapshotModel->findIndexForId(m_snapshotId);
 
     if (idx.isValid()) 
     {
       m_ui->snapshotsDataView->selectRow(m_proxyModel->mapFromSource(idx));
       const MarkerManagement::Snapshot snapshot = m_snapshotModel->getRowData(idx.row());
-      DEBUG_LOG() << "SnapShot Selected "  << snapshot.id() ;
+      DEBUG_LOG(m_logger) << "SnapShot Selected "  << snapshot.id() ;
       m_snapshotId = snapshot.id();
       m_ui->lblName->setText(QString::fromStdString(snapshot.name()));
     }
@@ -114,7 +114,7 @@ void SnapshotTopicEditor::onSnapshotSelected()
     return;
 
   m_snapshotId = snapshot.id();
-  DEBUG_LOG() << "new snapshot id = " << m_snapshotId;
+  DEBUG_LOG(m_logger) << "new snapshot id = " << m_snapshotId;
   m_ui->lblName->setText(QString::fromStdString(snapshot.name()));
   slotChangesMade();
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/TopicEditor/topic_editor.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/TopicEditor/topic_editor.h
index ee69b1d0c..b410d7499 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/TopicEditor/topic_editor.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/TopicEditor/topic_editor.h
@@ -31,6 +31,8 @@ public:
   ~SnapshotTopicEditor();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void updateInternalData() override final;
   void retranslate() override final;
 
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 a20aec87e..1ceb38e87 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
@@ -76,7 +76,7 @@ bool SnapshotCreateDialog::init(const std::shared_ptr<MarkerManagement::Interfac
   m_session = session;
 
   if (!m_session->getForeignGuiInterface<FileManagement::ForeignGuiInterface>(m_flmGui))
-    ERROR_LOG() << "flm gui missing - cannot create screenshots for a snapshot";
+    ERROR_LOG(m_logger) << "flm gui missing - cannot create screenshots for a snapshot";
 
   m_ui->cbSavePreview->setEnabled(false);
   m_ui->cbSavePreview->setChecked(true);
@@ -126,8 +126,8 @@ void SnapshotCreateDialog::sendSnapshotRequest()
   req.timeStamp(partitionTime);
   req.fileContentId(m_fileId);
 
-  DEBUG_LOG() << "Edit/Create snapshot id = " << m_editData.id();
-  DEBUG_LOG() << "File id = " << m_fileId;
+  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]()
   {
@@ -135,7 +135,7 @@ void SnapshotCreateDialog::sendSnapshotRequest()
   }))
   {
     m_editData.id(m_requestHelper->getRepliedId());
-    DEBUG_LOG() << "Saved snapshot with id = " << m_requestHelper->getRepliedId();
+    DEBUG_LOG(m_logger) << "Saved snapshot with id = " << m_requestHelper->getRepliedId();
     __unchange__();
     closeRequest();
   }
@@ -190,12 +190,12 @@ void SnapshotCreateDialog::saveSnapshotPreviewInLibrary()
 
   const QString title = ( m_ui->leName->text() + QStringLiteral(" (")+ dtg + QStringLiteral(")"));
 
-  DEBUG_LOG() << "saveSnapshotPreviewInLibrary: " << title;
+  DEBUG_LOG(m_logger) << "saveSnapshotPreviewInLibrary: " << title;
 
   auto spSitMapGuiIfc = m_sitMapGuiIfc.lock();
   if (!spSitMapGuiIfc->isMapReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " sitMapGuiInterface not ready";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " sitMapGuiInterface not ready";
     return;
   }
 
@@ -223,7 +223,7 @@ void SnapshotCreateDialog::saveSnapshotPreviewInLibrary()
         initialFolderId = exeFolderId;
     }
 
-    DEBUG_LOG() << "Initial folder Id = " << initialFolderId
+    DEBUG_LOG(m_logger) << "Initial folder Id = " << initialFolderId
                         << " snapshotFolderId =" << snapshotFolderId;
 
     const int folderId = snapshotFolderId > 0 ? snapshotFolderId : initialFolderId;
@@ -252,13 +252,13 @@ void SnapshotCreateDialog::saveSnapshotPreviewInLibrary()
     }))
     {
       m_fileId = m_requestHelper->getRepliedId();
-      DEBUG_LOG() << "Saved file in library with id = " << m_fileId;
+      DEBUG_LOG(m_logger) << "Saved file in library with id = " << m_fileId;
 
       sendSnapshotRequest();
 
       if (m_editData.fileContentId() != m_fileId)
       {
-        DEBUG_LOG() << "One more request needed!";
+        DEBUG_LOG(m_logger) << "One more request needed!";
         m_editData.fileContentId(m_fileId);
       }
     }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_create_snapshot.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_create_snapshot.h
index ae2bcfc10..4d5c4b2fd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_create_snapshot.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_create_snapshot.h
@@ -52,6 +52,8 @@ public:
   bool apply() override final;
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   QByteArray getFilterParams() const;
 
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 2deb9ad5a..3979a1a98 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
@@ -120,7 +120,7 @@ void MarkerManagementDialog::onEditMarker()
   if (marker.id() <= 0)
     return;
 
-  DEBUG_LOG() << "current MarkerId: " << marker.id();
+  DEBUG_LOG(m_logger) << "current MarkerId: " << marker.id();
 
   AudioVideoManagement::StreamNameMapping *streamNameMapping = nullptr;
   if (m_avmInterface)
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 301806c8e..267a96757 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
@@ -60,6 +60,8 @@ private slots:
   void onShowOtherUsersMarkers(bool isChecked);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void tableColumnOrganiserSetting() override;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_dialog.h
index 3385221c0..003b3ead5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_dialog.h
@@ -41,6 +41,8 @@ public:
   void onMarkerModifyReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void createDescriptions(const MarkerManagement::Marker &marker);
   QString toDisplayNames(const QString &videoStreams);
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 39eb855ad..59fe1df61 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
@@ -55,27 +55,27 @@ bool InterfaceImpl::fetchInterfaces()
   m_session->getForeignDataInterface_NEW<FileManagement::ForeignGuiInterface>(m_flmGui); 
 
   if (!m_session->getDtc<OperatorManagement::DataInterface>(m_opmDtc))
-    WARNING_LOG() << "No Opm Dtc, no Snapshots";
+    WARNING_LOG(m_logger) << "No Opm Dtc, no Snapshots";
 
   if (!m_session->getDtc<FileManagement::DataInterface>(m_flmDtc))
-    WARNING_LOG() << "No Flm Dtc, no Snapshots";
+    WARNING_LOG(m_logger) << "No Flm Dtc, no Snapshots";
 
   if (!m_session->getFtc<FileManagement::DataInterface>(m_flmFtc))
-    WARNING_LOG() << "No Flm Ftc, no Snapshots";
+    WARNING_LOG(m_logger) << "No Flm Ftc, no Snapshots";
 
   if (!m_session->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(m_sitMapGuiIfc))
-    WARNING_LOG() << "No SitMap, no Snapshots";
+    WARNING_LOG(m_logger) << "No SitMap, no Snapshots";
 
   if (!m_session->getDtc<SituationReplayManagement::DataInterface>(m_coreDtc))
   {
-    WARNING_LOG() << "No ReplayManagement!!";
+    WARNING_LOG(m_logger) << "No ReplayManagement!!";
     return false;
   }
 
   if (m_session->app() == LtsAppDescriptor::App::Scripts
       && !m_session->getForeignGuiInterface<SituationReplay::ForeignGuiInterface>(m_srpIfc))
   {
-    WARNING_LOG() << "Scripts: MarkerManagement: no srp, no topic!";
+    WARNING_LOG(m_logger) << "Scripts: MarkerManagement: no srp, no topic!";
     return false;
   }
 
@@ -91,43 +91,43 @@ bool InterfaceImpl::fetchInterfacesReplay()
 
   if (!m_session->getForeignDataInterface<SituationReplayManagement::DataInterface>(m_srmForeign))
   {
-    WARNING_LOG() << "No Srm, no Snapshots";
+    WARNING_LOG(m_logger) << "No Srm, no Snapshots";
     m_snapshotsAvailable = false;
   }
 
   if (!LtsAppManager::LtsAppManager::getInstance()->hasApp(LtsAppDescriptor::App::Snapshot))
   {
-    DEBUG_LOG() << "No Snapshot App? no Snapshots!"; 
+    DEBUG_LOG(m_logger) << "No Snapshot App? no Snapshots!"; 
     m_snapshotsAvailable = false;
   }
 
   if (!m_session->getDtc<OperatorManagement::DataInterface>(m_opmDtc))
   {
-    WARNING_LOG() << "No Opm, no Snapshots";
+    WARNING_LOG(m_logger) << "No Opm, no Snapshots";
     m_snapshotsAvailable = false;
   }
 
   if (!m_session->getForeignGuiInterface<FilterManagement::ForeignFltParticipantGuiInterface>(m_fltParticipantIfc))
   {
-    WARNING_LOG() << "No Flt/Part, no Snapshots";
+    WARNING_LOG(m_logger) << "No Flt/Part, no Snapshots";
     m_snapshotsAvailable = false;
   }
   if (!m_session->getForeignGuiInterface<FilterManagement::ForeignAesGuiInterface>(m_fltAesIfc))
   {
-    WARNING_LOG() << "No Flt/Aes, no Snapshots";
+    WARNING_LOG(m_logger) << "No Flt/Aes, no Snapshots";
     m_snapshotsAvailable = false;
   }
 
   if (!m_session->getForeignGuiInterface<FilterManagement::ForeignFltBuildingComponentGuiInterface>(m_fltBuildingComponentIfc))
   {
-    DEBUG_LOG() << "No Flt/BuildingComponent";
+    DEBUG_LOG(m_logger) << "No Flt/BuildingComponent";
     
     
   }
 
   if (!m_session->getForeignGuiInterface<FileManagement::ForeignGuiInterface>(m_flmGui))
   {
-    WARNING_LOG() << "No Flm, no Snapshots";
+    WARNING_LOG(m_logger) << "No Flm, no Snapshots";
     m_snapshotsAvailable = false;
   }
 
@@ -306,30 +306,30 @@ void InterfaceImpl::startSnapshot()
 
   try
   {
-    DEBUG_LOG() << "replayPartitionCreateRequest ...";
+    DEBUG_LOG(m_logger) << "replayPartitionCreateRequest ...";
     m_replayPartitionId = m_srmForeign->replayPartitionCreateRequest(m_session->exerciseId(),
                                                                      LtsSessionData::LtsSessionData::getInstance()->getWorkstationId(),
                                                                      LtsSessionData::LtsSessionData::getInstance()->getOperatorId(),
                                                                      Core::ReplayType_def::SnapshotData);
-    DEBUG_LOG() << "replayPartitionCreateRequest ...DONE";
+    DEBUG_LOG(m_logger) << "replayPartitionCreateRequest ...DONE";
   }
   
   catch(const std::runtime_error &rterr)
   {
-    ERROR_LOG() << "Failed to start replay partition for snapshot.  std::runtime_error";
-    ERROR_LOG() << "Failed to start replay partition for snapshot.  std::runtime_error: " << rterr.what();
+    ERROR_LOG(m_logger) << "Failed to start replay partition for snapshot.  std::runtime_error";
+    ERROR_LOG(m_logger) << "Failed to start replay partition for snapshot.  std::runtime_error: " << rterr.what();
     new LtsWidgets::LtsMessageDialogNew(m_session->baseLayout(), tr("Failed to start replay partition for snapshot!"));
     return;
   }
   catch(const std::exception &exception)
   {
-    ERROR_LOG() << "Failed to start replay partition for snapshot. Exception: " << exception.what();
+    ERROR_LOG(m_logger) << "Failed to start replay partition for snapshot. Exception: " << exception.what();
     new LtsWidgets::LtsMessageDialogNew(m_session->baseLayout(), tr("Failed to start replay partition for snapshot!"));
     return;
   }
   catch(...)
   {
-    ERROR_LOG() << "Failed to start replay partition for snapshot. Exception: ... ";
+    ERROR_LOG(m_logger) << "Failed to start replay partition for snapshot. Exception: ... ";
     new LtsWidgets::LtsMessageDialogNew(m_session->baseLayout(), tr("Failed to start replay partition for snapshot!"));
     return;
   }
@@ -337,7 +337,7 @@ void InterfaceImpl::startSnapshot()
 
   if (m_replayPartitionId < 0)
   {
-    ERROR_LOG() << "Failed to start replay partition for snapshot - invalid replay partition id!";
+    ERROR_LOG(m_logger) << "Failed to start replay partition for snapshot - invalid replay partition id!";
     new LtsWidgets::LtsMessageDialogNew(m_session->baseLayout(), tr("Failed to start replay partition for snapshot - invalid replay partition id!"));
     return;
   }
@@ -458,12 +458,12 @@ bool InterfaceImpl::applyFilter(const Snapshot &snapshot, NGL::INGLLogger &logge
     }
     else
     {
-      ERROR_LOG() << Q_FUNC_INFO << "Error while applying filters";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << "Error while applying filters";
     }
   }
   else
   {
-    ERROR_LOG() << Q_FUNC_INFO << "No Filter Ifc (Part or Aes) to apply filters";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << "No Filter Ifc (Part or Aes) to apply filters";
   }
 
   return false;
@@ -504,7 +504,7 @@ bool InterfaceImpl::snapshotAdjustSitMap(const Snapshot &snapshot, bool bApplyFi
     if (!planOverlay.isEmpty())
     {
       const bool bIsMapReady = sitMapGuiIfc->isMapReady();
-      DEBUG_LOG() << Q_FUNC_INFO << " bIsMapReady = " << bIsMapReady;
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " bIsMapReady = " << bIsMapReady;
 
       if (bIsMapReady)
       {
@@ -540,7 +540,7 @@ bool InterfaceImpl::snapshotAdjustSitMap(const Snapshot &snapshot, bool bApplyFi
                         << " planOverlay: " << planOverlay;
         };
         if (!sitMapGuiIfc->setMapReadyCallback(this, onMapIsReadyFn))
-          ERROR_LOG() << Q_FUNC_INFO << ", setMapReadyCallback failed, snapShotOverlayId: " << snapShotOverlayId;
+          ERROR_LOG(m_logger) << Q_FUNC_INFO << ", setMapReadyCallback failed, snapShotOverlayId: " << snapShotOverlayId;
       }
 
     }
@@ -595,7 +595,7 @@ void InterfaceImpl::resetReplay()
   }
   else
   {
-    WARNING_LOG() << "could not reset sit map original settings - leaving settings as is...";
+    WARNING_LOG(m_logger) << "could not reset sit map original settings - leaving settings as is...";
   }
 }
 
@@ -604,7 +604,7 @@ TopicReplay::Interface *InterfaceImpl::createInterface(TopicEditorBase::TopicTyp
 {
   std::shared_ptr<MarkerManagement::Interface::Dtc> mrkDtc;
   if (!m_session->getDtc<MarkerManagement::DataInterface>(mrkDtc))
-    WARNING_LOG() << "mrk dtc missing - snapshot topics cannot live fetch data but instead uses data saved inside the topic";
+    WARNING_LOG(m_logger) << "mrk dtc missing - snapshot topics cannot live fetch data but instead uses data saved inside the topic";
 
   return new TopicReplayInterface(m_srpIfc, mrkDtc, m_scriptsMrkIfc , m_logger);
 }
@@ -636,7 +636,7 @@ bool TopicReplayInterface::playbackInit(const QJsonObject &attributes)
 {
   if (m_srpIfc == nullptr)
   {
-    WARNING_LOG() << "MarkerManagement:TopicReplayInterface::playbackInit: no srp ifc, no playback";
+    WARNING_LOG(m_logger) << "MarkerManagement:TopicReplayInterface::playbackInit: no srp ifc, no playback";
     return false;
   }
 
@@ -648,7 +648,7 @@ bool TopicReplayInterface::playbackInit(const QJsonObject &attributes)
   
   if (m_snapshot.id() <= 0 || m_snapshot.timeStamp() < 1)
   {
-    WARNING_LOG() << "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());
@@ -658,7 +658,7 @@ bool TopicReplayInterface::playbackInit(const QJsonObject &attributes)
 
   if (m_snapshot.timeStamp() < 1)
   {
-    WARNING_LOG() << "invalid snapshot timestamp for playback: " << QString::fromUtf8(QJsonDocument(attributes).toJson());
+    WARNING_LOG(m_logger) << "invalid snapshot timestamp for playback: " << QString::fromUtf8(QJsonDocument(attributes).toJson());
     return false;
   }
 
@@ -666,14 +666,14 @@ bool TopicReplayInterface::playbackInit(const QJsonObject &attributes)
 
   if (scriptsExerciseId == 0)
   {
-    WARNING_LOG() << "invalid script's exercise id for playback: "
+    WARNING_LOG(m_logger) << "invalid script's exercise id for playback: "
                           << attributes[QStringLiteral("scriptsExerciseId")].toVariant().toString();
     return false;
   }
 
   if (m_parentIfc == nullptr || !m_parentIfc->snapshotAdjustSitMap(m_snapshot, true, m_originalMapSettings, nullptr, m_logger))
   {
-    WARNING_LOG() << "Cannot adjust Situation Map Ifc from Snapshot app";
+    WARNING_LOG(m_logger) << "Cannot adjust Situation Map Ifc from Snapshot app";
     return false;
   }
 
@@ -720,15 +720,15 @@ bool InterfaceImpl::eventFilter(QObject *obj, QEvent *event)
        event->type() == LtsWidgets::AddSnapshotEvent::addSnapshotEventId() ||
        event->type() == LtsWidgets::SaveSnapshotEvent::saveSnapshotEventId()))
   {
-    ERROR_LOG() << "Filtering voice commands (add/set marker, add/save snapshot)";
+    ERROR_LOG(m_logger) << "Filtering voice commands (add/set marker, add/save snapshot)";
 
     if (event->type() == LtsWidgets::SetMarkerEvent::setMarkerEventId())
     {
-      DEBUG_LOG() << "Set marker";
+      DEBUG_LOG(m_logger) << "Set marker";
 
       auto ev = static_cast<LtsWidgets::SetMarkerEvent*>(event);
 
-      DEBUG_LOG() << "Event description = " << ev->getDescription();
+      DEBUG_LOG(m_logger) << "Event description = " << ev->getDescription();
 
       MarkerManagement::Marker req;
 
@@ -763,13 +763,13 @@ bool InterfaceImpl::eventFilter(QObject *obj, QEvent *event)
       }))
       {
         req.id(m_requestHelper->getRepliedId());
-        DEBUG_LOG() << "Saved Marker with id = " << m_requestHelper->getRepliedId();
+        DEBUG_LOG(m_logger) << "Saved Marker with id = " << m_requestHelper->getRepliedId();
       }
 
     }
     if (event->type() == LtsWidgets::AddMarkerEvent::addMarkerEventId())
     {
-      DEBUG_LOG() << "init dialog Add marker";
+      DEBUG_LOG(m_logger) << "init dialog Add marker";
 
       LtsWidgets::LtsBaseLayoutWidget *baseLayout = m_session->baseLayout();
 
@@ -793,7 +793,7 @@ bool InterfaceImpl::eventFilter(QObject *obj, QEvent *event)
     }
     if (event->type() == LtsWidgets::AddSnapshotEvent::addSnapshotEventId() && m_snapshotsAvailable)
     {
-      DEBUG_LOG() << "init dialog Add snapshot";
+      DEBUG_LOG(m_logger) << "init dialog Add snapshot";
 
       LtsWidgets::LtsBaseLayoutWidget *baseLayout = m_session->baseLayout();
 
@@ -818,11 +818,11 @@ bool InterfaceImpl::eventFilter(QObject *obj, QEvent *event)
 
     if (event->type() == LtsWidgets::SaveSnapshotEvent::saveSnapshotEventId() && m_snapshotsAvailable)
     {
-      DEBUG_LOG() << "Save snapshot";
+      DEBUG_LOG(m_logger) << "Save snapshot";
 
       auto ev = static_cast<LtsWidgets::SaveSnapshotEvent*>(event);
 
-      DEBUG_LOG() << "Event description = " << ev->getDescription();
+      DEBUG_LOG(m_logger) << "Event description = " << ev->getDescription();
 
       qint64 partitionTime = m_session->partitionTime();
 
@@ -854,7 +854,7 @@ bool InterfaceImpl::eventFilter(QObject *obj, QEvent *event)
       }))
       {
         req.id(m_requestHelper->getRepliedId());
-        DEBUG_LOG() << "Saved Snapshot with 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_edit_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_gui_plugin.h
index 7eb0daef6..feb1aa005 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_gui_plugin.h
@@ -73,6 +73,8 @@ public:
   QVector<TopicEditorBase::TopicData> additionalTrackEntries(const QJsonObject &attributes) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<SituationReplay::ForeignGuiInterface> m_srpIfc;
   Snapshot m_snapshot;
   QByteArray m_originalMapSettings;
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 4bd73562a..5f7839d3e 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
@@ -61,7 +61,8 @@ bool containsStream(QComboBox *cb, const QString &internalStreamName)
 
 namespace MarkerManagement
 {
-FinishedSignal::FinishedSignal():QObject(){}
+FinishedSignal::FinishedSignal() : QObject(),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 
 SetMarkers::SetMarkers(LtsSession::LtsSession *session, QWidget *parent)
@@ -169,7 +170,7 @@ bool SetMarkers::apply()
   }
   catch(const std::exception &ex)
   {
-    ERROR_LOG() << "saving marker failed: " << ex.what();
+    ERROR_LOG(m_logger) << "saving marker failed: " << ex.what();
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("Failed to save marker. Please try again later."));
     return false;
   }
@@ -333,13 +334,13 @@ void SetMarkers::sendMarkerRequest() noexcept(false)
   req.timeStampOffset(m_ui->cbxOffset->currentText().toInt() * 1000);
   req.fileContentId(m_fileId);
 
-  DEBUG_LOG() << "Start Marker request with file content Id = " << 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);
 
-  DEBUG_LOG() << "Saved marker with id = " << m_requestHelper->getRepliedId();
+  DEBUG_LOG(m_logger) << "Saved marker with id = " << m_requestHelper->getRepliedId();
 }
 
 void SetMarkers::saveMarkerInLibrary() noexcept(false)
@@ -351,13 +352,13 @@ void SetMarkers::saveMarkerInLibrary() noexcept(false)
       .arg(LtsSessionData::LtsSessionData::getInstance()->getOperatorId())
       .arg(m_ui->teNote->toPlainText().left(20)); 
 
-  DEBUG_LOG() << "saveMarkerInLibrary: " << title;
+  DEBUG_LOG(m_logger) << "saveMarkerInLibrary: " << title;
 
   auto spSitMapGuiIfc = m_sitMapGuiIfc.lock();
   if (!spSitMapGuiIfc->isMapReady())
   {
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("Cannot create a marker as the map is not ready yet."));
-    ERROR_LOG() << Q_FUNC_INFO << " sitMapGuiInterface not ready";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " sitMapGuiInterface not ready";
     return;
   }
 
@@ -369,13 +370,13 @@ void SetMarkers::saveMarkerInLibrary() noexcept(false)
   auto onImage = [this, &fig, &image](const QImage &_image)
   {
     image = _image;
-    DEBUG_LOG() << "onImage callback: image size (w, h) = (" << image.width() << ", " << image.height() << ")";
+    DEBUG_LOG(m_logger) << "onImage callback: image size (w, h) = (" << image.width() << ", " << image.height() << ")";
     QMetaObject::invokeMethod(fig.get(), &FinishedSignal::finished, Qt::QueuedConnection);
   };
 
   if (!spSitMapGuiIfc->toImage(this, onImage)) 
   {
-    ERROR_LOG() << "Failed to save marker image from map";
+    ERROR_LOG(m_logger) << "Failed to save marker image from map";
     return;
   }
 
@@ -418,17 +419,17 @@ void SetMarkers::saveMarkerInLibrary() noexcept(false)
   }
   catch(const std::exception &ex)
   {
-    ERROR_LOG() << "failed to save image for marker: " << ex.what();
+    ERROR_LOG(m_logger) << "failed to save image for marker: " << ex.what();
     return;
   }
 
-  DEBUG_LOG() << "Saved file in library with id = " << m_fileId;
+  DEBUG_LOG(m_logger) << "Saved file in library with id = " << m_fileId;
 
   sendMarkerRequest(); 
 
   if (m_editData.fileContentId() != m_fileId)
   {
-    DEBUG_LOG() << "One more request needed!";
+    DEBUG_LOG(m_logger) << "One more request needed!";
     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 a28099b2e..e0d7afaf7 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
@@ -51,7 +51,7 @@ SnapshotDialog::SnapshotDialog(const QString &menuGroup, LtsSession::LtsSession
   , m_planEditorApp(nullptr)
   , m_fileId(-1)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_ui->setupUi(this);
 
   m_buttonBox->connectButton(LtsWidgets::DialogButton::Show,
@@ -82,16 +82,16 @@ SnapshotDialog::SnapshotDialog(const QString &menuGroup, LtsSession::LtsSession
   setOnlineHelpFilename(QStringLiteral("Situation-Snapshots"));
   m_ui->widget->setSelectionMode(QAbstractItemView::SelectionMode::ExtendedSelection);
   session->getForeignGuiInterface<FileManagement::ForeignGuiInterface>(m_flmGui);
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 
 SnapshotDialog::~SnapshotDialog()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   
   delete m_ui;
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 
@@ -120,7 +120,7 @@ void SnapshotDialog::onShow()
 
 void SnapshotDialog::onRefreshCurrent(const Snapshot &snapshot)
 {
-  INFO_LOG() << Q_FUNC_INFO << " current SnapshotId: " << snapshot.id();
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " current SnapshotId: " << snapshot.id();
 
   
   if (snapshot.id() != m_currentSnapshot.id())
@@ -133,7 +133,7 @@ void SnapshotDialog::onRefreshCurrent(const Snapshot &snapshot)
 
 void SnapshotDialog::showSnapshot()
 {
-  INFO_LOG() << 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();
@@ -146,7 +146,7 @@ bool SnapshotDialog::applyFilter(const Snapshot &snapshot)
 
   if (filterContent.isEmpty())
   {
-    ERROR_LOG() << "filterContent is empty, snapshot.id()="<< snapshot.id();
+    ERROR_LOG(m_logger) << "filterContent is empty, snapshot.id()="<< snapshot.id();
     return false;
   }
 
@@ -155,7 +155,7 @@ bool SnapshotDialog::applyFilter(const Snapshot &snapshot)
 
   if (!appFilter.applyFilter(filterContent))
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Error while applying filters";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Error while applying filters";
     return false;
   }
 
@@ -178,13 +178,13 @@ bool SnapshotDialog::applyFilter(const Snapshot &snapshot)
         MarkerManagementApplyFilter appFilter2(pe_session, pe_fltParticipantIfc, pe_fltAesIfc, pe_fltBuildingComponentIfc);
         if (!appFilter2.applyFilter(filterContent))
         {
-          ERROR_LOG() << Q_FUNC_INFO << "Error while applying filters";
+          ERROR_LOG(m_logger) << Q_FUNC_INFO << "Error while applying filters";
           return false;
         }
       } else
-        ERROR_LOG() << Q_FUNC_INFO << "getForeignGuiInterface failed";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << "getForeignGuiInterface failed";
     } else
-      ERROR_LOG() << Q_FUNC_INFO << "Internal error - can not get previously created session!";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << "Internal error - can not get previously created session!";
   }
   
 
@@ -204,7 +204,7 @@ bool SnapshotDialog::showSnapshotInternal(const Snapshot &snapshot, bool bApplyF
   SituationMap::SitMapUpdatesEnabledHelper sitMapHelper(spSitMapGuiIfc);
 
   const int partitionId = m_session->partitionId();
-  INFO_LOG() << Q_FUNC_INFO << " current Snapshot: " << snapshot
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " current Snapshot: " << snapshot
                      << ", replayPartition: " << partitionId
                      << ", applyFilter=" << bApplyFilter;
 
@@ -218,7 +218,7 @@ bool SnapshotDialog::showSnapshotInternal(const Snapshot &snapshot, bool bApplyF
 
   if (!m_requestHelper->startSingleRequest([req, this]() { return m_srpFtc->changeReplayStateRequest(req, this); }))
   {
-    ERROR_LOG() << "Replay could not be started for partition id = " << partitionId;
+    ERROR_LOG(m_logger) << "Replay could not be started for partition id = " << partitionId;
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("Replay could not be started for partition with id %1").arg(partitionId));
     return false;
   }
@@ -229,7 +229,7 @@ bool SnapshotDialog::showSnapshotInternal(const Snapshot &snapshot, bool bApplyF
   if (bApplyFilter)
     if (!applyFilter(snapshot))
     {
-      ERROR_LOG() << "applyFilter failed, partition id = " << partitionId;
+      ERROR_LOG(m_logger) << "applyFilter failed, partition id = " << partitionId;
       success = false;
     }
 
@@ -239,7 +239,7 @@ bool SnapshotDialog::showSnapshotInternal(const Snapshot &snapshot, bool bApplyF
     std::shared_ptr<PlanOverlaysPlugin::ForeignGuiInterface> ovrDtc;
     if (m_session->getForeignGuiInterface<PlanOverlaysPlugin::ForeignGuiInterface>(ovrDtc))
     {
-      INFO_LOG() << Q_FUNC_INFO << " unloadAllPlans via PlanOverlaysPlugin to update dialog";
+      INFO_LOG(m_logger) << Q_FUNC_INFO << " unloadAllPlans via PlanOverlaysPlugin to update dialog";
       ovrDtc->unloadAllPlans();
     }
 
@@ -254,13 +254,13 @@ bool SnapshotDialog::showSnapshotInternal(const Snapshot &snapshot, bool bApplyF
         
         {
           const bool bIsMapReady = spSitMapGuiIfc->isMapReady();
-          INFO_LOG() << Q_FUNC_INFO << " bIsMapReady = " << bIsMapReady;
+          INFO_LOG(m_logger) << Q_FUNC_INFO << " bIsMapReady = " << bIsMapReady;
 
           if (bIsMapReady)
           {
             if (!spSitMapGuiIfc->planOverlaySetContent(snapShotOverlayId, tr("Snapshot-PlanOverlay"), planOverlay, true))
             {
-              ERROR_LOG() << 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;
@@ -298,16 +298,16 @@ bool SnapshotDialog::showSnapshotInternal(const Snapshot &snapshot, bool bApplyF
 
             const int snapshotId = snapshot.id();
             auto onMapIsReadyFn = [this, spSitMapGuiIfc, planOverlay, snapshotId]() {
-              INFO_LOG() << Q_FUNC_INFO  << " try again: do planOverlaySetContent...";
+              INFO_LOG(m_logger) << Q_FUNC_INFO  << " try again: do planOverlaySetContent...";
               if (!spSitMapGuiIfc->planOverlaySetContent(snapShotOverlayId, tr("Snapshot-PlanOverlay"), planOverlay, true))
               {
-                ERROR_LOG() << Q_FUNC_INFO << " Error add planOverlay to snapshot, SnapshotId: " << snapshotId
+                ERROR_LOG(m_logger) << Q_FUNC_INFO << " Error add planOverlay to snapshot, SnapshotId: " << snapshotId
                                     << " planOverlay.size()=" << planOverlay.size()
                                     << " planOverlay=" << planOverlay;
               }
             };
             if (!spSitMapGuiIfc->setMapReadyCallback(this, onMapIsReadyFn))
-              ERROR_LOG() << Q_FUNC_INFO << ", setMapReadyCallback failed, SnapshotId: " << snapshotId;
+              ERROR_LOG(m_logger) << Q_FUNC_INFO << ", setMapReadyCallback failed, SnapshotId: " << snapshotId;
 
           }
         } 
@@ -320,7 +320,7 @@ bool SnapshotDialog::showSnapshotInternal(const Snapshot &snapshot, bool bApplyF
       const QByteArray ba(QByteArray::fromRawData(snapshot.movementTracks().c_str(), snapshot.movementTracks().size()));
       if (!spSitMapGuiIfc->setMovementTrackManagerSettingsJSon(ba))
       {
-        ERROR_LOG() << Q_FUNC_INFO << " Error setMovementTrackManagerSettingsJSon, SnapshotId: " << snapshot.id();
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " Error setMovementTrackManagerSettingsJSon, SnapshotId: " << snapshot.id();
         success = false;
       }
     }
@@ -367,7 +367,7 @@ void SnapshotDialog::onEditPlan()
   if (!m_planEditorApp)
   {
     
-    ERROR_LOG() << "Creating Plan Editor-Snapshot failed.";
+    ERROR_LOG(m_logger) << "Creating Plan Editor-Snapshot failed.";
     return;
   }
 
@@ -391,7 +391,7 @@ void SnapshotDialog::onEditPlan()
 
 void SnapshotDialog::onPlaneditorFinished()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " onPlaneditorFinished"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " onPlaneditorFinished"
                       << " m_planEditorHasUpdatedThePlan=" << m_planEditorHasUpdatedThePlan;
 
   
@@ -417,7 +417,7 @@ void SnapshotDialog::slotReplaySessionForPlanEditorStarted()
   auto session = m_planEditorApp->getSession(IDL::PartitionType::Replay, partitionId);
   if (!session)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Internal error - can not get previously created session!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Internal error - can not get previously created session!";
     return;
   }
 
@@ -436,7 +436,7 @@ void SnapshotDialog::slotReplaySessionForPlanEditorStarted()
   session->getForeignGuiInterface<PlanEditorPlugin::ForeignGuiInterface>(planEditorIfc);
   if (!sitMapGuiIfc || !planEditorIfc)
   {
-    WARNING_LOG() << "Can not create plan editor app - found not all required interfaces";
+    WARNING_LOG(m_logger) << "Can not create plan editor app - found not all required interfaces";
     m_planEditorApp->deleteLater();
     m_planEditorApp = nullptr;
     return;
@@ -446,7 +446,7 @@ void SnapshotDialog::slotReplaySessionForPlanEditorStarted()
   
 
 
-  DEBUG_LOG() << 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;
@@ -459,7 +459,7 @@ void SnapshotDialog::slotReplaySessionForPlanEditorStarted()
 
   if (!m_requestHelper->startSingleRequest([req, this]() { return m_srpFtc->changeReplayStateRequest(req, this); }))
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Replay could not be started for partition id = " << partitionId;
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Replay could not be started for partition id = " << partitionId;
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("Replay could not be started for partition with id %1").arg(partitionId));
     m_planEditorApp->deleteLater();
     return;
@@ -474,7 +474,7 @@ void SnapshotDialog::slotReplaySessionForPlanEditorStarted()
     const QJsonDocument jDoc(QJsonDocument::fromJson(ba, &parserError));
     if (parserError.error != QJsonParseError::NoError)
     {
-      ERROR_LOG() << "Error parsing json document: " << parserError.errorString();
+      ERROR_LOG(m_logger) << "Error parsing json document: " << parserError.errorString();
       return;
     }
 
@@ -483,7 +483,7 @@ void SnapshotDialog::slotReplaySessionForPlanEditorStarted()
 
     if (oms.mode == SituationMap::Mode::Mode_3D)
     {
-      DEBUG_LOG() << " PlanEditor in 3D not supported yet, use 2D";
+      DEBUG_LOG(m_logger) << " PlanEditor in 3D not supported yet, use 2D";
       oms.mode = SituationMap::Mode::Mode_2D;
       sitMapGuiIfc->setOperatorMapSettingsJson(oms.toJson());  
     } else {
@@ -534,12 +534,12 @@ void SnapshotDialog::prepareIndex(const QModelIndex &idx)
 {
   const MarkerManagement::Snapshot &snapshot = m_model->getRowData(idx.row());
 
-  DEBUG_LOG() << "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();
   if (fileId > 0) 
   {
-    DEBUG_LOG() << "Loading file content with id = " << fileId;
+    DEBUG_LOG(m_logger) << "Loading file content with id = " << fileId;
 
     QByteArray content;
     if (m_flmGui->loadContent(fileId, content) && content.size() > 0)
@@ -551,17 +551,17 @@ void SnapshotDialog::prepareIndex(const QModelIndex &idx)
       m_imageTitles.append( name + QStringLiteral(" (")+ timeStr + QStringLiteral(")"));
       m_images.append(QImage::fromData(content));
 
-      DEBUG_LOG() << " title=" << m_imageTitles.last()
+      DEBUG_LOG(m_logger) << " title=" << m_imageTitles.last()
                           << " description=" << m_descriptions.last()
                           << " content.size=" << content.size();
     }
     else
     {
-      ERROR_LOG() << "Cannot retrieve file content for fileId = " << fileId;
+      ERROR_LOG(m_logger) << "Cannot retrieve file content for fileId = " << fileId;
     }
   }
   else
-    WARNING_LOG() << "Not found: file id = 0 for snapshot id = " << snapshot.id();
+    WARNING_LOG(m_logger) << "Not found: file id = 0 for snapshot id = " << snapshot.id();
 }
 
 
@@ -572,20 +572,20 @@ void SnapshotDialog::onPrint()
   m_imageTitles.clear();
   m_images.clear();
 
-  DEBUG_LOG() << "selectedRows.size()=" << selectedRows.size();
+  DEBUG_LOG(m_logger) << "selectedRows.size()=" << selectedRows.size();
   for (const QModelIndex &idx : selectedRows)
     prepareIndex(idx);
 
   if (m_images.size() > 0)
     LtsPrinting::printImages(m_session, this, tr("Snapshots"), m_images, m_imageTitles, m_descriptions);
   else
-    ERROR_LOG() << "No snapshots selected or no valid images to print";
+    ERROR_LOG(m_logger) << "No snapshots selected or no valid images to print";
 }
 
 
 bool SnapshotDialog::saveSnapshotPlan(const QByteArray &planXMLContent)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " save snapshot";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " save snapshot";
 
   
   m_currentSnapshot.planOverlay(planXMLContent.constData());
@@ -597,7 +597,7 @@ bool SnapshotDialog::saveSnapshotPlan(const QByteArray &planXMLContent)
 
   if (!ok)
   {
-    ERROR_LOG() << "Error while updating snapshot plan overlay";
+    ERROR_LOG(m_logger) << "Error while updating snapshot plan overlay";
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("Error while updating snapshot plan overlay"), tr("Saving Plan to Snapshot") );
   }
   else
@@ -656,7 +656,7 @@ bool SnapshotDialog::init(const std::shared_ptr<MarkerManagement::Interface::Dtc
   
   QTimer::singleShot(1000, this, [this, spSitMapGuiIfc]() {
     if (!spSitMapGuiIfc->setMapReadyCallback(this, [this]() { enaDisa(); }))
-      ERROR_LOG() << Q_FUNC_INFO << " setMapReadyCallback failed"
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " setMapReadyCallback failed"
                           << ", m_session->toString " << m_session->toString()
                           << ", this=" << this;
   });
@@ -669,7 +669,7 @@ bool SnapshotDialog::init(const std::shared_ptr<MarkerManagement::Interface::Dtc
 
 void SnapshotDialog::aboutToClose()
 {
-  DEBUG_LOG() << "aboutToClose - start";
+  DEBUG_LOG(m_logger) << "aboutToClose - start";
   if (m_planEditorApp)
   {
     m_planEditorApp->disconnect(this);  
@@ -778,7 +778,7 @@ void SnapshotDialog::onEditMetaData()
   if (snapshot.id() <= 0)
     return;
 
-  INFO_LOG() << "current SnapshotId: " << snapshot.id();
+  INFO_LOG(m_logger) << "current SnapshotId: " << snapshot.id();
 
   if (snapshot.operatorId() == LtsSessionData::LtsSessionData::getInstance()->getOperatorId())
   { 
@@ -874,7 +874,7 @@ void SnapshotDialog::saveSnapshotFilter()
   auto spSitMapGuiIfc = m_sitMapGuiIfc.lock();
   if (!spSitMapGuiIfc)
   {
-    ERROR_LOG() << Q_FUNC_INFO << ", no m_sitMapGuiIfc, return";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << ", no m_sitMapGuiIfc, return";
     return;
   }
 
@@ -886,7 +886,7 @@ void SnapshotDialog::saveSnapshotFilter()
   req.mapSettings(mapSettings.data());
   req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
 
-  DEBUG_LOG() << "File content id (of preview image) = " << m_currentSnapshot.fileContentId();
+  DEBUG_LOG(m_logger) << "File content id (of preview image) = " << m_currentSnapshot.fileContentId();
   req.fileContentId(m_fileId);
 
   
@@ -902,7 +902,7 @@ void SnapshotDialog::saveSnapshotFilter()
   
 
   if (!m_requestHelper->startSingleRequest([req, this]() { return m_mrkFtc->snapshotModifyRequest(req, this);}))
-    ERROR_LOG() << "Saving snapshot filter failed";
+    ERROR_LOG(m_logger) << "Saving snapshot filter failed";
   else
   {
     __unchange__();
@@ -935,12 +935,12 @@ void SnapshotDialog::saveSnapshotPreviewInLibrary(const QString &snapshotTitle)
       .arg(LtsSessionData::LtsSessionData::getInstance()->getOperatorId())
       .arg(snapshotTitle.left(20));
 
-  DEBUG_LOG() << "saveSnapshotPreviewInLibrary: " << title;
+  DEBUG_LOG(m_logger) << "saveSnapshotPreviewInLibrary: " << title;
 
   auto spSitMapGuiIfc = m_sitMapGuiIfc.lock();
   if (!spSitMapGuiIfc->isMapReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " sitMapGuiInterface not ready";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " sitMapGuiInterface not ready";
     return;
   }
 
@@ -966,7 +966,7 @@ void SnapshotDialog::saveSnapshotPreviewInLibrary(const QString &snapshotTitle)
       snapshotFolderId = m_flmDtc->findFolder(initialFolderId, QStringLiteral("Snapshots"));
     }
 
-    DEBUG_LOG() << "Initial folder Id = " << initialFolderId
+    DEBUG_LOG(m_logger) << "Initial folder Id = " << initialFolderId
                         << " snapshotFolderId =" << snapshotFolderId;
 
     const int folderId = snapshotFolderId > 0 ? snapshotFolderId : initialFolderId;
@@ -995,17 +995,17 @@ void SnapshotDialog::saveSnapshotPreviewInLibrary(const QString &snapshotTitle)
     }))
     {
       m_fileId = m_requestHelper->getRepliedId();
-      DEBUG_LOG() << Q_FUNC_INFO << " Saved file in library with id = " << m_fileId;
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " Saved file in library with id = " << m_fileId;
 
       saveSnapshotFilter();
 
       if (m_currentSnapshot.fileContentId() != m_fileId)
       {
-        DEBUG_LOG() << Q_FUNC_INFO << " One more request needed!";  
+        DEBUG_LOG(m_logger) << Q_FUNC_INFO << " One more request needed!";  
         m_currentSnapshot.fileContentId(m_fileId);
       }
     } else {
-      ERROR_LOG() << Q_FUNC_INFO << " Saved file in library with id = " << m_fileId << " failed";
+      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.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog.h
index 1a277e186..3e931eec1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog.h
@@ -63,6 +63,7 @@ public:
   void showSnapshot();
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onSnapshotRemoveReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
   void onReplayPartitionRemoveReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject);}
   void onChangeReplayStateReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject);}
@@ -80,6 +81,7 @@ public:
   void onSymbolAppearanceUpdateReply(const Core::FunctionReplyObject &reply) override final { m_requestHelper->requestReply(reply); }
 
 protected:
+  NGL::INGLLogger &m_logger;
   void aboutToClose() override;
 private slots:
   void enaDisa();
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 8a261990c..1a184dc44 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
@@ -182,7 +182,7 @@ void SnapshotDialogModel::loadPreview(int fileContentId, int rowId)
   QByteArray byteArray;
   if (m_flmGui->loadContent(fileContentId, byteArray, true) && byteArray.size() > 0)
   {
-    DEBUG_LOG() << "m_previews.insert fileContentId=" << fileContentId
+    DEBUG_LOG(m_logger) << "m_previews.insert fileContentId=" << fileContentId
                         << " size Preview=" << byteArray.size();
 
     QImage img = LtsUtils::getImage(byteArray);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging.h
index 7458e09c7..5a9cd72d9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging.h
@@ -41,6 +41,8 @@ public:
             const MessagingModel::Box &box);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void onSelectionChanged();
   void onShowMessage();
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 9b3dee468..99c2bfb69 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
@@ -151,7 +151,7 @@ void MessagingModel::onSpecificsEquipmentChanged(const TrainingAreaBaseOC::Speci
     int oldParticipantId = m_ownParticipantId;
     m_ownParticipantId = m_ppmDtc->participantIdByEquipmentNumber(data.equipmentNumber());
     if (m_ownParticipantId <= 0)
-      WARNING_LOG() << "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();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging_model.h
index 71524e966..368217364 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_messaging_model.h
@@ -50,6 +50,8 @@ public:
   QVariant data(const QModelIndex &, int) const override;
 
 protected:
+
+NGL::INGLLogger &m_logger;
   bool isFiltered(const OperatorMessage &msg, DataModification modType) const override;
 
 private slots:
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 fe59172f0..4093df327 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
@@ -93,7 +93,7 @@ NewMessageDialog::NewMessageDialog(LtsSession::LtsSession *session, QWidget *par
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_session(session)
 {
-  INFO_LOG() << "NewMessageDialog::Konstruktor";
+  INFO_LOG(m_logger) << "NewMessageDialog::Konstruktor";
   m_ui->setupUi(this);
 
   m_ui->leSubject->clear();
@@ -166,7 +166,7 @@ bool NewMessageDialog::init(const std::shared_ptr<Messaging::Interface::Dtc> &dt
   m_ftc = ftc;
   m_opmCbxDtc = opmCbxDtc;
 
-  INFO_LOG() << "NewMessageDialog::init";
+  INFO_LOG(m_logger) << "NewMessageDialog::init";
   fillAddressBox();
 
   return true;
@@ -182,7 +182,7 @@ bool NewMessageDialog::initAnswerDialog(const Messaging::OperatorMessage &msg)
   if (msg.senderType() == Messaging::AddressType_def::ObserverController)
   {
     int idx = m_ui->cmbOperators->findData(0-msg.senderId());
-    INFO_LOG() << "senderId=" << 0-msg.senderId()
+    INFO_LOG(m_logger) << "senderId=" << 0-msg.senderId()
                        << " idx = " << idx;
     m_ui->cmbOperators->setCurrentIndex(idx);
   }
@@ -223,11 +223,11 @@ bool NewMessageDialog::initAnswerDialog(const Messaging::OperatorMessage &msg)
 
 bool NewMessageDialog::apply()
 {
-  DEBUG_LOG() << "--- onSendMessage() ";
+  DEBUG_LOG(m_logger) << "--- onSendMessage() ";
   QString subject = m_ui->leSubject->text();
   QString message = m_ui->teMessage->toPlainText();
 
-  DEBUG_LOG() << "subject = " << subject
+  DEBUG_LOG(m_logger) << "subject = " << subject
                       << ",message = " << message;
 
 
@@ -238,7 +238,7 @@ bool NewMessageDialog::apply()
   {
     CreateOperatorMessageRequest comr;
     
-    DEBUG_LOG() << "request for Operators";
+    DEBUG_LOG(m_logger) << "request for Operators";
     comr.senderId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
     comr.subject(subject.toStdString());
     comr.senderType(Messaging::AddressType_def::type::Operator);
@@ -250,21 +250,21 @@ bool NewMessageDialog::apply()
     for (const RecipientModel::Recipient &r : recvOperators)
     {
       comr.recipientIds().push_back(r.recipientId);
-      DEBUG_LOG() << "recipientId =" << r.recipientId;
+      DEBUG_LOG(m_logger) << "recipientId =" << r.recipientId;
     }
     m_requestHelper->addRequest([comr, this]()
     {
-      DEBUG_LOG() << "m_ftc->createOperatorMessageRequest ";
+      DEBUG_LOG(m_logger) << "m_ftc->createOperatorMessageRequest ";
       return m_ftc->createOperatorMessageRequest(comr, this);
     });
   }
-  DEBUG_LOG() << " m_recipientModel->countOcMessages=" << recvOCs.size();
+  DEBUG_LOG(m_logger) << " m_recipientModel->countOcMessages=" << recvOCs.size();
   
   if (!recvOCs.isEmpty())
   {
     CreateOperatorMessageRequest comrOC;
     
-    DEBUG_LOG() << "request for OCs";
+    DEBUG_LOG(m_logger) << "request for OCs";
     comrOC.senderId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
     comrOC.subject(subject.toStdString());
     comrOC.senderType(Messaging::AddressType_def::type::Operator);
@@ -275,11 +275,11 @@ bool NewMessageDialog::apply()
     for (const RecipientModel::Recipient &r : recvOCs)
     {
       comrOC.recipientIds().push_back(r.recipientId);
-      DEBUG_LOG() << "recipientId OC =" << r.recipientId;
+      DEBUG_LOG(m_logger) << "recipientId OC =" << r.recipientId;
     }
     m_requestHelper->addRequest([comrOC, this]()
     {
-      DEBUG_LOG() << "m_ftc->createOperatorMessageRequest OC";
+      DEBUG_LOG(m_logger) << "m_ftc->createOperatorMessageRequest OC";
       return m_ftc->createOperatorMessageRequest(comrOC, this);
     });
   }
@@ -295,7 +295,7 @@ void NewMessageDialog::fillAddressBox()
 
 void NewMessageDialog::addrTypeChanged()
 {
-  DEBUG_LOG() << "************** addrTypeChanged ";
+  DEBUG_LOG(m_logger) << "************** addrTypeChanged ";
   fillAddressBox();
   if (m_session->app() != LtsAppDescriptor::App::OC)
     m_ui->lblCharsLeft->setVisible(m_ui->cbxAddrType->isChecked() || m_recipientsContainsOc);
@@ -310,13 +310,13 @@ void NewMessageDialog::addAddr()
   r.recipientId = abs(m_ui->cmbOperators->currentData().toInt());
   m_recipientModel->addData(r);
 
-  DEBUG_LOG() << "************** addAddr: " << m_ui->cmbOperators->currentText()
+  DEBUG_LOG(m_logger) << "************** addAddr: " << m_ui->cmbOperators->currentText()
                       << " isOperator:" << r.isOperator;
 } 
 
 void NewMessageDialog::removeAddr()
 {
-  DEBUG_LOG() << "************** removeAddr ";
+  DEBUG_LOG(m_logger) << "************** removeAddr ";
   QModelIndex modelIndex = m_ui->addrListView->currentIndex();
   m_recipientModel->removeData(modelIndex);
   m_ui->addrRemoveButton->setEnabled(m_recipientModel->rowCount() > 0);
@@ -325,7 +325,7 @@ void NewMessageDialog::removeAddr()
 
 void NewMessageDialog::onAddrSelectionChanged()
 {
-  DEBUG_LOG() << "************** onAddrSelectionChanged ";
+  DEBUG_LOG(m_logger) << "************** onAddrSelectionChanged ";
   m_ui->addrRemoveButton->setEnabled(true);
 } 
 
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 b9363e6f5..f85b18f2c 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
@@ -71,7 +71,7 @@ bool ShowMessageDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
   QDateTime qDateTime;
   qDateTime.setMSecsSinceEpoch(operatorMessage.timeStamp());
   QString time = qDateTime.toUTC().toString();
-  INFO_LOG() << "    time =  " << time;
+  INFO_LOG(m_logger) << "    time =  " << time;
 
   m_ui->time->setText(time);
   m_ui->msgContent->append(QString::fromStdString(operatorMessage.message()));
@@ -128,13 +128,13 @@ void ShowMessageDialog::onAnswerMessage()
   NewMessageDialog *answerDialog = new NewMessageDialog(m_session, this);
   if (!answerDialog->init(m_dtc, m_ftc, m_opmCbxDtc))
   {
-    ERROR_LOG() << "Can't initialize NewMessageDialog!";
+    ERROR_LOG(m_logger) << "Can't initialize NewMessageDialog!";
     return;
   }
 
   if (!answerDialog->initAnswerDialog(m_operatorMessage))
   {
-    ERROR_LOG() << "Can't set values from previous message!";
+    ERROR_LOG(m_logger) << "Can't set values from previous message!";
     return;
   }
 
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 e0b60292e..adccc4085 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
@@ -101,7 +101,7 @@ void MeteoDataView::onEditStaticMeteoData()
 
   MeteoDataManagement::MeteoData meteoData = m_model->getRowData(row);
 
-  DEBUG_LOG() << "--- onEditStaticMeteoData() "
+  DEBUG_LOG(m_logger) << "--- onEditStaticMeteoData() "
                       << " id: " << meteoData.id()
                       << " mduId: " << meteoData.weatherStationId()
                       << " isStaticData: " << meteoData.isStaticMeteoData()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_meteo_data.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_meteo_data.h
index 006cce0b2..73ddb2c1c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_meteo_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_meteo_data.h
@@ -30,6 +30,8 @@ public:
             const std::shared_ptr<MeteoDataManagement::Interface::Ftc> &ftc);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void onSelectionChanged();
   void onEditStaticMeteoData();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_meteo_data_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_meteo_data_model.h
index 7bb0706e4..7b983a0e2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_meteo_data_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_meteo_data_model.h
@@ -35,6 +35,8 @@ public:
   QVariant data(const QModelIndex &, int) const override final;
 
 private:
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<MeteoDataManagement::Interface::Dtc> m_dtc;
 };
 } 
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 1f3a1cf63..788c68ae8 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
@@ -42,11 +42,11 @@ bool StaticMeteoDataEdit::init(const std::shared_ptr<MeteoDataManagement::Interf
                                const std::shared_ptr<MeteoDataManagement::Interface::Ftc> &ftc,
                                LtsSession::LtsSession *session)
 {
-  DEBUG_LOG() << "StaticMeteoDataEdit::init()";
+  DEBUG_LOG(m_logger) << "StaticMeteoDataEdit::init()";
 
   if (!dtc || !ftc || !session)
   {
-    ERROR_LOG() << "StaticMeteoDataEdit::init() Invalid shared_ptr!";
+    ERROR_LOG(m_logger) << "StaticMeteoDataEdit::init() Invalid shared_ptr!";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_static_meteo_data_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_static_meteo_data_edit.h
index ba203a8f6..dc73087f2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_static_meteo_data_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MeteoDataManagement/Gui/MeteoData/mdm_static_meteo_data_edit.h
@@ -34,6 +34,8 @@ public:
   bool apply() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void loadStaticMeteoDataFromDatabase();
   void onStaticMeteoDataModifyReply(const Core::FunctionReplyObject &replyObject) override { m_requestHelper->requestReply(replyObject); }
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 977d26195..d57d41bf2 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
@@ -107,7 +107,7 @@ void NotificationManagementDialog::onAcknowledgeNotification()
   m_requestHelper->startSingleRequest(
       [&]()
       {
-        DEBUG_LOG() << "m_ftc->readReceipt ";
+        DEBUG_LOG(m_logger) << "m_ftc->readReceipt ";
         return m_ftc->readReceiptRequest(request, this);
       });
 }
@@ -162,7 +162,7 @@ void NotificationManagementDialog::onRemoveNotification()
   m_requestHelper->startSingleRequest(
       [&]()
       {
-        DEBUG_LOG() << "m_ftc->readReceipt ";
+        DEBUG_LOG(m_logger) << "m_ftc->readReceipt ";
         return m_ftc->deleteMessageRequest(request, this);
       });
 }
@@ -187,7 +187,7 @@ void NotificationManagementDialog::onShowNotificationContent()
   QString content = QCoreApplication::translate("Notification", noti.content().c_str());
 
   NomNotification notiDDS = m_dtc->nomNotification(noti.id());
-  DEBUG_LOG() << "onShowNotificationContent"
+  DEBUG_LOG(m_logger) << "onShowNotificationContent"
                        << ", content=" << noti.content()
                        << ", contentArgs().size()=" << noti.contentArgs().size()
                        << ", notiDDS.contentArgs().size()=" << notiDDS.contentArgs().size();
@@ -195,7 +195,7 @@ void NotificationManagementDialog::onShowNotificationContent()
   for (const std::string& arg : notiDDS.contentArgs()) {
     
     content = content.arg(QString::fromStdString(arg));
-    DEBUG_LOG() << ".arg() ersetzt immer den kleinsten freien Platzhalter"
+    DEBUG_LOG(m_logger) << ".arg() ersetzt immer den kleinsten freien Platzhalter"
                          << ", arg=" << arg
                          << ", content=" << content;
   }
@@ -211,7 +211,7 @@ void NotificationManagementDialog::onShowNotificationContent()
   wid->setMarkdown(content);
   connect(wid, &QTextBrowser::anchorClicked, this, [this, contentPopup](QUrl link )
   {
-    DEBUG_LOG() << "LINK CLICKED: " << link.toString();
+    DEBUG_LOG(m_logger) << "LINK CLICKED: " << link.toString();
     auto *event = new LtsWidgets::LtsLinkEvent(link, m_session->baseLayoutWidget());
     event->setAccepted(false);
     QApplication::postEvent(qApp, event); 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog.h
index fa7c2da1e..7694d2ee1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog.h
@@ -41,6 +41,8 @@ class NotificationManagementDialog
   void onShowNotificationContent();
 
   protected:
+
+  NGL::INGLLogger &m_logger;
   void onReadReceiptReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
   void onDeleteMessageReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
 
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 b46a35d1b..2cca7513c 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
@@ -52,7 +52,7 @@ bool NotificationManagementDialogModel::initModel(const LtsSession::LtsSessionDa
           insertRow(noti);
       });
 
-  INFO_LOG() << "initModel - #notis: " << m_vecData.size();
+  INFO_LOG(m_logger) << "initModel - #notis: " << m_vecData.size();
   return true;
 }
 
@@ -189,7 +189,7 @@ QString NotificationManagementDialogModel::getNameByAddressId(int addressId, con
     {
       if (addr.addressType() == AddressType_def::Operator)
       {
-        DEBUG_LOG() << "addressId=" << addressId
+        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());
       }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog_model.h
index bd0f914c9..3ccabbc29 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog_model.h
@@ -38,6 +38,8 @@ class NotificationManagementDialogModel final : public LtsWidgets::LtsAbstractTa
   bool initModel(const LtsSession::LtsSessionDataDds *session);
 
   protected:
+
+  NGL::INGLLogger &m_logger;
   int getId(const NotificationManagement::NomNotification &data) const override final;
   QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override final;
 
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 317422323..0a7544dab 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
@@ -121,7 +121,7 @@ bool BaseDownloader::init()
 
 void BaseDownloader::onStartBaseDownloadReply(const BaseDownloadReply &replyObject)
 {
-  DEBUG_LOG() << "NEW STATE REPLY: " << replyObject.currentStep() << " \n" << replyObject.progress();
+  DEBUG_LOG(m_logger) << "NEW STATE REPLY: " << replyObject.currentStep() << " \n" << replyObject.progress();
   switch (replyObject.replyState().underlying())
   {
   case Core::FtReplyState::InProgress:
@@ -208,7 +208,7 @@ void BaseDownloader::startBaseDownload()
                                      m_ui->leServer->text().toStdString(),
                                      QDateTime::currentMSecsSinceEpoch());
 
-  DEBUG_LOG() << "EXERCISE ID: " << m_exerciseId;
+  DEBUG_LOG(m_logger) << "EXERCISE ID: " << m_exerciseId;
   
   if (m_ftc->startBaseDownloadRequest(req, this))
   {
@@ -317,13 +317,13 @@ void BaseDownloader::onNewTextMessageFromSocket(const QString &message)
   m_timer->stop();
   if (m_state == ConnectionState::ConnectedToExternalServer)
   {
-    DEBUG_LOG() << "message from SVC " << message;
+    DEBUG_LOG(m_logger) << "message from SVC " << message;
 
     doConnectToExerciseManagement(message);
   }
   else if (m_state == ConnectionState::ConnectedToExerciseManagement)
   {
-    DEBUG_LOG() << "message from EXM " << message;
+    DEBUG_LOG(m_logger) << "message from EXM " << message;
     fillExerciseModel(message);
   }
 }
@@ -400,7 +400,7 @@ void BaseDownloader::onOcPdfDownloadClicked()
   }
   const QString matrixOperator = LtsSessionData::LtsSessionData::getInstance()->getOperatorName();
 
-  DEBUG_LOG()<<Q_FUNC_INFO<<" folderId:" <<folderId<<" operatorName: "<<matrixOperator;
+  DEBUG_LOG(m_logger)<<Q_FUNC_INFO<<" folderId:" <<folderId<<" operatorName: "<<matrixOperator;
   OcPdfDownloadRequest req(folderId,matrixOperator.toStdString());
   m_ftc->ocPdfDownloadRequest(req, this);
 }
@@ -417,12 +417,12 @@ void BaseDownloader::doConnectToExerciseManagement(const QString &message)
   QJsonDocument doc = QJsonDocument::fromJson(message.toUtf8());
   if (!doc.isObject())
   {
-    WARNING_LOG() << "No Valid Object in " << message;
+    WARNING_LOG(m_logger) << "No Valid Object in " << message;
     return;
   }
   if (!doc.object().value(QStringLiteral("data")).isArray())
   {
-    WARNING_LOG() << "No Data Array in" << message;
+    WARNING_LOG(m_logger) << "No Data Array in" << message;
     return;
   }
 
@@ -456,7 +456,7 @@ void BaseDownloader::doConnectToExerciseManagement(const QString &message)
 
   if (exPort > 0)
   {
-    DEBUG_LOG() << "Connect To EXM";
+    DEBUG_LOG(m_logger) << "Connect To EXM";
     m_socket->open(getUrl(m_ui->leServer->text(), exPort));
   }
 
@@ -465,14 +465,14 @@ void BaseDownloader::doConnectToExerciseManagement(const QString &message)
 QUrl BaseDownloader::getUrl(const QString &adress, unsigned short port) const
 {
   QString url = QLatin1String("ws://") + adress + QLatin1Char(':') + QString::number(port);
-  DEBUG_LOG() << "Connect to: "  << url;
+  DEBUG_LOG(m_logger) << "Connect to: "  << url;
 
   return QUrl(url);
 }
 
 void BaseDownloader::sendProcessListRequest()
 {
-  DEBUG_LOG() << "send processListRequest message to SVC";
+  DEBUG_LOG(m_logger) << "send processListRequest message to SVC";
   m_timer->start();
   m_socket->sendTextMessage(QStringLiteral("{\"type\": \"servicePortsInformationRequest\",\"uuid\": \"7777\"}"));
   m_ui->leStatus->setText(tr("Wait for Service Data."));
@@ -481,7 +481,7 @@ void BaseDownloader::sendProcessListRequest()
 
 void BaseDownloader::sendExerciseListRequest()
 {
-  DEBUG_LOG() << "send exerciseListRequest message to EXM";
+  DEBUG_LOG(m_logger) << "send exerciseListRequest message to EXM";
   m_timer->start();
   m_ftcTimer->start();
   m_socket->sendTextMessage(QStringLiteral("{\"type\": \"exerciseInformationRequest\",\"uuid\": \"7777\"}"));
@@ -498,7 +498,7 @@ void BaseDownloader::fillExerciseModel(const QString &exerciseList)
   QJsonDocument doc = QJsonDocument::fromJson(exerciseList.toUtf8());
   if (!doc.isObject() || !doc.object().value(QStringLiteral("data")).isArray())
   {
-    WARNING_LOG() << "No Valid Object in " << exerciseList;
+    WARNING_LOG(m_logger) << "No Valid Object in " << exerciseList;
     m_ui->leStatus->setText(tr("Got Invalid Data from Exercise Management."));
     return;
   }
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 a6e43afc0..669152b59 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
@@ -67,6 +67,8 @@ private Q_SLOTS:
   void onOcPdfDownloadClicked();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void doConnectToExerciseManagement(const QString &message);
   QUrl getUrl(const QString &adress, unsigned short port) const;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader_message.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader_message.h
index 62fcdb3f1..d1568646a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader_message.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader_message.h
@@ -32,6 +32,8 @@ private Q_SLOTS:
 
 private:
 
+
+NGL::INGLLogger &m_logger;
 private:
   Ui::BaseDownloaderMessage *m_ui;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader_pdf_selector.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader_pdf_selector.h
index e27034c69..0912de3a2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader_pdf_selector.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader_pdf_selector.h
@@ -37,6 +37,8 @@ Q_SIGNALS:
   void ok();
 
 private: 
+
+NGL::INGLLogger &m_logger;
   void addFile(const PdfInfo &document);
 
 private: 
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 d63e47fe2..69a6e04e8 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
@@ -32,6 +32,8 @@ public:
   QVariant data(const QModelIndex &, int) const override final;
 
 private:
+
+NGL::INGLLogger &m_logger;
   friend class ExProxyModel;
 };
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation.h
index 1bf639679..7f3d158c5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation.h
@@ -58,6 +58,7 @@ private Q_SLOTS:
   void onCoordinate(const QPointF &coord, double radius);
   void onClearCoordinate();
 private:
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   bool apply() override;
   void dialogCanceled () override;
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 6607d6f70..9343be0eb 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
@@ -60,7 +60,7 @@ bool FolderContentEditDialog::init(LtsSession::LtsSessionDataDds *session)
   m_session = session;
   if (!m_session->getFtc<OcBaseDownload::DataInterface>(m_obdFtc))
   {
-    ERROR_LOG() << "Cant get Obd FTC can't download";
+    ERROR_LOG(m_logger) << "Cant get Obd FTC can't download";
     return false;
   }
 
@@ -130,7 +130,7 @@ void FolderContentEditDialog::onOcPdfDownloadClicked()
   }
   const QString matrixOperator = LtsSessionData::LtsSessionData::getInstance()->getOperatorName();
 
-  DEBUG_LOG()<<Q_FUNC_INFO<<" folderId:" <<folderId<<" operatorName: "<<matrixOperator;
+  DEBUG_LOG(m_logger)<<Q_FUNC_INFO<<" folderId:" <<folderId<<" operatorName: "<<matrixOperator;
   OcBaseDownload::OcPdfDownloadRequest req(folderId,matrixOperator.toStdString());
   m_requestHelper->startSingleRequest([req, this]()
   {
@@ -157,13 +157,13 @@ void FolderContentEditDialog::onPreviewFile()
 
   if(m_pdfWidget == nullptr)
   {
-    WARNING_LOG()<<" pdf widget not initialized. trying to init...";
+    WARNING_LOG(m_logger)<<" pdf widget not initialized. trying to init...";
     initPdfWidow();
   }
   QFile f(m_currViewPath);
   if(f.open(QIODevice::ReadOnly))
   {
-    DEBUG_LOG() << "Current File: " << m_currViewPath;
+    DEBUG_LOG(m_logger) << "Current File: " << m_currViewPath;
     setPage(1);
     setZoomFactor(ZOOM_DEFAULT);
     setRotation(Poppler::Page::Rotate0);
@@ -178,7 +178,7 @@ void FolderContentEditDialog::onPreviewFile()
 
 void FolderContentEditDialog::onDeleteFile()
 {
-  TRACE_LOG()<<" delete file START ";
+  TRACE_LOG(m_logger)<<" delete file START ";
   QItemSelectionModel *select = m_ui->filesView->selectionModel();
   if(select == nullptr)
     return;
@@ -190,7 +190,7 @@ void FolderContentEditDialog::onDeleteFile()
     for(const auto index : std::as_const(indexList))
     {
       fileInfoList << m_fileSystemModel->fileInfo(index);
-      TRACE_LOG()<< "file path:"<<fileInfoList.last().absoluteFilePath();
+      TRACE_LOG(m_logger)<< "file path:"<<fileInfoList.last().absoluteFilePath();
     }
 
     QDir dir;
@@ -198,11 +198,11 @@ void FolderContentEditDialog::onDeleteFile()
     for (auto fileInfo : fileInfoList)
     {
       bool success = dir.remove(fileInfo.fileName());
-      TRACE_LOG()<< "remove file:"<<fileInfo.absoluteFilePath() << " | succeed? "<< success;
+      TRACE_LOG(m_logger)<< "remove file:"<<fileInfo.absoluteFilePath() << " | succeed? "<< success;
     }
   }
 
-  TRACE_LOG() <<" delete file End ";
+  TRACE_LOG(m_logger) <<" delete file End ";
 
 }
 
@@ -211,7 +211,7 @@ void FolderContentEditDialog::onDeleteFile()
 void FolderContentEditDialog::setDefaultFileSystemPath(QString path)
 {
   m_filesysPath = path.isEmpty() ? QDir::homePath() : path;
-  TRACE_LOG()<<" set default filesystem path: "<< path;
+  TRACE_LOG(m_logger)<<" set default filesystem path: "<< path;
 }
 
 
@@ -220,7 +220,7 @@ void FolderContentEditDialog::setPage(int pageNo)
 {
   if (m_pageNo == pageNo)
     return;
-  DEBUG_LOG() << "setPage = " << pageNo;
+  DEBUG_LOG(m_logger) << "setPage = " << pageNo;
   m_pageNo = pageNo;
   m_pdfWidget->setPage(pageNo);
   emit currentPageChanged(m_pageNo);
@@ -246,7 +246,7 @@ void FolderContentEditDialog::setZoomFactor(double zoomFactor)
 {
   if (qFuzzyCompare(m_zoomFactor, zoomFactor))
     return;
-  DEBUG_LOG() << "setZoomFactor = " << zoomFactor;
+  DEBUG_LOG(m_logger) << "setZoomFactor = " << zoomFactor;
   m_zoomFactor = zoomFactor;
   m_pdfWidget->setZoomFactor(zoomFactor);
 }
@@ -257,7 +257,7 @@ void FolderContentEditDialog::setRotation(int rotation)
 {
   if (m_rotation == rotation)
     return;
-  DEBUG_LOG() << "setRotation = " << rotation;
+  DEBUG_LOG(m_logger) << "setRotation = " << rotation;
   m_rotation = rotation;
   m_pdfWidget->setRotation(getRotationFromValue(m_rotation));
   emit rotationChanged(rotation);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_equip_player.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_equip_player.h
index d83f77686..6befd623b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_equip_player.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_equip_player.h
@@ -40,6 +40,9 @@ private Q_SLOTS:
 
 
 private:
+
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   bool apply() override;
   bool checkEqNr();
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 65ab0014b..60d09e28f 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
@@ -203,7 +203,7 @@ void FaultMessage::onSpecificsEquipmentChanged(const TrainingAreaBaseOC::Specifi
 
   m_ownEquipmentId = data.equipmentNumber();
   if (m_ownEquipmentId <= 0)
-    WARNING_LOG() << "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_fault_message.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_fault_message.h
index be27870f2..8f14c1ff5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_fault_message.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_fault_message.h
@@ -40,6 +40,8 @@ private Q_SLOTS:
   void onSpecificsEquipmentChanged(const TrainingAreaBaseOC::SpecificsEquipment &data, const DataModification &modType);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   bool apply() override;
   void timText(QLineEdit *le, QLabel *lbl);
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 5ef71b191..0dffda027 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
@@ -154,7 +154,7 @@ bool OcParticipantInfo::setUiValues()
         }
       };
       if (!m_sitMapGuiIfc->setMovementTrackCallback(this, onMovementTrackChangedFunc))
-        ERROR_LOG() << Q_FUNC_INFO << " setMovementTrackCallback failed";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " setMovementTrackCallback failed";
     }
     break;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/ParticipantInfoOc/osc_participant_info.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/ParticipantInfoOc/osc_participant_info.h
index e1e5fef34..1b3f16a45 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/ParticipantInfoOc/osc_participant_info.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/ParticipantInfoOc/osc_participant_info.h
@@ -37,6 +37,9 @@ public:
 
 
 private:
+
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
 
   static void setRed(QWidget *w, bool bRed);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_close_aes_list.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_close_aes_list.h
index 09ff24804..5b51f43a5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_close_aes_list.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_close_aes_list.h
@@ -28,6 +28,8 @@ Q_SIGNALS:
   void updateAesList(const QSet<int> &newList);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_close_aes_list_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_close_aes_list_model.h
index 8092f7dde..ab5a209b5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_close_aes_list_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_close_aes_list_model.h
@@ -38,6 +38,8 @@ public:
   QVariant data(const QModelIndex &, int) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   LtsSession::LtsSession *m_session;
   std::shared_ptr<AreaEffectSimulation::Interface::Dtc> m_aesDtc;
   std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_pdmDtc;
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 ac407b4fe..4e595f9b8 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
@@ -25,7 +25,7 @@ SelfTest::SelfTest(LtsSession::LtsSession *session, QWidget *parent)
 
   if ( m_session->getDtc<TrainingAreaBaseOC::DataInterface>(m_tabocDtc))
   {
-    WARNING_LOG() << "load tab settings";
+    WARNING_LOG(m_logger) << "load tab settings";
     connect(m_tabocDtc.get(), &TrainingAreaBaseOC::Interface::Dtc::technicalStateSfmChanged,
             this, &SelfTest::onSfmStatusChanged);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_selftest.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_selftest.h
index 86438b3c0..7786a3313 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_selftest.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/System/osc_selftest.h
@@ -35,6 +35,8 @@ private Q_SLOTS:
   void onCheckLastCondition();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
 
   QString getTechStatError(u_char errorID) const;
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 a1d3f8b51..208be28fe 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,6 +51,7 @@ private Q_SLOTS:
   void onResetRange();
   void onSoundCheck();
 private:
+NGL::INGLLogger &m_logger;
   void loadOperatorSettings();
   void retranslate() override;
   bool apply() override;
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 90c7abd2d..388f765b7 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
@@ -38,7 +38,7 @@ bool OnlineHelpViewerDialog::init(const QString &fileName)
   else 
     helpDir += (locale + QStringLiteral("/%1.html").arg(fileName));
 
-  INFO_LOG() << "helpDir=" << helpDir;
+  INFO_LOG(m_logger) << "helpDir=" << helpDir;
 
 #ifndef LTS_DEBUG
   m_ui->lblPage->setVisible(false);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineHelp/Gui/OnlineHelpViewer/online_help_viewer_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineHelp/Gui/OnlineHelpViewer/online_help_viewer_dialog.h
index 8cef53fcd..de9adcfcb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineHelp/Gui/OnlineHelpViewer/online_help_viewer_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineHelp/Gui/OnlineHelpViewer/online_help_viewer_dialog.h
@@ -30,6 +30,7 @@ private slots:
   void onContextdMenuReloadRequested();
 
 private:
+  NGL::INGLLogger &m_logger;
   void retranslate() override;
 
   Ui::OnlineHelpViewerDialog *m_ui;
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 a9d002b6a..52ccd17c9 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
@@ -99,10 +99,9 @@ void DetailedChartModel::onDynamicParticipantDataChanged(const ParticipantManage
   emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1));
 }
 
-DetailedChartModel::DetailedChartModel(const AbstractChartModel::ChartConfig &config, QObject *parent)
-  : AbstractChartModel(config, parent)
-  .getNGLLogger("OnlineReportDetailedChartModel"))
-{
+DetailedChartModel::DetailedChartModel(const AbstractChartModel::ChartConfig &config, QObject *parent) : AbstractChartModel(config, parent)
+  .getNGLLogger("OnlineReportDetailedChartModel")),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_participantStates.insert(ProjectDataManagement::VulnerabilityState::CombatReady, QSet<int32_t>());
   m_participantStates.insert(ProjectDataManagement::VulnerabilityState::LightDamage, QSet<int32_t>());
   m_participantStates.insert(ProjectDataManagement::VulnerabilityState::MediumDamage, QSet<int32_t>());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_detailed_chart_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_detailed_chart_model.h
index 4dd33efee..7292dd754 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_detailed_chart_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_detailed_chart_model.h
@@ -24,6 +24,8 @@ private Q_SLOTS:
   void onDynamicParticipantDataChanged(const ParticipantManagement::DynamicParticipantData &data, DataModification modType);
 
 private: 
+
+NGL::INGLLogger &m_logger;
   explicit DetailedChartModel(const AbstractChartModel::ChartConfig &config, QObject *parent);
 
 private: 
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 0e302c5de..090b474b7 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
@@ -61,8 +61,8 @@ void SimpleChartModel::onDynamicParticipantDataChanged(const ParticipantManageme
 
   const ParticipantManagement::StateInformation &stateInfo = m_config.ppmDtc->youngestStateInformation(data.stateHistory());
 
-  DEBUG_LOG() << "Participant id = " << data.participantId();
-  DEBUG_LOG() << "State Info Vulnerability = " << stateInfo.vulnerabilityState();
+  DEBUG_LOG(m_logger) << "Participant id = " << data.participantId();
+  DEBUG_LOG(m_logger) << "State Info Vulnerability = " << stateInfo.vulnerabilityState();
 
   if (stateInfo.vulnerabilityState() < ProjectDataManagement::VulnerabilityState::CatastrophicKill)
     setCombatReady(data.participantId());
@@ -72,10 +72,9 @@ void SimpleChartModel::onDynamicParticipantDataChanged(const ParticipantManageme
   emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1));
 }
 
-SimpleChartModel::SimpleChartModel(const AbstractChartModel::ChartConfig &config, QObject *parent)
-  : AbstractChartModel(config, parent)
-  .getNGLLogger("OnlineReportSimpleChartModel"))
-{
+SimpleChartModel::SimpleChartModel(const AbstractChartModel::ChartConfig &config, QObject *parent) : AbstractChartModel(config, parent)
+  .getNGLLogger("OnlineReportSimpleChartModel")),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   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/Charts/ore_simple_chart_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_simple_chart_model.h
index 7345f3c84..a3f3fbfbe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_simple_chart_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_simple_chart_model.h
@@ -24,6 +24,8 @@ private Q_SLOTS:
   void onDynamicParticipantDataChanged(const ParticipantManagement::DynamicParticipantData &data, DataModification modType);
 
 private: 
+
+NGL::INGLLogger &m_logger;
   explicit SimpleChartModel(const AbstractChartModel::ChartConfig &config, QObject *parent);
 
   void setCombatReady(int32_t 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 ec2ff5c39..218bef554 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
@@ -184,7 +184,7 @@ bool CreateReportDialog::apply()
                                               m_ppmDtc,
                                               participantIds);
 
-  DEBUG_LOG() << "Creating new ReportDialog with config: "
+  DEBUG_LOG(m_logger) << "Creating new ReportDialog with config: "
                       << chartConfig.toJson().toJson();
   ReportDialog *dialog = new ReportDialog(chartConfig, this);
 
@@ -215,7 +215,7 @@ void CreateReportDialog::setChildrenSelected(const QModelIndex &parent)
     if (m_participantModel->hasChildren(childIndex))
       setChildrenSelected(childIndex);
 
-    DEBUG_LOG() << "Setting row "
+    DEBUG_LOG(m_logger) << "Setting row "
                         << childIndex.row()
                         << " selected";
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_create_report_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_create_report_dialog.h
index 2c62c5e3f..9ee8e7cd4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_create_report_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_create_report_dialog.h
@@ -43,6 +43,8 @@ private slots:
   void onRemoveName(const QString &name);
 
 private: 
+
+NGL::INGLLogger &m_logger;
   bool apply() override;
   void retranslate() override;
   void setChildrenSelected(const QModelIndex &parent);
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 0a135373a..931f66735 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
@@ -37,7 +37,7 @@ ReportDialog::ReportDialog(const AbstractChartModel::ChartConfig &config, QWidge
   {
     QString errorStr = tr("Not possible to draw diagram. There are no participants to be looked at");
     m_ui->verticalLayout->addWidget(new QLabel(errorStr, this));
-    ERROR_LOG() << errorStr;
+    ERROR_LOG(m_logger) << errorStr;
     return;
   }
 
@@ -152,7 +152,7 @@ KDChart::Chart *ReportDialog::createNewChart(const AbstractChartModel::ChartConf
 
   if (!diagram)
   {
-    ERROR_LOG() << "Got unkown chart type. Aborting.";
+    ERROR_LOG(m_logger) << "Got unkown chart type. Aborting.";
     return result;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_report_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_report_dialog.h
index 9c8b3a9a7..4b13e05b8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_report_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_report_dialog.h
@@ -35,6 +35,8 @@ Q_SIGNALS:
   void removeName(const QString &name);
 
 private: 
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   static QVector<QBrush> brushes(const AbstractChartModel::ChartConfig &config);
   KDChart::Chart *createNewChart(const AbstractChartModel::ChartConfig &config, const QPen &linePen, bool hasToCreateLegend, const QString &header = QString());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_type_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_type_model.h
index 61758ee0e..425c4c60a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_type_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_type_model.h
@@ -20,6 +20,8 @@ public:
   QVariant data(const QModelIndex &index, int role) const override;
 
 protected:
+
+NGL::INGLLogger &m_logger;
   bool isFiltered(const ParticipantManagement::Type &data, DataModification modType) const override;
 private:
   std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
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 f6da8447a..8839d4d37 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
@@ -47,6 +47,8 @@ public:
   bool isFiltered( const OperatorManagement::User &data, DataModification modType ) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   QString hasVisibleParties(const std::vector<PartiesByExercise> &vpbe) const;
   QString visibleParties(const std::vector<int32_t> &parties) const;
   QString effectiveAcls(std::vector<int32_t> acls) const;
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 5f36e5acc..2a865cde6 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
@@ -41,7 +41,7 @@ bool RemoteShutdownDialog::init(const std::shared_ptr<AssetManagement::Interface
                                 const std::shared_ptr<AssetManagement::Interface::Dtc> &asmDtc)
 {
   int thisWsId = LtsSessionData::LtsSessionData::getInstance()->getWorkstationId();
-  DEBUG_LOG() << "ws id = " << thisWsId;
+  DEBUG_LOG(m_logger) << "ws id = " << thisWsId;
 
   if (thisWsId <= 0 || asmFtc == nullptr)
     return false;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/acl_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/acl_dialog.h
index e81487a0d..1035a3872 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/acl_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/acl_dialog.h
@@ -28,6 +28,8 @@ public:
             const std::shared_ptr<OperatorManagement::Interface::Ftc> &ftc);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
 
   AclDialogModel *m_model;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/acl_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/acl_dialog_model.h
index 837edfedb..666f2111e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/acl_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/acl_dialog_model.h
@@ -27,6 +27,8 @@ public:
   QVariant data(const QModelIndex &, int) const override final;
 
 private:
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<OperatorManagement::Interface::Dtc> m_dtc;
   std::shared_ptr<OperatorManagement::Interface::Ftc> m_ftc;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_dialog.h
index 1dc2ede46..48185bc93 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_dialog.h
@@ -44,6 +44,8 @@ class GroupEditDialog
   void onGroupChangeNameReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
 
   private:
+
+  NGL::INGLLogger &m_logger;
   void retranslate() override;
   bool apply() override;
 
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 99bc22255..75eaf968a 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
@@ -32,6 +32,7 @@ public:
 
   QVariant data(const QModelIndex &, int) const override final;
 protected:
+NGL::INGLLogger &m_logger;
   bool isFiltered(const Group &data, DataModification modType) const override
   {
     if (m_hideHidden && data.isHidden())
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 83467ed29..1ccf357cb 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
@@ -120,7 +120,7 @@ void OperatorDialog::onEditOperator()
 
   if (op.id() <= 0)
     return;
-  DEBUG_LOG() << "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());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_dialog.h
index f5adbda97..d6fa994c3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_dialog.h
@@ -40,6 +40,7 @@ public:
   bool init(LtsSession::LtsSession *session);
 
 private:
+  NGL::INGLLogger &m_logger;
   void retranslate() override;
   void onOperatorRemoveReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
   void tableColumnOrganiserSetting() override;
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 1a993d998..bc6a680d3 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
@@ -170,7 +170,7 @@ bool OperatorEditDialog::operatorCreateModify(const OperatorCreateModifyRequest
     return false;
   }
 
-  DEBUG_LOG() << "req.name: " << req.name();
+  DEBUG_LOG(m_logger) << "req.name: " << req.name();
   return m_requestHelper->startSingleRequest([this, req]()
   {
     return m_ftc->operatorCreateModifyRequest(req, this);
@@ -365,7 +365,7 @@ bool OperatorEditDialog::apply()
       const QVector<int> visiblePartyIds = m_visiblePartiesModel->getCheckedIds();
       std::vector<OperatorManagement::PartiesByExercise> vpbe;
       PartiesByExercise pbe;
-      DEBUG_LOG() << "----------------- m_session.exerciseId:" << m_session->exerciseId();
+      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()));
@@ -402,7 +402,7 @@ bool OperatorEditDialog::apply()
       const QVector<int> visiblePartyIds = m_visiblePartiesModel->getCheckedIds();
       std::vector<OperatorManagement::PartiesByExercise> vpbe;
       PartiesByExercise pbe;
-      DEBUG_LOG() << "----------------- m_session.exerciseId:" << m_session->exerciseId();
+      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()));
@@ -460,7 +460,7 @@ void OperatorEditDialog::createFolders()
     return;
   }
 
-  DEBUG_LOG() << "User Folder created with id = " << folderId;
+  DEBUG_LOG(m_logger) << "User Folder created with id = " << folderId;
 
 #ifdef GUEZ_MODE
 
@@ -473,7 +473,7 @@ void OperatorEditDialog::createFolders()
     return;
   }
 
-  DEBUG_LOG() << "User Subfolder created with id = " << subFolderId;
+  DEBUG_LOG(m_logger) << "User Subfolder created with id = " << subFolderId;
 #endif
 
   LtsWidgets::LtsMessageDialog::showMessage(this, tr("User folders successfully created"));
@@ -499,7 +499,7 @@ int OperatorEditDialog::createFolder(int parentFolderId, const QString &folderNa
     return m_flmFtc->folderModifyRequest(req, this);
   });
 
-  DEBUG_LOG() << "Created folder id = " << m_requestHelper->getRepliedId();
+  DEBUG_LOG(m_logger) << "Created folder id = " << m_requestHelper->getRepliedId();
 
   return m_requestHelper->getRepliedId();
 }
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 e0814be73..d7bd85cb2 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
@@ -49,6 +49,7 @@ public:
   void onFolderModifyReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
 
 private:
+  NGL::INGLLogger &m_logger;
   void retranslate() override;
   bool apply() override final;
   int createFolder(int parentFolderId, const QString &folderName, int userId, bool isHidden = false);
@@ -69,6 +70,7 @@ signals:
   void sendData(const OperatorManagement::User &data);
 
 private:
+  NGL::INGLLogger &m_logger;
   int m_operatorId;
   bool m_pictureChanged;
   bool m_visiblePartiesChanged;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/preset_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/preset_dialog.h
index 6d14d65e9..12044269d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/preset_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/preset_dialog.h
@@ -35,6 +35,8 @@ public:
             bool hideHidden = true);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void onGroupRemoveReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
   void tableColumnOrganiserSetting() override;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorOverview/operator_overview_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorOverview/operator_overview_dialog.h
index dc951f7b2..76a8f6767 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorOverview/operator_overview_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorOverview/operator_overview_dialog.h
@@ -35,6 +35,8 @@ public:
   bool init(LtsSession::LtsSession *session);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void onOperatorRemoveReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
   void tableColumnOrganiserSetting() override;
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 0cad45095..b08529e73 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
@@ -25,7 +25,7 @@ bool SettingsGroup::init()
   if (!m_subSetHandler || !m_opSettings)
   {
     
-    ERROR_LOG() << " SettingsGroup::init() failed. this=" << this
+    ERROR_LOG(m_logger) << " SettingsGroup::init() failed. this=" << this
                         << ", typeid.name='" << typeid(*this).name()
                         << ", m_id='" << m_id
                         << ", m_group='" << m_group;
@@ -71,7 +71,7 @@ void SettingsGroup::startLoad()
 #else
   if (!m_subSetHandler)
   {
-    ERROR_LOG() << " SettingsGroup::startLoad() : no m_subSetHandler. this=" << this
+    ERROR_LOG(m_logger) << " SettingsGroup::startLoad() : no m_subSetHandler. this=" << this
                         << ", typeid.name='" << typeid(*this).name()
                         << ", m_id='" << m_id
                         << ", m_group='" << m_group;
@@ -93,19 +93,19 @@ void SettingsGroup::startSave()
     return;
   for (SubSet &subset : m_subsets)
   {
-    DEBUG_LOG() << "saving11 subset for group: " << m_group
+    DEBUG_LOG(m_logger) << "saving11 subset for group: " << m_group
                         << ", id:" << m_id
                         << ", subset.name=" << subset.name
                         << ", subset.data=" << subset.data.toString();
 
     bool saveSubSetOk = m_subSetHandler->saveSubSet(subset); 
     if (!saveSubSetOk)
-      WARNING_LOG() << "saving22 subset failed for group: " << m_group
+      WARNING_LOG(m_logger) << "saving22 subset failed for group: " << m_group
                           << ", id:" << m_id
                           << ", subset.name=" << subset.name
                           << ", subset.data=" << subset.data.toString();
     else
-      DEBUG_LOG() << "saving22 subset for group: " << m_group
+      DEBUG_LOG(m_logger) << "saving22 subset for group: " << m_group
                           << ", id:" << m_id
                           << ", subset.name=" << subset.name
                           << ", subset.data=" << subset.data.toString();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/SettingsGroup/opm_settings_group.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/SettingsGroup/opm_settings_group.h
index 923c077c9..9c71bb7be 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/SettingsGroup/opm_settings_group.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/SettingsGroup/opm_settings_group.h
@@ -87,6 +87,8 @@ public:
 
 protected:
 
+
+NGL::INGLLogger &m_logger;
   virtual bool aboutToLoad() { return true; }
   virtual bool aboutToSave() { return true; }
   virtual bool aboutToDelete() { return true; }
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 49d1de62f..4e040a98d 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
@@ -44,7 +44,7 @@ OperatorSettingsDialog::OperatorSettingsDialog(LtsSession::LtsSession *session,
   , m_workspaceMap(nullptr)
   , m_filterMap(nullptr)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_ui->setupUi(this);
 
   
@@ -59,7 +59,7 @@ OperatorSettingsDialog::OperatorSettingsDialog(LtsSession::LtsSession *session,
     connect(m_ui->pbDEBUGNewWsID, &QPushButton::clicked, this, [this]()
     {
       const QString newId(QUuid::createUuid().toString());
-      ERROR_LOG() << "new WsId" << newId;
+      ERROR_LOG(m_logger) << "new WsId" << newId;
       m_session->setWorkspaceId(newId);
     });
   }
@@ -146,17 +146,17 @@ OperatorSettingsDialog::OperatorSettingsDialog(LtsSession::LtsSession *session,
   connect(m_ui->cbScriptsHideOnDrag, &QCheckBox::toggled, m_timer, static_cast<void (QTimer::*)(void)>(&QTimer::start));
   m_ui->cbScriptsHideOnDrag->setChecked(m_opSettings->value(QStringLiteral("Scripts"), QStringLiteral("HideOnDrag"), true).toBool());
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 
 OperatorSettingsDialog::~OperatorSettingsDialog()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (m_timer->isActive())
     onTimerTimeout();
   delete m_ui;
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 
@@ -258,7 +258,7 @@ void OperatorSettingsDialog::onWorkspaceLoad()
   QString workspaceId = m_ui->cbWorkspaces->currentData().toString();
   if (workspaceId.compare(QUuid().toString()) == 0)
   {
-    WARNING_LOG() << "Tried to load a Workspace with Null-Uuid! ... skipping";
+    WARNING_LOG(m_logger) << "Tried to load a Workspace with Null-Uuid! ... skipping";
     m_ui->cbWorkspaces->setCurrentIndex(0);
     return;
   }
@@ -297,7 +297,7 @@ void OperatorSettingsDialog::onWorkspaceOverwrite()
 
 
 
-  DEBUG_LOG() << Q_FUNC_INFO << " emit signalOverwriteWorkspace: "
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " emit signalOverwriteWorkspace: "
                       << " workspaceId= '" << workspaceId << "'"
                       << " workspaceName= '" << workspaceName << "'";
   emit signalOverwriteWorkspace(workspaceId, workspaceName, QString());
@@ -324,7 +324,7 @@ void OperatorSettingsDialog::onWorkspacesComboboxIndexChanged(int index)
 {
   const QString &wspId = m_ui->cbWorkspaces->itemData(index).toString();
 
-  DEBUG_LOG() << Q_FUNC_INFO << " id: '" << wspId << "'"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: '" << wspId << "'"
                       << " itemText: '" << m_ui->cbWorkspaces->itemText(index) << "'";
 
   if (!m_workspaceMap->contains(wspId) || m_workspaceMap->value(wspId)->data().isEmpty())
@@ -370,7 +370,7 @@ void OperatorSettingsDialog::onFilterPresetLoad()
   QString filterPresetId = m_ui->cbFilterPresets->currentData().toString();
   if (filterPresetId.compare(QUuid().toString()) == 0)
   {
-    WARNING_LOG() << "Tried to load a FilterPreset with Null-Uuid! ... skipping";
+    WARNING_LOG(m_logger) << "Tried to load a FilterPreset with Null-Uuid! ... skipping";
     m_ui->cbFilterPresets->setCurrentIndex(0);
     return;
   }
@@ -451,7 +451,7 @@ void OperatorSettingsDialog::onFilterPresetDelete()
 void OperatorSettingsDialog::onFilterPresetsComboboxIndexChanged(int index)
 {
   const QString &id       = m_ui->cbFilterPresets->itemData(index).toString();
-  DEBUG_LOG() << Q_FUNC_INFO << " id: '" << id << "'"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: '" << id << "'"
                       << " itemText: '" << m_ui->cbFilterPresets->itemText(index) << "'";
 
   m_ui->pbLoadFilterPreset->setProperty(DISABLE_FAST_CLICKS_PROPERTY, QVariant());
@@ -498,13 +498,13 @@ void OperatorSettingsDialog::updateCombobox(QComboBox *cbx, const QMap<QString,
     const QJsonObject &mapValue = it.value()->data();
     if (mapValue.isEmpty())
     {
-      WARNING_LOG() << "Entry with Id: " << it.key() << " has empty data! ... skipping this entry";
+      WARNING_LOG(m_logger) << "Entry with Id: " << it.key() << " has empty data! ... skipping this entry";
       continue;
     }
     QString name = mapValue.value(QStringLiteral("name")).toString();
     if (name.isEmpty())
     {
-      WARNING_LOG() << "Entry with Id: " << it.key() << " has empty name! ... skipping this entry";
+      WARNING_LOG(m_logger) << "Entry with Id: " << it.key() << " has empty name! ... skipping this entry";
       continue;
     }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_dialog.h
index 55e6fc228..772df8139 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_dialog.h
@@ -184,6 +184,7 @@ signals:
   void linesRemovedChanged(int numLines);
 
 protected:
+  NGL::INGLLogger &m_logger;
   void paintEvent(QPaintEvent *event) override;
   void keyPressEvent(QKeyEvent *event) override;
   void timerEvent(QTimerEvent *event) override;
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 dddf847d4..9e6f2f43e 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
@@ -23,8 +23,7 @@ static int s_lastTypeUsed = -1;
 
 ParticipantEditItemWidgetBase::ParticipantEditItemWidgetBase(bool asSupportService,
                                                              LtsSession::LtsSession *session,
-                                                             QWidget *parent)
-  : QWidget(parent)
+                                                             QWidget *parent) : QWidget(parent)
   , m_asSupportService(asSupportService)
   , m_bEditMode(false)
   , m_typeMinimum(0)
@@ -34,8 +33,8 @@ ParticipantEditItemWidgetBase::ParticipantEditItemWidgetBase(bool asSupportServi
   , m_dtc(nullptr)
   , m_ppmGuiCbxIfc(nullptr)
   , m_session(session)
-  , m_ui(new Ui::ParticipantEditItemWidgetBase)
-{
+  , m_ui(new Ui::ParticipantEditItemWidgetBase),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_ui->setupUi(this);
   setWindowTitle(tr("Edit Participant"));
   connect(m_ui->pbIcon, &QToolButton::clicked, this, &ParticipantEditItemWidgetBase::onSymbolSelection);
@@ -106,7 +105,7 @@ bool ParticipantEditItemWidgetBase::init(const std::shared_ptr<ParticipantManage
                                          const std::shared_ptr<AdvancedSymbology::ForeignDataInterface> &asb,
                                          const bool addItem)
 {
-  DEBUG_LOG() << "init addItem=" << addItem
+  DEBUG_LOG(m_logger) << "init addItem=" << addItem
                       << " m_bEditMode=" << m_bEditMode;
   if (!dtc || !ppmGuiCbxIfc)
     return false;
@@ -121,7 +120,7 @@ bool ParticipantEditItemWidgetBase::init(const std::shared_ptr<ParticipantManage
   slotRetranslate();
   if (addItem)
   {
-    DEBUG_LOG() << "setDesignatorData()";
+    DEBUG_LOG(m_logger) << "setDesignatorData()";
     setDesignatorData();
     m_ui->cbTypeClass->setCurrentIndex(m_ui->cbTypeClass->findData(s_lastTypeClassUsed));
     const int idx = m_ui->cbType->findData(s_lastTypeUsed);
@@ -131,7 +130,7 @@ bool ParticipantEditItemWidgetBase::init(const std::shared_ptr<ParticipantManage
 
   else if (m_bEditMode)
   {
-    DEBUG_LOG() << "setData()";
+    DEBUG_LOG(m_logger) << "setData()";
     setData();
   }
   return true;
@@ -223,7 +222,7 @@ void ParticipantEditItemWidgetBase::onSymbolConfig()
 
 void ParticipantEditItemWidgetBase::onChangeSymbol(const QString &sidc)
 {
-  TRACE_LOG() << Q_FUNC_INFO << ", Changing symbol to " << sidc;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << ", Changing symbol to " << sidc;
   if (!m_asbfc || sidc == m_sidc)
     return;
 
@@ -250,7 +249,7 @@ void ParticipantEditItemWidgetBase::onChangeSymbol(const QString &sidc)
   }
   else
   {
-    ERROR_LOG() << Q_FUNC_INFO << " sidc is not encoded, sidc = '" << sidc << "'";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " sidc is not encoded, sidc = '" << sidc << "'";
     m_ui->pbSymbolConfig->setEnabled(false);
   }
 
@@ -260,7 +259,7 @@ void ParticipantEditItemWidgetBase::onChangeSymbol(const QString &sidc)
     m_symbolConfig = nullptr;
   }
 
-  DEBUG_LOG() << "Changing symbol to " << sidc << " is in progress";
+  DEBUG_LOG(m_logger) << "Changing symbol to " << sidc << " is in progress";
 }
 
 ParticipantManagement::TypeClass ParticipantEditItemWidgetBase::typeClassIdFromTypeId(int typeId) const
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 50c4bed85..2c990a906 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
@@ -36,6 +36,7 @@ public:
   ~ParticipantEditItemWidgetBase();
 
 protected:
+  NGL::INGLLogger &m_logger;
   bool init(const std::shared_ptr<ParticipantManagement::Interface::Dtc> &dtc,
             const std::shared_ptr<ParticipantManagement::ForeignGuiComboboxInterface> &ppmGuiCbxIfc,
             const std::shared_ptr<AdvancedSymbology::ForeignDataInterface> &asb,
@@ -56,6 +57,7 @@ protected Q_SLOTS:
   void onChangeSymbol(const QString &sidc);
 
 protected:
+  NGL::INGLLogger &m_logger;
   ParticipantManagement::TypeClass typeClassIdFromTypeId(int typeId) const;
   bool isUnitType(int typeId) const;
 
@@ -66,6 +68,7 @@ Q_SIGNALS:
   void readyToClose();
 
 protected:
+  NGL::INGLLogger &m_logger;
   bool m_asSupportService;
   bool m_bEditMode;
   int m_typeMinimum;
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 bc6fbcb87..75a032a72 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
@@ -360,7 +360,7 @@ bool ParticipantEditModel::canDropMimeData(const QMimeData *data,
   if (!isUnitType(parentItem->participant.typeId()))
     return false;
 
-  DEBUG_LOG() << "can drop on " << row << ", " << column << ", parent: "
+  DEBUG_LOG(m_logger) << "can drop on " << row << ", " << column << ", parent: "
                       << parent.row() << "," << parent.column() << ", " << parent.isValid()
                       << ", action: " << action;
 
@@ -389,7 +389,7 @@ bool ParticipantEditModel::canDropMimeData(const QMimeData *data,
     
     if (idSource != 0 && isParentOf(parentItem, idSource))
     {
-      DEBUG_LOG() << "isParentOf() for idSource: " << idSource << " is true - no drop";
+      DEBUG_LOG(m_logger) << "isParentOf() for idSource: " << idSource << " is true - no drop";
       return false;
     }
   }
@@ -802,7 +802,7 @@ void ParticipantEditModel::insertChildrenOf(int parentId,
     auto it = tmap.constFind(childId);
     if (it == tmap.constEnd())
     {
-      WARNING_LOG() << "Can not find participant with id " << childId << " - ignoring";
+      WARNING_LOG(m_logger) << "Can not find participant with id " << childId << " - ignoring";
       continue;
     }
     const ParticipantData &data = it.value();
@@ -827,11 +827,11 @@ void ParticipantEditModel::insertChildrenOf(int parentId,
     childItem->participant = data;
     childItem->bIsChecked = isChecked(checkedParticipants.contains(data.id()), cs);
 
-    DEBUG_LOG() << "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)
     {
-      WARNING_LOG() << "avoid endless loop in recursion";
+      WARNING_LOG(m_logger) << "avoid endless loop in recursion";
       return;
     }
     insertRow(insertPos, parentIdx, childItem);
@@ -1086,7 +1086,7 @@ void ParticipantEditModel::onParticipantChanged(const ParticipantManagement::Par
 
     CheckedTreeItem *childItem = static_cast<CheckedTreeItem *>(createItem(QVariant(), QIcon()));
     childItem->participant = m_dtc->convertParticipantToParticipantData(data);
-    DEBUG_LOG() << "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);  
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 a40c9bc4e..9cef36479 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
@@ -101,6 +101,7 @@ public:
   QString getHierarchyFromIndex(const QModelIndex &index) const;
 
 protected:
+  NGL::INGLLogger &m_logger;
   void gatherParticipants(QHash<int, ParticipantData> &tmap,
                           QHash<int, QSet<int>> &parentId2id) const;
 
@@ -148,6 +149,7 @@ signals:
   void internalDataChanged();
 
 protected:
+  NGL::INGLLogger &m_logger;
   int  m_partyId;
   bool m_bRowsAreCheckable;
   bool m_bUnitsSelectable;
@@ -176,6 +178,7 @@ 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;
 
@@ -249,6 +252,7 @@ public:
   SortData sortData() const { return m_sortData; }
 
 protected:
+  NGL::INGLLogger &m_logger;
   bool lessThan(const QModelIndex &sourceLeft, const QModelIndex &sourceRight) const override;
   bool filterAcceptsColumn(int source_column, const QModelIndex &source_parent) const override;
   bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
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 3f39f3465..1d4334205 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
@@ -75,7 +75,7 @@ void ParticipantIconModelBase::tryRenderSymbol(const QString &symbol, NGLTreeIte
   {
     AdvancedSymbology::SymbolDataToRender symDataToRender(symbol);
     symDataToRender.role = m_partyRole;
-    DEBUG_LOG() << "Rendering symbol '" << symbol << "' for item " << item;
+    DEBUG_LOG(m_logger) << "Rendering symbol '" << symbol << "' for item " << item;
     if (m_partyColor.isValid())
     {
       symDataToRender.fillColor = m_partyColor;
@@ -92,7 +92,7 @@ void ParticipantIconModelBase::tryRenderSymbol(const QString &symbol, NGLTreeIte
     AdvancedSymbology::SymbolResult *symResPtr = symRes.data();
     if (!symResPtr)
     {
-      WARNING_LOG() << "Can not render symbol for sidc '" << symbol << "'";
+      WARNING_LOG(m_logger) << "Can not render symbol for sidc '" << symbol << "'";
       return;
     }
 
@@ -138,11 +138,11 @@ void ParticipantIconModelBase::symbolRendered(AdvancedSymbology::SymbolResult *s
   const QIcon icon(QPixmap::fromImage(symResData.result->symbolImage().image()));
   for (NGLTreeItem *item : symResData.treeItems)
   {
-    DEBUG_LOG() << "Symbol for " << item << " ready";
+    DEBUG_LOG(m_logger) << "Symbol for " << item << " ready";
 
     
     if (!updateIcon(QModelIndex(), item, icon))
-      WARNING_LOG() << "updateIcon failed for item " << item;
+      WARNING_LOG(m_logger) << "updateIcon failed for item " << item;
   }
 
   m_symbolResultMapping.erase(it);
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 aac414ad0..cb14577c9 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
@@ -35,6 +35,7 @@ class PPMCOMMON_EXPORT ParticipantIconModelBase : public NGLTreeModel
 {
   Q_OBJECT
 protected:
+  NGL::INGLLogger &m_logger;
   ParticipantIconModelBase(const std::shared_ptr<Interface::Dtc> &ppmDtc,
                            const std::shared_ptr<AdvancedSymbology::ForeignDataInterface> &asbIfc,
                            const QStringList &hdr,
@@ -53,10 +54,12 @@ protected:
   bool updateIcon(const QModelIndex &currentIndex, NGLTreeItem *itemToUpdate, const QIcon &icon);
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onTypeChanged(const ParticipantManagement::Type &data, DataModification modType);
 
 protected:
   
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<ParticipantManagement::Interface::Dtc> m_dtc;
   
   QHash<qint32, ParticipantManagement::Type> m_types;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/ppm_msdl_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/ppm_msdl_edit.h
index 21a53c203..47d9d914e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/ppm_msdl_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/ppm_msdl_edit.h
@@ -40,6 +40,8 @@ public:
             const std::shared_ptr<ParticipantManagement::ForeignGuiComboboxInterface> &ppmGuiCbxIfc);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   bool apply() override;
   void lock() override;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/participant_show.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/participant_show.h
index 9fc4f3029..6ba02fbfa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/participant_show.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/participant_show.h
@@ -45,6 +45,8 @@ public:
             const QString &nameParty);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
 
 protected slots:
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 e90725789..74a9e1367 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
@@ -43,6 +43,8 @@ public:
 
 protected:
 
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<ParticipantManagement::Interface::Dtc> m_dtc;
 };
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_party_view.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_party_view.h
index 2f5ef0296..ec77ea390 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_party_view.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_party_view.h
@@ -40,6 +40,8 @@ public:
             const std::shared_ptr<AdvancedSymbology::ForeignDataInterface> &asbIfc);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
 
   void onSelectionChanged();
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 927ea2b94..cd4fc918f 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
@@ -16,7 +16,7 @@ ParticipantPlanningModel::ParticipantPlanningModel(QObject *parent,
 {
   m_titles += tr("Hierarchy");
 
-  DEBUG_LOG() << "ParticipantPlanningModel::ParticipantPlanningModel";
+  DEBUG_LOG(m_logger) << "ParticipantPlanningModel::ParticipantPlanningModel";
 }
 
 QVariant ParticipantPlanningModel::data(const QModelIndex &index, int role) const
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_planning_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_planning_model.h
index 15250515a..09bb596ff 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_planning_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/OperationalPlanning/ppm_planning_model.h
@@ -28,5 +28,7 @@ signals:
   void newData();
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 } 
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 305bafa52..a4f35bbde 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
@@ -234,17 +234,17 @@ void ParticipantEdit::showIsSimulated()
 
 void ParticipantEdit::lock()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_ui->cbParty->setEnabled(true); 
   
-  DEBUG_LOG() << Q_FUNC_INFO << " END";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void ParticipantEdit::unlock()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_ui->cbParty->setEnabled(true);
-  DEBUG_LOG() << Q_FUNC_INFO << " END";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void ParticipantEdit::onPartyChanged()
@@ -320,7 +320,7 @@ void ParticipantEdit::onEnaDisa()
   {
     if (m_dtc->isAdlerVerbund(m_pTreehandler->getSelectedData().typeId()))
     {
-      DEBUG_LOG() << "Can't Edit Adler SAA Participants";
+      DEBUG_LOG(m_logger) << "Can't Edit Adler SAA Participants";
       enableEdit = true;
     }
     else
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_edit.h
index 90c7debe0..bd6e8d76a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_edit.h
@@ -60,6 +60,7 @@ public:
             const std::shared_ptr<AdvancedSymbology::ForeignDataInterface>            &asbIfc);
 
 private:
+  NGL::INGLLogger &m_logger;
   void retranslate() override;
   bool apply() override;
   void showIsSimulated();
@@ -88,6 +89,7 @@ private slots:
 
 
 private:
+  NGL::INGLLogger &m_logger;
   void tableColumnOrganiserSetting() override;
 
   bool m_asSupportService;
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 48632cf48..4d8a150da 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
@@ -78,7 +78,7 @@ void ParticipantOrganisationDialog::retranslate()
 
 void ParticipantOrganisationDialog::lock()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   m_ui->cbParty->setEnabled(true); 
 
@@ -90,12 +90,12 @@ void ParticipantOrganisationDialog::lock()
   m_ui->tvDetached->setEnabled(false);
 
 
-  DEBUG_LOG() << Q_FUNC_INFO << " END";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void ParticipantOrganisationDialog::unlock()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   m_ui->cbParty->setEnabled(true);
 
@@ -103,7 +103,7 @@ void ParticipantOrganisationDialog::unlock()
   m_ui->tvAttached->setEnabled(true);
   m_ui->tvCooperate->setEnabled(true);
   m_ui->tvDetached->setEnabled(true);
-  DEBUG_LOG() << Q_FUNC_INFO << " END";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool ParticipantOrganisationDialog::init(const std::shared_ptr<ParticipantManagement::Interface::Dtc> &dtc,
@@ -356,7 +356,7 @@ void ParticipantOrganisationDialog::onPartyChanged()
   s_preselectedParty = curPartyId;
 
 
-  DEBUG_LOG() << Q_FUNC_INFO << " START, curPartyId" << curPartyId
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, curPartyId" << curPartyId
                       << ", m_asSupportService=" << m_asSupportService;
 
 
@@ -421,9 +421,8 @@ void ParticipantOrganisationDialog::showContextMenu(const QPoint &position)
 
 
 
-DeleteDelegate::DeleteDelegate(QObject *parent)
-  : QItemDelegate(parent)
-{
+DeleteDelegate::DeleteDelegate(QObject *parent) : QItemDelegate(parent),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 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_organisation.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_organisation.h
index f8660f06c..4a34687c7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_organisation.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_organisation.h
@@ -72,6 +72,8 @@ public:
   void unlock() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   QModelIndex selectedIndexView() const;
   bool saveParticipantData(const ModifyParticipantDataRequest &request);
 
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 62006c0f5..9b41c84e7 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
@@ -153,7 +153,7 @@ bool ParticipantPoolModel::dropMimeData(const QMimeData *data, Qt::DropAction ac
   if (action != Qt::CopyAction && action != Qt::MoveAction)
     return false;
 
-  DEBUG_LOG() << "dropMimeData: " << data->formats().join(QLatin1Char(','));
+  DEBUG_LOG(m_logger) << "dropMimeData: " << data->formats().join(QLatin1Char(','));
 
   if (!data->hasFormat(ParticipantTemplateRoot) &&
       !data->hasFormat(ParticipantPartyRoot) &&
@@ -250,7 +250,7 @@ void ParticipantPoolModel::onParticipantDataChanged(const Participant &data, Dat
       const ParticipantData &part = m_vecData.at(i);
       if (part.id() == data.id())
       {
-        DEBUG_LOG() << "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())
         {
@@ -301,7 +301,7 @@ void ParticipantPoolModel::onParticipantOrganisationChanged(const ParticipantOrg
 
 bool ParticipantPoolModel::moveFromPartyToPool(int rootParticipantId, const QString &mimeType)
 {
-  ERROR_LOG() << "Moving participant " << rootParticipantId << " from party to root with mime type " << mimeType;
+  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());
@@ -400,7 +400,7 @@ void ParticipantPoolModel::tryRemoveParticipantFromModel(int participantId)
     const ParticipantData &part = m_vecData.at(i);
     if (part.id() == participantId)
     {
-      DEBUG_LOG() << "Removing participant " << participantId;
+      DEBUG_LOG(m_logger) << "Removing participant " << participantId;
       
       LtsWidgets::LtsAbstractTableModel<ParticipantManagement::ParticipantData>::removeRow(i);
       break;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_pool_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_pool_model.h
index 986d4d50d..7d9c35bea 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_pool_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_pool_model.h
@@ -64,6 +64,7 @@ Q_SIGNALS:
   void modifyParticipantData(const QVector<ParticipantData> &participantData, const QString &originatorMimeType);
 
 private:
+  NGL::INGLLogger &m_logger;
   bool moveFromPartyToPool(int rootParticipantId, const QString &mimeType);
   QVector<Participant> getSuperiorParticipants(int participantId);
   bool convertFromParticipantTemplateToParticipantData(const ParticipantManagement::TemplateParticipant &inputParticipant, ParticipantManagement::ParticipantData &outPutData);
@@ -74,6 +75,7 @@ private:
   int poolPartyId() const { return m_asSupportService ? 1 : 0; }
 
 private:
+  NGL::INGLLogger &m_logger;
   bool m_asSupportService;
   QVector<ParticipantData> m_fullPoolData;
   QVector<ParticipantData> m_dataToDelete;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_unit_namer.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_unit_namer.h
index bfaad1c2d..85002e624 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_unit_namer.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_unit_namer.h
@@ -28,6 +28,8 @@ Q_SIGNALS:
   void newUnitNames(const QString &, const QString &);
 
 private:
+
+NGL::INGLLogger &m_logger;
   Ui::ParticipantUnitNamer *m_ui;
   QValidator               *m_validator;
 };
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 15b2b5c66..9cdf199a5 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
@@ -63,7 +63,7 @@ bool TacticalOrganisation::init(const std::shared_ptr<ParticipantManagement::Int
 
   if (!m_session->createTopicClient<Core::Interface::Ftc>(m_coreFtc))
   {
-    ERROR_LOG() << Q_FUNC_INFO << " create coreFtc failed";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " create coreFtc failed";
 
     return false;
   }
@@ -150,7 +150,7 @@ void TacticalOrganisation::onReinitLeft()
   s_preselectedPartyLeft = partyId;
   auto *model = modelForParty(partyId, true);
 
-  INFO_LOG() << "Set model left: " << model;
+  INFO_LOG(m_logger) << "Set model left: " << model;
   m_ui->dvPartyLeft->setModel(model);
 #ifndef LTS_DEBUG
   m_ui->dvPartyLeft->setColumnHidden(ParticipantEditModel::ColParticipantId, true);
@@ -164,7 +164,7 @@ void TacticalOrganisation::onReinitRight()
   s_preselectedPartyRight = partyId;
   auto *model = modelForParty(partyId, false);
 
-  INFO_LOG() << "Set model right: " << model;
+  INFO_LOG(m_logger) << "Set model right: " << model;
   m_ui->dvPartyRight->setModel(model);
 #ifndef LTS_DEBUG
   m_ui->dvPartyRight->setColumnHidden(ParticipantEditModel::ColParticipantId, true);
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 e07376e15..d25567044 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
@@ -53,6 +53,7 @@ public:
 
   void retranslate() override;
 protected:
+  NGL::INGLLogger &m_logger;
   bool apply() override;
   void onModifyParticipantDataReply(const Core::FunctionReplyObject &replyObject) override;
 private Q_SLOTS:
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 464ff2be2..7be85d07c 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
@@ -55,6 +55,8 @@ public:
   void onCallBiteReply(const Core::FunctionReplyObject &replyObject) override final  { m_requestHelper->requestReply(replyObject); }
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void addLabel(const QString &text, int row, int column, LabelType labelType = LabelType::Normal);
   int checkArguments(bool available, bool statusOk, qint64 bitValue, int i);
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 526db7a23..0835509f6 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
@@ -346,7 +346,7 @@ void ParticipantConfigDialog::onSelectionChanged()
 
   for (const QModelIndex &index : currentlySelectedParticipants)
   {
-    DEBUG_LOG() << "setChildrenSelected row =" << index.row() << " column=" << index.column();
+    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();
     if (tc != TypeClass::Human  && tc != TypeClass::Unit)
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 f701f258c..6354161de 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
@@ -61,6 +61,7 @@ public:
 
 
 private:
+  NGL::INGLLogger &m_logger;
   void onModifyStateReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
   void onInitParticipantReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
   void onSendMessageReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject);  }
@@ -80,6 +81,7 @@ private slots:
   void onSelectionChanged();
 
 private:
+  NGL::INGLLogger &m_logger;
   bool apply() override final;
   void changeLabelText(QLabel *label, int value);
 
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 6e42e7692..bbabb9994 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
@@ -370,7 +370,7 @@ bool ParticipantConfigModel::canDropMimeData(const QMimeData *data,
   if (!isUnitType(parentItem->participant.typeId()))
     return false;
 
-  DEBUG_LOG() << "can drop on " << row << ", " << column << ", parent: "
+  DEBUG_LOG(m_logger) << "can drop on " << row << ", " << column << ", parent: "
                       << parent.row() << "," << parent.column() << ", " << parent.isValid()
                       << ", action: " << action;
 
@@ -399,7 +399,7 @@ bool ParticipantConfigModel::canDropMimeData(const QMimeData *data,
     
     if (idSource != 0 && isParentOf(parentItem, idSource))
     {
-      DEBUG_LOG() << "isParentOf() for idSource: " << idSource << " is true - no drop";
+      DEBUG_LOG(m_logger) << "isParentOf() for idSource: " << idSource << " is true - no drop";
       return false;
     }
   }
@@ -759,7 +759,7 @@ void ParticipantConfigModel::insertChildrenOf(int parentId,
     auto it = tmap.constFind(childId);
     if (it == tmap.constEnd())
     {
-      WARNING_LOG() << "Can not find participant with id " << childId << " - ignoring";
+      WARNING_LOG(m_logger) << "Can not find participant with id " << childId << " - ignoring";
       continue;
     }
     const ParticipantData &data = it.value();
@@ -784,7 +784,7 @@ void ParticipantConfigModel::insertChildrenOf(int parentId,
     childItem->participant = data;
     childItem->bIsChecked = isChecked(checkedParticipants.contains(data.id()), cs);
 
-    DEBUG_LOG() << "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);  
@@ -1074,7 +1074,7 @@ void ParticipantConfigModel::onParticipantChanged(const ParticipantManagement::P
 
     CheckedTreeItem *childItem = static_cast<CheckedTreeItem *>(createItem(QVariant(), QIcon()));
     childItem->participant = m_dtc->convertParticipantToParticipantData(data);
-    DEBUG_LOG() << "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);  
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_model.h
index ee6062199..65e32bd36 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_model.h
@@ -103,6 +103,7 @@ public:
   QString getHierarchyFromIndex(const QModelIndex &index) const;
 
 protected:
+  NGL::INGLLogger &m_logger;
   void gatherParticipants(QHash<int, ParticipantData> &tmap,
                           QHash<int, QSet<int>> &parentId2id) const;
 
@@ -151,6 +152,7 @@ signals:
   void internalDataChanged();
 
 protected:
+  NGL::INGLLogger &m_logger;
   int  m_partyId;
   bool m_bRowsAreCheckable;
   bool m_bUnitsSelectable;
@@ -178,6 +180,7 @@ 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;
 
@@ -251,6 +254,7 @@ public:
   SortData sortData() const { return m_sortData; }
 
 protected:
+  NGL::INGLLogger &m_logger;
   bool lessThan(const QModelIndex &sourceLeft, const QModelIndex &sourceRight) const override;
   bool filterAcceptsColumn(int source_column, const QModelIndex &source_parent) const override;
   bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
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 c88fdddcc..72de80ab3 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
@@ -55,7 +55,7 @@ bool ParticipantFollowDialog::init(LtsSession::LtsSession *session,
                                    const std::shared_ptr<Interface::Dtc> &dtc,
                                    const std::shared_ptr<ForeignParticipantInfoGuiInterface> &ppmGuiIfc)
 {
-  DEBUG_LOG() << "ParticipantFollowDialog::init";
+  DEBUG_LOG(m_logger) << "ParticipantFollowDialog::init";
   m_dtc = dtc;
   m_ppmGuiIfc = ppmGuiIfc;
   enadisa();
@@ -227,7 +227,7 @@ void ParticipantFollowDialog::onDoubleClicked()
   m_followParticipantId = data.id();
   m_followEquipmentNo = getEquipmentNumber(m_followParticipantId);
   enadisa();
-  DEBUG_LOG() << "onDoubleClicked follow Participant Id =" << m_followParticipantId
+  DEBUG_LOG(m_logger) << "onDoubleClicked follow Participant Id =" << m_followParticipantId
                        << " m_followEquipmentNo=" << m_followEquipmentNo;
 }
 
@@ -337,7 +337,7 @@ void ParticipantFollowDialog::fillParticipantMapFromTree(const QModelIndex &pare
 
 int ParticipantFollowDialog::getEquipmentNumber(const int participantId)
 {
-  DEBUG_LOG() << "getEquipmentNumber(" << participantId << ")";
+  DEBUG_LOG(m_logger) << "getEquipmentNumber(" << participantId << ")";
   int equipmentNumber = 0;
 
   QMapIterator<int, int> iter(m_participantMap);
@@ -345,10 +345,10 @@ int ParticipantFollowDialog::getEquipmentNumber(const int participantId)
   while (iter.hasNext())
   {
     iter.next();
-    DEBUG_LOG() << iter.key() << " : " << iter.value();
+    DEBUG_LOG(m_logger) << iter.key() << " : " << iter.value();
     if (iter.value() == participantId)
     {
-      DEBUG_LOG() << "return: " << iter.key();
+      DEBUG_LOG(m_logger) << "return: " << iter.key();
       return (iter.key());
     }
   }
@@ -358,13 +358,13 @@ int ParticipantFollowDialog::getEquipmentNumber(const int participantId)
 void ParticipantFollowDialog::onStartFollowClicked()
 {
   int participantId = m_participantMap.value(m_equipNo);
-  DEBUG_LOG() << "Follow Participant id=" << participantId << " on Map";
+  DEBUG_LOG(m_logger) << "Follow Participant id=" << participantId << " on Map";
 
   if (!m_ui->cbAll->isChecked())
     onDoubleClicked();
   else
   {
-    DEBUG_LOG() << "Start Follow Participant id=" << participantId << " on Map";
+    DEBUG_LOG(m_logger) << "Start Follow Participant id=" << participantId << " on Map";
     m_followParticipantId = participantId;
     m_followEquipmentNo = m_equipNo;
   }
@@ -373,7 +373,7 @@ void ParticipantFollowDialog::onStartFollowClicked()
 
 void ParticipantFollowDialog::onStopFollowClicked()
 {
-  DEBUG_LOG() << "Stop Follow Participant id=" << m_followParticipantId << " on Map";
+  DEBUG_LOG(m_logger) << "Stop Follow Participant id=" << m_followParticipantId << " on Map";
   m_followParticipantId = 0;
   m_followEquipmentNo = 0;
   enadisa();
@@ -408,9 +408,9 @@ void ParticipantFollowDialog::enadisa()
     labelText.append(QStringLiteral(")"));
   }
   m_ui->lbFollow->setText(labelText);
-  DEBUG_LOG() << "labelText=" << labelText;
-  DEBUG_LOG() << " m_ui->lbFollow->getText()" << m_ui->lbFollow->text();
-  DEBUG_LOG() << "newFollowEquipment(" << m_followEquipmentNo << ", "
+  DEBUG_LOG(m_logger) << "labelText=" << labelText;
+  DEBUG_LOG(m_logger) << " m_ui->lbFollow->getText()" << m_ui->lbFollow->text();
+  DEBUG_LOG(m_logger) << "newFollowEquipment(" << m_followEquipmentNo << ", "
                        << m_followParticipantId << ")";
   emit newFollowEquipment(m_followEquipmentNo,m_followParticipantId );
 }
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 861aebe50..2f124dd80 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
@@ -64,13 +64,13 @@ bool ParticipantGearRestock::init(LtsSession::LtsSession *session, bool showAllO
 
   if (!m_pdmDtc->canRestock(m_gearTypeId) && m_dialogMode == DialogMode::DM_Restock)
   {
-    WARNING_LOG() << "Not possible to restock gearTypeId = " << m_gearTypeId;
+    WARNING_LOG(m_logger) << "Not possible to restock gearTypeId = " << m_gearTypeId;
     return false;
   }
 
   if (!m_pdmDtc->canSetDefaults(m_gearTypeId) && m_dialogMode == DialogMode::DM_SetRestockDefaults)
   {
-    WARNING_LOG() << "Not possible to set restock defaults gearTypeId = " << m_gearTypeId;
+    WARNING_LOG(m_logger) << "Not possible to set restock defaults gearTypeId = " << m_gearTypeId;
     return false;
   }
 
@@ -107,7 +107,7 @@ bool ParticipantGearRestock::init(LtsSession::LtsSession *session, bool showAllO
     int chargeTypeId = gearType2ChargeType.chargeTypeId();
     int maxCharge = m_pdmDtc->maxCharge(m_gearTypeId, chargeTypeId);
 
-    DEBUG_LOG() << "maxCharge = " << maxCharge;
+    DEBUG_LOG(m_logger) << "maxCharge = " << maxCharge;
 
     ParticipantGearRestockCharge* pgrc = new ParticipantGearRestockCharge(m_ui->scrollArea, showAllOptions);
     pgrc->init(chargeTypeId, m_pdmDtc->trChargeTypeShortName(chargeTypeId, true), m_pdmDtc->factoryDefault(m_gearTypeId, chargeTypeId), maxCharge);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_gear_restock.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_gear_restock.h
index 5f19571dc..4aa75f21d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_gear_restock.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_gear_restock.h
@@ -47,6 +47,7 @@ public:
   bool init(LtsSession::LtsSession *session, bool showAllOptions = false);
 
 private:
+  NGL::INGLLogger &m_logger;
   void retranslate() override;
   bool apply() override final;
   void onSelectiveReammunitionReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
@@ -55,6 +56,7 @@ private slots:
   void validate(int newVal);
 
 private:
+  NGL::INGLLogger &m_logger;
   LtsUtils::RequestHelper *m_requestHelper;
   LtsSession::LtsSession  *m_session;
 
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 48a3cabd0..99f79450e 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
@@ -36,6 +36,8 @@ public:
             const std::shared_ptr<AreaEffectSimulation::Interface::Dtc> &aesDtc);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
 
   int m_ddsId;
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 a9c145ed8..54dedc176 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
@@ -43,6 +43,8 @@ private Q_SLOTS:
   void onDynamicParticipantDataChanged(const DynamicParticipantData &data, DataModification modType);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void reinitModel(const std::vector<StateInformation> &newData);
   QVariant dataInternal(const QModelIndex &index) const;
 
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 456489564..6d117e7a8 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
@@ -69,7 +69,7 @@ bool HitLineInfoDialog::init(const std::shared_ptr<ParticipantManagement::Interf
   {
     if (data.id() == m_hitLineId)
     {
-      DEBUG_LOG() << "Found HitLine Id: " << data.id();
+      DEBUG_LOG(m_logger) << "Found HitLine Id: " << data.id();
       m_hitLineInfo = data;
 
       
@@ -81,14 +81,14 @@ bool HitLineInfoDialog::init(const std::shared_ptr<ParticipantManagement::Interf
   });
 
   if (!m_isInitialized)
-    WARNING_LOG() << "Non HitLineInfo data found for id: " << m_hitLineId;
+    WARNING_LOG(m_logger) << "Non HitLineInfo data found for id: " << m_hitLineId;
   return m_isInitialized;
 } 
 
 
 void HitLineInfoDialog::showHitLineInfos()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " id:" << m_hitLineId;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id:" << m_hitLineId;
 
   if (m_participantOriginator.id() <= 0 || m_participantInjury.id() <= 0)
     return;
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 72ef2ab55..c06ed941d 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
@@ -41,6 +41,8 @@ public:
             const std::shared_ptr<SituationMap::ForeignGuiInterface>     &sitMapGuiIfc);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void showHitLineInfos();
   void findOnMap(int id);
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 db6c4e6dc..ddf670880 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
@@ -144,7 +144,7 @@ bool ParticipantInfoDialog::init(LtsSession::LtsSession *session,
                                  const std::shared_ptr<AdvancedSymbology::ForeignDataInterface> &asbInterface,
                                  const std::shared_ptr<ForeignParticipantInfoGuiInterface> &ppmGuiIfc)
 {
-  DEBUG_LOG()<< "ParticipantInfoDialog::init";
+  DEBUG_LOG(m_logger)<< "ParticipantInfoDialog::init";
   m_session = session;
   m_dtc = dtc;
   m_ftc = ftc;
@@ -187,7 +187,7 @@ bool ParticipantInfoDialog::init(LtsSession::LtsSession *session,
 
   });
 
-  DEBUG_LOG()<< "Vor setUiValues";
+  DEBUG_LOG(m_logger)<< "Vor setUiValues";
   return setUiValues();
 }
 
@@ -197,7 +197,7 @@ bool ParticipantInfoDialog::setUiValues()
   
 
 
-  DEBUG_LOG() << "------------------setUiValues-----------------";
+  DEBUG_LOG(m_logger) << "------------------setUiValues-----------------";
 
   if (!m_dtc || !m_ftc || m_participant.id() < 0)
     return false;
@@ -224,7 +224,7 @@ bool ParticipantInfoDialog::setUiValues()
 
   
   const bool isUas = m_dtc->isTypeUas(participantData.typeId());
-  DEBUG_LOG() << "------------------UAS-----------------"
+  DEBUG_LOG(m_logger) << "------------------UAS-----------------"
                        << " isTypeUas" << isUas
                        << " participantId=" <<participantData.id()
                        << " typeId=" << participantData.typeId();
@@ -348,7 +348,7 @@ bool ParticipantInfoDialog::setUiValues()
   }
   case TypeClass::Vessel:
   case TypeClass::Unknown:
-    ERROR_LOG() << Q_FUNC_INFO << m_typeClass;
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << m_typeClass;
     return false;
   }
 
@@ -460,7 +460,7 @@ bool ParticipantInfoDialog::setUiValues()
     setOnlineHelpFilename(QStringLiteral("Info_Dialog-Unit"));
     break;
   case TypeClass::Unknown:
-    ERROR_LOG() << Q_FUNC_INFO << m_typeClass;
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << m_typeClass;
   }
 
   return true;
@@ -520,7 +520,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
     youngestState.stateTime(0);
     for (const StateInformation &si : history)
     {
-      DEBUG_LOG() << "StateInformation "
+      DEBUG_LOG(m_logger) << "StateInformation "
                            << " time=" << si.stateTime()
                            << " vulnerabilityBits=" << si.vulnerabilityBits()
                            << " vulnerabilityKindId=" << si.vulnerabilityKindId();
@@ -533,7 +533,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
     
     m_ui->lblStatus->setText(ProjectDataManagement::toString(lastState.vulnerabilityState(), vc));
     
-    DEBUG_LOG()<<" >>> last state: "<<lastState.vitality() << "last kind: " <<lastState.vulnerabilityKindId();
+    DEBUG_LOG(m_logger)<<" >>> last state: "<<lastState.vitality() << "last kind: " <<lastState.vulnerabilityKindId();
     m_ui->lblVitality->setText(QString::number(lastState.vitality()) + QStringLiteral("%"));
 
     
@@ -541,7 +541,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
     const int BCONTAMINATION = 0x8000;
     const int CCONTAMINATION = 0x10000;
     QStringList contaminationList;
-    DEBUG_LOG() << "Set Contamination"
+    DEBUG_LOG(m_logger) << "Set Contamination"
                          << " time=" << youngestState.stateTime()
                          << " vulnerabilityKindId=" << youngestState.vulnerabilityKindId()
                          << " vulnerabilityBits=" << youngestState.vulnerabilityBits()
@@ -549,7 +549,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
 
     if ( youngestState.vulnerabilityBits() & NCONTAMINATION)
     {
-      DEBUG_LOG() << "append N";
+      DEBUG_LOG(m_logger) << "append N";
 
       const ProjectDataManagement::VulnerabilityState vs(static_cast<ProjectDataManagement::VulnerabilityState_def::type>(14));
       QString fullName = ProjectDataManagement::toString(vs);
@@ -560,7 +560,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
     }
     if ( youngestState.vulnerabilityBits() & BCONTAMINATION)
     {
-      DEBUG_LOG() << "append B";
+      DEBUG_LOG(m_logger) << "append B";
 
       const ProjectDataManagement::VulnerabilityState vs(static_cast<ProjectDataManagement::VulnerabilityState_def::type>(15));
       QString fullName = ProjectDataManagement::toString(vs);
@@ -571,7 +571,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
     }
     if ( youngestState.vulnerabilityBits() & CCONTAMINATION)
     {
-      DEBUG_LOG() << "append C";
+      DEBUG_LOG(m_logger) << "append C";
 
       const ProjectDataManagement::VulnerabilityState vs(static_cast<ProjectDataManagement::VulnerabilityState_def::type>(16));
       QString fullName = ProjectDataManagement::toString(vs);
@@ -615,7 +615,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
   m_ui->lbContamination->setHidden(contaminationListIsEmpty);
   m_ui->lblContamination->setHidden(contaminationListIsEmpty);
 
-  DEBUG_LOG()<< "setBackgroundColor ="<< data.manipulation().size();
+  DEBUG_LOG(m_logger)<< "setBackgroundColor ="<< data.manipulation().size();
   setBackgroundColor(m_ui->lblEquipNr, Qt::red, data.manipulation().size());
 
   
@@ -791,11 +791,11 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
   {
     m_ui->twGear->hide();
   }
-  DEBUG_LOG() << "### m_sanMatStock: " << m_sanMatStock.size();
+  DEBUG_LOG(m_logger) << "### m_sanMatStock: " << m_sanMatStock.size();
 
-  DEBUG_LOG() << "### data.sanitationMaterialStock(): " << data.sanitationMaterialStock().size();
-  DEBUG_LOG() << "### data.participantId(): " << data.participantId();
-  DEBUG_LOG() << "### 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();
 
   
   if (data.sanitationMaterialStock().size() == 0)
@@ -806,8 +806,8 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici
   }
   else if (data.sanitationMaterialStock() != m_sanMatStock)
   {
-    DEBUG_LOG() << "### data.qualification(): " << data.qualification();
-    DEBUG_LOG() << "### 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()));
@@ -1008,7 +1008,7 @@ void ParticipantInfoDialog::onPositionChanged(const ParticipantPosition &positio
     isOpsBuildingSource = true;
 
 
-  DEBUG_LOG() << "reportingSource = OpsBuilding true" ;
+  DEBUG_LOG(m_logger) << "reportingSource = OpsBuilding true" ;
   setBackgroundColor(m_ui->lblPositionData, Qt::lightGray, isOpsBuildingSource );
 
   onUpdatePosition(position.participantId(), position.pos(), position.sampleTime());
@@ -1214,7 +1214,7 @@ void ParticipantInfoDialog::setSanitationLabelColor(SanitationResult proceduresD
   case SanitationResult::deprecatedNA:
     break;
   }
-  DEBUG_LOG() << "Set Color to: " << proceduresDone.underlying();
+  DEBUG_LOG(m_logger) << "Set Color to: " << proceduresDone.underlying();
   m_ui->lblKind->setPalette(pal);
   m_ui->lblKind->setAutoFillBackground(true);
   m_ui->lblKind->setToolTip(toolTip);
@@ -1406,7 +1406,7 @@ void ParticipantInfoDialog::onPartitionTimeChanged(qint64 newPartitionTime)
 {
   if (LtsUtils::isPositionTimeOutdated(newPartitionTime, m_lastPositionMSec) )
   {
-    DEBUG_LOG()<< "setBackgroundColor ="<< LtsUtils::isPositionTimeOutdated(newPartitionTime, m_lastPositionMSec);
+    DEBUG_LOG(m_logger)<< "setBackgroundColor ="<< LtsUtils::isPositionTimeOutdated(newPartitionTime, m_lastPositionMSec);
     setBackgroundColor(m_ui->lblPositionData, Qt::red, true);
   }
   qint64 lastPosSec = (newPartitionTime - m_lastPositionMSec) / 1000;
@@ -1502,7 +1502,7 @@ void ParticipantInfoDialog::onTargetConfig()
 {
   if (!m_tgtFtc)
     return;
-  INFO_LOG() << "onTargetConfig send TargetConfigRequest";
+  INFO_LOG(m_logger) << "onTargetConfig send TargetConfigRequest";
 
   TargetManagement::ConfigureTargetRequest request;
 
@@ -1521,7 +1521,7 @@ void ParticipantInfoDialog::onTargetConfigChanged(const TargetManagement::Target
 {
   if (modType == DataModification::eRemoved)
     return;
-  INFO_LOG() << "onTargetConfigChanged participantId = " << m_participant.id()
+  INFO_LOG(m_logger) << "onTargetConfigChanged participantId = " << m_participant.id()
                      << " data.participantId = " << data.participantId();
   if (data.participantId() != m_participant.id())
     return;
@@ -1538,7 +1538,7 @@ void ParticipantInfoDialog::onTargetModeChangeed()
 {
   if (!m_tgtFtc)
     return;
-  INFO_LOG() << "onTargetModeChangeed";
+  INFO_LOG(m_logger) << "onTargetModeChangeed";
   TargetManagement::ConfigureTargetRequest request;
 
   request.id(0);
@@ -1546,7 +1546,7 @@ void ParticipantInfoDialog::onTargetModeChangeed()
   request.tgtCommand(TargetManagement::TgtCommand_def::SetMode);
   int modeInt = m_ui->cbTargetMode->currentData().toInt();
   TargetManagement::Mode mode = static_cast <TargetManagement::Mode_def::type>(modeInt);
-  INFO_LOG() << "onTargetModeChangeed=" <<  mode;
+  INFO_LOG(m_logger) << "onTargetModeChangeed=" <<  mode;
   request.mode(mode);
 
   auto cb = [request, this]()
@@ -1566,7 +1566,7 @@ void ParticipantInfoDialog::onTargetWeaponChanged()
   request.participantId(m_participant.id());
   request.tgtCommand(TargetManagement::TgtCommand_def::SetWeapon);
   request.weapon(m_ui->cbTargetWeapon->currentData().toInt());
-  INFO_LOG() << "onTargetWeaponChangeed = " <<  request.weapon();
+  INFO_LOG(m_logger) << "onTargetWeaponChangeed = " <<  request.weapon();
 
   auto cb = [request, this]()
   {
@@ -1594,8 +1594,8 @@ void ParticipantInfoDialog::onContextMenuRequested(const QPoint &position)
 
   GearInformation &gear = m_gearList[pointedItem->row()];
 
-  DEBUG_LOG() << "gear type selected = " << gear.gearTypeId();
-  DEBUG_LOG() << "gear Id = " << gear.gearId();
+  DEBUG_LOG(m_logger) << "gear type selected = " << gear.gearTypeId();
+  DEBUG_LOG(m_logger) << "gear Id = " << gear.gearId();
 
   QList<QAction*> actions;
 
@@ -1677,16 +1677,16 @@ void ParticipantInfoDialog::onUnlockUAS()
 {
   UAS uas = m_dtc->getUasByParticipantId(m_participant.id(), m_session->exerciseId());
   m_uasId = uas.id();
-  DEBUG_LOG()<<" -- onUnlockUAS uasId: "<< uas.id() <<" /// participantId: "<<uas.participantId()<<" /// equipmentNumber: "<<m_participant.equipmentNumber();
+  DEBUG_LOG(m_logger)<<" -- onUnlockUAS uasId: "<< uas.id() <<" /// participantId: "<<uas.participantId()<<" /// equipmentNumber: "<<m_participant.equipmentNumber();
 
   if (uas.id() <= 0 )
   {
-    ERROR_LOG()<<" -- onUnlockUAS invalid uasId: "<<uas.id()<<" !!!";
+    ERROR_LOG(m_logger)<<" -- onUnlockUAS invalid uasId: "<<uas.id()<<" !!!";
     return;
   }
   if (!m_participant.equipmentNumber().is_set())
   {
-    ERROR_LOG()<<" -- onUnlockUAS invalid EquipmentNumber for UAS: "<<uas.id()<<" !!!";
+    ERROR_LOG(m_logger)<<" -- onUnlockUAS invalid EquipmentNumber for UAS: "<<uas.id()<<" !!!";
     return;
   }
   ModifyUasStateRequest req;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.h
index 505ef43ed..c638e9cbc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.h
@@ -85,6 +85,7 @@ signals:
 
 
 private:
+  NGL::INGLLogger &m_logger;
   void retranslate() override;
   bool setUiValues();
   static void setBackgroundColor(QWidget *w,  Qt::GlobalColor color, bool bSetColor);
@@ -146,6 +147,7 @@ private Q_SLOTS:
   void onOpenTargetConfigurationL400();
 
 private:
+  NGL::INGLLogger &m_logger;
   Participant m_participant;
   int m_uasId; 
   qint64 m_lastPositionMSec;
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 f0469a89a..915cb7a69 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
@@ -11,16 +11,15 @@
 namespace ParticipantManagement
 {
 
-ParticipantInfoLtdGearComponent::ParticipantInfoLtdGearComponent(QTableWidget *tableWidget)
-  : m_tableWidget(tableWidget)
-{
+ParticipantInfoLtdGearComponent::ParticipantInfoLtdGearComponent(QTableWidget *tableWidget) : m_tableWidget(tableWidget),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   if (!m_tableWidget)
-    ERROR_LOG() << "Got invalid table widget.";
+    ERROR_LOG(m_logger) << "Got invalid table widget.";
 }
 
 void ParticipantInfoLtdGearComponent::updateData(const std::vector<LaserDesignation> &newData)
 {
-  TRACE_LOG() << Q_FUNC_INFO;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO;
 
   if (!m_tableWidget)
     return;
@@ -36,7 +35,7 @@ void ParticipantInfoLtdGearComponent::updateData(const std::vector<LaserDesignat
 
 void ParticipantInfoLtdGearComponent::addGear(int gearId, int row)
 {
-  TRACE_LOG() << Q_FUNC_INFO;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO;
 
   if (!m_tableWidget)
     return;
@@ -60,7 +59,7 @@ void ParticipantInfoLtdGearComponent::clear()
 
 void ParticipantInfoLtdGearComponent::updateRow(const LaserDesignation &laserDesignation)
 {
-  TRACE_LOG() << Q_FUNC_INFO << ": " << laserDesignation;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << ": " << laserDesignation;
 
   if (!m_rowPerGearId.contains(laserDesignation.gearId()) || !m_rowPerGearId.value(laserDesignation.gearId()).isValid())
     return;
@@ -71,7 +70,7 @@ void ParticipantInfoLtdGearComponent::updateRow(const LaserDesignation &laserDes
 
 void ParticipantInfoLtdGearComponent::removeOutdatedData(const std::vector<LaserDesignation> &newData)
 {
-  TRACE_LOG() << Q_FUNC_INFO;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO;
 
   if (!m_tableWidget)
     return;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_ltd_gear_component.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_ltd_gear_component.h
index 33e6a4ab5..c4256f443 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_ltd_gear_component.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_ltd_gear_component.h
@@ -33,6 +33,7 @@ public:
 
   static const int LTD_ID {1043};
 private:
+  NGL::INGLLogger &m_logger;
   struct LtdRow
   {
     QTableWidgetItem *chargeType {nullptr} ;
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 976337556..9f2d347de 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
@@ -52,7 +52,7 @@ void ParticipantInfoTableDialog::retranslate()
 bool ParticipantInfoTableDialog::init(LtsSession::LtsSession *session,
                                       const std::shared_ptr<Interface::Dtc> &dtc)
 {
-  DEBUG_LOG() << "**** init";
+  DEBUG_LOG(m_logger) << "**** init";
 
   m_session = session;
   m_dtc = dtc;
@@ -104,7 +104,7 @@ void ParticipantInfoTableDialog::onColumnContextMenu(const QPoint &position)
 
 void ParticipantInfoTableDialog::onAddClicked()
 {
-  DEBUG_LOG() << "**** onAddClicked() ";
+  DEBUG_LOG(m_logger) << "**** onAddClicked() ";
   InfoTableAddDialog *addParticipantsDialog = new InfoTableAddDialog(this);
   addParticipantsDialog->init(m_session, m_dtc);
 
@@ -118,7 +118,7 @@ void ParticipantInfoTableDialog::onAddClicked()
 
 void ParticipantInfoTableDialog::onRemoveClicked()
 {
-  DEBUG_LOG() << "**** onRemoveClicked() ";
+  DEBUG_LOG(m_logger) << "**** onRemoveClicked() ";
   const QModelIndexList selectedRows = m_ui->tvParticipant->selectionModel()->selectedRows();
 
   if (!selectedRows.count())
@@ -138,7 +138,7 @@ void ParticipantInfoTableDialog::onRemoveClicked()
 void ParticipantInfoTableDialog::onSelectionChanged(const QItemSelection &selected,
                                                     const QItemSelection &deselected)
 {
-  DEBUG_LOG() << "onSelectionChanged";
+  DEBUG_LOG(m_logger) << "onSelectionChanged";
   Q_UNUSED(selected);
   Q_UNUSED(deselected);
 
@@ -148,7 +148,7 @@ void ParticipantInfoTableDialog::onSelectionChanged(const QItemSelection &select
 
 void ParticipantInfoTableDialog::onShowTlnInfo(const QModelIndex &idx)
 {
-  DEBUG_LOG() << "onDoubleClick --> showTlnInfo";
+  DEBUG_LOG(m_logger) << "onDoubleClick --> showTlnInfo";
   QModelIndex realIdx = m_sortFilterProxyModel->mapToSource(idx);
 
   const int id = m_infoTableModel->getRowData(realIdx.row()).id();
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 c43529540..e0443fc25 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
@@ -42,7 +42,7 @@ bool ParticipantInfoTableModel::initModel(LtsSession::LtsSession *session,
                                           const std::shared_ptr<ParticipantManagement::Interface::Dtc> &ppmDtc,
                                           bool bWithPositionandBiteResult)
 {
-  DEBUG_LOG() << "**** initModel";
+  DEBUG_LOG(m_logger) << "**** initModel";
 
   m_session = session;
   m_ppmDtc  = ppmDtc;
@@ -210,7 +210,7 @@ void ParticipantInfoTableModel::updateDataView(const QSet<int> &participantIds)
 void ParticipantInfoTableModel::onParticipantChanged(const ParticipantManagement::DynamicParticipantData &data,
                                                      DataModification modType)
 {
-  DEBUG_LOG() << "**** participantDataChanged";
+  DEBUG_LOG(m_logger) << "**** participantDataChanged";
 
   const int row = findRowForId(data.participantId());
   if (row < 0)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_model.h
index ee2c644c8..ccb14875d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_model.h
@@ -74,6 +74,7 @@ protected Q_SLOTS:
   void onTimeoutCheck();
 
 private:
+  NGL::INGLLogger &m_logger;
   ParticipantInfo setInfoData(const ParticipantManagement::Participant &part) const;
   void fillParticipantContent(ParticipantInfo &info,
                               const DynamicParticipantData &data) const;
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 903c33b1c..9f18fcd8e 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
@@ -56,6 +56,8 @@ private slots:
   void leaveEvent(QEvent *e) override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   int changeLabelText(int value);
   void onClicked();
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 eed6a3d66..8f1c85424 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
@@ -175,7 +175,7 @@ void ParticipantSetInjuryDialog::setOldData(const DynamicParticipantData &data)
 
   int index = m_ui->cbState->findData(lastState.vulnerabilityState().underlying());
 
-  DEBUG_LOG() << "Old vulnerability state = " << index;
+  DEBUG_LOG(m_logger) << "Old vulnerability state = " << index;
 
   if (index > 0)
     m_ui->cbState->setCurrentIndex(index);
@@ -188,10 +188,10 @@ uint32_t ParticipantSetInjuryDialog::getInjuryBit()
   
   int side = m_bgSide->button(1)->isEnabled() ? m_bgSide->checkedId() : 0;
 
-  DEBUG_LOG() << "getInjuryBit() -------------- ";
-  DEBUG_LOG() << "Injury = " << m_bgInjury->checkedId();
-  DEBUG_LOG() << "Body = " << m_bgBodypart->checkedId();
-  DEBUG_LOG() << "Side = " << side;
+  DEBUG_LOG(m_logger) << "getInjuryBit() -------------- ";
+  DEBUG_LOG(m_logger) << "Injury = " << m_bgInjury->checkedId();
+  DEBUG_LOG(m_logger) << "Body = " << m_bgBodypart->checkedId();
+  DEBUG_LOG(m_logger) << "Side = " << side;
 
   return (((((m_bgInjury->checkedId() * 16) + m_bgBodypart->checkedId()) * 4) + side) + 2048);
 
@@ -328,8 +328,8 @@ bool ParticipantSetInjuryDialog::apply()
   req.participantIds({m_participantId});
   req.vulnerabilityKind(getInjuryBit());
 
-  DEBUG_LOG() << "Saving vulnerability state = " << req.vulnerabilityState();
-  DEBUG_LOG() << "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 11bed01ef..ed72f2ac6 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
@@ -78,6 +78,7 @@ public:
   ~ParticipantSetInjuryDialog();
 
 private:
+  NGL::INGLLogger &m_logger;
   void onModifyStateReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
   void retranslate() override;
 
@@ -93,9 +94,11 @@ private slots:
   void resetRadioStates(bool onlySides = false);
 
 private:
+  NGL::INGLLogger &m_logger;
   bool apply() override final;
 
 private:
+  NGL::INGLLogger &m_logger;
   int m_participantId;
   int m_eqId;
   LtsSession::LtsSession *m_session;
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 6376c12af..f009a9995 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
@@ -197,8 +197,8 @@ bool ParticipantSetSanitationDialog::apply()
   sanDat.originatorEquipmentNumber(0);
   req.data(sanDat);
 
-  DEBUG_LOG() << "Medic treatment: qualification = " << sanDat.qualification();
-  DEBUG_LOG() << "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 87fae01b8..342eb6634 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
@@ -46,6 +46,7 @@ public:
 private slots:
   void onQualificationChanged();
 private:
+  NGL::INGLLogger &m_logger;
   void fillCb();
   void setCbxName();
   qint64 getProcedures();
@@ -56,6 +57,7 @@ private:
   void onSetSanitationReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
 
 private:
+  NGL::INGLLogger &m_logger;
   LtsUtils::RequestHelper *m_requestHelper;
   int      m_participantId;
   int      m_eqId{-1};
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 a99ba8504..e2f2b56d3 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
@@ -33,7 +33,7 @@ parent)
 bool AreaModel::initModel(const TargetInformation &targetInformation)
 {
   
-  INFO_LOG() << "initModel - #AreaModel: " << targetInformation.shootbackAreas().size();
+  INFO_LOG(m_logger) << "initModel - #AreaModel: " << targetInformation.shootbackAreas().size();
 
   for (auto singleArea : std::as_const(targetInformation.shootbackAreas()))
     onShootbackAreaChanged(singleArea, DataModification::eAdded);
@@ -79,7 +79,7 @@ QVariant AreaModel::headerData(int section, Qt::Orientation orientation, int rol
 
 QVariant AreaModel::data(const QModelIndex &index, int role) const
 {
-  INFO_LOG() << Q_FUNC_INFO << " role=" << role
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " role=" << role
                      << " index = " << index.column();
 
   if (!indexIsValid(index))
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 eb37d0072..fd34d3bfc 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
@@ -36,16 +36,16 @@ ParticipantTargetConfigurationDialog::ParticipantTargetConfigurationDialog(QWidg
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_ui(new Ui::ParticipantTargetConfigurationDialog)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_ui->setupUi(this);
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 ParticipantTargetConfigurationDialog::~ParticipantTargetConfigurationDialog()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   delete m_ui;
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void ParticipantTargetConfigurationDialog::retranslate()
@@ -58,14 +58,14 @@ void ParticipantTargetConfigurationDialog::retranslate()
 
 bool ParticipantTargetConfigurationDialog::apply()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   ModifyTargetInformationRequest req;
   req.targetInfo(m_targetInformation);  
 
-  DEBUG_LOG() << Q_FUNC_INFO << " update m_targetInformation: " << m_targetInformation;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " update m_targetInformation: " << m_targetInformation;
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return m_requestHelper->startSingleRequest([req, this]()
   {
     return m_ftc->modifyTargetInformationRequest(req, this);
@@ -77,11 +77,11 @@ bool ParticipantTargetConfigurationDialog::init(int participantId,
                                                 const std::shared_ptr<Interface::Ftc> &ftc,
                                                 const std::shared_ptr<SituationMap::ForeignGuiInterface> &sitMapGuiIfc)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_participantId = participantId;
   if (m_participantId <= 0)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " participant invalid, participantId = " << m_participantId;
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " participant invalid, participantId = " << m_participantId;
     return false;
   }
 
@@ -156,7 +156,7 @@ bool ParticipantTargetConfigurationDialog::init(int participantId,
   {
     onTargetInformationChanged(m_targetInformation, DataModification::eAdded); 
   } else {
-    DEBUG_LOG() << Q_FUNC_INFO << " targetInformation not found for participantId = " << m_participantId
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " targetInformation not found for participantId = " << m_participantId
                         << " - use default.";
     m_targetInformation.participantId(m_participantId);  
   }
@@ -167,7 +167,7 @@ bool ParticipantTargetConfigurationDialog::init(int participantId,
 
   m_ui->cb_showOnMap->setChecked(true);  
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
@@ -190,8 +190,8 @@ void ParticipantTargetConfigurationDialog::onDynamicParticipantDataChanged(const
     const ProjectDataManagement::VulnerabilityState_def::type vulStateType = vulState.underlying();
 
     int idx = m_ui->cb_status->findData(vulStateType);
-    DEBUG_LOG() << Q_FUNC_INFO << " cb_status: vulState=" << vulState;
-    DEBUG_LOG() << Q_FUNC_INFO << " cb_status: setCurrentIndex idx=" << idx;
+    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);
     m_ui->cb_status->setEnabled(true);
   }
@@ -213,7 +213,7 @@ void ParticipantTargetConfigurationDialog::onTargetInformationChanged(const Targ
   case DataModification::eAdded:
   case DataModification::eModified:
   {
-    DEBUG_LOG() << Q_FUNC_INFO << " got new targetInformation from dds: " << data;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " got new targetInformation from dds: " << data;
     m_targetInformation = data;
   }
     break;
@@ -224,7 +224,7 @@ void ParticipantTargetConfigurationDialog::onTargetInformationChanged(const Targ
 
 void ParticipantTargetConfigurationDialog::onStatusChanged()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   m_ui->cb_status->setEnabled(false); 
 
@@ -293,7 +293,7 @@ void ParticipantTargetConfigurationDialog::onStatusChanged()
 
 
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 
@@ -400,7 +400,7 @@ bool updateValue(ProjectDataManagement::VulnerabilityState& oldValueRef, Project
 
 void ParticipantTargetConfigurationDialog::onGuiChanged()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   
 
   bool hasChanged = false;
@@ -417,26 +417,26 @@ void ParticipantTargetConfigurationDialog::onGuiChanged()
   hasChanged |= updateValue(m_targetInformation.takedownEffect(), static_cast<ProjectDataManagement::VulnerabilityState_def::type>(m_ui->cb_takeDownEffect->currentData().toInt()) );
   hasChanged |= updateValue(m_targetInformation.takedownInterval(), m_ui->sb_takeDownInterval->value());
 
-  DEBUG_LOG() << Q_FUNC_INFO << " hasChanged=" << hasChanged;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " hasChanged=" << hasChanged;
 
   
   const std::vector<ParticipantManagement::ShootbackArea> &modelAreasStdVec = m_areaModel.getDataStdVector();
   if (modelAreasStdVec != m_targetInformation.shootbackAreas())
   {
-    DEBUG_LOG() << Q_FUNC_INFO << " hasChanged=" << hasChanged;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " hasChanged=" << hasChanged;
     hasChanged = true;
     m_targetInformation.shootbackAreas(modelAreasStdVec);
   }
 
-  DEBUG_LOG() << Q_FUNC_INFO << " slotChangesMade sChanged=" << hasChanged;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " slotChangesMade sChanged=" << hasChanged;
   this->slotChangesMade();
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void ParticipantTargetConfigurationDialog::onDataChanged()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, m_targetInformation=" << m_targetInformation;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, m_targetInformation=" << m_targetInformation;
 
   int idx;
 
@@ -461,12 +461,12 @@ void ParticipantTargetConfigurationDialog::onDataChanged()
   QVector<ShootbackArea> qVec = QVector<ShootbackArea>(areas.begin(), areas.end());
   m_areaModel.setData(qVec);
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void ParticipantTargetConfigurationDialog::onAddBtnClicked()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (!m_sitMapGuiIfc)
     return;
 
@@ -477,7 +477,7 @@ void ParticipantTargetConfigurationDialog::onAddBtnClicked()
                              s_minPoints,
                              s_maxPoints);
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 QPolygonF areaToPolygon(const ShootbackArea &area)
@@ -506,14 +506,14 @@ QPolygonF areaToPolygon(const ShootbackArea &area)
 
 void ParticipantTargetConfigurationDialog::onEditBtnClicked()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (!m_sitMapGuiIfc)
     return;
 
   const QModelIndex curIdx = m_ui->ltsDataView->currentIndex();
   if (!curIdx.isValid())
     return;
-  INFO_LOG() << " edit...";
+  INFO_LOG(m_logger) << " edit...";
 
   const ShootbackArea &area = m_areaModel.getRowData(curIdx.row());
 
@@ -531,24 +531,24 @@ void ParticipantTargetConfigurationDialog::onEditBtnClicked()
                              -1,
                              coordinates);
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void ParticipantTargetConfigurationDialog::onRemoveBtnClicked()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   const QModelIndex curIdx = m_ui->ltsDataView->currentIndex();
   if (!curIdx.isValid())
     return;
-  INFO_LOG() << " remove...";
+  INFO_LOG(m_logger) << " remove...";
 
   m_areaModel.removeRow(curIdx.row());
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void ParticipantTargetConfigurationDialog::onShowOnMapChanged(int)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   if (!m_sitMapGuiIfc)
     return;
@@ -562,7 +562,7 @@ void ParticipantTargetConfigurationDialog::onShowOnMapChanged(int)
     for (int row = 0; row < rowCount; ++row)
     {
       const ShootbackArea &currentArea = m_areaModel.getRowData(row);
-      INFO_LOG() << " row=" << row << " ; currentArea " <<  currentArea;
+      INFO_LOG(m_logger) << " row=" << row << " ; currentArea " <<  currentArea;
       const QPolygonF &poly = areaToPolygon(currentArea);
       polyVec.append(poly);
     } 
@@ -571,7 +571,7 @@ void ParticipantTargetConfigurationDialog::onShowOnMapChanged(int)
   } else {
     m_sitMapGuiIfc->removePreviewObject();
   }
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void ParticipantTargetConfigurationDialog::onSelectionChanged()
@@ -592,7 +592,7 @@ void ParticipantTargetConfigurationDialog::onSelectionChanged()
   int row = curIdx.row();
 
   ShootbackArea currentArea = m_areaModel.getRowData(row);
-  INFO_LOG() << " currentArea "<<  currentArea;
+  INFO_LOG(m_logger) << " currentArea "<<  currentArea;
   m_previewPolygon = areaToPolygon(currentArea);
 
 
@@ -602,11 +602,11 @@ void ParticipantTargetConfigurationDialog::onSelectionChanged()
 
 void ParticipantTargetConfigurationDialog::onPolygonData(const QPolygonF &poly)
 {
-  INFO_LOG() << Q_FUNC_INFO << " START";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   if (poly.size() < 3)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " polygon insufficiant, size=" << poly.size();
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " polygon insufficiant, size=" << poly.size();
     return;
   }
 
@@ -627,13 +627,13 @@ void ParticipantTargetConfigurationDialog::onPolygonData(const QPolygonF &poly)
       return;
     ShootbackArea temp = m_areaModel.getRowData(curIdx.row());
     newArea.identifier(temp.identifier());
-    DEBUG_LOG() << Q_FUNC_INFO << "updating newArea = " << newArea;
+    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());
-    DEBUG_LOG() << Q_FUNC_INFO << " adding tempArea = " << newArea;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " adding tempArea = " << newArea;
     m_areaModel.insertRow(newArea);
 
     QModelIndex mi = m_areaModel.index(size, 0);
@@ -649,22 +649,21 @@ void ParticipantTargetConfigurationDialog::onPolygonData(const QPolygonF &poly)
 
 void ParticipantTargetConfigurationDialog::showPreviewObject()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (!m_sitMapGuiIfc || m_previewPolygon.isEmpty())
     return;
   m_sitMapGuiIfc->displayPreviewObject(this, m_previewPolygon, true);
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 
 
 
 
-EditNameDelegate::EditNameDelegate(QWidget *parent)
-  : QItemDelegate(parent)
-{
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+EditNameDelegate::EditNameDelegate(QWidget *parent) : QItemDelegate(parent),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 QWidget *EditNameDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option,
@@ -691,7 +690,7 @@ void EditNameDelegate::setEditorData(QWidget *editor, const QModelIndex &index)
   QVariant v = index.data(Qt::EditRole);
   le->setText(v.toString());
 
-  DEBUG_LOG()  << Q_FUNC_INFO
+  DEBUG_LOG(m_logger)  << Q_FUNC_INFO
                       << " rox/column: " << index.row() << "/" << index.column()
                       << " Input: " << v.toString();
 }
@@ -704,7 +703,7 @@ void EditNameDelegate::setModelData(QWidget *editor,
   if (!le)
     return;
 
-  DEBUG_LOG() << Q_FUNC_INFO
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO
                       << " rox/column: " << index.row() << "/" << index.column()
                       << " setData... Input: " << le->text();
 
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 cd6add9b5..c1a59f48e 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
@@ -45,7 +45,7 @@ void ParticipantsMountedTableDialog::onShowTlnInfo()
   if (!m_ppmGuiIfc)
     return;
 
-  DEBUG_LOG() << "onDoubleClick --> showTlnInfo";
+  DEBUG_LOG(m_logger) << "onDoubleClick --> showTlnInfo";
   const QModelIndex idx = m_ui->tvMountedParticipants->currentIndex();
   const int id = m_mountedTableModel->getRowData(idx.row()).id();
   m_ppmGuiIfc->showParticipantInfoWindow(id);
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 db2dc5763..87e7c4786 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
@@ -43,7 +43,7 @@ bool CombatPower::init(const std::shared_ptr<ParticipantManagement::Interface::D
 {
   if (!dtc || !asbIfc || !ppmGuiCbxIfc)
   {
-    ERROR_LOG() << "Could not load all interfaces needed";
+    ERROR_LOG(m_logger) << "Could not load all interfaces needed";
     return false;
   }
   m_dtc = dtc;
@@ -67,7 +67,7 @@ bool CombatPower::init(const std::shared_ptr<ParticipantManagement::Interface::D
   if (idx >= 0)
     m_ui->cbParty->setCurrentIndex(idx);
 
-  DEBUG_LOG() << "Init CombatPower - parties: " << m_ui->cbParty->count();
+  DEBUG_LOG(m_logger) << "Init CombatPower - parties: " << m_ui->cbParty->count();
   onPartyChanged();
   m_ui->vLay->addWidget(m_orgChart);
   return true;
@@ -75,7 +75,7 @@ bool CombatPower::init(const std::shared_ptr<ParticipantManagement::Interface::D
 
 void CombatPower::onPartyChanged()
 {
-  DEBUG_LOG() << "onPartyChanged - parties: " << m_ui->cbParty->count();
+  DEBUG_LOG(m_logger) << "onPartyChanged - parties: " << m_ui->cbParty->count();
   if (s_preselectedParty == -1)
     m_ui->cbParty->setCurrentIndex(s_preselectedParty);
   s_preselectedParty = m_ui->cbParty->currentData().toUInt();
@@ -91,7 +91,7 @@ void CombatPower::onOpenInfo(int id)
 
 void CombatPower::onUpdateParticipant(const Participant &data, DataModification modType)
 {
-  DEBUG_LOG() << "onUpdateParticipant - parties: " << m_ui->cbParty->count();
+  DEBUG_LOG(m_logger) << "onUpdateParticipant - parties: " << m_ui->cbParty->count();
   if (data.partyId() != m_ui->cbParty->currentData().toInt())
     return;
   if (modType == DataModification::eModified)
@@ -102,7 +102,7 @@ void CombatPower::onUpdateParticipant(const Participant &data, DataModification
 
 void CombatPower::onUpdateDynamicParticipantData(const DynamicParticipantData &data, DataModification modType)
 {
-  DEBUG_LOG() << "onUpdateDynamicParticipantData - parties: " << m_ui->cbParty->count();
+  DEBUG_LOG(m_logger) << "onUpdateDynamicParticipantData - parties: " << m_ui->cbParty->count();
   if (m_dtc->participant(data.participantId()).partyId() != m_ui->cbParty->currentData().toInt())
     return;
   if (modType == DataModification::eModified)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/combat_power.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/combat_power.h
index 4697625a9..c1f85cc11 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/combat_power.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/combat_power.h
@@ -42,6 +42,7 @@ private slots:
   void onUpdateParticipant(const Participant &data, DataModification modType);
 
 private:
+  NGL::INGLLogger &m_logger;
   void retranslate() override;
 
   ParticipantManagement::LtsParticipantsOrgChart *m_orgChart;
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 7c38cdc5d..2b2fd4c83 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
@@ -47,7 +47,9 @@ OrgChartMain::OrgChartMain(LtsSession::LtsSession *session
 
 OrgChartMain::~OrgChartMain()
 {
+#ifdef BUILD_RTI
   m_topicLockHanderData.disconnect();
+#endif
 
   m_orgChart->setParent(nullptr); 
   m_orgChart->deleteLater();
@@ -62,11 +64,11 @@ void OrgChartMain::retranslate()
 
 void OrgChartMain::fillComboBoxes()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (!m_isTemplate)
     m_ppmGuiCbxIfc->fillPartyComboBox(m_ui->cbParty);
 
-  DEBUG_LOG() << "Init OrgChartMain - parties: " << m_ui->cbParty->count() << " is template? " << m_isTemplate;
+  DEBUG_LOG(m_logger) << "Init OrgChartMain - parties: " << m_ui->cbParty->count() << " is template? " << m_isTemplate;
 }
 
 void OrgChartMain::updateButtonMimeData()
@@ -99,7 +101,7 @@ void OrgChartMain::updateButtonMimeData()
 
 QColor OrgChartMain::currentPartyColor()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   QColor color = AdvancedSymbology::SymbolDataToRender::unknownColor();
 
   int partyId = -1;
@@ -109,7 +111,7 @@ QColor OrgChartMain::currentPartyColor()
   if (partyId > 0)
     color = QColor::fromRgb(QRgb(m_dtc->party(partyId).color()));
 
-  TRACE_LOG() << Q_FUNC_INFO << " color=" << color.name()
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " color=" << color.name()
                       << " (partyId = " << partyId << ")"
                       << " (m_asSupportService=" << m_asSupportService << ")"
                       << " (m_ui->cbParty->isVisible()=" << m_ui->cbParty->isVisible() << ")";
@@ -118,7 +120,7 @@ QColor OrgChartMain::currentPartyColor()
 
 AdvancedSymbology::Role OrgChartMain::currentPartyRole()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   AdvancedSymbology::Role role = AdvancedSymbology::Role::Unknown;
 
@@ -129,7 +131,7 @@ AdvancedSymbology::Role OrgChartMain::currentPartyRole()
   if (partyId > 0)
     role = AdvancedSymbology::roleToRole<>(m_dtc->party(partyId).role());
 
-  TRACE_LOG() << Q_FUNC_INFO << " role=" << role
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " role=" << role
                       << " (partyId = " << partyId << ")"
                       << " (m_asSupportService=" << m_asSupportService << ")"
                       << " (m_ui->cbParty->isVisible()=" << m_ui->cbParty->isVisible() << ")";
@@ -147,7 +149,7 @@ bool OrgChartMain::init(const std::shared_ptr<ParticipantManagement::Interface::
 {
   if (!dtc || !ftc || !ppmGuiCbxIfc || !asbIfc)
   {
-    ERROR_LOG() << "Could not load all interfaces needed";
+    ERROR_LOG(m_logger) << "Could not load all interfaces needed";
     return false;
   }
   m_dtc = dtc;
@@ -171,7 +173,9 @@ bool OrgChartMain::init(const std::shared_ptr<ParticipantManagement::Interface::
     return false;
   connect(m_dtc.get(), &Interface::Dtc::participantChanged, this, &OrgChartMain::onUpdateParticipant, Qt::UniqueConnection);
 
+#ifdef BUILD_RTI
   initTopicLockHandler();
+#endif
 
   m_ui->vLay->addWidget(m_orgChart);
   if (m_session->partitionType() != IDL::PartitionType::Global)
@@ -181,7 +185,7 @@ bool OrgChartMain::init(const std::shared_ptr<ParticipantManagement::Interface::
             this,
             &OrgChartMain::onPartyChanged, Qt::UniqueConnection);
     m_ppmGuiCbxIfc->fillPartyComboBox(m_ui->cbParty);
-    DEBUG_LOG() << "Init OrgChartMain - parties: " << m_ui->cbParty->count();
+    DEBUG_LOG(m_logger) << "Init OrgChartMain - parties: " << m_ui->cbParty->count();
     onPartyChanged();
   }
   else
@@ -194,13 +198,14 @@ bool OrgChartMain::init(const std::shared_ptr<ParticipantManagement::Interface::
   return initButtons();
 }
 
+#ifdef BUILD_RTI
 void OrgChartMain::initTopicLockHandler()
 {
   std::shared_ptr<Core::Interface::Ftc> coreFtc;
 
   if (!m_session->createTopicClient<Core::Interface::Ftc>(coreFtc))
   {
-    ERROR_LOG() << Q_FUNC_INFO << " create coreFtc failed";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " create coreFtc failed";
     return;
   }
   coreFtc->enableAll();
@@ -212,7 +217,7 @@ void OrgChartMain::initTopicLockHandler()
 
 void OrgChartMain::onLockDataChanged()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   m_ui->cbParty->setEnabled(true);
 
@@ -223,7 +228,7 @@ void OrgChartMain::onLockDataChanged()
   if (m_topicLockedBy.isEmpty())
   {
     
-    DEBUG_LOG() << Q_FUNC_INFO << " READ-WRITE";
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " READ-WRITE";
     setUnchangeable(false);
     m_orgChart->setDisabled(false);
 
@@ -231,7 +236,7 @@ void OrgChartMain::onLockDataChanged()
   else
   {
     
-    DEBUG_LOG() << Q_FUNC_INFO << " READ-ONLY";
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " READ-ONLY";
 
     setUnchangeable(true);
     m_orgChart->setDisabled(true);
@@ -239,7 +244,7 @@ void OrgChartMain::onLockDataChanged()
 
   retranslate(); 
 }
-
+#endif
 
 bool OrgChartMain::loadTemplate(int templateRootId, bool isSupport)
 {
@@ -323,7 +328,7 @@ bool OrgChartMain::initButtons()
     return true;
   for (const ParticipantManagement::TemplateParticipant &templateData : std::as_const(templates))
   {
-    DEBUG_LOG() << Q_FUNC_INFO << " templateId = " << templateData.templateId()
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " templateId = " << templateData.templateId()
                         << " typeId = " << templateData.typeId()
                         << " designator= " << templateData.designator().c_str()
                         << " tactIdent= " << templateData.tacticalIdentifier().c_str();
@@ -363,7 +368,7 @@ bool OrgChartMain::initButtons()
       m_templateMimeDataHelpers[icon] = mimeDataHelper;
       if (!mimeDataHelper->init(icon, templateId, m_dtc, AdvancedSymbology::SymbolDictionary::defaultSymbologyType()))
       {
-        ERROR_LOG() << Q_FUNC_INFO << " init failed"
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed"
                             << " (m_ui->cbParty->isVisible() " << m_ui->cbParty->isVisible() << ")";
         continue;
       }
@@ -553,14 +558,15 @@ void OrgChartMain::onPartyChanged()
 
 
   __unchange__();
-  DEBUG_LOG() << "onPartyChanged - parties: " << m_ui->cbParty->count();
+  DEBUG_LOG(m_logger) << "onPartyChanged - parties: " << m_ui->cbParty->count();
   m_party = m_ui->cbParty->currentData().toInt();
 
 
-  DEBUG_LOG() << " OrgChartMain::onPartyChanged()!!! -> newPartyId" << m_party;
+  DEBUG_LOG(m_logger) << " OrgChartMain::onPartyChanged()!!! -> newPartyId" << m_party;
 
   m_ui->cbParty->setEnabled(false); 
 
+#ifdef BUILD_RTI
   
   if (m_topicLockHanderData.isLocked())
   {
@@ -573,6 +579,7 @@ void OrgChartMain::onPartyChanged()
   topicInfo.setEntity(m_party);
   topicInfo.setValid();
   m_topicLockHanderData.slotTryLock(topicInfo); 
+#endif
 
   if (m_orgChart)
     m_orgChart->loadParty(m_party);
@@ -644,7 +651,7 @@ void OrgChartMain::onDelete(const QString &data)
 
 void OrgChartMain::onUpdateItem(const QModelIndex &parent, const ParticipantData &editData)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   Q_UNUSED(parent);
   
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main.h
index e1708de24..caa217238 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main.h
@@ -17,7 +17,9 @@
 
 #include <LtsWidgets/lts_dialog.h>
 #include <LtsSession/lts_session.h>
+#ifdef BUILD_RTI
 #include <LtsSession/lts_session_lock_handler.h>
+#endif
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 
 #include <QPointer>
@@ -50,13 +52,16 @@ public:
             , bool useSymData = true
             , bool asSupportService = false
             , int templateId = -1);
+#ifdef BUILD_RTI
   void initTopicLockHandler();
+#endif
 
   void onModifyParticipantDataReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
   void onModifyTemplateDataReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
   bool loadTemplate(int templateRootId, bool isSupport = false);
 
 private:
+  NGL::INGLLogger &m_logger;
   void retranslate() override;
   bool initButtons();
   QByteArray getMimeData(const Type &type, const QImage &image);
@@ -80,9 +85,12 @@ private slots:
   void onReload();
 
   void onUpdateParticipant(const Participant &data, DataModification modType);
+#ifdef BUILD_RTI
   void onLockDataChanged();
+#endif
 
 private:
+  NGL::INGLLogger &m_logger;
   ParticipantManagement::LtsParticipantsOrgChart *m_orgChart;
   std::shared_ptr<ParticipantManagement::Interface::Dtc> m_dtc;
   std::shared_ptr<ParticipantManagement::Interface::Ftc> m_ftc;
@@ -98,9 +106,9 @@ private:
 
   QMap<QPointer<LtsWidgets::LtsDragIcon>, QPointer<OrgChartMain_MimeDataHelper>> m_templateMimeDataHelpers;
 
-  
+#ifdef BUILD_RTI
   LtsSession::TopicLockHanderData m_topicLockHanderData;
-
+#endif
 
   bool m_useSymData;
   bool m_asSupportService;
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 62fd6e8e6..a39cfadf1 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
@@ -12,16 +12,16 @@ namespace ParticipantManagement
 OrgChartMain_MimeDataHelper::OrgChartMain_MimeDataHelper(QObject *parent)
   : QObject(parent)
 {
-  TRACE_LOG() << Q_FUNC_INFO << "START";
-  TRACE_LOG() << Q_FUNC_INFO << "END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
 }
 
 
 OrgChartMain_MimeDataHelper::~OrgChartMain_MimeDataHelper()
 {
-  TRACE_LOG() << Q_FUNC_INFO << "START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "START";
   delete m_bulkRendererFindImage;
-  TRACE_LOG() << Q_FUNC_INFO << "END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
 }
 
 bool OrgChartMain_MimeDataHelper::init(LtsWidgets::LtsDragIcon *widget,
@@ -29,14 +29,14 @@ bool OrgChartMain_MimeDataHelper::init(LtsWidgets::LtsDragIcon *widget,
                                        const std::shared_ptr<Interface::Dtc> &dtc,
                                        AdvancedSymbology::SymbologyType symbologyType)
 {
-  TRACE_LOG() << Q_FUNC_INFO << "START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "START";
 
   m_templateId      = templateId;
   m_symbologyType   = symbologyType;
 
   if (!widget)
   {
-    ERROR_LOG() << Q_FUNC_INFO << "no widget";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << "no widget";
     return false;
   }
   m_widget = widget;
@@ -44,18 +44,18 @@ bool OrgChartMain_MimeDataHelper::init(LtsWidgets::LtsDragIcon *widget,
 
   if (!dtc)
   {
-    ERROR_LOG() << "Could not load all interfaces needed";
+    ERROR_LOG(m_logger) << "Could not load all interfaces needed";
     return false;
   }
   m_dtc = dtc;
 
-  TRACE_LOG() << Q_FUNC_INFO << "END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
   return true;
 }
 
 void OrgChartMain_MimeDataHelper::run(AdvancedSymbology::Role role, const QColor &color)
 {
-  TRACE_LOG() << Q_FUNC_INFO << "START"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "START"
                       << " m_symbologyType = " << m_symbologyType
                       << " role = " << role
                       << " color = " << color.name();
@@ -65,7 +65,7 @@ void OrgChartMain_MimeDataHelper::run(AdvancedSymbology::Role role, const QColor
 
   if (!m_dtc)
   {
-    ERROR_LOG() << "Could not load all interfaces needed";
+    ERROR_LOG(m_logger) << "Could not load all interfaces needed";
     return;
   }
 
@@ -83,12 +83,12 @@ void OrgChartMain_MimeDataHelper::run(AdvancedSymbology::Role role, const QColor
 
   m_bulkRendererFindImage->run();
 
-  TRACE_LOG() << Q_FUNC_INFO << "END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
 }
 
 void OrgChartMain_MimeDataHelper::prepareBulkRenderer(int templateId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << "START"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "START"
                       << " templateId= " << templateId;
 
   const TemplateParticipant &tPart = m_dtc->templateParticipant(templateId);
@@ -96,7 +96,7 @@ void OrgChartMain_MimeDataHelper::prepareBulkRenderer(int templateId)
   const AdvancedSymbology::SymbolDataToRender &symDataToRender =
       symbolDataToRender(QString::fromStdString(tPart.symbol())); 
 
-  DEBUG_LOG() << Q_FUNC_INFO << " addRequest for templateId = " << templateId << ": "
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " addRequest for templateId = " << templateId << ": "
                       << " tPart = " << tPart
                       << " symDataToRender=" << symDataToRender.toString();
 
@@ -112,7 +112,7 @@ void OrgChartMain_MimeDataHelper::prepareBulkRenderer(int templateId)
       prepareBulkRenderer(infId);
   }
 
-  TRACE_LOG() << Q_FUNC_INFO << "END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
 }
 
 QJsonObject OrgChartMain_MimeDataHelper::getMimeData(int templateId)
@@ -141,7 +141,7 @@ QJsonObject OrgChartMain_MimeDataHelper::getMimeData(int templateId)
   const AdvancedSymbology::SymbolDataToRender &symDataToRender =
     symbolDataToRender(QString::fromStdString(tPart.symbol()));
 
-  DEBUG_LOG() << Q_FUNC_INFO << " getResult for templateId = " << templateId
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " getResult for templateId = " << templateId
                       << " symDataToRender=" << symDataToRender.toString();
 
   QSharedPointer<AdvancedSymbology::SymbolResultWatcher> watcher =
@@ -157,7 +157,7 @@ QJsonObject OrgChartMain_MimeDataHelper::getMimeData(int templateId)
                        .arg(QString::fromLatin1(data.toBase64()));
     retObj.insert(QStringLiteral("image"), imageAdd);
   } else {
-    ERROR_LOG() << Q_FUNC_INFO << " getResult failed! "
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " getResult failed! "
                         << " templateId = " << templateId
                         << " symDataToRender=" << symDataToRender.toString();
   }
@@ -189,10 +189,10 @@ AdvancedSymbology::SymbolDataToRender OrgChartMain_MimeDataHelper::symbolDataToR
 
 void OrgChartMain_MimeDataHelper::onRenderingFinished()
 {
-  TRACE_LOG() << Q_FUNC_INFO << "START, bulkRendererFindImage->size: " << m_bulkRendererFindImage->size();
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "START, bulkRendererFindImage->size: " << m_bulkRendererFindImage->size();
 
   const QJsonObject &obj = getMimeData(m_templateId);
-  DEBUG_LOG() << Q_FUNC_INFO << " m_templateId =" << m_templateId
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " m_templateId =" << m_templateId
                       << " obj.size = " << obj.size()
                       << " size2 = " << QJsonDocument(obj).toJson().size();
 
@@ -202,7 +202,7 @@ void OrgChartMain_MimeDataHelper::onRenderingFinished()
     m_widget->setEnabled(true);
   }
 
-  TRACE_LOG() << Q_FUNC_INFO << "END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
 }
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main_helper.h
index 48294c28a..f72ebf57b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main_helper.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main_helper.h
@@ -41,6 +41,8 @@ protected slots:
   void onRenderingFinished();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void prepareBulkRenderer(int templateId);
   QJsonObject getMimeData(int templateId);
   AdvancedSymbology::SymbolDataToRender symbolDataToRender(const QString &sidc);
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 574793d67..3d69f64c8 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
@@ -127,7 +127,7 @@ bool LtsParticipantsOrgChart::init(const std::shared_ptr<ParticipantManagement::
 
 void LtsParticipantsOrgChart::loadParty(int partyId)
 {
-  TRACE_LOG() << "loadParty " << partyId;
+  TRACE_LOG(m_logger) << "loadParty " << partyId;
   m_partyId = partyId;
   const QMap<qint32, ParticipantManagement::Participant> participantMap = m_dtc->participants();
 
@@ -159,7 +159,7 @@ void LtsParticipantsOrgChart::loadParty(int partyId)
   m_participantOrgChart_MimeDataHelper = new ParticipantOrgChart_MimeDataHelper(this);
   if (!m_participantOrgChart_MimeDataHelper->init(m_dtc, AdvancedSymbology::SymbolDictionary::defaultSymbologyType(), true))
   {
-    ERROR_LOG() << Q_FUNC_INFO << " init failed";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
     return;
   }
 
@@ -175,7 +175,7 @@ void LtsParticipantsOrgChart::loadParty(int partyId)
 
 void LtsParticipantsOrgChart::onParticipantOrgChart_MimeDataHelperFinished()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   QString preDefThing = QLatin1String(" var datascource = ");
 
@@ -205,13 +205,13 @@ void LtsParticipantsOrgChart::onParticipantOrgChart_MimeDataHelperFinished()
     m_ui->wevOrgChart->reload();
   }
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 
 bool LtsParticipantsOrgChart::loadTemplate(int templateRootId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   ParticipantManagement::TemplateParticipant root = m_dtc->templateParticipant(templateRootId);
 
   if (m_ui->wevOrgChart->page()->url().toString() == QLatin1String("about:blank"))
@@ -224,7 +224,7 @@ bool LtsParticipantsOrgChart::loadTemplate(int templateRootId)
   m_participantOrgChart_MimeDataHelper = new ParticipantOrgChart_MimeDataHelper(this);
   if (!m_participantOrgChart_MimeDataHelper->init(m_dtc, AdvancedSymbology::SymbolDictionary::defaultSymbologyType(), false))
   {
-    ERROR_LOG() << Q_FUNC_INFO << " init failed";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
     return false;
   }
 
@@ -247,7 +247,7 @@ void LtsParticipantsOrgChart::updateParticipant(int participantId)
 
   if (!helper->init(m_dtc, AdvancedSymbology::SymbolDictionary::defaultSymbologyType(), true))
   {
-    ERROR_LOG() << Q_FUNC_INFO << " init failed";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
     return;
   }
 
@@ -265,24 +265,24 @@ void LtsParticipantsOrgChart::updateParticipant(int participantId)
 
 void LtsParticipantsOrgChart::onSingleParticipantOrgChart_MimeDataHelperFinished()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   ParticipantOrgChart_MimeDataHelper *senderWatcher = qobject_cast<ParticipantOrgChart_MimeDataHelper*>(sender());
   if (!senderWatcher)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " sender failed";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " sender failed";
     return;
   }
 
   const int participantId = senderWatcher->getParticipantId();
   const QJsonObject &newJson = senderWatcher->getMimeDataResult();
 
-  DEBUG_LOG() << Q_FUNC_INFO << " sendUpdateString:"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " sendUpdateString:"
                       << " participantId=" << participantId;
 
   emit sendUpdateString(participantId, newJson);
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 
@@ -298,12 +298,11 @@ void LtsParticipantsOrgChart::getWholeHierarchy()
 
 
 
-WebNofitifier::WebNofitifier(QObject *parent)
-  : QObject(parent)
+WebNofitifier::WebNofitifier(QObject *parent) : QObject(parent)
   , m_currentJsonString(QString())
   , m_updateString(QString())
-  , m_updateTimer(new QTimer(this))
-{
+  , m_updateTimer(new QTimer(this)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   connect(m_updateTimer, &QTimer::timeout, this, &WebNofitifier::onTimerTick);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart.h
index a76763d18..ad59c624a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart.h
@@ -96,6 +96,8 @@ signals:
   void sendUpdateString(int, const QJsonObject &);
 
 private:
+
+NGL::INGLLogger &m_logger;
   int m_partyId;
   bool m_useSymData;
   bool m_isMenuEnabled;
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 469fd3997..88ebe381b 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
@@ -13,40 +13,40 @@ namespace ParticipantManagement
 ParticipantOrgChart_MimeDataHelper::ParticipantOrgChart_MimeDataHelper(QObject *parent)
   : QObject(parent)
 {
-  TRACE_LOG() << Q_FUNC_INFO << "START";
-  TRACE_LOG() << Q_FUNC_INFO << "END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
 }
 
 
 ParticipantOrgChart_MimeDataHelper::~ParticipantOrgChart_MimeDataHelper()
 {
-  TRACE_LOG() << Q_FUNC_INFO << "START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "START";
   delete m_bulkRendererFindImage;
   delete m_bulkRendererFindBaseSymbol;
-  TRACE_LOG() << Q_FUNC_INFO << "END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
 }
 
 bool ParticipantOrgChart_MimeDataHelper::init(const std::shared_ptr<Interface::Dtc> &dtc,
                                               AdvancedSymbology::SymbologyType symbologyType, bool participantMode)
 {
-  TRACE_LOG() << Q_FUNC_INFO << "START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "START";
 
   m_symbologyType   = symbologyType;
   m_participantMode = participantMode;
   if (!dtc)
   {
-    ERROR_LOG() << "Could not load all interfaces needed";
+    ERROR_LOG(m_logger) << "Could not load all interfaces needed";
     return false;
   }
   m_dtc = dtc;
 
-  TRACE_LOG() << Q_FUNC_INFO << "END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
   return true;
 }
 
 void ParticipantOrgChart_MimeDataHelper::run(int participantId, bool single, AdvancedSymbology::Role role, const QColor &color, bool useSymData)
 {
-  TRACE_LOG() << Q_FUNC_INFO << "START"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "START"
                       << ", participantId=" << participantId
                       << ", single=" << single
                       << ", role=" << role
@@ -61,7 +61,7 @@ void ParticipantOrgChart_MimeDataHelper::run(int participantId, bool single, Adv
 
   if (!m_dtc)
   {
-    ERROR_LOG() << "Could not load all interfaces needed";
+    ERROR_LOG(m_logger) << "Could not load all interfaces needed";
     return;
   }
 
@@ -87,14 +87,14 @@ void ParticipantOrgChart_MimeDataHelper::run(int participantId, bool single, Adv
   else
     m_bulkRendererFindBaseSymbol->run();
 
-  TRACE_LOG() << Q_FUNC_INFO << "END"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "END"
                       << ", color=" << color.name()
                       << ", useSymData" << useSymData;
 }
 
 bool ParticipantOrgChart_MimeDataHelper::prepareBulkRenderer(int participantId, bool single)
 {
-  TRACE_LOG() << Q_FUNC_INFO << "START"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "START"
                       << ", participantId=" << participantId
                       << ", single=" << single;
 
@@ -139,13 +139,13 @@ bool ParticipantOrgChart_MimeDataHelper::prepareBulkRenderer(int participantId,
   for (int infId : inferior)
     prepareBulkRenderer(infId, single);
 
-  TRACE_LOG() << Q_FUNC_INFO << "END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
   return true;
 }
 
 QJsonObject ParticipantOrgChart_MimeDataHelper::getMimeData(int participantId, bool single)
 {
-  TRACE_LOG() << Q_FUNC_INFO << "START"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "START"
                       << ", participantId=" << participantId
                       << ", single=" << single;
 
@@ -200,7 +200,7 @@ QJsonObject ParticipantOrgChart_MimeDataHelper::getMimeData(int participantId, b
         .arg(QString::fromLatin1(data.toBase64()));
     retObj.insert(QStringLiteral("image"), imageAdd);
   } else {
-    ERROR_LOG() << Q_FUNC_INFO << " SymbolResultWatcher for 2nd recusion not found";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " SymbolResultWatcher for 2nd recusion not found";
   }
 
   
@@ -223,7 +223,7 @@ QJsonObject ParticipantOrgChart_MimeDataHelper::getMimeData(int participantId, b
 
 QJsonObject ParticipantOrgChart_MimeDataHelper::getTemplateMimeData(int participantId, bool single)
 {
-  TRACE_LOG() << Q_FUNC_INFO << "START"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "START"
                       << ", participantTemplateId=" << participantId
                       << ", single=" << single;
 
@@ -278,7 +278,7 @@ QJsonObject ParticipantOrgChart_MimeDataHelper::getTemplateMimeData(int particip
         .arg(QString::fromLatin1(data.toBase64()));
     retObj.insert(QStringLiteral("image"), imageAdd);
   } else {
-    ERROR_LOG() << Q_FUNC_INFO << " SymbolResultWatcher for 2nd recusion not found";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " SymbolResultWatcher for 2nd recusion not found";
   }
 
   
@@ -350,12 +350,12 @@ AdvancedSymbology::SymbolDataToRender ParticipantOrgChart_MimeDataHelper::symbol
 
 void ParticipantOrgChart_MimeDataHelper::onRenderingFinished()
 {
-  TRACE_LOG() << Q_FUNC_INFO << "START, bulkRendererFindImage->size: " << m_bulkRendererFindImage->size();
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "START, bulkRendererFindImage->size: " << m_bulkRendererFindImage->size();
   if (m_participantMode)
     m_mimeData = getMimeData(m_participantId, m_single);
   else
     m_mimeData = getTemplateMimeData(m_participantId, m_single);
-  DEBUG_LOG() << Q_FUNC_INFO
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO
                       << " m_participantId =" << m_participantId
                       << " m_single = " << m_single
                       << " m_mimeData.size = " << m_mimeData.size()
@@ -363,7 +363,7 @@ void ParticipantOrgChart_MimeDataHelper::onRenderingFinished()
 
   emit finished();
 
-  TRACE_LOG() << Q_FUNC_INFO << "END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
 }
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart_helper.h
index 665fe003f..93b2d9c33 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart_helper.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart_helper.h
@@ -39,6 +39,8 @@ protected slots:
   void onRenderingFinished();
 
 private:
+
+NGL::INGLLogger &m_logger;
   bool prepareBulkRenderer(int participantId, bool single = false);
   QJsonObject getMimeData(int participantId, bool single = false);
   QJsonObject getTemplateMimeData(int participantId, bool single = false);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection.h
index cf1dfaeb1..0dcde2276 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection.h
@@ -62,6 +62,8 @@ private:
 
 
 
+
+NGL::INGLLogger &m_logger;
 protected slots:
   void onEnaDisa(); 
 
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 089b19d7d..4ea57ba86 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
@@ -657,7 +657,7 @@ void ParticipantSelectionModel::insertChildrenOf(int parentId,
     auto it = tmap.constFind(childId);
     if (it == tmap.constEnd())
     {
-      WARNING_LOG() << "Can not find participant with id " << childId << " - ignoring";
+      WARNING_LOG(m_logger) << "Can not find participant with id " << childId << " - ignoring";
       continue;
     }
     const ParticipantData &data = it.value();
@@ -682,7 +682,7 @@ void ParticipantSelectionModel::insertChildrenOf(int parentId,
     childItem->participant = data;
     childItem->bIsChecked = isChecked(checkedParticipants.contains(data.id()), cs);
 
-    DEBUG_LOG() << "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);  
@@ -913,7 +913,7 @@ void ParticipantSelectionModel::onParticipantChanged(const ParticipantManagement
 
     CheckedTreeItem *childItem = static_cast<CheckedTreeItem *>(createItem(QVariant(), QIcon()));
     childItem->participant = m_dtc->convertParticipantToParticipantData(data);
-    DEBUG_LOG() << "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);  
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 5aaf842f8..7a0b67895 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
@@ -95,6 +95,7 @@ public:
   QString getHierarchyFromIndex(const QModelIndex &index) const;
 
 protected:
+  NGL::INGLLogger &m_logger;
   void gatherParticipants(QHash<int, ParticipantData> &tmap,
                           QHash<int, QSet<int>> &parentId2id) const;
 
@@ -140,6 +141,7 @@ signals:
   void internalDataChanged();
 
 protected:
+  NGL::INGLLogger &m_logger;
   int  m_partyId;
   bool m_bRowsAreCheckable;
   bool m_bUnitsSelectable;
@@ -167,6 +169,7 @@ 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;
 
@@ -240,6 +243,7 @@ public:
   SortData sortData() const { return m_sortData; }
 
 protected:
+  NGL::INGLLogger &m_logger;
   bool lessThan(const QModelIndex &sourceLeft, const QModelIndex &sourceRight) const override;
   bool filterAcceptsColumn(int source_column, const QModelIndex &source_parent) const override;
   bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser.h
index d5390eec6..1041f2cf0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser.h
@@ -46,6 +46,8 @@ private slots:
   void onPrint();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void onModifyTemplateDataReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
   void tableColumnOrganiserSetting() override;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser_frameless.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser_frameless.h
index 4f0e6652a..159d4d9d1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser_frameless.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser_frameless.h
@@ -33,6 +33,8 @@ Q_SIGNALS:
   void selectedTemplate(int);
 
 private:
+
+NGL::INGLLogger &m_logger;
   ParticipantTemplateChooserModel *m_model;
   std::shared_ptr<ParticipantManagement::Interface::Dtc> m_dtc;
   LtsSession::LtsSession *m_session;
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 a0d9b7599..5c60c4545 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
@@ -46,6 +46,8 @@ public:
   Qt::DropActions supportedDragActions() const override { return Qt::CopyAction; }
 
 protected:
+
+NGL::INGLLogger &m_logger;
   int getId(const TemplateParticipant &data) const override
   {
     return data.templateId();
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 4e846edeb..5e792cfef 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
@@ -402,7 +402,7 @@ void ParticipantTemplateEdit::onDoubleClicked(const QModelIndex &selIndex)
 void ParticipantTemplateEdit::onSelectionChanged(const QItemSelection & ,
                                                  const QItemSelection & )
 {
-  DEBUG_LOG() << "onSelectionChanged";
+  DEBUG_LOG(m_logger) << "onSelectionChanged";
 
   enaDisa();
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_edit.h
index faac8c3a5..fb5b87943 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_edit.h
@@ -55,6 +55,7 @@ public Q_SLOTS:
   bool apply() override final;
 
 private:
+  NGL::INGLLogger &m_logger;
   void retranslate() override;
   QModelIndex selectedIndexView() const;
   bool isContainer(const QModelIndex &index);
@@ -84,6 +85,7 @@ protected slots:
 
 
 private:
+  NGL::INGLLogger &m_logger;
   int m_rootId;
   bool m_asSupportService;
   bool m_bNeedCommitModifedData;
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 09bae3553..df82dff3b 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
@@ -29,6 +29,8 @@ public:
   ~TemplateUnitNamer();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void onSetUnitName();
   void onTypeClassChanged();
   void enaDisa();
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 ead2ec52a..3d0605c6f 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
@@ -48,17 +48,17 @@ bool OperatorPartyAssignment::init(LtsSession::LtsSession *session)
   m_buttonBox->getButton(LtsWidgets::DialogButton::Ok)->setVisible(false);
   if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
   {
-    ERROR_LOG()<<" -- Couldn't init ppmDtc";
+    ERROR_LOG(m_logger)<<" -- Couldn't init ppmDtc";
     return false;
   }
   if (!m_session->getDtc<OperatorManagement::DataInterface>(m_opmDtc))
   {
-    ERROR_LOG()<<" -- Couldn't init opmDtc";
+    ERROR_LOG(m_logger)<<" -- Couldn't init opmDtc";
     return false;
   }
   if (!m_session->getFtc<ParticipantManagement::DataInterface>(m_ppmFtc))
   {
-    ERROR_LOG()<<" -- Couldn't init ppmFtc";
+    ERROR_LOG(m_logger)<<" -- Couldn't init ppmFtc";
     return false;
   }
 
@@ -98,7 +98,7 @@ QMap<int, bool> OperatorPartyAssignment::getPartyStatesForOpertator() const
   
   
   
-  DEBUG_LOG()<<" -- [getPartyStatesForOpertator] -> ";
+  DEBUG_LOG(m_logger)<<" -- [getPartyStatesForOpertator] -> ";
   const auto &partys = m_ppmDtc->partys();
   QMap<int,bool> mapPartyCheckStates;
   for (auto p : partys)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment.h
index 4cd6d7b2b..4de2e271d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/operator_party_assignment.h
@@ -41,11 +41,13 @@ private slots:
   void onOperatorChanged(const OperatorManagement::User &data, DataModification modType);
   void onSelectionOperatorChanged(const int index);
 private:
+  NGL::INGLLogger &m_logger;
   void retranslate() override;
   bool apply() override;
   void onModifyPartyDataReply(const Core::FunctionReplyObject &replyObject) override { m_requestHelper->requestReply(replyObject); }
   void enaDisa();
 private:
+  NGL::INGLLogger &m_logger;
   QString m_menuGroup;
   std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
   std::shared_ptr<ParticipantManagement::Interface::Ftc> m_ppmFtc;
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 9bc4a7004..a1430c43d 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
@@ -35,6 +35,8 @@ public slots:
   void updateView(const QMap<int, bool> partyCheckStates);
 
 protected:
+
+NGL::INGLLogger &m_logger;
   QVariant data(const QModelIndex &, int) const override;
   bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override final;
   Qt::ItemFlags flags(const QModelIndex &index) const override;
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 a2c1f927c..2dddaf083 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
@@ -70,7 +70,7 @@ void PartyEdit::lock()
 
 bool PartyEdit::init(int partyId, LtsSession::LtsSession *session)
 {
-  DEBUG_LOG() << "PartyEdit::init()";
+  DEBUG_LOG(m_logger) << "PartyEdit::init()";
   m_session = session;
 
   if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_dtc))
@@ -179,7 +179,7 @@ bool PartyEdit::apply()
   reqOpm.rolePresetId(user.rolePresetId());
 
   QString properties = QString::fromUtf8(QJsonDocument(opmProperties).toJson());
-  DEBUG_LOG() << "properties: " << properties;
+  DEBUG_LOG(m_logger) << "properties: " << properties;
   reqOpm.properties(properties.toStdString());
 
   m_requestHelper->addRequest([reqOpm, this]()
@@ -364,14 +364,14 @@ void PartyEdit::notificationCheck()
 {
   if (!m_dtcOpm->isAdlerAllowedParty(m_session->exerciseId(), m_partyId, LtsSessionData::LtsSessionData::getInstance()->getOperatorId()))
   {
-    WARNING_LOG() << "Party " << m_partyId << " not allowed for this user";
+    WARNING_LOG(m_logger) << "Party " << m_partyId << " not allowed for this user";
     m_ui->lblNotifications->hide();
     m_ui->cbAdlerNotification->hide();
     m_ui->cbCombatOrder->hide();
     return;
   }
 
-  DEBUG_LOG() << "Party allowed for ADLER notifications";
+  DEBUG_LOG(m_logger) << "Party allowed for ADLER notifications";
 
   const std::string properties = m_dtcOpm->user(LtsSessionData::LtsSessionData::getInstance()->getOperatorId()).properties();
   QJsonObject opmProperties(QJsonDocument::fromJson(QByteArray::fromStdString(properties)).object());
@@ -407,7 +407,7 @@ void PartyEdit::notificationCheck()
 
 void PartyEdit::modifyPartyProperties()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   ParticipantManagement::Party requestParty;
   requestParty = m_dtc->party(m_partyId);
@@ -422,11 +422,11 @@ void PartyEdit::modifyPartyProperties()
 
   if (parserError.error != QJsonParseError::NoError)
   {
-    ERROR_LOG() << "Error parsing json document: " << parserError.errorString() << " '" << propertiesBa << "'";
+    ERROR_LOG(m_logger) << "Error parsing json document: " << parserError.errorString() << " '" << propertiesBa << "'";
     doc = QJsonDocument();
   }
 
-  DEBUG_LOG() << "json to parse: " << doc.toJson();
+  DEBUG_LOG(m_logger) << "json to parse: " << doc.toJson();
 
   QJsonObject obj(doc.object());
   obj[QStringLiteral("Adler")] = adlerPropertiesObj;
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 6a0e0a8cb..d35aa05ac 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
@@ -34,12 +34,12 @@ bool PartyModel::initModel(LtsSession::LtsSession *session)
   m_session = session;
   if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
   {
-    ERROR_LOG()<<" Couldn't load ppmDtc!!! ";
+    ERROR_LOG(m_logger)<<" Couldn't load ppmDtc!!! ";
     return false;
   }
   if (!m_session->getDtc<OperatorManagement::DataInterface>(m_opmDtc))
   {
-    ERROR_LOG()<<" Couldn't load opmDtc!!! ";
+    ERROR_LOG(m_logger)<<" Couldn't load opmDtc!!! ";
     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 4f3dfb86d..3df5dd2f5 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
@@ -40,6 +40,8 @@ public:
   QVariant data(const QModelIndex &, int) const override;
 
 protected:
+
+NGL::INGLLogger &m_logger;
   bool isFiltered(const Party &data, DataModification modType) const override
   {
     
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 14df6ad71..64f4389e8 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
@@ -196,7 +196,7 @@ void PartyView::onSyncParties()
       SyncPartiesRequest req;
       req.exerciseId(m_session->exerciseId());
 
-      DEBUG_LOG() << "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/PartyEdit/ppm_party_view.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_view.h
index 9d2859f75..612f6b78d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_view.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_view.h
@@ -39,6 +39,11 @@ public:
       
 
 private:
+      
+      
+      
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void onModifyPartyDataReply(const Core::FunctionReplyObject &replyObject) override { m_requestHelper->requestReply(replyObject); }
   void onRemovePartyReply(const Core::FunctionReplyObject &replyObject) override { m_requestHelper->requestReply(replyObject); }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/ppm_saab_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/ppm_saab_edit.h
index 2dd9ef419..cd323f810 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/ppm_saab_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/ppm_saab_edit.h
@@ -42,6 +42,8 @@ public:
             const std::shared_ptr<ParticipantManagement::ForeignGuiComboboxInterface> &ppmGuiCbxIfc);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   bool apply() override;
   void tableColumnOrganiserSetting() override;
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 0c8f3a9df..7128a9325 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
@@ -91,14 +91,14 @@ void ExportSaab::onStartExport()
   if (!file.open(QIODevice::WriteOnly))
   {
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("Not possible to start export. You do not have the permission to write the selected file."));
-    ERROR_LOG() << "Could not export exercise: \"" << strExportFile << "\" could not be opened for writing";
+    ERROR_LOG(m_logger) << "Could not export exercise: \"" << strExportFile << "\" could not be opened for writing";
     return;
   }
 
   if (!isValidConfigFile())
   {
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("Not possible to start export. Config file invalid."));
-    ERROR_LOG() << "Could not export exercise: \"" << strConfigFile << "\" invalid";
+    ERROR_LOG(m_logger) << "Could not export exercise: \"" << strConfigFile << "\" invalid";
     return;
   }
 
@@ -181,13 +181,13 @@ bool ExportSaab::isValidConfigFile()
 {
   if (!m_configFile)
   {
-    ERROR_LOG() << "Not possible to read config: No file selected";
+    ERROR_LOG(m_logger) << "Not possible to read config: No file selected";
     return false;
   }
 
   if (!m_configFile->open(QIODevice::ReadOnly))
   {
-    ERROR_LOG() << "Not possible to read config: Could not open file \""
+    ERROR_LOG(m_logger) << "Not possible to read config: Could not open file \""
                         << m_configFile->fileName()
                         << "\" for reading.";
     return false;
@@ -217,11 +217,11 @@ bool ExportSaab::isValidConfigFile()
   m_configFile->close();
 
   if (!hasEchelons)
-    ERROR_LOG() << "Could not find " << SAAB_ECHELONS() << " in file \"" << m_configFile->fileName() << '\"';
+    ERROR_LOG(m_logger) << "Could not find " << SAAB_ECHELONS() << " in file \"" << m_configFile->fileName() << '\"';
   if (!hasSymbols)
-    ERROR_LOG() << "Could not find " << SAAB_SYMBOLS() << " in file \"" << m_configFile->fileName() << '\"';
+    ERROR_LOG(m_logger) << "Could not find " << SAAB_SYMBOLS() << " in file \"" << m_configFile->fileName() << '\"';
   if (!hasForces)
-    ERROR_LOG() << "Could not find " << SAAB_FORCES() << " in file \"" << m_configFile->fileName() << '\"';
+    ERROR_LOG(m_logger) << "Could not find " << SAAB_FORCES() << " in file \"" << m_configFile->fileName() << '\"';
 
   return hasEchelons && hasSymbols && hasForces;
 }
@@ -243,13 +243,13 @@ void ExportSaab::importConfig()
 
   if (!m_configFile)
   {
-    ERROR_LOG() << "Not possible to read config: No file selected";
+    ERROR_LOG(m_logger) << "Not possible to read config: No file selected";
     return;
   }
 
   if (!m_configFile->open(QIODevice::ReadOnly))
   {
-    ERROR_LOG() << "Not possible to read config: Could not open file \""
+    ERROR_LOG(m_logger) << "Not possible to read config: Could not open file \""
                         << m_configFile->fileName()
                         << "\" for reading.";
     return;
@@ -456,13 +456,13 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Participant &p
 {
   if (participant.isDeleted())
   {
-    DEBUG_LOG() << "Participant with id " << participant.id() << " id deleted --> skipping";
+    DEBUG_LOG(m_logger) << "Participant with id " << participant.id() << " id deleted --> skipping";
     return nullptr;
   }
 
   if (participant.externalId())
   {
-    DEBUG_LOG() << "Particpant with id " << participant.id() << " has external ID set to " << participant.externalId() << " --> not being exported.";
+    DEBUG_LOG(m_logger) << "Particpant with id " << participant.id() << " has external ID set to " << participant.externalId() << " --> not being exported.";
     return nullptr;
   }
 
@@ -491,7 +491,7 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Participant &p
   {
     result = new SaabUnit;
 
-    DEBUG_LOG() << "Reading unit with " << participant.inferiorIds().size() << " inferiors";
+    DEBUG_LOG(m_logger) << "Reading unit with " << participant.inferiorIds().size() << " inferiors";
 
     for (int32_t id : participant.inferiorIds())
     {
@@ -499,7 +499,7 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Participant &p
 
       if (player == nullptr)
       {
-        DEBUG_LOG() << "Skipping inferior with id " << id;
+        DEBUG_LOG(m_logger) << "Skipping inferior with id " << id;
         continue;
       }
 
@@ -509,7 +509,7 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Participant &p
     
     if (!static_cast<SaabUnit *>(result)->inferiors.size())
     {
-      DEBUG_LOG() << "Unit " << participant.id() << " has no inferiors.";
+      DEBUG_LOG(m_logger) << "Unit " << participant.id() << " has no inferiors.";
       return nullptr;
     }
 
@@ -519,7 +519,7 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Participant &p
   case ParticipantManagement::TypeClass::Aircraft:
   case ParticipantManagement::TypeClass::Unknown:
   default:
-    DEBUG_LOG() << "Type " << participant.typeId() << " is not supported.";
+    DEBUG_LOG(m_logger) << "Type " << participant.typeId() << " is not supported.";
     return nullptr;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import.cpp
index 56ecffdff..089fdda07 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import.cpp
@@ -35,7 +35,7 @@ ImportSaab::ImportSaab(ParticipantManagement::ParticipantEditModel *pModel, cons
 
   if (!pSession->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc) || !pSession->getFtc<ParticipantManagement::DataInterface>(m_ppmFtc))
   {
-    ERROR_LOG() << "Fetching m_ppmDtc or m_ppmFtc failed!";
+    ERROR_LOG(m_logger) << "Fetching m_ppmDtc or m_ppmFtc failed!";
     setEnabled(false);
   }
   else
@@ -230,13 +230,13 @@ void ImportSaab::importOrbat()
 {
   if (!m_xmlFile)
   {
-    ERROR_LOG() << "Not possible to import ORBAT: No file selected";
+    ERROR_LOG(m_logger) << "Not possible to import ORBAT: No file selected";
     return;
   }
 
   if (!m_xmlFile->open(QIODevice::ReadOnly))
   {
-    ERROR_LOG() << "Not possible to import ORBAT: Could not open file \""
+    ERROR_LOG(m_logger) << "Not possible to import ORBAT: Could not open file \""
                         << m_xmlFile->fileName()
                         << "\" for reading.";
     return;
@@ -267,7 +267,7 @@ void ImportSaab::importOrbat()
   if (m_logger.isDebugEnabled())
   {
     for (SaabUnit *u : std::as_const(m_rootUnits))
-      DEBUG_LOG() << u->toString();
+      DEBUG_LOG(m_logger) << u->toString();
   }
 
   m_xmlFile->close();
@@ -290,13 +290,13 @@ void ImportSaab::importConfig()
 
   if (!m_configFile)
   {
-    ERROR_LOG() << "Not possible to read config: No file selected";
+    ERROR_LOG(m_logger) << "Not possible to read config: No file selected";
     return;
   }
 
   if (!m_configFile->open(QIODevice::ReadOnly))
   {
-    ERROR_LOG() << "Not possible to read config: Could not open file \""
+    ERROR_LOG(m_logger) << "Not possible to read config: Could not open file \""
                         << m_configFile->fileName()
                         << "\" for reading.";
     return;
@@ -374,7 +374,7 @@ QVector<SaabPlayer *> ImportSaab::inferiors(SaabPlayer *player) const
 
 SaabPlayer *ImportSaab::readUnit(QXmlStreamReader *reader) const
 {
-  DEBUG_LOG() << "reading unit: tokentype: " << reader->tokenString() << " | name: " << reader->name().toString();
+  DEBUG_LOG(m_logger) << "reading unit: tokentype: " << reader->tokenString() << " | name: " << reader->name().toString();
 
   SaabUnit *result = new SaabUnit;
 
@@ -433,7 +433,7 @@ SaabPlayer *ImportSaab::readUnit(QXmlStreamReader *reader) const
     int index = playerIndexByGuid(result->guid, result->inferiors);
 
     if (index < 0)
-      WARNING_LOG() << SAAB_POSITION_BY_PLAYER_ID() << " set, but GUID " << result->positionByPlayerId << " could not be found.";
+      WARNING_LOG(m_logger) << SAAB_POSITION_BY_PLAYER_ID() << " set, but GUID " << result->positionByPlayerId << " could not be found.";
     else
       result->inferiors.prepend(result->inferiors.takeAt(index));
   }
@@ -443,21 +443,21 @@ SaabPlayer *ImportSaab::readUnit(QXmlStreamReader *reader) const
 
 SaabPlayer *ImportSaab::readOcPlayer(QXmlStreamReader *reader) const
 {
-  DEBUG_LOG() << "reading oc player: tokentype: " << reader->tokenString() << " | name: " << reader->name().toString();
+  DEBUG_LOG(m_logger) << "reading oc player: tokentype: " << reader->tokenString() << " | name: " << reader->name().toString();
 
   return readPersonOcPlayer<SaabOcPlayer>(reader, XmlStrings::SAAB_OC_PLAYER());;
 }
 
 SaabPlayer *ImportSaab::readPersonPlayer(QXmlStreamReader *reader) const
 {
-  DEBUG_LOG() << "reading person player: tokentype: " << reader->tokenString() << " | name: " << reader->name().toString();
+  DEBUG_LOG(m_logger) << "reading person player: tokentype: " << reader->tokenString() << " | name: " << reader->name().toString();
 
   return readPersonOcPlayer<SaabPersonPlayer>(reader, XmlStrings::SAAB_PERSON_PLAYER());
 }
 
 SaabPlayer *ImportSaab::readVehiclePlayer(QXmlStreamReader *reader) const
 {
-  DEBUG_LOG() << "reading vehicle player: tokentype: " << reader->tokenString() << " | name: " << reader->name().toString();
+  DEBUG_LOG(m_logger) << "reading vehicle player: tokentype: " << reader->tokenString() << " | name: " << reader->name().toString();
 
   using namespace XmlStrings;
 
@@ -468,7 +468,7 @@ SaabPlayer *ImportSaab::readVehiclePlayer(QXmlStreamReader *reader) const
     SaabVehicle vehicle = saabVehicleByGUID(reader->readElementText());
 
     if (vehicle.guid.isEmpty())
-      WARNING_LOG() << SAAB_VEHICLE_REF_ID() << " set, but GUID " << result->refId << " could not be found.";
+      WARNING_LOG(m_logger) << SAAB_VEHICLE_REF_ID() << " set, but GUID " << result->refId << " could not be found.";
     else
     {
       result->registrationNumber = vehicle.registrationNumber;
@@ -577,7 +577,7 @@ void ImportSaab::buildImportTreeView(const QVector<SaabPlayer *> &vecUnitsWithVa
         if (vecUnitsWithValidDISTypes.contains(player->superior))
           tmp.append(player);
         else
-          WARNING_LOG() << "Parent missing: Could not import player " << player->designation;
+          WARNING_LOG(m_logger) << "Parent missing: Could not import player " << player->designation;
 
         continue;
       }
@@ -595,13 +595,13 @@ bool ImportSaab::isValidSaabOrbatFile() const
 {
   if (!m_xmlFile)
   {
-    ERROR_LOG() << "Not possible to import ORBAT: No file selected";
+    ERROR_LOG(m_logger) << "Not possible to import ORBAT: No file selected";
     return false;
   }
 
   if (!m_xmlFile->open(QIODevice::ReadOnly))
   {
-    ERROR_LOG() << "Not possible to import ORBAT: Could not open file \""
+    ERROR_LOG(m_logger) << "Not possible to import ORBAT: Could not open file \""
                         << m_xmlFile->fileName()
                         << "\" for reading.";
     return false;
@@ -631,11 +631,11 @@ bool ImportSaab::isValidSaabOrbatFile() const
   m_xmlFile->close();
 
   if (!hasExerciseOrbatRoot)
-    ERROR_LOG() << "Could not find " << SAAB_EXERCISE_ORBAT() << " in file \"" << m_xmlFile->fileName() << '\"';
+    ERROR_LOG(m_logger) << "Could not find " << SAAB_EXERCISE_ORBAT() << " in file \"" << m_xmlFile->fileName() << '\"';
   if (!hasExercise)
-    ERROR_LOG() << "Could not find " << SAAB_EXERCISE() << " in file \"" << m_xmlFile->fileName() << '\"';
+    ERROR_LOG(m_logger) << "Could not find " << SAAB_EXERCISE() << " in file \"" << m_xmlFile->fileName() << '\"';
   if (!hasOrbat)
-    ERROR_LOG() << "Could not find " << SAAB_ORBAT() << " in file \"" << m_xmlFile->fileName() << '\"';
+    ERROR_LOG(m_logger) << "Could not find " << SAAB_ORBAT() << " in file \"" << m_xmlFile->fileName() << '\"';
 
   return hasExerciseOrbatRoot && hasExercise && hasOrbat;
 }
@@ -644,13 +644,13 @@ bool ImportSaab::isValidConfigFile() const
 {
   if (!m_configFile)
   {
-    ERROR_LOG() << "Not possible to read config: No file selected";
+    ERROR_LOG(m_logger) << "Not possible to read config: No file selected";
     return false;
   }
 
   if (!m_configFile->open(QIODevice::ReadOnly))
   {
-    ERROR_LOG() << "Not possible to read config: Could not open file \""
+    ERROR_LOG(m_logger) << "Not possible to read config: Could not open file \""
                         << m_configFile->fileName()
                         << "\" for reading.";
     return false;
@@ -677,9 +677,9 @@ bool ImportSaab::isValidConfigFile() const
   m_configFile->close();
 
   if (!hasEchelons)
-    ERROR_LOG() << "Could not find " << SAAB_ECHELONS() << " in file \"" << m_configFile->fileName() << '\"';
+    ERROR_LOG(m_logger) << "Could not find " << SAAB_ECHELONS() << " in file \"" << m_configFile->fileName() << '\"';
   if (!hasSymbols)
-    ERROR_LOG() << "Could not find " << SAAB_SYMBOLS() << " in file \"" << m_configFile->fileName() << '\"';
+    ERROR_LOG(m_logger) << "Could not find " << SAAB_SYMBOLS() << " in file \"" << m_configFile->fileName() << '\"';
 
   return hasEchelons && hasSymbols;
 }
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 328e66c22..99c1d5583 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
@@ -66,11 +66,11 @@ bool TypeEdit::init(int typeId,
                     const std::shared_ptr<FileManagement::Interface::Dtc> &flmDtc,
                     const std::shared_ptr<FileManagement::Interface::Ftc> &flmFtc)
 {
-  DEBUG_LOG() << "TypeEdit::init()";
+  DEBUG_LOG(m_logger) << "TypeEdit::init()";
 
   if (!dtc || !ftc || !ppmGuiCbxIfc)
   {
-    ERROR_LOG() << "TypeEdit::init() Invalid shared_ptr!";
+    ERROR_LOG(m_logger) << "TypeEdit::init() Invalid shared_ptr!";
     return false;
   }
 
@@ -82,9 +82,9 @@ bool TypeEdit::init(int typeId,
   m_flmFtc = flmFtc;
 
   if (m_flmDtc && !m_flmDtc->enableFileContent())
-    WARNING_LOG() << "Could not enable FLM DTC fileContent!";
+    WARNING_LOG(m_logger) << "Could not enable FLM DTC fileContent!";
   if (m_flmFtc && !m_flmFtc->enableFileContentSetUsed())
-    WARNING_LOG() << "Could not enable FLM FTC fileContentSetUsed!";
+    WARNING_LOG(m_logger) << "Could not enable FLM FTC fileContentSetUsed!";
 
   std::shared_ptr<ParticipantManagement::ForeignMSDLGuiInterface> msdlInterface;
   m_session->getForeignGuiInterface<ParticipantManagement::ForeignMSDLGuiInterface>(msdlInterface);
@@ -157,13 +157,13 @@ bool TypeEdit::apply()
   });
 
 
-  DEBUG_LOG() << "Old symbol: " << m_symbolSidcOld;
-  DEBUG_LOG() << "New symbol: " << m_symbolSidc;
+  DEBUG_LOG(m_logger) << "Old symbol: " << m_symbolSidcOld;
+  DEBUG_LOG(m_logger) << "New symbol: " << m_symbolSidc;
 
   if (!m_symbolSidc.isEmpty())
   {
     int symbolId = AdvancedSymbology::SidcCodec::decodeCivilXml(m_symbolSidc);
-    DEBUG_LOG() << "Symbol Id = " << symbolId;
+    DEBUG_LOG(m_logger) << "Symbol Id = " << symbolId;
     if (symbolId > 0) 
     {
       FileManagement::FileContent data = m_flmDtc->fileContent(symbolId);
@@ -188,7 +188,7 @@ bool TypeEdit::apply()
   if (!m_symbolSidcOld.isEmpty() && m_symbolSidcOld != m_symbolSidc)
   {
     int symbolId = AdvancedSymbology::SidcCodec::decodeCivilXml(m_symbolSidcOld);
-    DEBUG_LOG() << "Symbol Id = " << symbolId;
+    DEBUG_LOG(m_logger) << "Symbol Id = " << symbolId;
     if (symbolId > 0) 
     {
       FileManagement::FileContent data = m_flmDtc->fileContent(symbolId);
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 8d3bd3f4e..cc0a08964 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
@@ -61,6 +61,8 @@ public slots:
   void onChangeSymbolInternal(const QString &sidc, bool bInitial = false);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   bool apply() override;
   void fillComboboxes();
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 3ddf8b093..f604b872a 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
@@ -49,6 +49,8 @@ protected slots:
   void onDataChangedLocal(const Type &data, DataModification modType);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void updateFilterTypeClasses();
 private:
   QHash<int, EquipmentType> m_equipmentTypes;
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 fe0e6151b..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
@@ -37,6 +37,8 @@ public:
             const std::shared_ptr<FileManagement::Interface::Ftc> &flmFtc);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void onRemoveTypeReply(const Core::FunctionReplyObject &replyObject) override { m_requestHelper->requestReply(replyObject); }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_list_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_list_dialog.h
index dd7880b00..4e818b1cd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_list_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Uas/ppm_uas_list_dialog.h
@@ -48,6 +48,8 @@ public:
   bool init();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void onRemoveUasReply(const Core::FunctionReplyObject &reply) override;
   void retranslate() override;
   void tableColumnOrganiserSetting() override;
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 b1098d7f5..19c6a1412 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
@@ -57,7 +57,7 @@ bool UasListModel::initModel(LtsSession::LtsSession *session)
 
   m_exmDtc->waitForHistoricalDataExercise(500);
 
-  DEBUG_LOG() << "UasListModel initialised for exercise " << m_exerciseId;
+  DEBUG_LOG(m_logger) << "UasListModel initialised for exercise " << m_exerciseId;
 
   return true;
 }
@@ -124,7 +124,7 @@ void UasListModel::onUasChanged(const UAS &data, const DataModification modType)
   case DataModification::eModified:
   case DataModification::eAdded:
   {
-    DEBUG_LOG() << "DataModification::eModified and eAdded: ";
+    DEBUG_LOG(m_logger) << "DataModification::eModified and eAdded: ";
 
     if (row < 0)
       insertRow(data);
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 4f789368b..95fdcd10e 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
@@ -51,6 +51,7 @@ class UasListModel : public LtsWidgets::LtsAbstractTableModel<UAS>
   void onUasChanged(const ParticipantManagement::UAS &data,
                     const DataModification modType);
   private:
+  NGL::INGLLogger &m_logger;
   int32_t m_exerciseId { 0 };
   std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
   std::shared_ptr<ExerciseManagement::Interface::Dtc> m_exmDtc;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/Test/main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/Test/main.cpp
index d7ed8b234..85aeb4ca1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/Test/main.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/Test/main.cpp
@@ -171,7 +171,7 @@ class TestMainWindow  : public QMainWindow
       if (!QFile::exists(initFilePath))
         FATAL_LOG(m_logger) << Q_FUNC_INFO << " MapIniFile location Failed";
       else
-        DEBUG_LOG() << Q_FUNC_INFO << " MapIniFile found: " << initFilePath;
+        DEBUG_LOG(m_logger) << Q_FUNC_INFO << " MapIniFile found: " << initFilePath;
 
       SituationMap::MapSettings * mapSettings = new SituationMap::MapSettings(initFilePath, m_map);
       MapInitializer *mapInitializer = new MapInitializer(*m_map, *mapSettings, QLatin1String("PlanEditorTest"), m_map);
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 5bf34aa15..0511f2409 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
@@ -261,7 +261,7 @@ public:
 
     if (partyColors.size() > customColorCount)
     {
-      WARNING_LOG() << Q_FUNC_INFO << " To much party colors ("
+      WARNING_LOG(m_logger) << Q_FUNC_INFO << " To much party colors ("
                             << partyColors.size()
                             << ") color dialog custom colors are limited to "
                             << customColorCount
@@ -602,7 +602,7 @@ void AttributeDialogManager::onResetWidgets()
 
 AdvancedSymbology::Gui::SymbolModificationDialog *AttributeDialogManager::InternalData::buildSymbolModifyDialog(QWidget *parent, bool isParticipant)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START "
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START "
                       << ", isParticipant=" << isParticipant
                       << ", this=" << this;
 
@@ -641,7 +641,7 @@ static void colorizeButton(QAbstractButton *button, const QColor color)
 
 SymbologyXML::SymbolDialog *AttributeDialogManager::InternalData::buildSymbolXMLDialog(QWidget *parent)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START " << ", this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START " << ", this=" << this;
 
   SymbologyXML::SymbolDialog *dlg = new SymbologyXML::SymbolDialog(m_map->symbolDictionary(),m_geoModel,true,parent);
   if(dlg)
@@ -1106,7 +1106,7 @@ LtsWidgets::LtsDialog *AttributeDialogManager::InternalData::buildTextAttrBox(QW
 
 LtsWidgets::LtsDialog * AttributeDialogManager::InternalData::buildParticipantBox(QWidget *parent)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, this=" << this;
   Dialog *dlg = new Dialog(parent);
 
   dlg->setObjectName(QLatin1String("PlanEditor::ParticipantData"));
@@ -1334,7 +1334,7 @@ LtsWidgets::LtsDialog * AttributeDialogManager::InternalData::buildParticipantBo
     m_self->onCloseDialog();
   });
 
-  TRACE_LOG() << Q_FUNC_INFO << " END, this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, this=" << this;
   return dlg;
 } 
 
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 743c0f9da..eb159a41f 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
@@ -158,7 +158,7 @@ template<class RubberbandClass> GeometryPlacer<RubberbandClass>::GeometryPlacer(
 
   if (m_uidList.isEmpty())
   {
-    WARNING_LOG() << Q_FUNC_INFO << "Object list of GeometryPlacer is empty.";
+    WARNING_LOG(m_logger) << Q_FUNC_INFO << "Object list of GeometryPlacer is empty.";
     return;
   }
 
@@ -167,7 +167,7 @@ template<class RubberbandClass> GeometryPlacer<RubberbandClass>::GeometryPlacer(
     
     
 
-    ERROR_LOG() << Q_FUNC_INFO << "Can't determine bounding box of selected features";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << "Can't determine bounding box of selected features";
 
 #ifdef LTS_DEBUG
       
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 6a5f7cedd..dcd176e82 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
@@ -137,7 +137,7 @@ public:
           if (lineNo > 1)
           {
             if (!parseLine(stripLeadingAndTrailingQuotes(line)))
-              ERROR_LOG() << "Error while parsing MIL2525D_toMIL2525C.def in line " << lineNo << ENDLOG();
+              ERROR_LOG(m_logger) << "Error while parsing MIL2525D_toMIL2525C.def in line " << lineNo << ENDLOG();
           }
         }
         file.close();
@@ -186,9 +186,9 @@ public:
         }
 #endif
       }
-      else ERROR_LOG() << "Open file for reading failed: " << file.fileName() << ENDLOG();
+      else ERROR_LOG(m_logger) << "Open file for reading failed: " << file.fileName() << ENDLOG();
     }
-    else ERROR_LOG() << "File doesn't exist: " << file.fileName() << ENDLOG();
+    else ERROR_LOG(m_logger) << "File doesn't exist: " << file.fileName() << ENDLOG();
   } 
 
   ~Internal()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/plan_editor.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/plan_editor.h
index 404d53b9e..eb765ecb6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/plan_editor.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/plan_editor.h
@@ -286,6 +286,8 @@ public slots:
 
 protected:
 
+
+NGL::INGLLogger &m_logger;
   bool eventFilter(QObject *obj, QEvent *event) override;
 
   void initializePlan();
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 cfa5d3e11..450a4b17e 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
@@ -308,12 +308,12 @@ public:
 
     if (m_geoModel == nullptr)
     {
-      ERROR_LOG() << Q_FUNC_INFO << " Creating Geometry Model failed.";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " Creating Geometry Model failed.";
       return;
     }
     if (m_geoModelRenderer == nullptr)
     {
-      ERROR_LOG() << Q_FUNC_INFO << " Creating Geometry Model Renderer failed.";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " Creating Geometry Model Renderer failed.";
       return;
     }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/selection_worker.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/selection_worker.cpp
index e80547d0d..7015d0bcc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/selection_worker.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/selection_worker.cpp
@@ -19,13 +19,12 @@ SelectionWorker::SelectionWorker(PlanEditor                   *planEditor
                                  , SituationMap::GeometryModel *geometryModel
                                  , SituationMap::Map            *map
                                  , SelectionMode                 mode
-                                 , const QPointF                &viewPortPosition)
-  : QObject(planEditor)
+                                 , const QPointF                &viewPortPosition) : QObject(planEditor)
   , m_planEditor(planEditor)
   , m_geometryModel(geometryModel)
   , m_map(map)
-  , m_rubberband(nullptr)
-{
+  , m_rubberband(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 
   switch (mode)
   {
@@ -47,7 +46,7 @@ SelectionWorker::SelectionWorker(PlanEditor                   *planEditor
       connect(rubberband, &SituationMap::RB::Rubberband::apply, this, &SelectionWorker::onLineSelect);
       connect(rubberband, &SituationMap::RB::Rubberband::abort, this, &SelectionWorker::onAbortSelect);
     }
-    else ERROR_LOG() << Q_FUNC_INFO << "Creating rubberband for line selection failed.";
+    else ERROR_LOG(m_logger) << Q_FUNC_INFO << "Creating rubberband for line selection failed.";
   } break;
 
   case SelectionMode::Lasso :
@@ -65,7 +64,7 @@ SelectionWorker::SelectionWorker(PlanEditor                   *planEditor
       connect(rubberband, &SituationMap::RB::Rubberband::apply, this, &SelectionWorker::onLassoSelect);
       connect(rubberband, &SituationMap::RB::Rubberband::abort, this, &SelectionWorker::onAbortSelect);
     }
-    else ERROR_LOG() << Q_FUNC_INFO << "Creating rubberband for lasso selection failed.";
+    else ERROR_LOG(m_logger) << Q_FUNC_INFO << "Creating rubberband for lasso selection failed.";
   } break;
 
   case SelectionMode::Rectangle :
@@ -82,7 +81,7 @@ SelectionWorker::SelectionWorker(PlanEditor                   *planEditor
       connect(rubberband, &SituationMap::RB::Rubberband::apply, this, &SelectionWorker::onRectSelect);
       connect(rubberband, &SituationMap::RB::Rubberband::abort, this, &SelectionWorker::onAbortSelect);
     }
-    else ERROR_LOG() << Q_FUNC_INFO << "Creating rubberband for rectangle selection failed.";
+    else ERROR_LOG(m_logger) << Q_FUNC_INFO << "Creating rubberband for rectangle selection failed.";
   } break;
 
   case SelectionMode::Picking        :
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 e99303da0..5f0d93823 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
@@ -391,7 +391,7 @@ public:
 
     if (!setContent(xml, &errorMsg, &errorLine, &errorColumn))
     {
-      ERROR_LOG() << Q_FUNC_INFO << " parsing xml input failed: " << errorMsg << " at line " << errorLine << " , column " << errorColumn;
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " parsing xml input failed: " << errorMsg << " at line " << errorLine << " , column " << errorColumn;
       setContent(backup);
       return false;
     }
@@ -412,7 +412,7 @@ public:
 
     if (!setContent(device, &errorMsg, &errorLine, &errorColumn))
     {
-      ERROR_LOG() << Q_FUNC_INFO << " parsing xml input failed: " << errorMsg << " at line " << errorLine << " , column " << errorColumn;
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " parsing xml input failed: " << errorMsg << " at line " << errorLine << " , column " << errorColumn;
       setContent(backup);
       return false;
     }
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 c9d67e4dd..044ca1553 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
@@ -91,7 +91,7 @@ void PlanTopicEditor::updateInternalData()
 
   if (fileId != -1)
   {
-    DEBUG_LOG() << "topic compatibility mode - converting..";
+    DEBUG_LOG(m_logger) << "topic compatibility mode - converting..";
 
     QJsonObject fakePlanItem;
     fakePlanItem[QStringLiteral("keyId")] = 0;
@@ -111,7 +111,7 @@ void PlanTopicEditor::updateInternalData()
 
   if (m_planItems.isEmpty())
   {
-    WARNING_LOG() << "topic empty";
+    WARNING_LOG(m_logger) << "topic empty";
     return;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/TopicEditor/topic_editor.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/TopicEditor/topic_editor.h
index 3a947ee94..d007037cc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/TopicEditor/topic_editor.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/TopicEditor/topic_editor.h
@@ -34,6 +34,10 @@ public:
 
 
 private:
+
+
+
+NGL::INGLLogger &m_logger;
   void updateInternalData() override final;
   void retranslate() override final;
 
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 36a21db5f..fbd6d138b 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
@@ -381,7 +381,7 @@ void PlanOverlayModel::updatePlanItem(const PlanItem &planItem)
 {
   if (!planItem.isValid())
   {
-    ERROR_LOG() << "planItem has invalid key";
+    ERROR_LOG(m_logger) << "planItem has invalid key";
     return;
   }
 
@@ -539,12 +539,12 @@ void PlanOverlayModel::removeOverlay(int keyId)
 
 bool PlanOverlayModel::reInitModel(int exerciseId, int phaseId)
 {
-  DEBUG_LOG() << "ReInit Model for exerciseId = " << exerciseId << ", phaseId = " << phaseId;
+  DEBUG_LOG(m_logger) << "ReInit Model for exerciseId = " << exerciseId << ", phaseId = " << phaseId;
 
   if ((exerciseId < 1) || (phaseId < 1))
   {
     
-    WARNING_LOG() << Q_FUNC_INFO << " has been called with undefined exercise and/or phaseId";
+    WARNING_LOG(m_logger) << Q_FUNC_INFO << " has been called with undefined exercise and/or phaseId";
     return false;
   }
 
@@ -558,7 +558,7 @@ bool PlanOverlayModel::reInitModel(int exerciseId, int phaseId)
     int planExId = it.value().m_exerciseId;
     int planPhId = it.value().m_phaseId;
 
-    DEBUG_LOG() << "Plan name = " << it.value().m_fileName << " exercise = " << planExId << " phase = " << planPhId;
+    DEBUG_LOG(m_logger) << "Plan name = " << it.value().m_fileName << " exercise = " << planExId << " phase = " << planPhId;
 
     if ((planExId < 1) || (planPhId < 1) || ((planExId == exerciseId) && (planPhId == phaseId)))
     {
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 fab86c467..67c3a9cd4 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
@@ -174,6 +174,7 @@ signals:
 
 private:
 
+  NGL::INGLLogger &m_logger;
   PlanItem &planItemRef(int keyId);
 
   class InternalData;
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 297263f64..72f2d3c1f 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
@@ -122,31 +122,31 @@ bool InterfaceImpl::fetchInterfaces()
   
   if (!m_session->getDtc<FileManagement::DataInterface>(m_internal->m_dtc))
   {
-    DEBUG_LOG() << "getDtc for FileManagement::DataInterface failed.";
+    DEBUG_LOG(m_logger) << "getDtc for FileManagement::DataInterface failed.";
     return false;
   }
 
   if (!m_session->getDtc<OperatorManagement::DataInterface>(m_internal->m_opmDtc))
   {
-    DEBUG_LOG() << "getDtc for OperatorManagement::DataInterface failed.";
+    DEBUG_LOG(m_logger) << "getDtc for OperatorManagement::DataInterface failed.";
     return false;
   }
 
   if (!m_session->getDtc<ExerciseManagement::DataInterface>(m_internal->m_exmDtc))
   {
-    DEBUG_LOG() << "getDtc for ExerciseManagement::DataInterface failed.";
+    DEBUG_LOG(m_logger) << "getDtc for ExerciseManagement::DataInterface failed.";
     return false;
   }
 
   if (!m_session->getFtc<FileManagement::DataInterface>(m_internal->m_ftc))
   {
-    DEBUG_LOG() << "getFtc for FileManagement::DataInterface failed.";
+    DEBUG_LOG(m_logger) << "getFtc for FileManagement::DataInterface failed.";
     return false;
   }
 
   if (!m_session->getForeignGuiInterface(m_internal->m_situationMapGui))
   {
-    DEBUG_LOG() << "getForeignGuiInterface for SituationMap::ForeignGuiInterface failed.";
+    DEBUG_LOG(m_logger) << "getForeignGuiInterface for SituationMap::ForeignGuiInterface failed.";
     return false;
   }
 
@@ -238,7 +238,7 @@ bool InterfaceImpl::loadPlan(int planFileId,
 
   if (overrideSitMapIfc == nullptr) 
   {
-    ERROR_LOG() << "no sit map ifc to load a plan on!";
+    ERROR_LOG(m_logger) << "no sit map ifc to load a plan on!";
     return false;
   }
 
@@ -250,7 +250,7 @@ bool InterfaceImpl::loadPlan(int planFileId,
   
   if (fileContent.id() <= 0) 
   {
-    ERROR_LOG() << "Could not find plan with id " << planFileId << " in filemanagement - removing";
+    ERROR_LOG(m_logger) << "Could not find plan with id " << planFileId << " in filemanagement - removing";
     return false;
   }
 
@@ -265,7 +265,7 @@ bool InterfaceImpl::loadPlan(int planFileId,
     
     if (!overrideSitMapIfc->planOverlaySetContent(planFileId, nameOfPlan, planXMLContent))
     {
-      ERROR_LOG() << "no sit map ifc to load a plan on!";
+      ERROR_LOG(m_logger) << "no sit map ifc to load a plan on!";
       return false;
     }
 
@@ -307,7 +307,7 @@ bool InterfaceImpl::loadPlan(int planFileId,
         else
           planItem.m_maxScale = 0.0;
 
-        DEBUG_LOG() << " load plan and set minMaxScale:"
+        DEBUG_LOG(m_logger) << " load plan and set minMaxScale:"
             << " minScaleStr = " << minScaleStr
             << " maxScaleStr = " << maxScaleStr
             << " planItem.m_minScale = " << planItem.m_minScale
@@ -363,7 +363,7 @@ bool InterfaceImpl::loadPlan(int planFileId,
 
 bool InterfaceImpl::unloadAllPlans()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   const QMap<unsigned int, PlanOverlayModel::PlanItem> &planStore = m_internal->m_overlayModel->planStore();
 
@@ -372,12 +372,12 @@ bool InterfaceImpl::unloadAllPlans()
   {
     mapIt.next();
     unsigned int planId = mapIt.key();
-    DEBUG_LOG() << Q_FUNC_INFO << " removeOverlay, planId=" << planId;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " removeOverlay, planId=" << planId;
 
     
     m_internal->m_overlayModel->removeOverlay(planId);
   }
-  DEBUG_LOG() << Q_FUNC_INFO << " END";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
@@ -387,7 +387,7 @@ void InterfaceImpl::onUpdatePlan(int planId)
   PlanOverlaysPlugin::PlanOverlayModel::PlanItem planItem = m_internal->m_overlayModel->planItemValue(planId);
   if (!planItem.isValid())
   {
-    ERROR_LOG() << "plan item with id " << planId << " not found in model";
+    ERROR_LOG(m_logger) << "plan item with id " << planId << " not found in model";
     return;
   }
 
@@ -405,7 +405,7 @@ void InterfaceImpl::onUpdatePlan(int planId)
     
     if (!m_internal->m_foreignSitmapIfc->planOverlaySetContent(planFileId, planItem.m_fileName, planXMLContent))
     {
-      ERROR_LOG() << Q_FUNC_INFO << "Error rendering planContent [" << planItem.m_fileName << "]";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << "Error rendering planContent [" << planItem.m_fileName << "]";
       return false;
     }
 
@@ -423,7 +423,7 @@ void InterfaceImpl::onUpdatePlan(int planId)
 
   if (!ok)
   {
-    ERROR_LOG() << Q_FUNC_INFO << "Error reading planContent [" << planItem.m_fileName << "]";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << "Error reading planContent [" << planItem.m_fileName << "]";
     LtsWidgets::LtsMessageDialog::showMessage(m_session->baseLayout(), tr("Reading plan '%1' from database failed").arg(planItem.m_fileName), m_internal->m_messageBoxTitle);
   }
 }
@@ -498,7 +498,7 @@ QWidget *InterfaceImpl::openPlanOverlayDialog(const QJsonArray &planItems, bool
   {
     if (!planItemValue.isObject())
     {
-      WARNING_LOG() << "planItem from json array is not an object! " << planItemValue.type();
+      WARNING_LOG(m_logger) << "planItem from json array is not an object! " << planItemValue.type();
       continue;
     }
 
@@ -506,7 +506,7 @@ QWidget *InterfaceImpl::openPlanOverlayDialog(const QJsonArray &planItems, bool
     int planFileId = planItemObj[QStringLiteral("fileId")].toInt(-1);
 
     if (!loadPlan(planFileId, planItemObj))
-      ERROR_LOG() << "could not load plan with file id " << planFileId;
+      ERROR_LOG(m_logger) << "could not load plan with file id " << planFileId;
   }
 
 
@@ -562,7 +562,7 @@ void InterfaceImpl::onReloadPlanById(int planId)
       const QByteArray &planXMLContent = LtsUtils::toQByteArray(reply.content());
       if (planXMLContent.isEmpty())
       {
-        ERROR_LOG() << Q_FUNC_INFO << "Error plan [" << nameOfPlan << "] is empty";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << "Error plan [" << nameOfPlan << "] is empty";
         return false;
       }
 
@@ -570,7 +570,7 @@ void InterfaceImpl::onReloadPlanById(int planId)
 
       if (!m_internal->m_foreignSitmapIfc->planOverlaySetContent(planItem.m_fileId, planItem.m_fileName, planXMLContent))
       {
-        ERROR_LOG() << Q_FUNC_INFO << "Error rendering planContent [" << nameOfPlan << "]";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << "Error rendering planContent [" << nameOfPlan << "]";
         return false;
       }
 
@@ -595,7 +595,7 @@ void InterfaceImpl::onReloadPlanById(int planId)
 
     if (!ok)
     {
-      ERROR_LOG() << Q_FUNC_INFO << "Error reading planContent [" << nameOfPlan << "]";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << "Error reading planContent [" << nameOfPlan << "]";
       const QString & msg = tr("Reading plan '%1' from database failed").arg(nameOfPlan);
       LtsWidgets::LtsMessageDialog::showMessage(m_session->baseLayout(), msg, m_internal->m_messageBoxTitle);
       return;
@@ -617,14 +617,14 @@ bool InterfaceImpl::removePlan(int planId, SituationMap::ForeignGuiInterface* ov
 
   if (overrideSitMapIfc == nullptr) 
   {
-    ERROR_LOG() << "no sit map ifc to remove a plan from for planId " << planId;
+    ERROR_LOG(m_logger) << "no sit map ifc to remove a plan from for planId " << planId;
     return false;
   }
 
   const PlanOverlaysPlugin::PlanOverlayModel::PlanItem & planItem = m_internal->m_overlayModel->planItem(planId);
   if (!planItem.isValid())
   {
-    ERROR_LOG() << "plan item invalid for planId " << planId;
+    ERROR_LOG(m_logger) << "plan item invalid for planId " << planId;
     return false;
   }
 
@@ -708,7 +708,7 @@ void InterfaceImpl::onExerciseChanged(const ExerciseManagement::Exercise &data,
   {
     case DataModification::eModified:
     {
-      DEBUG_LOG() << "onExerciseChanged - Modified";
+      DEBUG_LOG(m_logger) << "onExerciseChanged - Modified";
       m_internal->m_overlayModel->reInitModel(data.id(), data.activePhaseId());
       break;
     }
@@ -727,12 +727,12 @@ void InterfaceImpl::onReloadPlanByName(const PlanOverlaysPlugin::PlanOverlayMode
   {
     int planFileId = m_internal->m_dtc->getFileId(FileManagement::FileType::TacticalPlan, planItem.m_fileName, exerciseId, phaseId);
 
-    DEBUG_LOG() << "Plan File Id = " << planFileId;
+    DEBUG_LOG(m_logger) << "Plan File Id = " << planFileId;
 
     if (planFileId < 1)
     {
       if (removeFromModel) *removeFromModel = true;
-      INFO_LOG() << "Plan overlay will be removed: name = " << planItem.m_fileName;
+      INFO_LOG(m_logger) << "Plan overlay will be removed: name = " << planItem.m_fileName;
       return;
     }
 
@@ -747,7 +747,7 @@ void InterfaceImpl::onReloadPlanByName(const PlanOverlaysPlugin::PlanOverlayMode
       const QByteArray &planXMLContent = LtsUtils::toQByteArray(reply.content());
       if (planXMLContent.isEmpty())
       {
-        ERROR_LOG() << Q_FUNC_INFO << "Error plan [" << nameOfPlan << "] is empty";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << "Error plan [" << nameOfPlan << "] is empty";
         return false;
       }
       else
@@ -757,13 +757,13 @@ void InterfaceImpl::onReloadPlanByName(const PlanOverlaysPlugin::PlanOverlayMode
         
         if (!m_internal->m_foreignSitmapIfc->planOverlayRemove(pi.m_fileId))
         {
-          ERROR_LOG() << Q_FUNC_INFO << "Error removing plan overlay from map failed [" << nameOfPlan << "]";
+          ERROR_LOG(m_logger) << Q_FUNC_INFO << "Error removing plan overlay from map failed [" << nameOfPlan << "]";
         }
 
         
         if (!m_internal->m_foreignSitmapIfc->planOverlaySetContent(fileContent.id(), nameOfPlan, planXMLContent))
         {
-          ERROR_LOG() << Q_FUNC_INFO << "Error rendering planContent [" << nameOfPlan << "]";
+          ERROR_LOG(m_logger) << Q_FUNC_INFO << "Error rendering planContent [" << nameOfPlan << "]";
           return false;
         }
 
@@ -797,7 +797,7 @@ void InterfaceImpl::onReloadPlanByName(const PlanOverlaysPlugin::PlanOverlayMode
 
     if (!ok)
     {
-      ERROR_LOG() << Q_FUNC_INFO << "Error reading planContent [" << nameOfPlan << "]";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << "Error reading planContent [" << nameOfPlan << "]";
       const QString & msg = tr("Reading plan '%1' from database failed").arg(nameOfPlan);
       LtsWidgets::LtsMessageDialog::showMessage(m_session->baseLayout(), msg, m_internal->m_messageBoxTitle);
     }
@@ -809,7 +809,7 @@ TopicEditorBase::TopicEditor *InterfaceImpl::createTopicEditor(const TopicEditor
 {
   std::shared_ptr<FileManagement::Interface::Dtc> flmDtc;
   if (!m_session->getDtc<FileManagement::DataInterface>(flmDtc))
-    WARNING_LOG() << "flm dtc missing - plan topic compatibility mode file name resolution not available";
+    WARNING_LOG(m_logger) << "flm dtc missing - plan topic compatibility mode file name resolution not available";
 
   PlanTopicEditor *editor = new PlanTopicEditor(&m_foreignIfc, flmDtc);
   editor->setTopicData(data);
@@ -839,7 +839,7 @@ bool InterfaceImpl::TopicReplayInterface::playbackInit(const QJsonObject &attrib
 {
   if (!m_foreignSitmapIfc)
   {
-    ERROR_LOG() << Q_FUNC_INFO << "No foreign sitMapIfc, use PlanOverlaysPlugin::ForeignGuiInterface::setForeignSitMapGuiIfc() to define SituationMapGuiPlugin interface. Can't load tactical plan for playback ...";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << "No foreign sitMapIfc, use PlanOverlaysPlugin::ForeignGuiInterface::setForeignSitMapGuiIfc() to define SituationMapGuiPlugin interface. Can't load tactical plan for playback ...";
     return false;
   }
 
@@ -849,8 +849,8 @@ bool InterfaceImpl::TopicReplayInterface::playbackInit(const QJsonObject &attrib
 
   if (planFileId != -1) 
   {
-    WARNING_LOG() << "Plan Overlays topic in compatibility mode!";
-    DEBUG_LOG() << "Loading plan id = " << planFileId;
+    WARNING_LOG(m_logger) << "Plan Overlays topic in compatibility mode!";
+    DEBUG_LOG(m_logger) << "Loading plan id = " << planFileId;
 
     if (!m_ovr->loadPlan(planFileId, false, m_foreignSitmapIfc))
       return false;
@@ -866,7 +866,7 @@ bool InterfaceImpl::TopicReplayInterface::playbackInit(const QJsonObject &attrib
     {
       if (!planItemValue.isObject())
       {
-        ERROR_LOG() << "PlanItem from json array is not an object! " << planItemValue.type();
+        ERROR_LOG(m_logger) << "PlanItem from json array is not an object! " << planItemValue.type();
         continue;
       }
 
@@ -875,7 +875,7 @@ bool InterfaceImpl::TopicReplayInterface::playbackInit(const QJsonObject &attrib
 
       if (!m_ovr->loadPlan(planFileId, planItemObj))
       {
-        ERROR_LOG() << "could not load plan with file id " << planFileId;
+        ERROR_LOG(m_logger) << "could not load plan with file id " << planFileId;
         continue;
       }
 
@@ -891,16 +891,16 @@ bool InterfaceImpl::TopicReplayInterface::playbackStop()
 {
   if (nullptr == m_foreignSitmapIfc)
   {
-    ERROR_LOG() << Q_FUNC_INFO << "Use PlanOverlaysPlugin::ForeignGuiInterface::setForeignSitMapGuiIfc() to define SituationMapGuiPlugin interface ...";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << "Use PlanOverlaysPlugin::ForeignGuiInterface::setForeignSitMapGuiIfc() to define SituationMapGuiPlugin interface ...";
     return false;
   }
 
   while (!m_loadedPlanFileIds.isEmpty())
   {
     int planFileId = m_loadedPlanFileIds.takeFirst();
-    DEBUG_LOG() << " removePlan with file id " << planFileId;
+    DEBUG_LOG(m_logger) << " removePlan with file id " << planFileId;
     if (!m_ovr->removePlan(planFileId, m_foreignSitmapIfc)) 
-      ERROR_LOG() << "could not unload plan with file id " << planFileId;
+      ERROR_LOG(m_logger) << "could not unload plan with file id " << planFileId;
   }
 
   return true;
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 f3ab0d548..cffafc122 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
@@ -111,6 +111,9 @@ public:
 private:
   
 
+
+
+NGL::INGLLogger &m_logger;
   void onReloadPlanById(int planId);
 
   
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 305c97383..78f628b76 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
@@ -21,7 +21,7 @@ PresentationEditDialog::PresentationEditDialog(QWidget *parent)
   , m_presentationId(-1)
   , m_ui(new Ui::PresentationEditDialog)
 {
-  DEBUG_LOG() << "PresentationEditDialog ctor";
+  DEBUG_LOG(m_logger) << "PresentationEditDialog ctor";
   
 
   m_ui->setupUi(this);
@@ -51,7 +51,7 @@ bool PresentationEditDialog::init(int presentationId,
                                   const std::shared_ptr<Interface::Ftc> &ftc,
                                   const std::shared_ptr<OperatorManagement::Interface::Dtc> &opmDtc)
 {
-  DEBUG_LOG() << "PresentationEditDialog::init";
+  DEBUG_LOG(m_logger) << "PresentationEditDialog::init";
   m_presentationId = presentationId;
   m_dtc = dtc;
   m_ftc = ftc;
@@ -140,7 +140,7 @@ bool PresentationEditDialog::apply()
       }
     }
 
-    DEBUG_LOG() << "Content size = " << m_content.size() << " for presentationId: " << m_presentationId;
+    DEBUG_LOG(m_logger) << "Content size = " << m_content.size() << " for presentationId: " << m_presentationId;
     req.content(m_content);
 
     m_presentationId = m_ftc->presentationModifyRequest(req);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_edit_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_edit_dialog.h
index 19acc558c..e33d06909 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_edit_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_edit_dialog.h
@@ -46,6 +46,8 @@ private slots:
   void onReturnPressed();
 
 private:
+
+NGL::INGLLogger &m_logger;
   bool apply();
 
   std::shared_ptr<Interface::Dtc> m_dtc;
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 71454983f..ef38f93f5 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
@@ -28,6 +28,7 @@ public:
 Q_SIGNALS:
   void checkboxClicked();
 protected:
+NGL::INGLLogger &m_logger;
  void switchCheckbox(const QModelIndex &index);
 private:
   friend class PreMobileDialogProxyModel;
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 953cf965e..af159a87b 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
@@ -46,7 +46,7 @@ bool PresentationManagementDialogModel::initModel(const std::shared_ptr<Interfac
       m_users.insert(static_cast<int>(it.value().id()), QString::fromStdString(it.value().name()));
   }
 
-  INFO_LOG() << "initModel - #presentations: " << m_vecData.size();
+  INFO_LOG(m_logger) << "initModel - #presentations: " << m_vecData.size();
   return true;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_model.h
index 0a1e5c535..82f66ef54 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_model.h
@@ -41,6 +41,8 @@ public:
   QVariant data(const QModelIndex &, int) const override;
 
 protected:
+
+NGL::INGLLogger &m_logger;
   bool isFiltered(const Presentation &data, DataModification modType) const override
   {
     if (!m_predicate(data))
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 5a56f3939..4fabcc440 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
@@ -22,7 +22,7 @@ PresentationManagementDialog::PresentationManagementDialog(QWidget *parent)
   , m_ftc(nullptr)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
 {
-  DEBUG_LOG() << "PresentationManagementDialog ctor";
+  DEBUG_LOG(m_logger) << "PresentationManagementDialog ctor";
   m_ui->setupUi(this);
 }
 
@@ -84,7 +84,7 @@ void PresentationManagementDialog::enaDisa()
 
 void PresentationManagementDialog::slotAdd()
 {
-  DEBUG_LOG() << "PresentationManagementDialog::slotAdd";
+  DEBUG_LOG(m_logger) << "PresentationManagementDialog::slotAdd";
   PresentationEditDialog *dialog = new PresentationEditDialog(this);
   if (!dialog->init(-1 , m_dtc, m_ftc, m_opmDtc))
   {
@@ -101,7 +101,7 @@ void PresentationManagementDialog::slotAdd()
 
 void PresentationManagementDialog::slotEdit()
 {
-  DEBUG_LOG() << "PresentationManagementDialog::slotEdit";
+  DEBUG_LOG(m_logger) << "PresentationManagementDialog::slotEdit";
   PresentationEditDialog *dialog = new PresentationEditDialog(this);
 
 
@@ -126,13 +126,13 @@ void PresentationManagementDialog::slotEdit()
 
 void PresentationManagementDialog::slotRemove()
 {
-  DEBUG_LOG() << "PresentationManagementDialog::slotRemove";
+  DEBUG_LOG(m_logger) << "PresentationManagementDialog::slotRemove";
   QModelIndex selIndex = m_ui->widget->currentIndex();
   if (!selIndex.isValid())
     return;
 
   Core::RemoveElementRequest req(m_model->getRowData(selIndex.row()).id());
-  DEBUG_LOG() << "Removing presentation id = " << req.id();
+  DEBUG_LOG(m_logger) << "Removing presentation id = " << req.id();
 
   m_requestHelper->startSingleRequest([req, this]()
   {
@@ -140,18 +140,18 @@ void PresentationManagementDialog::slotRemove()
   });
 
   if (m_requestHelper->failed())
-    ERROR_LOG() << "Failed to remove presentation";
+    ERROR_LOG(m_logger) << "Failed to remove presentation";
 }
 
 void PresentationManagementDialog::slotDelete()
 {
-  DEBUG_LOG() << "PresentationManagementDialog::slotDelete";
+  DEBUG_LOG(m_logger) << "PresentationManagementDialog::slotDelete";
   changeStatus(FileStatus::Deleted);
 }
 
 void PresentationManagementDialog::slotRestore()
 {
-  DEBUG_LOG() << "PresentationManagementDialog::slotRestore";
+  DEBUG_LOG(m_logger) << "PresentationManagementDialog::slotRestore";
   changeStatus(FileStatus::Valid);
 }
 
@@ -172,14 +172,14 @@ void PresentationManagementDialog::changeStatus(const FileStatus &fs)
   req.fileStatus(fs);
   req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
   req.lastModified(QDateTime::currentMSecsSinceEpoch());
-  DEBUG_LOG() << "Changing status for presentation id = " << pre.id();
+  DEBUG_LOG(m_logger) << "Changing status for presentation id = " << pre.id();
   m_requestHelper->startSingleRequest([this, req]()
   {
     return m_ftc->presentationChangeStatusRequest(PresentationChangeStatusRequest(req), this);
   });
 
   if (m_requestHelper->failed())
-    ERROR_LOG() << "Failed to change status for presentation";
+    ERROR_LOG(m_logger) << "Failed to change status for presentation";
 
 }
 
@@ -195,7 +195,7 @@ bool PresentationManagementDialog::init(const ScriptsDialogMode &dlgMode,
                                         const std::shared_ptr<OperatorManagement::Interface::Dtc> &opmDtc,
                                         LtsSession::LtsSession *session)
 {
-  DEBUG_LOG() << "PresentationManagementDialog::init";
+  DEBUG_LOG(m_logger) << "PresentationManagementDialog::init";
   m_modeDialog = dlgMode;
   m_dtc = dtc;
   m_ftc = ftc;
@@ -221,12 +221,12 @@ bool PresentationManagementDialog::init(const ScriptsDialogMode &dlgMode,
 
   const QMap<qint32, PresentationManagement::Presentation> presentations = dtc->presentations();
   for (const auto &p : presentations)
-    DEBUG_LOG() << "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);
 
   m_loadedScriptId = m_session->getSavegame()[QStringLiteral("ScriptId")].toInt();
-  ERROR_LOG() << "Loaded script id = " << m_loadedScriptId;
+  ERROR_LOG(m_logger) << "Loaded script id = " << m_loadedScriptId;
 
   if (m_modeDialog != ScriptsDialogMode::modeView)
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_dialog.h
index 2100399e2..b19777b88 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_dialog.h
@@ -45,6 +45,8 @@ public:
             LtsSession::LtsSession *session);
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void onPresentationRemoveReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
   void onPresentationChangeStatusReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
 
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 21205f70c..8843de45f 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
@@ -38,7 +38,7 @@ PreMobileDialog::PreMobileDialog(QWidget *parent)
   , m_avScriptsCount(0)
   , m_avScriptsActualDone(0)
 {
-  DEBUG_LOG() << "PreMobileDialog ctor";
+  DEBUG_LOG(m_logger) << "PreMobileDialog ctor";
   connect(&m_copyExercise, &DBAdministration::CopyExercise::copyDbFailed, this, &PreMobileDialog::onCopyDbFailed);
   connect(&m_copyExercise, &DBAdministration::CopyExercise::copyDbFinished, this, &PreMobileDialog::onCopyDbFinished);
 
@@ -49,7 +49,7 @@ PreMobileDialog::PreMobileDialog(QWidget *parent)
   m_progressBar = new QProgressBar();
   m_label = new QLabel();
   connect(m_label, &QLabel::destroyed, this, [this]()
-  {ERROR_LOG() << "Label destroyed";});
+  {ERROR_LOG(m_logger) << "Label destroyed";});
   m_widgetProgressBar->layout()->addWidget(m_label);
   m_widgetProgressBar->layout()->addWidget(m_progressBar);
   m_progressBar->setMinimum(0);
@@ -116,7 +116,7 @@ void PreMobileDialog::slotDownload()
   connect(&m_copyExercise, &DBAdministration::CopyExercise::nextProgress, this, &PreMobileDialog::onProgressBar);
 
   if (!m_copyExercise.doCopy(exerciseId))
-    ERROR_LOG() << "Failed to copy database from " << DBAdministration::Settings::serverDatabaseHost() << " to " << hostname;
+    ERROR_LOG(m_logger) << "Failed to copy database from " << DBAdministration::Settings::serverDatabaseHost() << " to " << hostname;
 
   
 
@@ -159,7 +159,7 @@ bool PreMobileDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
                            const std::shared_ptr<AudioVideoManagement::DataInterface> &avmDataIfc,
                            LtsSession::LtsSession *session)
 {
-  DEBUG_LOG() << "PreMobileDialog::init";
+  DEBUG_LOG(m_logger) << "PreMobileDialog::init";
   m_session = session;
   m_avmDataIfc = avmDataIfc;
   m_dtc = dtc;
@@ -186,7 +186,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() << "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);
 
@@ -246,7 +246,7 @@ void PreMobileDialog::handlePresentationContent(const GetPresentationContentRepl
 
   if (contentList.empty())
   {
-    WARNING_LOG() << "No content for Script Id = " << reply.id();
+    WARNING_LOG(m_logger) << "No content for Script Id = " << reply.id();
     return;
   }
 
@@ -268,28 +268,28 @@ void PreMobileDialog::handlePresentationContent(const GetPresentationContentRepl
 
 bool PreMobileDialog::downloadAVScripts()
 {
-  INFO_LOG() << "IN downloadAVScripts";
+  INFO_LOG(m_logger) << "IN downloadAVScripts";
   int nextProgress = 76;
   m_progressBar->setValue(nextProgress);
 
   if (!m_avmDataIfc->hasAvsSession())
   {
-    ERROR_LOG() << "avm hasAvsSession failed";
+    ERROR_LOG(m_logger) << "avm hasAvsSession failed";
     m_copyExercise.stopPing();
     return false;
   }
 
-  INFO_LOG() << "hasAVsSession ok";
+  INFO_LOG(m_logger) << "hasAVsSession ok";
 
   AudioVideoManagement::AvaSession *avaSession = m_avmDataIfc->avaSession();
   if (!avaSession->isEstablished())
   {
-    ERROR_LOG() << "avaSession not established, abort";
+    ERROR_LOG(m_logger) << "avaSession not established, abort";
     m_copyExercise.stopPing();
     return false;
   }
 
-  INFO_LOG() << "avaSession established";
+  INFO_LOG(m_logger) << "avaSession established";
 
   m_avaControl = avaSession->control();
 
@@ -323,14 +323,14 @@ void PreMobileDialog::slotScriptSet(const AudioVideoManagement::AvaStreamInfo &s
 {
   if (streamState == AudioVideoManagement::AvaStreamState::NotPossible)
   {
-    ERROR_LOG() << "Script " << m_lastScriptName << " not correctly downloaded";
+    ERROR_LOG(m_logger) << "Script " << m_lastScriptName << " not correctly downloaded";
     slotScriptDownloaded(streamState);
     return;
   }
 
-  DEBUG_LOG() << "ScriptName: " << m_lastScriptName;
-  DEBUG_LOG() << "streamInfo: start" << streamInfo.duration.count();
-  DEBUG_LOG() << "streamState: " << static_cast<int>(streamState);
+  DEBUG_LOG(m_logger) << "ScriptName: " << m_lastScriptName;
+  DEBUG_LOG(m_logger) << "streamInfo: start" << streamInfo.duration.count();
+  DEBUG_LOG(m_logger) << "streamState: " << static_cast<int>(streamState);
 
   m_avaControl->startScript(QStringLiteral("LOCAL_RECORD"), m_lastScriptName,
                             LtsUtils::createConnection(m_avaControl, &AudioVideoManagement::AvaControl::startScriptResponse,
@@ -339,7 +339,7 @@ void PreMobileDialog::slotScriptSet(const AudioVideoManagement::AvaStreamInfo &s
 
 void PreMobileDialog::slotScriptDownloaded(AudioVideoManagement::AvaStreamState streamState)
 {
-  DEBUG_LOG() << "streamState: " << static_cast<int>(streamState);
+  DEBUG_LOG(m_logger) << "streamState: " << static_cast<int>(streamState);
 
   m_avScriptsActualDone += 1;
   QString labelText = tr("Downloaded Audio Video Data: ") + QString::number(m_avScriptsActualDone) + QStringLiteral(" / ") + QString::number(m_avScriptsCount);
@@ -349,7 +349,7 @@ void PreMobileDialog::slotScriptDownloaded(AudioVideoManagement::AvaStreamState
 
   if (streamState == AudioVideoManagement::AvaStreamState::NotPossible)
   {
-    ERROR_LOG() << "Script " << m_lastScriptName << " not correctly downloaded";
+    ERROR_LOG(m_logger) << "Script " << m_lastScriptName << " not correctly downloaded";
     QString msg = tr("Could not download data - Audio/Video download - Script %1 failed").arg(m_lastScriptName);
     auto x = new LtsWidgets::LtsMessageDialogNew(this, msg);
     connect(x, &LtsWidgets::LtsMessageDialogNew::ok,
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_mobile_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_mobile_dialog.h
index 73518e786..5550483b9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_mobile_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/PresentationEdit/pre_mobile_dialog.h
@@ -57,6 +57,7 @@ private slots:
  void slotScriptDownloadedStep2();
  void onProgressBar(int nextProgress); 
 private:
+  NGL::INGLLogger &m_logger;
   void retranslate() override;
   void changeStatus(const FileStatus &fs);
   bool downloadAVScripts();
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 f3a31a235..5bf899140 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
@@ -57,7 +57,7 @@ ScriptChooser::ScriptChooser(const std::shared_ptr<Interface::Dtc> &dtc,
                         PresentationManagementDialogModel::Columns::Operator, QVariant(LtsSessionData::LtsSessionData::getInstance()->getOperatorId())
                         );
   if (!bSetOperator)
-    WARNING_LOG() << "could not set initial operator id to " << operatorId;
+    WARNING_LOG(m_logger) << "could not set initial operator id to " << operatorId;
 
   connect(m_ui->ltsDataView, &LtsDataView::LtsDataView::signalSelectionChanged,
           this, &ScriptChooser::onEnaDisa, Qt::QueuedConnection);
@@ -186,7 +186,7 @@ void ScriptChooser::onDeleteScript()
     req.fileStatus(fs);
     req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
     req.lastModified(QDateTime::currentMSecsSinceEpoch());
-    DEBUG_LOG() << "Changing status for presentation id = " << pre.id();
+    DEBUG_LOG(m_logger) << "Changing status for presentation id = " << pre.id();
 
     m_requestHelper->startSingleRequest([this, req]()
     {
@@ -197,7 +197,7 @@ void ScriptChooser::onDeleteScript()
     m_ui->ltsDataView->proxyModel()->removeRow(srcIdx.row());
 
     if (m_requestHelper->failed())
-      ERROR_LOG() << "Failed to change status for presentation-script_chooser";
+      ERROR_LOG(m_logger) << "Failed to change status for presentation-script_chooser";
   }
 
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/ScriptChooser/script_chooser.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/ScriptChooser/script_chooser.h
index 0ed04846f..f264c378f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/ScriptChooser/script_chooser.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/ScriptChooser/script_chooser.h
@@ -38,6 +38,7 @@ public:
   ~ScriptChooser();
 
 protected:
+  NGL::INGLLogger &m_logger;
   void closeEvent(QCloseEvent *event) override;
   void onPresentationRemoveReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
   void onPresentationChangeStatusReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/db_reader.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/db_reader.cpp
index 6147b60af..720495121 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/db_reader.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/db_reader.cpp
@@ -41,17 +41,17 @@ bool DbReader::loadPlugin(const LtsPluginManager::PluginInstance &pi)
   RecordReplay::RecordReplayPlugin *recPlugin = qobject_cast<RecordReplay::RecordReplayPlugin*>(pi.plugin);
   if (!recPlugin)
   {
-    ERROR_LOG() << "Cannot load RecordReplayPlugin " << pi.fileName;
+    ERROR_LOG(m_logger) << "Cannot load RecordReplayPlugin " << pi.fileName;
     return false;
   }
 
   if (!recPlugin->initCopy(m_exerciseId, m_bSupportsSchemasFrom, m_bSupportsSchemasTo))
   {
-    ERROR_LOG() << "Initialisation for RecordReplayPlugin " << pi.fileName << " failed ";
+    ERROR_LOG(m_logger) << "Initialisation for RecordReplayPlugin " << pi.fileName << " failed ";
     return false;
   }
 
-  INFO_LOG() << "Loaded record replay plugin " << recPlugin->pluginName();
+  INFO_LOG(m_logger) << "Loaded record replay plugin " << recPlugin->pluginName();
   m_plugins += recPlugin;
 
   return true;
@@ -89,7 +89,7 @@ bool DbReader::createTables()
 
       if (record.isEmpty())
       {
-        ERROR_LOG() << "Empty record for " << fqTableName;
+        ERROR_LOG(m_logger) << "Empty record for " << fqTableName;
         return false;
       }
 
@@ -102,7 +102,7 @@ bool DbReader::createTables()
 
 bool DbReader::copyData(qint64 fromTime, qint64 toTime)
 {
-  INFO_LOG() << "IN readData";
+  INFO_LOG(m_logger) << "IN readData";
   if (!m_queryFrom || !m_queryTo)
     return false;
   
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/db_reader.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/db_reader.h
index 8be325c4c..e4165a190 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/db_reader.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/db_reader.h
@@ -30,8 +30,10 @@ public:
 
   static bool createTable(NSqlQuery &q, const QString &tableName, const QSqlRecord &record, const QSqlIndex &pk, NGL::INGLLogger &logger);
 private:
+  NGL::INGLLogger &m_logger;
   bool loadPlugin(const LtsPluginManager::PluginInstance &pi);
 private:
+  NGL::INGLLogger &m_logger;
   int          m_exerciseId;
   QSqlDatabase m_dbFrom;
   QSqlDatabase m_dbTo;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/dvd_writer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/dvd_writer.cpp
index 6145b5370..049178476 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/dvd_writer.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/dvd_writer.cpp
@@ -61,12 +61,12 @@ void DVDWriter::incomingDataAvailable()
   while (m_dvdBurnProcess && m_dvdBurnProcess->canReadLine())
   {
     const QByteArray qB = m_dvdBurnProcess->readLine().trimmed();
-    INFO_LOG() << "qb = " << qB.data()
+    INFO_LOG(m_logger) << "qb = " << qB.data()
                        << " m_packageDir=" << m_packageDir;
 
     if (qB.contains(":-["))
     {
-      ERROR_LOG() << "growisofs error: '" << qB << "'";
+      ERROR_LOG(m_logger) << "growisofs error: '" << qB << "'";
       cleanupProcess();
 
       QString errString = QString::fromUtf8(qB.mid(3));
@@ -108,7 +108,7 @@ void DVDWriter::incomingDataAvailable()
       m_pProgressDlg->setValue(100);
     else if (qB.contains("media is not recognized"))
     {
-      ERROR_LOG() << "growisofs error: '" << qB << "'";
+      ERROR_LOG(m_logger) << "growisofs error: '" << qB << "'";
       cleanupProcess();
 
       if (LtsWidgets::LtsMessageDialog::showMessage(qobject_cast<QWidget *>(parent()), tr("No DVD in drive. Try again?"),
@@ -122,7 +122,7 @@ void DVDWriter::incomingDataAvailable()
     }
     else if (qB.contains(":-( unable to open"))
     {
-      ERROR_LOG() << "growisofs error: '" << qB << "'";
+      ERROR_LOG(m_logger) << "growisofs error: '" << qB << "'";
       cleanupProcess();
 
       if (LtsWidgets::LtsMessageDialog::showMessage(qobject_cast<QWidget *>(parent()), tr("Unable to open DVD device. Try again?"),
@@ -136,7 +136,7 @@ void DVDWriter::incomingDataAvailable()
     }
     else if (qB.contains(":-("))
     {
-      ERROR_LOG() << "growisofs error: '" << qB << "'";
+      ERROR_LOG(m_logger) << "growisofs error: '" << qB << "'";
       cleanupProcess();
 
       QString strError(tr("Unable to open DVD device"));
@@ -159,12 +159,12 @@ void DVDWriter::incomingDataAvailable()
 void DVDWriter::dvdFinished(int exitCode, QProcess::ExitStatus exitStatus)
 {
   
-  INFO_LOG() << "growisofs ends with extitCode : '" << exitCode << " and ExitStatus '" << exitStatus;
+  INFO_LOG(m_logger) << "growisofs ends with extitCode : '" << exitCode << " and ExitStatus '" << exitStatus;
 
   
   if (!m_dvdBurnProcess)
   {
-    WARNING_LOG() << "dvdFinished with error code: " << exitCode << ", status: " << exitStatus
+    WARNING_LOG(m_logger) << "dvdFinished with error code: " << exitCode << ", status: " << exitStatus
                           << " process is already cleaned up";
     return;
   }
@@ -180,7 +180,7 @@ void DVDWriter::dvdFinished(int exitCode, QProcess::ExitStatus exitStatus)
   }
   else
   {
-    ERROR_LOG() << "dvdFinished with error code: " << exitCode << ", status: " << exitStatus;
+    ERROR_LOG(m_logger) << "dvdFinished with error code: " << exitCode << ", status: " << exitStatus;
     LtsWidgets::LtsMessageDialog::showMessage(qobject_cast<QWidget *>(parent()),  tr("Burning aborted with an unkown error %1").arg(exitCode));
     cleanup(false);
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/dvd_writer.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/dvd_writer.h
index e5c2443ce..e86d791a3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/dvd_writer.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/dvd_writer.h
@@ -33,6 +33,8 @@ private slots:
   void dvdFinished(int exitCode, QProcess::ExitStatus exitStatus);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void cleanup(bool success);
   void cleanupProcess();
   bool checkBuringCapabilities();
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 69abae3a7..aa8c4b0f3 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
@@ -112,7 +112,7 @@ void ExportProcess::slotStartExport()
     auto it = m_trackEntryAssignments.constFind(QString::fromStdString(content.presentationTopicType()));
     if (it == m_trackEntryAssignments.constEnd())
     {
-      ERROR_LOG() << "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;
     }
 
@@ -147,7 +147,7 @@ void ExportProcess::slotStartExport()
 
     if (it == m_trackEntryAssignments.constEnd())
     {
-      ERROR_LOG() << "Invalid content for presentation type " << content.presentationTopicType();
+      ERROR_LOG(m_logger) << "Invalid content for presentation type " << content.presentationTopicType();
       continue;
     }
 
@@ -256,7 +256,7 @@ QVector<ExportStep *> ExportProcess::checkAdditionalExportEntries(
     addData.id = parentData.id;
 
     auto topicExportIfc = topicIfcFromType(addData.topicType, ExportOrReplay::Export);
-    DEBUG_LOG() << "addEntry type: " << addData.topicType << ", ifc: " << topicExportIfc;
+    DEBUG_LOG(m_logger) << "addEntry type: " << addData.topicType << ", ifc: " << topicExportIfc;
     if (!topicExportIfc)
       continue;
 
@@ -264,7 +264,7 @@ QVector<ExportStep *> ExportProcess::checkAdditionalExportEntries(
     ret += createExportStep(realParentId, addData, topicExportIfc, allSitReplayTimes);
     m_cntTopicsToExport++;
   }
-  DEBUG_LOG() << "topic count: " << m_cntTopicsToExport;
+  DEBUG_LOG(m_logger) << "topic count: " << m_cntTopicsToExport;
   return ret;
 }
 
@@ -285,7 +285,7 @@ ExportStep *ExportProcess::createExportStep(
   connect(pExportStep, &TakeHomePackageGenerator::ExportStep::signalExportFailed,
           this, &ExportProcess::slotRunExportStep, Qt::QueuedConnection);
 
-  DEBUG_LOG() << "Adding filter step " << data.topicType;
+  DEBUG_LOG(m_logger) << "Adding filter step " << data.topicType;
   return pExportStep;
 }
 
@@ -294,7 +294,7 @@ TopicReplay::Interface *ExportProcess::topicIfcFromType(TopicEditorBase::TopicTy
   auto it = m_trackEntryAssignments.constFind(TopicEditorBase::topicTypeString(type));
   if (it == m_trackEntryAssignments.constEnd())
   {
-    WARNING_LOG() << "Invalid content for presentation type " << type;
+    WARNING_LOG(m_logger) << "Invalid content for presentation type " << type;
     return nullptr;
   }
 
@@ -302,7 +302,7 @@ TopicReplay::Interface *ExportProcess::topicIfcFromType(TopicEditorBase::TopicTy
   TopicReplay::Interface *topicIfc = exportOrReplay == ExportOrReplay::Export ? ta.topicExportFactory->createInterface(ta.topicType)
                                                                               : ta.topicReplayFactory->createInterface(ta.topicType);
   if (!topicIfc)
-    WARNING_LOG() << "Could not find replay interface for " << type;
+    WARNING_LOG(m_logger) << "Could not find replay interface for " << type;
   return topicIfc;
 }
 
@@ -319,13 +319,13 @@ void ExportProcess::slotRunExportStep()
 {
   if (m_logger.isDebugEnabled())
   {
-    DEBUG_LOG() << "ExportProcess::slotRunExportStep() CALLED, m_vecExportSteps.size(): " << m_vecExportSteps.size()
+    DEBUG_LOG(m_logger) << "ExportProcess::slotRunExportStep() CALLED, m_vecExportSteps.size(): " << m_vecExportSteps.size()
                         << ", m_vecExportStepsExecuted.size(): " << m_vecExportStepsExecuted.size();
 
     for (const auto &s : std::as_const(m_vecExportSteps))
-      DEBUG_LOG() << "m_vecExportSteps: " << s << " compare: " << (s == sender());
+      DEBUG_LOG(m_logger) << "m_vecExportSteps: " << s << " compare: " << (s == sender());
     for (const auto &s : std::as_const(m_vecExportStepsExecuted))
-      DEBUG_LOG() << "m_vecExportStepsExecuted: " << s << " compare: " << (s == sender());
+      DEBUG_LOG(m_logger) << "m_vecExportStepsExecuted: " << s << " compare: " << (s == sender());
   }
 
   if (m_pProgressDlg->wasCanceled())
@@ -346,7 +346,7 @@ void ExportProcess::slotRunExportStep()
                            .arg(TopicEditorBase::topicTypeString(pExportStep->m_topicData.topicType))
                            .arg(m_vecExportStepsExecuted.size())
                            .arg(m_cntTopicsToExport));
-    DEBUG_LOG() << strExportLabel;
+    DEBUG_LOG(m_logger) << strExportLabel;
     m_pProgressDlg->setLabelText(strExportLabel);
 
     QString strExportPath(contentPath() + QString::number(pExportStep->topicId()) + QLatin1Char('/'));
@@ -438,11 +438,11 @@ void ExportProcess::createDataJson(const std::shared_ptr<ExerciseManagement::Int
 {
   
   {
-    DEBUG_LOG() << "Add exercise to ExportRootPath";
+    DEBUG_LOG(m_logger) << "Add exercise to ExportRootPath";
     QFile file(exportRootPath() + QStringLiteral("exercises.json"));
     if (!file.open(QFile::ReadWrite))
     {
-      WARNING_LOG() << "Can not open " << file.fileName() << " for read/write: " << file.errorString();
+      WARNING_LOG(m_logger) << "Can not open " << file.fileName() << " for read/write: " << file.errorString();
       return;
     }
     QJsonDocument doc(QJsonDocument::fromJson(file.readAll()));
@@ -453,12 +453,12 @@ void ExportProcess::createDataJson(const std::shared_ptr<ExerciseManagement::Int
     obj[QStringLiteral("Exercises")] = arr;
     file.resize(0);
     file.write(QJsonDocument(obj).toJson(QJsonDocument::Indented));
-    INFO_LOG() << " file.write " <<  QJsonDocument(obj).toJson(QJsonDocument::Indented);
+    INFO_LOG(m_logger) << " file.write " <<  QJsonDocument(obj).toJson(QJsonDocument::Indented);
     file.close();
   }
   
   QFile file(exportPath(m_pSession->exerciseId()) + QStringLiteral("data.json"));
-  INFO_LOG() << "ExportProcess::createDataJson " << exportPath(m_pSession->exerciseId()) + QStringLiteral("data.json");
+  INFO_LOG(m_logger) << "ExportProcess::createDataJson " << exportPath(m_pSession->exerciseId()) + QStringLiteral("data.json");
   if (!file.open(QFile::ReadWrite))
     return;
 
@@ -507,7 +507,7 @@ void ExportProcess::createDataJson(const std::shared_ptr<ExerciseManagement::Int
   }
   file.resize(0);
   file.write(QJsonDocument(obj).toJson(QJsonDocument::Indented));
-  INFO_LOG() << " file.write " <<  QJsonDocument(obj).toJson(QJsonDocument::Indented);
+  INFO_LOG(m_logger) << " file.write " <<  QJsonDocument(obj).toJson(QJsonDocument::Indented);
   file.close();
 }
 
@@ -545,7 +545,7 @@ void ExportProcess::createPresentationTable()
   {
     if (s->exportFailed())
     {
-      WARNING_LOG() << "Export failed for " << s->topicId();
+      WARNING_LOG(m_logger) << "Export failed for " << s->topicId();
       continue;
     }
 
@@ -620,9 +620,9 @@ void ExportProcess::copyStaticContent() const
   QString exportPathStr = exportPath(m_pSession->exerciseId());
   exportPathStr.truncate(exportPathStr.size() - 1);
   if (!NGL::copyDirContentsToDir(QStringLiteral("thp"), exportPathStr, true))
-    WARNING_LOG() << "Could not find thp static content directory exportPath=" << exportPathStr;
+    WARNING_LOG(m_logger) << "Could not find thp static content directory exportPath=" << exportPathStr;
   if (!NGL::copyDirContentsToDir(QStringLiteral("thp_standalone"), exportPathStr + QDir::separator() + QString::number(m_scriptId), true))
-    WARNING_LOG() << "Could not find thp_standalone static content directory exportPath=" << exportPathStr + QDir::separator() + QString::number(m_scriptId);
+    WARNING_LOG(m_logger) << "Could not find thp_standalone static content directory exportPath=" << exportPathStr + QDir::separator() + QString::number(m_scriptId);
 
 }
 
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 426966418..466a3db26 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
@@ -70,6 +70,7 @@ private slots:
   void slotRunExportStep();
 
 private:
+  NGL::INGLLogger &m_logger;
   QVector<ExportStep *> parseFilterSteps(
     int parentTopicId, QJsonObject &detailData, const QVector<TopicReplay::Interface::SituationReplayTime> &allSitReplayTimes
   );
@@ -101,6 +102,7 @@ private:
   void copyStaticContent() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   QVector<ExportStep *> m_vecExportSteps;
   QVector<ExportStep *> m_vecExportStepsExecuted;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/situation_exporter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/situation_exporter.cpp
index 7c2b5dc0b..2dac37d29 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/situation_exporter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/situation_exporter.cpp
@@ -41,7 +41,7 @@ SituationExporter::~SituationExporter()
 
 bool SituationExporter::exportStaticData(const QString &strPathToFile)
 {
-  DEBUG_LOG() << "Exporting static data to " << strPathToFile;
+  DEBUG_LOG(m_logger) << "Exporting static data to " << strPathToFile;
   m_dbIn.close();
   m_dbOut.close();
 
@@ -106,7 +106,7 @@ bool SituationExporter::exportStaticData(const QString &strPathToFile)
   {
     if (!copyTable(t, false))
     {
-      ERROR_LOG() << "Copying table " << t.schema << "." << t.table << " failed... ";
+      ERROR_LOG(m_logger) << "Copying table " << t.schema << "." << t.table << " failed... ";
       return false;
     }
   }
@@ -123,7 +123,7 @@ bool SituationExporter::exportStaticData(const QString &strPathToFile)
   {
     if (!copyTable(t, true))
     {
-      ERROR_LOG() << "Copying table " << t.schema << "." << t.table << " failed... ";
+      ERROR_LOG(m_logger) << "Copying table " << t.schema << "." << t.table << " failed... ";
       return false;
     }
   }
@@ -160,11 +160,11 @@ bool SituationExporter::copyTable(const StaticTableToCopy &t, bool bOnlyCreateSc
 
   const QString fqTableName(t.schema.isEmpty() ? t.table : (t.schema + QLatin1Char('.') + t.table));
 
-  DEBUG_LOG() << "Copying " << fqTableName << " started";
+  DEBUG_LOG(m_logger) << "Copying " << fqTableName << " started";
   const QSqlRecord record = m_dbIn.record(fqTableName);
   if (record.isEmpty())
   {
-    ERROR_LOG() << "Empty record for " << fqTableName;
+    ERROR_LOG(m_logger) << "Empty record for " << fqTableName;
     return false;
   }
   QStringList selectTableColumns;
@@ -197,17 +197,17 @@ bool SituationExporter::copyTable(const StaticTableToCopy &t, bool bOnlyCreateSc
                                         selectTableColumns.join(QStringLiteral(", ")),
                                         insertTablePlaceholder.join(QStringLiteral(", "))));
 
-  DEBUG_LOG() << selectTableCommand;
-  DEBUG_LOG() << insertTableCommand;
+  DEBUG_LOG(m_logger) << selectTableCommand;
+  DEBUG_LOG(m_logger) << insertTableCommand;
 
   if (!qOut.prepare(insertTableCommand))
   {
-    ERROR_LOG() << "qOut prepare failed... " << qOut.lastError().text();
+    ERROR_LOG(m_logger) << "qOut prepare failed... " << qOut.lastError().text();
     return false;
   }
   if (!qIn.exec(selectTableCommand))
   {
-    ERROR_LOG() << "qIn select failed... " << qIn.lastError().text();
+    ERROR_LOG(m_logger) << "qIn select failed... " << qIn.lastError().text();
     return false;
   }
   while (qIn.next())
@@ -216,11 +216,11 @@ bool SituationExporter::copyTable(const StaticTableToCopy &t, bool bOnlyCreateSc
       qOut.bindValue(insertTablePlaceholder.at(i), qIn.value(i));
     if (!qOut.exec())
     {
-      ERROR_LOG() << "qOut insert failed.. " << qOut.lastError().text();
+      ERROR_LOG(m_logger) << "qOut insert failed.. " << qOut.lastError().text();
       return false;
     }
   }
-  DEBUG_LOG() << "Copying " << fqTableName << " finished";
+  DEBUG_LOG(m_logger) << "Copying " << fqTableName << " finished";
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/situation_exporter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/situation_exporter.h
index b11c80c3e..9dfeda17b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/situation_exporter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/Common/TakeHomePackageGenerator/situation_exporter.h
@@ -18,6 +18,7 @@ public:
   bool exportDynamicData(qint64 fromTime, qint64 toTime);
 
 private:
+  NGL::INGLLogger &m_logger;
   struct StaticTableToCopy
   {
     QString schema;
@@ -27,6 +28,7 @@ private:
 
   bool copyTable(const StaticTableToCopy &t, bool bOnlyCreateSchema);
 private:
+  NGL::INGLLogger &m_logger;
   int m_exerciseId;
   QSqlDatabase m_dbIn;
   QSqlDatabase m_dbOut;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_dialog.cpp
index c30e8a55b..5b269d9c0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_dialog.cpp
@@ -309,7 +309,7 @@ void ScriptDialog::slotTrackEntryDeleted(const int topicId)
 
   if (m_currentTopicEditor != nullptr && m_currentTopicEditor->topicId() == topicId)
   {
-    ERROR_LOG() << "slotTrackEntryDeleted" << topicId << "editor" << m_currentTopicEditor->topicId();
+    ERROR_LOG(m_logger) << "slotTrackEntryDeleted" << topicId << "editor" << m_currentTopicEditor->topicId();
     m_currentTopicEditor->deleteLater();
     m_currentTopicEditor = nullptr;
   }
@@ -347,7 +347,7 @@ void ScriptDialog::slotEditEntry(const int topicId)
     }
   }
 
-  ERROR_LOG() << "could not find coresponding track entry with id " << topicId;
+  ERROR_LOG(m_logger) << "could not find coresponding track entry with id " << topicId;
 }
 
 
@@ -408,7 +408,7 @@ void ScriptDialog::startEssentialsViewStage2(const Core::ReplayPartition &replay
 
     if (m_essentialsViewSession == nullptr)
     {
-      WARNING_LOG() << "no session for m_essentialsViewSession";
+      WARNING_LOG(m_logger) << "no session for m_essentialsViewSession";
       LtsWidgets::LtsMessageDialog::showMessage(this, tr("Essentials View was not properly initialized"), tr("Essentials View Session"));
       m_essentialsViewApp->deleteLater();
       m_essentialsViewApp = nullptr;
@@ -433,13 +433,13 @@ void ScriptDialog::startEssentialsViewStage2(const Core::ReplayPartition &replay
           connect(m_essentialsViewSession, &LtsSession::LtsSession::destroyed, applyFilterPtr, [applyFilter]() { delete applyFilter; });
 
           sitMapFilterIfc->setApplyFilter(applyFilter);
-          DEBUG_LOG() << "set filter topic editor's flt ifc to essentials view's flt ifc";
+          DEBUG_LOG(m_logger) << "set filter topic editor's flt ifc to essentials view's flt ifc";
         }
         else
-          WARNING_LOG() << "cannot set filter topic editor's flt ifc to essentials view's flt ifc - cannot find topic editor";
+          WARNING_LOG(m_logger) << "cannot set filter topic editor's flt ifc to essentials view's flt ifc - cannot find topic editor";
       }
       else
-        WARNING_LOG() << "cannot set filter topic editor's flt ifc to essentials view's flt ifc - cannot find essentials view's flt ifc";
+        WARNING_LOG(m_logger) << "cannot set filter topic editor's flt ifc to essentials view's flt ifc - cannot find essentials view's flt ifc";
     }
 
 
@@ -458,13 +458,13 @@ void ScriptDialog::startEssentialsViewStage2(const Core::ReplayPartition &replay
             sitMapFilterGuiIfc->setSitMapGuiIfc(nullptr);
           });
 
-          DEBUG_LOG() << "set sit map filter gui ifc's sit map gui ifc to essential view's sit map gui ifc";
+          DEBUG_LOG(m_logger) << "set sit map filter gui ifc's sit map gui ifc to essential view's sit map gui ifc";
         }
         else
-          WARNING_LOG() << "unable to initialize situation map filter gui plugin - sit map filter gui ifc";
+          WARNING_LOG(m_logger) << "unable to initialize situation map filter gui plugin - sit map filter gui ifc";
       }
       else
-        WARNING_LOG() << "unable to initialize situation map filter gui plugin - sit map gui ifc missing!";
+        WARNING_LOG(m_logger) << "unable to initialize situation map filter gui plugin - sit map gui ifc missing!";
     }
 
 
@@ -478,13 +478,13 @@ void ScriptDialog::startEssentialsViewStage2(const Core::ReplayPartition &replay
         thisSrpGuiIfc->setSrpIfc(m_essentialsViewsSrpGuiIfc.get());
         connect(m_essentialsViewSession, &LtsSession::LtsSession::destroyed, this, [thisSrpGuiIfc]() { thisSrpGuiIfc->setSrpIfc(nullptr); });
         connect(m_essentialsViewSession, &LtsSession::LtsSession::signalClose, this, [this]() { m_essentialsViewsSrpGuiIfc = nullptr; });
-        DEBUG_LOG() << "set srp gui ifc's srp gui ifc to essential view's srp gui ifc";
+        DEBUG_LOG(m_logger) << "set srp gui ifc's srp gui ifc to essential view's srp gui ifc";
       }
       else
-        WARNING_LOG() << "unable to initialize srp gui plugin - this srp gui ifc missing!";
+        WARNING_LOG(m_logger) << "unable to initialize srp gui plugin - this srp gui ifc missing!";
     }
     else
-      WARNING_LOG() << "unable to initialize srp gui plugin - essentials view's srp gui ifc missing!";
+      WARNING_LOG(m_logger) << "unable to initialize srp gui plugin - essentials view's srp gui ifc missing!";
 
 
     
@@ -496,10 +496,10 @@ void ScriptDialog::startEssentialsViewStage2(const Core::ReplayPartition &replay
       {
         thisPlanOverlayGuiIfc->setForeignPlanOverlaysGuiIfc(essentialsViewPlanOverlaysGuiIfc.get());
         connect(m_essentialsViewSession, &LtsSession::LtsSession::destroyed, this, [thisPlanOverlayGuiIfc]() { thisPlanOverlayGuiIfc->setForeignPlanOverlaysGuiIfc(nullptr); });
-        WARNING_LOG() << "set this plan overlay's own gui ifc to essential view's plan overlays gui ifc";
+        WARNING_LOG(m_logger) << "set this plan overlay's own gui ifc to essential view's plan overlays gui ifc";
       }
       else
-        WARNING_LOG() << "unable to initialize plan overlays gui plugin - essential view's plan overlays gui ifc missing!";
+        WARNING_LOG(m_logger) << "unable to initialize plan overlays gui plugin - essential view's plan overlays gui ifc missing!";
 
 
       std::shared_ptr<SituationMap::ForeignGuiInterface> essentialsViewSitMapGuiIfc;
@@ -507,13 +507,13 @@ void ScriptDialog::startEssentialsViewStage2(const Core::ReplayPartition &replay
       {
         thisPlanOverlayGuiIfc->setForeignSitMapGuiIfc(essentialsViewSitMapGuiIfc.get());
         connect(m_essentialsViewSession, &LtsSession::LtsSession::destroyed, this, [thisPlanOverlayGuiIfc]() { thisPlanOverlayGuiIfc->setForeignSitMapGuiIfc(nullptr); });
-        DEBUG_LOG() << "set this plan overlay's sitMap gui ifc to essential view's sitMap gui ifc";
+        DEBUG_LOG(m_logger) << "set this plan overlay's sitMap gui ifc to essential view's sitMap gui ifc";
       }
       else
-        WARNING_LOG() << "unable to initialize sitMap gui plugin - essential view's sitMap gui ifc missing!";
+        WARNING_LOG(m_logger) << "unable to initialize sitMap gui plugin - essential view's sitMap gui ifc missing!";
     }
     else
-      WARNING_LOG() << "unable to initialize plan overlay gui plugin - this plan overlay gui ifc missing!";
+      WARNING_LOG(m_logger) << "unable to initialize plan overlay gui plugin - this plan overlay gui ifc missing!";
 
 
     
@@ -521,10 +521,10 @@ void ScriptDialog::startEssentialsViewStage2(const Core::ReplayPartition &replay
     if (m_essentialsViewSession->getForeignGuiInterface<BuildingViewer::ForeignGuiInterface>(bgvIfc))
     {
       bgvIfc->initTopicEditor();
-      DEBUG_LOG() << "set bgv gui ifc's session";
+      DEBUG_LOG(m_logger) << "set bgv gui ifc's session";
     }
     else
-      WARNING_LOG() << "unable to set bgv gui ifc's session - essentials view's bgv ifc missing!";
+      WARNING_LOG(m_logger) << "unable to set bgv gui ifc's session - essentials view's bgv ifc missing!";
   });
 }
 
@@ -567,7 +567,7 @@ void ScriptDialog::slotStartEssentialsView()
           this, [this, replayId, t]()
   {
     int tries = t->property("tries").toInt();
-    INFO_LOG() << "try # " << tries;
+    INFO_LOG(m_logger) << "try # " << tries;
 
     Core::ReplayPartition replay = m_coreDtc->replayPartition(replayId);
 
@@ -670,7 +670,7 @@ void ScriptDialog::slotSetTopicPosition(QWidget *previewWidget, int ignoreTopicF
 
     if (thaRealTe == nullptr)
     {
-      ERROR_LOG() << "te not found: " << topicId;
+      ERROR_LOG(m_logger) << "te not found: " << topicId;
       return;
     }
 
@@ -875,7 +875,7 @@ void ScriptDialog::getPresentationContent()
 
     if (contentList.size() < 1)
     {
-      WARNING_LOG() << "No content for Script Id = " << m_scriptId;
+      WARNING_LOG(m_logger) << "No content for Script Id = " << m_scriptId;
       setUnchangeable(false);
       return;
     }
@@ -889,7 +889,7 @@ void ScriptDialog::getPresentationContent()
       auto tea = m_trackEntryAssignments.constFind(QString::fromStdString(content.presentationTopicType())); 
       if (tea == m_trackEntryAssignments.constEnd())
       {
-        ERROR_LOG() << "Invalid content for type " << QString::fromStdString(content.presentationTopicType());
+        ERROR_LOG(m_logger) << "Invalid content for type " << QString::fromStdString(content.presentationTopicType());
         
         continue;
       }
@@ -903,7 +903,7 @@ void ScriptDialog::getPresentationContent()
 
       if (!m_ui->widget->addTopic(te))
       {
-        WARNING_LOG() << "couldn't load topic #" << te->m_topicId;
+        WARNING_LOG(m_logger) << "couldn't load topic #" << te->m_topicId;
         delete te;
       }
     }
@@ -920,13 +920,13 @@ void ScriptDialog::getPresentationContent()
 
   m_requestHelper = new LtsUtils::RequestHelper(this);
 
-  DEBUG_LOG() << "waiting for script content..";
+  DEBUG_LOG(m_logger) << "waiting for script content..";
   if (!m_requestHelper->startSingleRequest([this]() 
 {
   return m_ftc->getPresentationContentRequest(GetPresentationContentRequest(m_scriptId), this);
   }, handlePresentationContent))
   {
-    ERROR_LOG() << "Cannot retrieve Presentation Content for ScriptId = " << m_scriptId;
+    ERROR_LOG(m_logger) << "Cannot retrieve Presentation Content for ScriptId = " << m_scriptId;
     
     setUnchangeable(false);
   }
@@ -1019,7 +1019,7 @@ void ScriptDialog::startReplaySession()
 
     if (replayId < 1)
     {
-      ERROR_LOG() << "replayId < 1";
+      ERROR_LOG(m_logger) << "replayId < 1";
       initFailed(__LINE__);
       return;
     }
@@ -1058,7 +1058,7 @@ void ScriptDialog::startReplaySession()
 
       if (rp.id() != replayId)
       {
-        ERROR_LOG() << "Script Player: replay ids do not match!!! cannot start app";
+        ERROR_LOG(m_logger) << "Script Player: replay ids do not match!!! cannot start app";
         initFailed(__LINE__);
         return;
       }
@@ -1068,7 +1068,7 @@ void ScriptDialog::startReplaySession()
 
       if (m_replaySession == nullptr)
       {
-        ERROR_LOG() << "m_replaySession == nullptr";
+        ERROR_LOG(m_logger) << "m_replaySession == nullptr";
         initFailed(__LINE__);
         return;
       }
@@ -1092,11 +1092,11 @@ void ScriptDialog::startReplaySession()
         QString result(resultList.join(QStringLiteral("<br> - ")));
 
         if (r && !result.isEmpty())
-          WARNING_LOG() << "At least one optional widget & control interface failed to load: " << result;
+          WARNING_LOG(m_logger) << "At least one optional widget & control interface failed to load: " << result;
 
         if (!r)
         {
-          ERROR_LOG() << "At least one widget & control interface failed to load: " << result;
+          ERROR_LOG(m_logger) << "At least one widget & control interface failed to load: " << result;
           initFailed(__LINE__);
           return;
         }
@@ -1115,7 +1115,7 @@ void ScriptDialog::startReplaySession()
     m_requestHelper->deleteLater();
     m_requestHelper = nullptr;
 
-    ERROR_LOG() << "replayPartitionCreateRequest failed";
+    ERROR_LOG(m_logger) << "replayPartitionCreateRequest failed";
     initFailed(__LINE__);
   };
 
@@ -1293,7 +1293,7 @@ void ScriptDialog::createSitMapApp()
   if (m_sitMapApp == nullptr)
   {
     LtsSessionData::LtsSessionData::getInstance()->setDebugFlagValue(QStringLiteral("DoNotCreateInstant.ReplayControl"), oldFlagValue); 
-    ERROR_LOG() << "createApp returned nullptr for m_sitMapApp";
+    ERROR_LOG(m_logger) << "createApp returned nullptr for m_sitMapApp";
     initFailed(__LINE__);
     return;
   }
@@ -1351,7 +1351,7 @@ void ScriptDialog::createSitMapApp()
           }
           else
           {
-            ERROR_LOG() << "setting SitMapFilterIfc's SitMapPtr to this SitMapIfc failed, because the SitMapFilterIfc could not be found !!";
+            ERROR_LOG(m_logger) << "setting SitMapFilterIfc's SitMapPtr to this SitMapIfc failed, because the SitMapFilterIfc could not be found !!";
             initFailed(__LINE__);
             return;
           }
@@ -1366,14 +1366,14 @@ void ScriptDialog::createSitMapApp()
           }
           else
           {
-            ERROR_LOG() << "setting ReplayControlIfc's SitMapPtr to this SitMapIfc failed, because the ReplayControlIfc could not be found !!";
+            ERROR_LOG(m_logger) << "setting ReplayControlIfc's SitMapPtr to this SitMapIfc failed, because the ReplayControlIfc could not be found !!";
             initFailed(__LINE__);
             return;
           }
         }
         else
         {
-          ERROR_LOG() << "setting SitMapFilterIfc's SitMapPtr to this SitMapIfc failed, because the SitMapIfc could not be found !!";
+          ERROR_LOG(m_logger) << "setting SitMapFilterIfc's SitMapPtr to this SitMapIfc failed, because the SitMapIfc could not be found !!";
           initFailed(__LINE__);
           return;
         }
@@ -1397,23 +1397,23 @@ void ScriptDialog::createSitMapApp()
             if (m_replaySession->getForeignGuiInterface<SituationMap::ScriptFilterForeignGuiInterface>(sitMapFilterGuiIfc))
             {
               sitMapFilterGuiIfc->setApplyFilter(applyFilter);
-              DEBUG_LOG() << "set sit map filter ifc's apply filter";
+              DEBUG_LOG(m_logger) << "set sit map filter ifc's apply filter";
             }
             else
-              WARNING_LOG() << "cannot set sit map filter ifc's apply filter - cannot find filter topic's ifc";
+              WARNING_LOG(m_logger) << "cannot set sit map filter ifc's apply filter - cannot find filter topic's ifc";
 
 
             std::shared_ptr<SituationReplay::ForeignGuiInterface> sitRepIfc; 
             if (m_replaySession->getForeignGuiInterface<SituationReplay::ForeignGuiInterface>(sitRepIfc))
             {
               sitRepIfc->setApplyFilter(applyFilter);
-              DEBUG_LOG() << "set sit replay ifc's apply filter";
+              DEBUG_LOG(m_logger) << "set sit replay ifc's apply filter";
             }
             else
-              WARNING_LOG() << "cannot set sit replay ifc's apply filter - cannot find filter topic's ifc";
+              WARNING_LOG(m_logger) << "cannot set sit replay ifc's apply filter - cannot find filter topic's ifc";
           }
           else
-            WARNING_LOG() << "cannot set sit map filter ifc's apply filter - cannot find map's flt ifc";
+            WARNING_LOG(m_logger) << "cannot set sit map filter ifc's apply filter - cannot find map's flt ifc";
         }
 
 
@@ -1429,14 +1429,14 @@ void ScriptDialog::createSitMapApp()
           }
           else
           {
-            DEBUG_LOG() << "setting planOverlayIfc's SitMapPtr to this SitMapIfc failed, because the SitMapIfc could not be found !!";
+            DEBUG_LOG(m_logger) << "setting planOverlayIfc's SitMapPtr to this SitMapIfc failed, because the SitMapIfc could not be found !!";
             initFailed(__LINE__);
             return;
           }
         }
         else
         {
-          DEBUG_LOG() << "setting planOverlayIfc's SitMapPtr to this SitMapIfc failed, because the SitMapFilterIfc could not be found !!";
+          DEBUG_LOG(m_logger) << "setting planOverlayIfc's SitMapPtr to this SitMapIfc failed, because the SitMapFilterIfc could not be found !!";
           initFailed(__LINE__);
           return;
         }
@@ -1451,14 +1451,14 @@ void ScriptDialog::createSitMapApp()
             thisMrkIfc->setScriptsMrkIfc(sitMapMrkIfc.get());
           else
           {
-            DEBUG_LOG() << "setting mrkIfc redirection failed - sitMap mrkIfc not found !";
+            DEBUG_LOG(m_logger) << "setting mrkIfc redirection failed - sitMap mrkIfc not found !";
             initFailed(__LINE__);
             return;
           }
         }
         else
         {
-          DEBUG_LOG() << "setting mrkIfc redirection failed - this mrkIfc not found !";
+          DEBUG_LOG(m_logger) << "setting mrkIfc redirection failed - this mrkIfc not found !";
           initFailed(__LINE__);
           return;
         }
@@ -1471,7 +1471,7 @@ void ScriptDialog::createSitMapApp()
       }
       else
       {
-        ERROR_LOG() << "could not start situation map app !!";
+        ERROR_LOG(m_logger) << "could not start situation map app !!";
         initFailed(__LINE__);
         return;
       }
@@ -1479,7 +1479,7 @@ void ScriptDialog::createSitMapApp()
   }
   else
   {
-    ERROR_LOG() << "Failed to start Situation App!";
+    ERROR_LOG(m_logger) << "Failed to start Situation App!";
     initFailed(__LINE__);
     return;
   }
@@ -1608,7 +1608,7 @@ bool ScriptDialog::apply()
       return false;
     else
     {
-      ERROR_LOG() << "Creating a copy of script " << m_scriptId;
+      ERROR_LOG(m_logger) << "Creating a copy of script " << m_scriptId;
       m_scriptId = 0;
       name = tr("Copy of ")+ name;
     }
@@ -1770,7 +1770,7 @@ int ScriptDialog::nextTopicTime() const
   auto nextTopicIter = topicMap.upperBound(m_positionTime); 
   if (nextTopicIter == topicMap.constEnd()) 
   {
-    DEBUG_LOG() << "There is no next topic!";
+    DEBUG_LOG(m_logger) << "There is no next topic!";
     return -1;
   }
 
@@ -1806,7 +1806,7 @@ void ScriptDialog::slotPlayUntilNextTopic()
 
   if (topicTime < 0)
   {
-    DEBUG_LOG() << "There is no next topic to play until!";
+    DEBUG_LOG(m_logger) << "There is no next topic to play until!";
     return;
   }
 
@@ -1818,7 +1818,7 @@ int ScriptDialog::previousTopicTime() const
 {
   if (m_topicMap.isEmpty())
   {
-    DEBUG_LOG() << "There are no topics while checking for previous topic!";
+    DEBUG_LOG(m_logger) << "There are no topics while checking for previous topic!";
     return -1;
   }
 
@@ -1838,7 +1838,7 @@ int ScriptDialog::previousTopicTime() const
 
   if (prevTopicIter == topicMap.constBegin())
   {
-    DEBUG_LOG() << "There is no previous topic! (1)";
+    DEBUG_LOG(m_logger) << "There is no previous topic! (1)";
     return -1;
   }
 
@@ -1846,7 +1846,7 @@ int ScriptDialog::previousTopicTime() const
 
   if (prevTopicIter == topicMap.constEnd())
   {
-    DEBUG_LOG() << "There is no previous topic! (2)";
+    DEBUG_LOG(m_logger) << "There is no previous topic! (2)";
     return -1;
   }
 
@@ -1898,7 +1898,7 @@ Screen *ScriptDialog::getProjectionWidget(const ScriptDialog::ProjectionWidget &
 
 ScriptDialog::ProjectionWidget ScriptDialog::identifyProjectionWidget(TrackEntry *topic) const
 {
-  DEBUG_LOG() << "identifyProjectionWidget: channel name: " << topic->m_channelName << ", filter parent channel name: " << topic->m_filterParentChannel;
+  DEBUG_LOG(m_logger) << "identifyProjectionWidget: channel name: " << topic->m_channelName << ", filter parent channel name: " << topic->m_filterParentChannel;
 
   if (topic->m_channelName == QStringLiteral("Screen 2"))
     return ProjectionWidget::Screen2;
@@ -1937,7 +1937,7 @@ bool ScriptDialog::_tryAddTopic(TrackEntryType trackEntryType,
   {
     if (!ta.m_topicEditorIfc->initTopicEditor())
     {
-      ERROR_LOG() << "Cannot add topic type " << typeName << " since 'initTopicEditor' failed";
+      ERROR_LOG(m_logger) << "Cannot add topic type " << typeName << " since 'initTopicEditor' failed";
       resultList.append(typeName);
       return false;
     }
@@ -2017,14 +2017,14 @@ void ScriptDialog::setReplayWidgetPosition(PlayingTopic *playingTopic)
 
   if (projectionWidget == nullptr)
   {
-    ERROR_LOG() << "screen for topic #" << playingTopic->topic->m_topicId << " not found";
+    ERROR_LOG(m_logger) << "screen for topic #" << playingTopic->topic->m_topicId << " not found";
     return;
   }
 
   int projectionWidth = projectionWidget->width();
   int projectionHeight = projectionWidget->height();
 
-  DEBUG_LOG() << "projection w: " << projectionWidth << ", h: " << projectionHeight;
+  DEBUG_LOG(m_logger) << "projection w: " << projectionWidth << ", h: " << projectionHeight;
 
   TrackEntry *topic = playingTopic->topic;
 
@@ -2048,7 +2048,7 @@ void ScriptDialog::setReplayWidgetPosition(PlayingTopic *playingTopic)
 
   if (replayWidget == nullptr)
   {
-    WARNING_LOG() << "no replay widget for topic" << topic->m_topicId;
+    WARNING_LOG(m_logger) << "no replay widget for topic" << topic->m_topicId;
     return;
   }
 
@@ -2057,7 +2057,7 @@ void ScriptDialog::setReplayWidgetPosition(PlayingTopic *playingTopic)
       || (topic->x < 0 || topic->w < 0 || topic->y < 0 || topic->h < 0)) 
   {
     replayWidget->setGeometry(x, y, projectionWidth, projectionHeight);
-    ERROR_LOG() << "set geo of replay widget !! #1 x" << x << "y" << y;
+    ERROR_LOG(m_logger) << "set geo of replay widget !! #1 x" << x << "y" << y;
   }
   else
   {
@@ -2069,7 +2069,7 @@ void ScriptDialog::setReplayWidgetPosition(PlayingTopic *playingTopic)
     replayWidget->setGeometry(x + qRound(projectionX), y + qRound(projectionY), qRound(projectionW), qRound(projectionH));
   }
 
-  DEBUG_LOG() << "final widget geo: " << replayWidget->geometry().x()
+  DEBUG_LOG(m_logger) << "final widget geo: " << replayWidget->geometry().x()
                       << ", " << replayWidget->geometry().y()
                       << ", " << replayWidget->geometry().width()
                       << ", " << replayWidget->geometry().height();
@@ -2089,7 +2089,7 @@ void ScriptDialog::setReplayWidgetFreestanding(PlayingTopic *playingTopic, bool
 
   if (projectionWidget == nullptr)
   {
-    ERROR_LOG() << "screen for topic #" << playingTopic->topic->m_topicId << " not found";
+    ERROR_LOG(m_logger) << "screen for topic #" << playingTopic->topic->m_topicId << " not found";
     return;
   }
 
@@ -2145,7 +2145,7 @@ void ScriptDialog::avsVisibilityHack(QWidget *parentForScreen, bool visible)
     QPoint pos(m_currentTopicDesigner->parentWidget()->mapToGlobal(geo.topLeft())); 
 
     widget->setGeometry(QRect(pos, s)); 
-    ERROR_LOG() << "geo x" << widget->geometry().x() << "geo y" << widget->geometry().y() << "geo h" << widget->geometry().height() << "geo w" << widget->geometry().width();
+    ERROR_LOG(m_logger) << "geo x" << widget->geometry().x() << "geo y" << widget->geometry().y() << "geo h" << widget->geometry().height() << "geo w" << widget->geometry().width();
 
     
     widget->setWindowFlags(Qt::FramelessWindowHint);
@@ -2174,7 +2174,7 @@ void ScriptDialog::avsVisibilityHack(QWidget *parentForScreen, bool visible)
     m_currentTopicDesigner->setParent(widget);
     m_currentTopicDesigner->show();
 
-    ERROR_LOG() << "made freestanding";
+    ERROR_LOG(m_logger) << "made freestanding";
   }
 }
 
@@ -2219,7 +2219,7 @@ void ScriptDialog::setFreestanding(bool freestanding, const ProjectionWidget &pw
 
   case ProjectionWidget::Unknown:
   {
-    ERROR_LOG() << "trying to set freestanding with unknown projection widget - cannot set freestanding";
+    ERROR_LOG(m_logger) << "trying to set freestanding with unknown projection widget - cannot set freestanding";
     return;
   }
   }
@@ -2243,7 +2243,7 @@ bool ScriptDialog::isScreenFreestanding(const ProjectionWidget &pw) const
   case ProjectionWidget::Screen2:
     return m_currentlyFreestandingTopicsScreen2;
   case ProjectionWidget::Unknown:
-    ERROR_LOG() << "projection widget unknown";
+    ERROR_LOG(m_logger) << "projection widget unknown";
     return false;
   }
   return true;
@@ -2286,7 +2286,7 @@ void ScriptDialog::addReplayWidget(PlayingTopic *playingTopic, QWidget *replayWi
 
   case ProjectionWidget::Unknown:
   {
-    ERROR_LOG() << "projection widget unknown - cannot add replay widget";
+    ERROR_LOG(m_logger) << "projection widget unknown - cannot add replay widget";
     return;
   }
   }
@@ -2305,7 +2305,7 @@ bool ScriptDialog::enableFireEventFlash(bool enable)
   if (m_sitMapSession->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(sitMapIfc))
     success = sitMapIfc->enableFireEventFlashing(enable);
   else
-    WARNING_LOG() << Q_FUNC_INFO << " Cannot execute enableFireEventFlashing with enable=" << enable;
+    WARNING_LOG(m_logger) << Q_FUNC_INFO << " Cannot execute enableFireEventFlashing with enable=" << enable;
   return success;
 }
 
@@ -2338,11 +2338,11 @@ void ScriptDialog::playTopic(TrackEntry *topic)
 
   for (const TopicAssignment &ta : std::as_const(m_trackEntryAssignments))
   {
-    DEBUG_LOG() << Q_FUNC_INFO << " ta.m_topicName = " << ta.m_topicName;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " ta.m_topicName = " << ta.m_topicName;
 
     if (topic->m_type == ta.m_trackEntryType)
     {
-      DEBUG_LOG() << Q_FUNC_INFO << " createInterface";
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " createInterface";
 
       playingTopic->topicTypeName = ta.m_topicName;
       playingTopic->trackEntryType = ta.m_trackEntryType;
@@ -2352,17 +2352,17 @@ void ScriptDialog::playTopic(TrackEntry *topic)
 
   if (playingTopic->topicTypeName.isEmpty() || playingTopic->topicReplayIfc == nullptr)
   {
-    WARNING_LOG() << "Topic could not be assigned!! type name: " << playingTopic->topicTypeName << "replay ifc: " << (void *)playingTopic->topicReplayIfc;
+    WARNING_LOG(m_logger) << "Topic could not be assigned!! type name: " << playingTopic->topicTypeName << "replay ifc: " << (void *)playingTopic->topicReplayIfc;
     
     return;
   }
 
-  DEBUG_LOG() << Q_FUNC_INFO << " playingTopic->trackEntryType " << playingTopic->trackEntryType;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " playingTopic->trackEntryType " << playingTopic->trackEntryType;
 
   if (playingTopic->trackEntryType == TrackEntryType::SituationMap ||
       playingTopic->trackEntryType == TrackEntryType::Situation) 
   {
-    DEBUG_LOG() << Q_FUNC_INFO << " addReplayWidget";
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " addReplayWidget";
 
     m_sitMapSession->baseLayout()->setAutoFillBackground(true); 
     addReplayWidget(playingTopic, m_sitMapSession->baseLayout());
@@ -2370,33 +2370,33 @@ void ScriptDialog::playTopic(TrackEntry *topic)
     if (sitMapIfc || m_sitMapSession->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(sitMapIfc))
       sitMapIfc->forceUpdate();
     else
-      WARNING_LOG() << "Cannot force update on Situation Map - map might be stuck!";
+      WARNING_LOG(m_logger) << "Cannot force update on Situation Map - map might be stuck!";
 
     if (playingTopic->trackEntryType == TrackEntryType::Situation)
     {
-      DEBUG_LOG() << Q_FUNC_INFO << " Situation -> ENable FireEventFlashing";
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " Situation -> ENable FireEventFlashing";
       if (!enableFireEventFlash(true))
-        WARNING_LOG() << Q_FUNC_INFO << " Cannot enableFireEventFlashing at Situation Map";
+        WARNING_LOG(m_logger) << Q_FUNC_INFO << " Cannot enableFireEventFlashing at Situation Map";
     }
   }
   else 
   {
-    DEBUG_LOG() << Q_FUNC_INFO << " non-sitmap";
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " non-sitmap";
 
     
     
     
     if (playingTopic->trackEntryType == TrackEntryType::Snapshot)
     {
-      DEBUG_LOG() << Q_FUNC_INFO << " Snapshot -> DISable FireEventFlashing";
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " Snapshot -> DISable FireEventFlashing";
       if (!enableFireEventFlash(false))
-        WARNING_LOG() << Q_FUNC_INFO << " Cannot disableFireEventFlashing at Situation Map";
+        WARNING_LOG(m_logger) << Q_FUNC_INFO << " Cannot disableFireEventFlashing at Situation Map";
     }
     else if (playingTopic->trackEntryType == TrackEntryType::SituationReplay)
     {
-      DEBUG_LOG() << Q_FUNC_INFO << " SituationReplay -> ENable FireEventFlashing";
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " SituationReplay -> ENable FireEventFlashing";
       if (!enableFireEventFlash(true))
-        WARNING_LOG() << Q_FUNC_INFO << " Cannot enableFireEventFlashing at Situation Map";
+        WARNING_LOG(m_logger) << Q_FUNC_INFO << " Cannot enableFireEventFlashing at Situation Map";
     }
 
 
@@ -2424,14 +2424,14 @@ void ScriptDialog::playTopic(TrackEntry *topic)
       }
     }
     else
-      WARNING_LOG() << "topic #" << playingTopic->topic->m_topicId << " has no widget to show on presentation screen";
+      WARNING_LOG(m_logger) << "topic #" << playingTopic->topic->m_topicId << " has no widget to show on presentation screen";
   }
 
 
   
   if (topic->m_detailData.isEmpty())
   {
-    WARNING_LOG() << "Note: Topic id " << topic->m_topicId << " has no JSON data";
+    WARNING_LOG(m_logger) << "Note: Topic id " << topic->m_topicId << " has no JSON data";
 
 
   }
@@ -2447,7 +2447,7 @@ void ScriptDialog::playTopic(TrackEntry *topic)
 
   if (!playingTopic->topicReplayIfc->playbackInit(obj))
   {
-    WARNING_LOG() << "Playing topic # " << topic->m_topicId << " playback init failed! Playback of this topic failed!";
+    WARNING_LOG(m_logger) << "Playing topic # " << topic->m_topicId << " playback init failed! Playback of this topic failed!";
     
     return;
   }
@@ -2465,9 +2465,9 @@ void ScriptDialog::playTopic(TrackEntry *topic)
     });
   }
 
-  DEBUG_LOG() << "playbackStart at offset" << m_positionTime - topic->m_startTime;
+  DEBUG_LOG(m_logger) << "playbackStart at offset" << m_positionTime - topic->m_startTime;
   if (!playingTopic->topicReplayIfc->playbackStart(m_positionTime - topic->m_startTime ))
-    WARNING_LOG() << "Playing topic # " << topic->m_topicId << " playback start failed! Playback of this topic failed!";
+    WARNING_LOG(m_logger) << "Playing topic # " << topic->m_topicId << " playback start failed! Playback of this topic failed!";
 
   m_journal.journalList.append(new NextTopicJournal(m_positionTime, playingTopic->isFilter, playingTopic->topicTypeName, topic->m_length));
 }
@@ -2559,7 +2559,7 @@ void ScriptDialog::slotTimerTick()
     if (m_positionTime >= topic->m_startTime && m_positionTime < (topic->m_startTime + topic->m_length)) 
     {
       
-      DEBUG_LOG() << "Playing topic id " << topic->m_topicId << " with description " <<  topic->m_description;
+      DEBUG_LOG(m_logger) << "Playing topic id " << topic->m_topicId << " with description " <<  topic->m_description;
       playTopic(topic);
     }
   }
@@ -2591,7 +2591,7 @@ void ScriptDialog::slotTimerTick()
       int realFilterTime = filterTe->m_startTime; 
       if (m_positionTime >= (realFilterTime + 1) && m_positionTime <= (realFilterTime + filterTe->m_length)) 
       {
-        DEBUG_LOG() << "Playing filter topic id " << filterTe->m_topicId << " with description " << filterTe->m_description;
+        DEBUG_LOG(m_logger) << "Playing filter topic id " << filterTe->m_topicId << " with description " << filterTe->m_description;
 
         
         playTopic(filterTe);
@@ -2720,10 +2720,10 @@ void ScriptDialog::slotPlay()
     {
       if (playingTopic->topicReplayIfc != nullptr && m_ignoreTopicForReplay != playingTopic->topic->m_topicId)
       {
-        DEBUG_LOG() << "playbackStart (resume) at offset" << m_positionTime - playingTopic->topic->m_startTime;
+        DEBUG_LOG(m_logger) << "playbackStart (resume) at offset" << m_positionTime - playingTopic->topic->m_startTime;
         if (!playingTopic->topicReplayIfc->playbackStart(m_positionTime - playingTopic->topic->m_startTime
                                                          ))
-          WARNING_LOG() << "Playing topic # " << playingTopic->topic->m_topicId << " playback start failed! Re-playback of this topic failed!";
+          WARNING_LOG(m_logger) << "Playing topic # " << playingTopic->topic->m_topicId << " playback start failed! Re-playback of this topic failed!";
       }
 
       
@@ -2731,15 +2731,15 @@ void ScriptDialog::slotPlay()
       
       if (playingTopic->trackEntryType == TrackEntryType::Snapshot)
       {
-        DEBUG_LOG() << Q_FUNC_INFO << " Snapshot -> DISable FireEventFlashing";
+        DEBUG_LOG(m_logger) << Q_FUNC_INFO << " Snapshot -> DISable FireEventFlashing";
         if (!enableFireEventFlash(false))
-          WARNING_LOG() << Q_FUNC_INFO << " Cannot disableFireEventFlashing at Situation Map";
+          WARNING_LOG(m_logger) << Q_FUNC_INFO << " Cannot disableFireEventFlashing at Situation Map";
       }
       else if (playingTopic->trackEntryType == TrackEntryType::SituationReplay)
       {
-        DEBUG_LOG() << Q_FUNC_INFO << " Snapshot -> ENable FireEventFlashing";
+        DEBUG_LOG(m_logger) << Q_FUNC_INFO << " Snapshot -> ENable FireEventFlashing";
         if (!enableFireEventFlash(true))
-          WARNING_LOG() << Q_FUNC_INFO << " Cannot enableFireEventFlashing at Situation Map";
+          WARNING_LOG(m_logger) << Q_FUNC_INFO << " Cannot enableFireEventFlashing at Situation Map";
       }
 
       
@@ -2792,7 +2792,7 @@ void ScriptDialog::slotPause()
   if (m_sitMapSession->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(sitMapIfc))
     sitMapIfc->enableFireEventFlashing(false);
   else
-    WARNING_LOG() << "Cannot update sit map fire event flashing";
+    WARNING_LOG(m_logger) << "Cannot update sit map fire event flashing";
 }
 
 
@@ -2847,7 +2847,7 @@ void ScriptDialog::stop(bool ended, bool ignoreFireEventFlashing)
     if (m_sitMapSession->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(sitMapIfc))
       sitMapIfc->enableFireEventFlashing(true);
     else
-      WARNING_LOG() << "Cannot update sit map fire event flashing";
+      WARNING_LOG(m_logger) << "Cannot update sit map fire event flashing";
   }
 }
 
@@ -2866,7 +2866,7 @@ void ScriptDialog::pausePlayingTopics()
   {
     if (playingTopic->topicReplayIfc != nullptr)
     {
-      DEBUG_LOG() << "Pause topic: " << playingTopic->topicTypeName;
+      DEBUG_LOG(m_logger) << "Pause topic: " << playingTopic->topicTypeName;
       playingTopic->topicReplayIfc->playbackPause();
 
       QString status = tr("Currently paused topic '%1' %2")
@@ -2875,7 +2875,7 @@ void ScriptDialog::pausePlayingTopics()
       m_ui->lwStatus->addItem(status);
     }
     else
-      DEBUG_LOG() << "Topic not paused: " << playingTopic->topicTypeName;
+      DEBUG_LOG(m_logger) << "Topic not paused: " << playingTopic->topicTypeName;
   }
 }
 
@@ -2934,7 +2934,7 @@ void ScriptDialog::initProjectionWidget(Screen **pointerToWidgetPointer)
   {
     if (static_cast<QObject *>(*pointerToWidgetPointer) == sender())
       *pointerToWidgetPointer = nullptr; 
-    INFO_LOG() << "a projection windows was destroyed";
+    INFO_LOG(m_logger) << "a projection windows was destroyed";
   });
 
   *pointerToWidgetPointer = projWindow;
@@ -2951,7 +2951,7 @@ void ScriptDialog::fillTopicVector()
 
   for (const LtsScriptTimeline::TrackEntry *trackEntry : std::as_const(m_topicVector))
   {
-    DEBUG_LOG() << "m_topicVector index=" << trackEntry->index
+    DEBUG_LOG(m_logger) << "m_topicVector index=" << trackEntry->index
                         << " topicId=" << trackEntry->m_topicId
                         << " type=" << trackEntry->m_type;
     
@@ -2975,7 +2975,7 @@ void ScriptDialog::fillTopicVector()
   for (const FilterTopic &filterTopic : std::as_const(m_filterTopicVector))
   {
     const LtsScriptTimeline::TrackEntry *trackEntry = filterTopic.filterTopic;
-    DEBUG_LOG() << "m_filterTopicVector mainTopicId=" <<  filterTopic.mainTopicId
+    DEBUG_LOG(m_logger) << "m_filterTopicVector mainTopicId=" <<  filterTopic.mainTopicId
                         << " index=" << trackEntry->index
                         << " topicId=" << trackEntry->m_topicId
                         << " type=" << trackEntry->m_type
@@ -3091,7 +3091,7 @@ void ScriptDialog::exportPresentationContent(const Core::FunctionReply &baseRepl
 
   if (contentList.size() < 1)
   {
-    ERROR_LOG() << "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;
   }
@@ -3106,7 +3106,7 @@ void ScriptDialog::exportPresentationContent(const Core::FunctionReply &baseRepl
 
       if (!topicStringToType(QString::fromStdString(content.presentationTopicType()), tet) || tet == TrackEntryType::INVALID)
       {
-        ERROR_LOG() << "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
@@ -3132,7 +3132,7 @@ void ScriptDialog::exportPresentationContent(const Core::FunctionReply &baseRepl
         eVSession()->baseLayout()->focusTab(pBaseGuiIfc->menuGroup(), QStringLiteral("bdvShowBdv"), LtsWidgets::LayoutArea::eMainTab);
     }
     else
-      ERROR_LOG() << "Fetching ForeignGuiInterface of BuildingViewer failed!";
+      ERROR_LOG(m_logger) << "Fetching ForeignGuiInterface of BuildingViewer failed!";
   }
 
 
@@ -3244,7 +3244,7 @@ void ScriptDialog::slotLoadScript()
     std::shared_ptr<OperatorManagement::Interface::Dtc> opmDtc;
     if (!m_exerciseSession->getDtc<OperatorManagement::DataInterface>(opmDtc))
     {
-      ERROR_LOG() << "opm dtc missing for script chooser ...";
+      ERROR_LOG(m_logger) << "opm dtc missing for script chooser ...";
       return;
     }
 
@@ -3297,7 +3297,7 @@ void ScriptDialog::slotExportScript()
     return;
 
   QString exportPath = TakeHomePackageGenerator::ExportProcess::exportPath(m_exerciseSession->exerciseId()) + QString::number(m_scriptId);
-  DEBUG_LOG() << "exportPath: " << exportPath;
+  DEBUG_LOG(m_logger) << "exportPath: " << exportPath;
 
   QDir dir(exportPath);
   if (!dir.exists())
@@ -3315,7 +3315,7 @@ void ScriptDialog::slotExportScript()
 
   if (dir.exists() && !dir.isEmpty())
   {
-    INFO_LOG() << "slotExportScript: dir.exists() && !dir.isEmpty()" ;
+    INFO_LOG(m_logger) << "slotExportScript: dir.exists() && !dir.isEmpty()" ;
     LtsWidgets::Button button = LtsWidgets::LtsMessageDialog::showMessage(this,
                                                                           tr("Specified folder already exists and is not empty. Do you want to overwrite this folder?"),
                                                                           tr("Information: %1").arg(dir.absolutePath()),
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_dialog.h
index 492585b12..01a533301 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_dialog.h
@@ -226,7 +226,7 @@ private:
 
     if (!m_exerciseSession->interfaceFromGui<TopicEditorInterface>(topicEditorIfc))
     {
-      ERROR_LOG() << "getTopicEditorIfc failed: Cannot add topic type "
+      ERROR_LOG(m_logger) << "getTopicEditorIfc failed: Cannot add topic type "
                           << LtsScriptTimeline::trackEntryTypeName(trackEntryType)
                           << " because topic editor ifc is missing.";
       return nullptr;
@@ -243,7 +243,7 @@ private:
 
     if (!m_replaySession->interfaceFromGui<TopicReplayInterface>(topicReplayFactory))
     {
-      ERROR_LOG() << "getTopicIfcFactory failed: Cannot add topic type "
+      ERROR_LOG(m_logger) << "getTopicIfcFactory failed: Cannot add topic type "
                           << LtsScriptTimeline::trackEntryTypeName(trackEntryType)
                           << " because topic ifc factory is missing.";
       return nullptr;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_journal_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_journal_dialog.h
index 9c34f0b01..b89db692e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_journal_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_journal_dialog.h
@@ -27,6 +27,8 @@ public:
   void retranslate() override final;
 
 private:
+
+NGL::INGLLogger &m_logger;
   void fillJournal();
 
 private slots:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_recorder.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_recorder.cpp
index 1973bce33..8757aa482 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_recorder.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_recorder.cpp
@@ -17,7 +17,7 @@ ScreenRecorder::ScreenRecorder(QObject *parent)
   : QObject(parent)
   , m_logger(getLogger(QStringLiteral("ScreenRecorder")))
 {
-  connect(this, &ScreenRecorder::newTime, this, [this](qint64 _t1){ DEBUG_LOG() << "newTime: " << _t1; });
+  connect(this, &ScreenRecorder::newTime, this, [this](qint64 _t1){ DEBUG_LOG(m_logger) << "newTime: " << _t1; });
 }
 
 
@@ -34,7 +34,7 @@ void ScreenRecorder::cut()
     }
     catch (const QString &msg)
     {
-      ERROR_LOG() << "Cutting recording of topic '" << tr->topicName() << "', id: " << tr->topicId() << " failed! " << msg;
+      ERROR_LOG(m_logger) << "Cutting recording of topic '" << tr->topicName() << "', id: " << tr->topicId() << " failed! " << msg;
       m_failedExportTopicIds += tr->topicId();
     }
   }
@@ -54,7 +54,7 @@ void ScreenRecorder::save(const QString &tmpDirPath)
     }
     catch (const QString &msg)
     {
-      ERROR_LOG() << "Saving recording of topic '" << tr->topicName() << "', id: " << tr->topicId() << " failed! " << msg;
+      ERROR_LOG(m_logger) << "Saving recording of topic '" << tr->topicName() << "', id: " << tr->topicId() << " failed! " << msg;
       m_failedExportTopicIds += tr->topicId();
     }
   }
@@ -81,14 +81,14 @@ void ScreenRecorder::addTopicsForScreen(Screen *screen, const std::vector<TopicI
     connect(topicRecorder, &TopicRecorder::exportFailed, this, [this, id]() { emit topicExportFailed(id); });
     connect(topicRecorder, &TopicRecorder::exportFailed, this, [this, name, id]()
     {
-      ERROR_LOG() << "Export failed for topic '" << name << "', id: " << id;
+      ERROR_LOG(m_logger) << "Export failed for topic '" << name << "', id: " << id;
       m_failedExportTopicIds += id;
     });
 
     m_topicRecorder.append(topicRecorder);
   }
 
-  DEBUG_LOG() << "Added " << topicItems.size() << " TopicRecorder.";
+  DEBUG_LOG(m_logger) << "Added " << topicItems.size() << " TopicRecorder.";
 }
 
 
@@ -117,7 +117,7 @@ void ScreenRecorder::setCurrentTime(qint64 currentTime)
 
 void ScreenRecorder::clear()
 {
-  DEBUG_LOG() << "Clearing TopicRecorder.";
+  DEBUG_LOG(m_logger) << "Clearing TopicRecorder.";
 
   for (TopicRecorder *currentTopicRecorder : std::as_const(m_topicRecorder))
   {
@@ -130,12 +130,12 @@ void ScreenRecorder::clear()
 
 void ScreenRecorder::waitForFinishedRecording()
 {
-  DEBUG_LOG() << "Waiting for TopicRecorder to finish ...";
+  DEBUG_LOG(m_logger) << "Waiting for TopicRecorder to finish ...";
 
   for (TopicRecorder *currentTopicRecorder : std::as_const(m_topicRecorder))
     currentTopicRecorder->waitForFinishedRecording();
 
-  DEBUG_LOG() << "... all TopicRecorder finished.";
+  DEBUG_LOG(m_logger) << "... all TopicRecorder finished.";
 }
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_recorder.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_recorder.h
index f7006f1de..c83f51716 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_recorder.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_recorder.h
@@ -49,6 +49,8 @@ signals:
   void cancel();
 
 private: 
+
+NGL::INGLLogger &m_logger;
   QVector<TopicRecorder *> m_topicRecorder;
   QSet<int> m_failedExportTopicIds;
 }; 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_shotter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_shotter.cpp
index 8d501c43b..40dd579df 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_shotter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_shotter.cpp
@@ -33,7 +33,7 @@ void ScreenShotter::addTopicsForScreen(Screen *screen, const std::vector<TopicIt
     const double topicY = currentTopicItem.topicData().y;
     const double topicW = currentTopicItem.topicData().w;
     const double topicH = currentTopicItem.topicData().h;
-    ERROR_LOG() << "ScreenShotter::addTopicsForScreen: x: " << topicX << ", y: " << topicY << ", w: " << topicW << ", h: " << topicH;
+    ERROR_LOG(m_logger) << "ScreenShotter::addTopicsForScreen: x: " << topicX << ", y: " << topicY << ", w: " << topicW << ", h: " << topicH;
     TopicShotter *topicShotter = new TopicShotter(id, name, screen, 0, startTime, stopTime, topicX, topicY,
                                                   topicW, topicH, (!currentTopicItem.parentChannel().isEmpty()),
                                                   currentTopicItem.description(), this);
@@ -42,14 +42,14 @@ void ScreenShotter::addTopicsForScreen(Screen *screen, const std::vector<TopicIt
     connect(topicShotter, &TopicShotter::exportFailed, this, [this, id]() { emit topicExportFailed(id); });
     connect(topicShotter, &TopicShotter::exportFailed, this, [this, name, id]()
     {
-      ERROR_LOG() << "Export failed for topic '" << name << "', id: " << id;
+      ERROR_LOG(m_logger) << "Export failed for topic '" << name << "', id: " << id;
       m_failedExportTopicIds += id;
     });
 
     m_topicShotter.append(topicShotter);
   }
 
-  DEBUG_LOG() << "Added " << topicItems.size() << " TopicShotter.";
+  DEBUG_LOG(m_logger) << "Added " << topicItems.size() << " TopicShotter.";
 }
 
 void ScreenShotter::saveRecordings(const QString &tmpDirPath)
@@ -65,7 +65,7 @@ void ScreenShotter::saveRecordings(const QString &tmpDirPath)
     }
     catch (const QString &msg)
     {
-      ERROR_LOG() << "Saving screenshot of topic '" << tr->topicName() << "', id: " << tr->topicId() << " failed! " << msg;
+      ERROR_LOG(m_logger) << "Saving screenshot of topic '" << tr->topicName() << "', id: " << tr->topicId() << " failed! " << msg;
       m_failedExportTopicIds += tr->topicId();
     }
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_shotter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_shotter.h
index b81ac23db..754f9a587 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_shotter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_shotter.h
@@ -36,6 +36,8 @@ signals:
   void topicExportFailed(const int failedTopicId);
 
 private: 
+
+NGL::INGLLogger &m_logger;
   QVector<TopicShotter *> m_topicShotter;
   QSet<int> m_failedExportTopicIds;
 }; 
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 2c0178592..e1358b256 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
@@ -147,7 +147,7 @@ ScriptTimelineDialog::ScriptTimelineDialog(const QString &menuGroup, QWidget *pa
 #endif
 
 #ifdef EXPORT_BDV_TOPIC_AS_JSON
-  WARNING_LOG() << "EXPORT_BDV_TOPIC_AS_JSON active!";
+  WARNING_LOG(m_logger) << "EXPORT_BDV_TOPIC_AS_JSON active!";
 #endif
 
   
@@ -264,7 +264,7 @@ void ScriptTimelineDialog::initInternal()
   }
   catch(const std::runtime_error &ex)
   {
-    ERROR_LOG() << "initInternal failed: " << ex.what();
+    ERROR_LOG(m_logger) << "initInternal failed: " << ex.what();
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("Scripts app could not be initialized."), tr("Initialization failed")); 
     emit m_session->signalClose();
     return;
@@ -455,8 +455,8 @@ bool ScriptTimelineDialog::import(const QVector<PresentationContent> &contents)
   {
     bRet = m_model->import(contents);
   }
-  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " failed: " << errMsg; }
-  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed"; }
+  catch (const QString &errMsg) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed: " << errMsg; }
+  catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed"; }
 
   if (!bRet)
     new LtsWidgets::LtsMessageDialogNew(this, tr("Script cannot be inserted at the given position."), tr("Import failed"));
@@ -475,7 +475,7 @@ void ScriptTimelineDialog::load()
   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() << "### ###Name: " << m_exerciseName;
+  DEBUG_LOG(m_logger) << "### ###Name: " << m_exerciseName;
   
   m_exerciseSession->baseLayout()->setCustomText(tr("Script: %1").arg(m_scriptName));
   QJsonObject savegame = m_exerciseSession->getSavegame();
@@ -622,7 +622,7 @@ bool ScriptTimelineDialog::apply()
       return false;
     }
 
-    ERROR_LOG() << "Creating a copy of script " << m_scriptId;
+    ERROR_LOG(m_logger) << "Creating a copy of script " << m_scriptId;
     m_scriptId = 0;
     name = tr("Copy of ") + name;
   }
@@ -643,7 +643,7 @@ bool ScriptTimelineDialog::apply()
     for (const int &topicItemId : std::as_const(mainTopicItemIds))
     {
       TopicItem &topicItem = m_model->topicItem(topicItemId);
-      DEBUG_LOG() << "Adding topic item: id=" << topicItem.id() << ", start=" << topicItem.startTime() / 1000
+      DEBUG_LOG(m_logger) << "Adding topic item: id=" << topicItem.id() << ", start=" << topicItem.startTime() / 1000
                           << ", duration=" << topicItem.duration() / 1000 << ", type=" << topicTypeString(topicItem.topicType())
                           << ", channel=" << topicItem.channel() << ", parentChannel=" << topicItem.parentChannel();
       content[i++] = m_model->topicItemPresentationContent(topicItemId);
@@ -651,13 +651,13 @@ bool ScriptTimelineDialog::apply()
   }
   catch (const QString &str)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " " << str;
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " " << str;
     new LtsWidgets::LtsMessageDialogNew(this, tr("Saving script failed. Please try again later."));
     return false;
   }
   catch (...)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " failed";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed";
     new LtsWidgets::LtsMessageDialogNew(this, tr("Saving script failed. Please try again later."));
     return false;
   }
@@ -714,7 +714,7 @@ void ScriptTimelineDialog::getReplaySession() noexcept(false)
   
   
 
-  ERROR_LOG() << "replayId: " << replayId;
+  ERROR_LOG(m_logger) << "replayId: " << replayId;
 
   bool found = false;
   Core::ReplayPartition rp;
@@ -742,7 +742,7 @@ void ScriptTimelineDialog::getReplaySession() noexcept(false)
     }
     catch (...)
     {
-      ERROR_LOG() << "[timeout] Failed to remove failed-to-start replay. domainId: " << m_session->domainId()
+      ERROR_LOG(m_logger) << "[timeout] Failed to remove failed-to-start replay. domainId: " << m_session->domainId()
                             << " - replay id: " << replayId
                             << " - url " << m_session->tcpConnectionUrl().toString();
     }
@@ -752,7 +752,7 @@ void ScriptTimelineDialog::getReplaySession() noexcept(false)
   if (!found)
   {
     throw std::runtime_error("replay timed out");
-    WARNING_LOG() << "[timeout] Error while trying to create a replay session: domainId: " << m_session->domainId()
+    WARNING_LOG(m_logger) << "[timeout] Error while trying to create a replay session: domainId: " << m_session->domainId()
                           << " - replay partition does not exist - replay id: " << replayId
                           << " - url " << m_session->tcpConnectionUrl().toString();
     rmPartFn();
@@ -789,7 +789,7 @@ void ScriptTimelineDialog::getReplaySession() noexcept(false)
   bool bResult = getTopics(resultList); 
   QString result(resultList.join(L("<br> - ")));
   if (bResult && !result.isEmpty())
-    WARNING_LOG() << "At least one optional widget & control interface failed to load: " << result;
+    WARNING_LOG(m_logger) << "At least one optional widget & control interface failed to load: " << result;
 
   if (!bResult)
   {
@@ -902,7 +902,7 @@ bool ScriptTimelineDialog::getTopic(TopicEditorBase::TopicType topicType,
   {
     if (!topicAssignment.topicEditorIfc->initTopicEditor())
     {
-      ERROR_LOG() << "Cannot add topic type " << typeName << " since 'initTopicEditor' failed";
+      ERROR_LOG(m_logger) << "Cannot add topic type " << typeName << " since 'initTopicEditor' failed";
       resultList.append(typeName);
       return false;
     }
@@ -995,7 +995,7 @@ void ScriptTimelineDialog::getPresentationContent()
   setUnchangeable(true);
   m_model->clear();
 
-  DEBUG_LOG() << "waiting for script content..";
+  DEBUG_LOG(m_logger) << "waiting for script content..";
 
   try
   {
@@ -1004,7 +1004,7 @@ void ScriptTimelineDialog::getPresentationContent()
   }
   catch(...)
   {
-    ERROR_LOG() << "Cannot retrieve PresentationContent for script with id = " << m_scriptId;
+    ERROR_LOG(m_logger) << "Cannot retrieve PresentationContent for script with id = " << m_scriptId;
     setUnchangeable(false);
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("Failed to load script. Please try again later."));
     return;
@@ -1120,22 +1120,22 @@ void ScriptTimelineDialog::getSitMapApp() noexcept(false)
       if (m_replaySession->getForeignGuiInterface<SituationMap::ScriptFilterForeignGuiInterface>(sitMapFilterGuiIfc))
       {
         sitMapFilterGuiIfc->setApplyFilter(applyFilter);
-        DEBUG_LOG() << "set sit map filter ifc's apply filter";
+        DEBUG_LOG(m_logger) << "set sit map filter ifc's apply filter";
       }
       else
-        WARNING_LOG() << "cannot set sit map filter ifc's apply filter - cannot find filter topic's ifc";
+        WARNING_LOG(m_logger) << "cannot set sit map filter ifc's apply filter - cannot find filter topic's ifc";
 
       std::shared_ptr<SituationReplay::ForeignGuiInterface> sitRepIfc; 
       if (m_replaySession->getForeignGuiInterface<SituationReplay::ForeignGuiInterface>(sitRepIfc))
       {
         sitRepIfc->setApplyFilter(applyFilter);
-        DEBUG_LOG() << "set sit replay ifc's apply filter";
+        DEBUG_LOG(m_logger) << "set sit replay ifc's apply filter";
       }
       else
-        WARNING_LOG() << "cannot set sit replay ifc's apply filter - cannot find filter topic's ifc";
+        WARNING_LOG(m_logger) << "cannot set sit replay ifc's apply filter - cannot find filter topic's ifc";
     }
     else
-      WARNING_LOG() << "cannot set sit map filter ifc's apply filter - cannot find map's flt ifc";
+      WARNING_LOG(m_logger) << "cannot set sit map filter ifc's apply filter - cannot find map's flt ifc";
   }
 
   
@@ -1201,7 +1201,7 @@ void ScriptTimelineDialog::getProjectionWidget(Screen **pointerToWidgetPointer,
     {
       if (static_cast<QObject *>(*pointerToWidgetPointer) == sender())
         *pointerToWidgetPointer = nullptr; 
-      INFO_LOG() << "a projection window was destroyed";
+      INFO_LOG(m_logger) << "a projection window was destroyed";
     });
     *pointerToWidgetPointer = screenPtr;
 
@@ -1210,7 +1210,7 @@ void ScriptTimelineDialog::getProjectionWidget(Screen **pointerToWidgetPointer,
     else
     {
       if (!LtsMultiMonitor::LtsMultiMonitor::getInstance()->putScreenAutomatically(screenPtr))
-        ERROR_LOG() << "Could not place screen automatically!";
+        ERROR_LOG(m_logger) << "Could not place screen automatically!";
     }
   }, Qt::QueuedConnection);
 }
@@ -1223,7 +1223,7 @@ bool ScriptTimelineDialog::enableFireEventFlash(bool enable)
   if (m_sitMapSession->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(sitMapIfc))
     success = sitMapIfc->enableFireEventFlashing(enable);
   else
-    WARNING_LOG() << Q_FUNC_INFO << " Cannot execute enableFireEventFlashing with enable=" << enable;
+    WARNING_LOG(m_logger) << Q_FUNC_INFO << " Cannot execute enableFireEventFlashing with enable=" << enable;
   return success;
 }
 
@@ -1235,7 +1235,7 @@ void ScriptTimelineDialog::exportPresentationContent(const Core::FunctionReply &
 
   if (contentList.size() < 1)
   {
-    ERROR_LOG() << "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;
   }
@@ -1248,7 +1248,7 @@ void ScriptTimelineDialog::exportPresentationContent(const Core::FunctionReply &
       TopicEditorBase::TopicType topicType = TopicEditorBase::topicTypeFromString(QString::fromStdString(content.presentationTopicType()));
       if (topicType == TopicEditorBase::TopicType::Invalid)
       {
-        ERROR_LOG() << "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
@@ -1274,7 +1274,7 @@ void ScriptTimelineDialog::exportPresentationContent(const Core::FunctionReply &
         essentialsViewSession()->baseLayout()->focusTab(pBaseGuiIfc->menuGroup(), L("bdvShowBdv"), LtsWidgets::LayoutArea::eMainTab);
     }
     else
-      ERROR_LOG() << "Fetching ForeignGuiInterface of BuildingViewer failed!";
+      ERROR_LOG(m_logger) << "Fetching ForeignGuiInterface of BuildingViewer failed!";
   }
 
   QProgressDialog *pProgressDlg = new QProgressDialog(tr("Export in progress..."), tr("Cancel"), 0, 0, this);
@@ -1328,7 +1328,7 @@ void ScriptTimelineDialog::startEssentialsViewStage2(const Core::ReplayPartition
     }
     catch (...)
     {
-      ERROR_LOG() << "[timeout] Failed to remove failed-to-start replay. domainId: " << m_session->domainId()
+      ERROR_LOG(m_logger) << "[timeout] Failed to remove failed-to-start replay. domainId: " << m_session->domainId()
                             << " - replay id: " << replay.id()
                             << " - url " << m_session->tcpConnectionUrl().toString();
     }
@@ -1361,7 +1361,7 @@ void ScriptTimelineDialog::startEssentialsViewStage2(const Core::ReplayPartition
     m_essentialsViewSession = m_essentialsViewApp->getSession(params.partitionType, params.partitionId);
     if (m_essentialsViewSession == nullptr)
     {
-      WARNING_LOG() << "no session for m_essentialsViewSession";
+      WARNING_LOG(m_logger) << "no session for m_essentialsViewSession";
       LtsWidgets::LtsMessageDialog::showMessage(this, tr("Essentials View was not properly initialized"), tr("Essentials View Session"));
       m_essentialsViewApp->deleteLater();
       m_essentialsViewApp = nullptr;
@@ -1391,10 +1391,10 @@ void ScriptTimelineDialog::startEssentialsViewStage2(const Core::ReplayPartition
           connect(m_essentialsViewSession, &LtsSession::LtsSession::destroyed, applyFilterPtr, [applyFilter]() { delete applyFilter; });
 
           sitMapFilterIfc->setApplyFilter(applyFilter);
-          DEBUG_LOG() << "set filter topic editor's flt ifc to essentials view's flt ifc";
+          DEBUG_LOG(m_logger) << "set filter topic editor's flt ifc to essentials view's flt ifc";
         }
         else
-          WARNING_LOG() << "cannot set filter topic editor's flt ifc to essentials view's flt ifc - cannot find topic editor";
+          WARNING_LOG(m_logger) << "cannot set filter topic editor's flt ifc to essentials view's flt ifc - cannot find topic editor";
 
         
         std::shared_ptr<SituationReplay::ForeignGuiInterface> srpIfc; 
@@ -1408,14 +1408,14 @@ void ScriptTimelineDialog::startEssentialsViewStage2(const Core::ReplayPartition
           connect(m_essentialsViewSession, &LtsSession::LtsSession::destroyed, applyFilterPtr, [applyFilter]() { delete applyFilter; });
 
           srpIfc->setApplyFilter(applyFilter);
-          DEBUG_LOG() << "set srp topic editor's flt ifc to essentials view's flt ifc";
+          DEBUG_LOG(m_logger) << "set srp topic editor's flt ifc to essentials view's flt ifc";
         }
         else
-          WARNING_LOG() << "cannot set srp topic editor's flt ifc to essentials view's flt ifc - cannot find topic editor";
+          WARNING_LOG(m_logger) << "cannot set srp topic editor's flt ifc to essentials view's flt ifc - cannot find topic editor";
 
       }
       else
-        WARNING_LOG() << "cannot set filter topic editor's flt ifc to essentials view's flt ifc - cannot find essentials view's flt ifc";
+        WARNING_LOG(m_logger) << "cannot set filter topic editor's flt ifc to essentials view's flt ifc - cannot find essentials view's flt ifc";
     }
 
     {
@@ -1433,13 +1433,13 @@ void ScriptTimelineDialog::startEssentialsViewStage2(const Core::ReplayPartition
             sitMapFilterGuiIfc->setSitMapGuiIfc(nullptr);
           });
 
-          DEBUG_LOG() << "set sit map filter gui ifc's sit map gui ifc to essential view's sit map gui ifc";
+          DEBUG_LOG(m_logger) << "set sit map filter gui ifc's sit map gui ifc to essential view's sit map gui ifc";
         }
         else
-          WARNING_LOG() << "unable to initialize situation map filter gui plugin - sit map filter gui ifc";
+          WARNING_LOG(m_logger) << "unable to initialize situation map filter gui plugin - sit map filter gui ifc";
       }
       else
-        WARNING_LOG() << "unable to initialize situation map filter gui plugin - sit map gui ifc missing!";
+        WARNING_LOG(m_logger) << "unable to initialize situation map filter gui plugin - sit map gui ifc missing!";
     }
 
     
@@ -1453,13 +1453,13 @@ void ScriptTimelineDialog::startEssentialsViewStage2(const Core::ReplayPartition
         thisSrpGuiIfc->setEssentialsViewInterfaces(m_essentialsViewsSrpIfc.get(), m_essentialsViewsSitMapIfc.get());
         connect(m_essentialsViewSession, &LtsSession::LtsSession::destroyed, this, [thisSrpGuiIfc]() { thisSrpGuiIfc->setEssentialsViewInterfaces(nullptr, nullptr); });
         connect(m_essentialsViewSession, &LtsSession::LtsSession::signalClose, this, [this]() { m_essentialsViewsSrpIfc = nullptr; m_essentialsViewsSitMapIfc = nullptr; });
-        DEBUG_LOG() << "set srp gui ifc's srp gui ifc to essential view's srp gui ifc";
+        DEBUG_LOG(m_logger) << "set srp gui ifc's srp gui ifc to essential view's srp gui ifc";
       }
       else
-        WARNING_LOG() << "unable to initialize srp gui plugin - this srp gui ifc missing!";
+        WARNING_LOG(m_logger) << "unable to initialize srp gui plugin - this srp gui ifc missing!";
     }
     else
-      WARNING_LOG() << "unable to initialize srp gui plugin - essentials view's srp / sitmap ifc missing!";
+      WARNING_LOG(m_logger) << "unable to initialize srp gui plugin - essentials view's srp / sitmap ifc missing!";
 
     
     std::shared_ptr<PlanOverlaysPlugin::ForeignGuiInterface> thisPlanOverlayGuiIfc;
@@ -1470,33 +1470,33 @@ void ScriptTimelineDialog::startEssentialsViewStage2(const Core::ReplayPartition
       {
         thisPlanOverlayGuiIfc->setForeignPlanOverlaysGuiIfc(essentialsViewPlanOverlaysGuiIfc.get());
         connect(m_essentialsViewSession, &LtsSession::LtsSession::destroyed, this, [thisPlanOverlayGuiIfc]() { thisPlanOverlayGuiIfc->setForeignPlanOverlaysGuiIfc(nullptr); });
-        WARNING_LOG() << "set this plan overlay's own gui ifc to essential view's plan overlays gui ifc";
+        WARNING_LOG(m_logger) << "set this plan overlay's own gui ifc to essential view's plan overlays gui ifc";
       }
       else
-        WARNING_LOG() << "unable to initialize plan overlays gui plugin - essential view's plan overlays gui ifc missing!";
+        WARNING_LOG(m_logger) << "unable to initialize plan overlays gui plugin - essential view's plan overlays gui ifc missing!";
 
       std::shared_ptr<SituationMap::ForeignGuiInterface> essentialsViewSitMapGuiIfc;
       if (m_essentialsViewSession->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(essentialsViewSitMapGuiIfc))
       {
         thisPlanOverlayGuiIfc->setForeignSitMapGuiIfc(essentialsViewSitMapGuiIfc.get());
         connect(m_essentialsViewSession, &LtsSession::LtsSession::destroyed, this, [thisPlanOverlayGuiIfc]() { thisPlanOverlayGuiIfc->setForeignSitMapGuiIfc(nullptr); });
-        DEBUG_LOG() << "set this plan overlay's sitMap gui ifc to essential view's sitMap gui ifc";
+        DEBUG_LOG(m_logger) << "set this plan overlay's sitMap gui ifc to essential view's sitMap gui ifc";
       }
       else
-        WARNING_LOG() << "unable to initialize sitMap gui plugin - essential view's sitMap gui ifc missing!";
+        WARNING_LOG(m_logger) << "unable to initialize sitMap gui plugin - essential view's sitMap gui ifc missing!";
     }
     else
-      WARNING_LOG() << "unable to initialize plan overlay gui plugin - this plan overlay gui ifc missing!";
+      WARNING_LOG(m_logger) << "unable to initialize plan overlay gui plugin - this plan overlay gui ifc missing!";
 
     
     std::shared_ptr<BuildingViewer::ForeignGuiInterface> bgvIfc;
     if (m_essentialsViewSession->getForeignGuiInterface<BuildingViewer::ForeignGuiInterface>(bgvIfc))
     {
       bgvIfc->initTopicEditor();
-      DEBUG_LOG() << "set bgv gui ifc's session";
+      DEBUG_LOG(m_logger) << "set bgv gui ifc's session";
     }
     else
-      WARNING_LOG() << "unable to set bgv gui ifc's session - essentials view's bgv ifc missing!";
+      WARNING_LOG(m_logger) << "unable to set bgv gui ifc's session - essentials view's bgv ifc missing!";
 
     if (openTopicEditor)
     {
@@ -1547,7 +1547,7 @@ TopicEditorBase::TopicEditor *ScriptTimelineDialog::createTopicEditor(const Topi
 
   if (it == m_topicAssignments.cend())
   {
-    ERROR_LOG() << "no topic assignment for topic with type = " << topicTypeString(data.topicType);
+    ERROR_LOG(m_logger) << "no topic assignment for topic with type = " << topicTypeString(data.topicType);
     return nullptr;
   }
 
@@ -1635,7 +1635,7 @@ Screen *ScriptTimelineDialog::getProjectionWidget(const ProjectionWidget &projec
 
 ScriptTimelineDialog::ProjectionWidget ScriptTimelineDialog::identifyProjectionWidget(const TopicItem &topicItem) const
 {
-  DEBUG_LOG() << "identifyProjectionWidget: channel name: " << topicItem.channel()
+  DEBUG_LOG(m_logger) << "identifyProjectionWidget: channel name: " << topicItem.channel()
                       << ", filter parent channel name: " << topicItem.parentChannel();
 
   if (topicItem.channel() == L("Screen 2"))
@@ -1693,7 +1693,7 @@ void ScriptTimelineDialog::addReplayWidget(int topicItemId, QWidget *replayWidge
       break;
 
     case ProjectionWidget::Unknown:
-      ERROR_LOG() << "projection widget unknown - cannot add replay widget";
+      ERROR_LOG(m_logger) << "projection widget unknown - cannot add replay widget";
       return;
     }
 
@@ -1701,7 +1701,7 @@ void ScriptTimelineDialog::addReplayWidget(int topicItemId, QWidget *replayWidge
   }
   catch (...)
   {
-    ERROR_LOG() << "unknown topic item with id = " << topicItemId;
+    ERROR_LOG(m_logger) << "unknown topic item with id = " << topicItemId;
   }
 }
 
@@ -1715,13 +1715,13 @@ void ScriptTimelineDialog::setReplayWidgetPosition(int topicItemId)
     QWidget *projectionWidgetPtr = getProjectionWidget(projectionWidgetType);
     if (projectionWidgetPtr == nullptr)
     {
-      ERROR_LOG() << "screen for topic item with id = " << topicItemId << " not found";
+      ERROR_LOG(m_logger) << "screen for topic item with id = " << topicItemId << " not found";
       return;
     }
 
     int projectionWidth = projectionWidgetPtr->width();
     int projectionHeight = projectionWidgetPtr->height();
-    DEBUG_LOG() << "projection: width = " << projectionWidth << ", height = " << projectionHeight;
+    DEBUG_LOG(m_logger) << "projection: width = " << projectionWidth << ", height = " << projectionHeight;
     const TopicEditorBase::TopicData &data = topicItem.topicData();
     int x = 0;
     int y = 0;
@@ -1740,7 +1740,7 @@ void ScriptTimelineDialog::setReplayWidgetPosition(int topicItemId)
     QWidget *replayWidget = topicItem.replayWidget();
     if (replayWidget == nullptr)
     {
-      WARNING_LOG() << "no replay widget for topic item with id = " << topicItemId;
+      WARNING_LOG(m_logger) << "no replay widget for topic item with id = " << topicItemId;
       return;
     }
 
@@ -1749,7 +1749,7 @@ void ScriptTimelineDialog::setReplayWidgetPosition(int topicItemId)
         (data.x <  0.00000 || data.w <  0.00001 || data.y <  0.00000 || data.h <  0.00001)) 
     {
       replayWidget->setGeometry(x, y, projectionWidth, projectionHeight);
-      WARNING_LOG() << "set geo of replay widget !! #1 x" << x << "y" << y;
+      WARNING_LOG(m_logger) << "set geo of replay widget !! #1 x" << x << "y" << y;
     }
     else
     {
@@ -1762,14 +1762,14 @@ void ScriptTimelineDialog::setReplayWidgetPosition(int topicItemId)
       {
         double oldW = dataW;
         dataW = 1.0 - dataX - 0.001;
-        ERROR_LOG() << "############## oldW = " << oldW << ", newW = " << dataW;
+        ERROR_LOG(m_logger) << "############## oldW = " << oldW << ", newW = " << dataW;
       }
 
       if ((dataY + dataH) > 1.0)
       {
         double oldH = dataH;
         dataH = 1.0 - dataY - 0.001;
-        ERROR_LOG() << "############## oldH = " << oldH << ", newH = " << dataH;
+        ERROR_LOG(m_logger) << "############## oldH = " << oldH << ", newH = " << dataH;
       }
 
       double projectionX = projectionWidth; projectionX *= dataX;
@@ -1780,13 +1780,13 @@ void ScriptTimelineDialog::setReplayWidgetPosition(int topicItemId)
       replayWidget->setGeometry(x + qRound(projectionX), y + qRound(projectionY), qRound(projectionW), qRound(projectionH));
     }
 
-    DEBUG_LOG() << "final widget geo: " << replayWidget->geometry().x() << ", " << replayWidget->geometry().y()
+    DEBUG_LOG(m_logger) << "final widget geo: " << replayWidget->geometry().x() << ", " << replayWidget->geometry().y()
                         << ", " << replayWidget->geometry().width() << ", " << replayWidget->geometry().height();
     replayWidget->show();
   }
   catch (...)
   {
-    ERROR_LOG() << "unknown topic item with id = " << topicItemId;
+    ERROR_LOG(m_logger) << "unknown topic item with id = " << topicItemId;
   }
 }
 
@@ -1803,7 +1803,7 @@ void ScriptTimelineDialog::setReplayWidgetFreestanding(int topicItemId, bool fre
     QWidget *projectionWidgetPtr = getProjectionWidget(identifyProjectionWidget(topicItem));
     if (projectionWidgetPtr == nullptr)
     {
-      ERROR_LOG() << "screen for topic #" << topicItemId << " not found";
+      ERROR_LOG(m_logger) << "screen for topic #" << topicItemId << " not found";
       return;
     }
 
@@ -1829,7 +1829,7 @@ void ScriptTimelineDialog::setReplayWidgetFreestanding(int topicItemId, bool fre
   }
   catch (...)
   {
-    ERROR_LOG() << "unknown topic item with id = " << topicItemId;
+    ERROR_LOG(m_logger) << "unknown topic item with id = " << topicItemId;
   }
 }
 
@@ -1870,7 +1870,7 @@ bool ScriptTimelineDialog::isScreenFreestanding(const ProjectionWidget &projecti
     return m_isTopicsScreen2Freestanding;
   case ProjectionWidget::Unknown:
   default:
-    ERROR_LOG() << "projection widget unknown";
+    ERROR_LOG(m_logger) << "projection widget unknown";
     return false;
   }
   Q_UNREACHABLE();
@@ -1893,7 +1893,7 @@ void ScriptTimelineDialog::setProjectionWidgetFreestanding(bool freestanding, co
     break;
 
   case ProjectionWidget::Unknown:
-    ERROR_LOG() << "trying to set freestanding with unknown projection widget - cannot set freestanding";
+    ERROR_LOG(m_logger) << "trying to set freestanding with unknown projection widget - cannot set freestanding";
     return;
   }
   try
@@ -1907,7 +1907,7 @@ void ScriptTimelineDialog::setProjectionWidgetFreestanding(bool freestanding, co
   }
   catch (...)
   {
-    ERROR_LOG() << "search over topic items failed";
+    ERROR_LOG(m_logger) << "search over topic items failed";
   }
 }
 
@@ -1962,7 +1962,7 @@ void ScriptTimelineDialog::avsVisibilityHack(QWidget *parentForScreen, bool visi
 
     m_currentTopicDesigner->setParent(widget);
     m_currentTopicDesigner->show();
-    DEBUG_LOG() << "made freestanding";
+    DEBUG_LOG(m_logger) << "made freestanding";
   }
 }
 
@@ -2056,8 +2056,8 @@ void ScriptTimelineDialog::openContextMenu(QPoint pos, int topicItemId)
         {
           m_model->cutToClipboard(topicItemIds);
         }
-        catch (const QString &str) { ERROR_LOG() << str; }
-        catch (...) { ERROR_LOG() << "cutToClipboard failed"; }
+        catch (const QString &str) { ERROR_LOG(m_logger) << str; }
+        catch (...) { ERROR_LOG(m_logger) << "cutToClipboard failed"; }
       }
     });
     contextMenu->addAction(action);
@@ -2080,8 +2080,8 @@ void ScriptTimelineDialog::openContextMenu(QPoint pos, int topicItemId)
         {
           m_model->copyToClipboard(topicItemIds);
         }
-        catch (const QString &str) { ERROR_LOG() << str; }
-        catch (...) { ERROR_LOG() << "copyToClipboard failed"; }
+        catch (const QString &str) { ERROR_LOG(m_logger) << str; }
+        catch (...) { ERROR_LOG(m_logger) << "copyToClipboard failed"; }
       }
     });
     contextMenu->addAction(action);
@@ -2101,8 +2101,8 @@ void ScriptTimelineDialog::openContextMenu(QPoint pos, int topicItemId)
       {
         m_model->pasteFromClipboard(m_ui->timeline->view()->toTime(pos.x()));
       }
-      catch (const QString &str) { ERROR_LOG() << str; }
-      catch (...) { ERROR_LOG() << "pasteFromClipboard failed"; }
+      catch (const QString &str) { ERROR_LOG(m_logger) << str; }
+      catch (...) { ERROR_LOG(m_logger) << "pasteFromClipboard failed"; }
     });
     contextMenu->addAction(action);
   }
@@ -2133,8 +2133,8 @@ void ScriptTimelineDialog::setTopicDescription(int topicItemId)
       slotChangesMade();
     }
   }
-  catch (const QString &str) { ERROR_LOG() << Q_FUNC_INFO << " " << str; }
-  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed for item with id = " << topicItemId; }
+  catch (const QString &str) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " " << str; }
+  catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed for item with id = " << topicItemId; }
 }
 
 
@@ -2159,8 +2159,8 @@ void ScriptTimelineDialog::enableTopicEditors(bool enable)
 
       topicEditor->setEnabled(enable);
     }
-    catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " failed for item with id = " << itemId << ": " << errMsg; }
-    catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed for item with id = " << itemId; }
+    catch (const QString &errMsg) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed for item with id = " << itemId << ": " << errMsg; }
+    catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed for item with id = " << itemId; }
   }
 }
 
@@ -2237,47 +2237,47 @@ void ScriptTimelineDialog::playTopic(int topicItemId)
 
     if (!topicItem.replayInterface())
     {
-      WARNING_LOG() << "no replay interface for topic of type = " << topicTypeString(topicItem.topicType());
+      WARNING_LOG(m_logger) << "no replay interface for topic of type = " << topicTypeString(topicItem.topicType());
       
       return;
     }
 
-    DEBUG_LOG() << Q_FUNC_INFO << " playing topic of type = " << topicTypeString(topicItem.topicType());
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " playing topic of type = " << topicTypeString(topicItem.topicType());
     if (topicItem.topicType() == TopicEditorBase::TopicType::SituationMap ||
         topicItem.topicType() == TopicEditorBase::TopicType::Situation) 
     {
-      DEBUG_LOG() << Q_FUNC_INFO << " addReplayWidget";
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " addReplayWidget";
       m_sitMapSession->baseLayout()->setAutoFillBackground(true); 
       addReplayWidget(topicItemId, m_sitMapSession->baseLayout());
 
       if (sitMapIfc || m_sitMapSession->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(sitMapIfc))
         sitMapIfc->forceUpdate();
       else
-        WARNING_LOG() << "Cannot force update on Situation Map - map might be stuck!";
+        WARNING_LOG(m_logger) << "Cannot force update on Situation Map - map might be stuck!";
 
       if (topicItem.topicType() == TopicEditorBase::TopicType::Situation)
       {
-        DEBUG_LOG() << Q_FUNC_INFO << " Situation -> ENable FireEventFlashing";
+        DEBUG_LOG(m_logger) << Q_FUNC_INFO << " Situation -> ENable FireEventFlashing";
         if (!enableFireEventFlash(true))
-          WARNING_LOG() << Q_FUNC_INFO << " Cannot enableFireEventFlashing at Situation Map";
+          WARNING_LOG(m_logger) << Q_FUNC_INFO << " Cannot enableFireEventFlashing at Situation Map";
       }
     }
     else 
     {
-      DEBUG_LOG() << Q_FUNC_INFO << " non-sitmap";
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " non-sitmap";
 
       
       if (topicItem.topicType() == TopicEditorBase::TopicType::Snapshot)
       {
-        DEBUG_LOG() << Q_FUNC_INFO << " disable FireEventFlashing";
+        DEBUG_LOG(m_logger) << Q_FUNC_INFO << " disable FireEventFlashing";
         if (!enableFireEventFlash(false))
-          WARNING_LOG() << Q_FUNC_INFO << " disableFireEventFlashing failed";
+          WARNING_LOG(m_logger) << Q_FUNC_INFO << " disableFireEventFlashing failed";
       }
       else if (topicItem.topicType() == TopicEditorBase::TopicType::SituationReplay)
       {
-        DEBUG_LOG() << Q_FUNC_INFO << " enable FireEventFlashing";
+        DEBUG_LOG(m_logger) << Q_FUNC_INFO << " enable FireEventFlashing";
         if (!enableFireEventFlash(true))
-          WARNING_LOG() << Q_FUNC_INFO << " enableFireEventFlashing failed";
+          WARNING_LOG(m_logger) << Q_FUNC_INFO << " enableFireEventFlashing failed";
       }
 
       bool isAvs = isUsingAvsWindow(topicItem.topicType());
@@ -2298,7 +2298,7 @@ void ScriptTimelineDialog::playTopic(int topicItemId)
       
       if (!isProjectionWidgetAvailable && !isFreeStandingHackActive && !isAudio && !isReplay)
       {
-        DEBUG_LOG() << Q_FUNC_INFO << " Can't use Projection Widget " << topicItem.description();
+        DEBUG_LOG(m_logger) << Q_FUNC_INFO << " Can't use Projection Widget " << topicItem.description();
         return;
       }
       if (!isAvs || (isAvs && !isAudio && isProjectionWidgetAvailable))
@@ -2307,7 +2307,7 @@ void ScriptTimelineDialog::playTopic(int topicItemId)
 
         if (!isAvs && isProjectionWidgetAvailable && !getProjectionWidget(projectionWidgetType)->isVisible() && !isFreeStandingHackActive )
         {
-          DEBUG_LOG() << Q_FUNC_INFO << " Can't Widget "<< topicItem.description();
+          DEBUG_LOG(m_logger) << Q_FUNC_INFO << " Can't Widget "<< topicItem.description();
           return;
         }
         replayWidget = topicItem.replayInterface()->createWidget();
@@ -2315,7 +2315,7 @@ void ScriptTimelineDialog::playTopic(int topicItemId)
 
       if (isAvs && !getProjectionWidget(projectionWidgetType)->isVisible() && !isFreeStandingHackActive )
       {
-        DEBUG_LOG() << Q_FUNC_INFO << " Can't get AVS Widget "<< topicItem.description();
+        DEBUG_LOG(m_logger) << Q_FUNC_INFO << " Can't get AVS Widget "<< topicItem.description();
         return;
       }
 
@@ -2334,13 +2334,13 @@ void ScriptTimelineDialog::playTopic(int topicItemId)
         }
       }
       else
-        WARNING_LOG() << "topic item with id = " << topicItemId << " has no widget to show on presentation screen" << " NAME: " << topicItem.description();
+        WARNING_LOG(m_logger) << "topic item with id = " << topicItemId << " has no widget to show on presentation screen" << " NAME: " << topicItem.description();
 
     }
     
     if (topicItem.properties().isEmpty())
     {
-      WARNING_LOG() << "topic item with id " << topicItemId << " has no JSON data";
+      WARNING_LOG(m_logger) << "topic item with id " << topicItemId << " has no JSON data";
       
       
     }
@@ -2353,7 +2353,7 @@ void ScriptTimelineDialog::playTopic(int topicItemId)
 
     if (!topicItem.replayInterface()->playbackInit(obj))
     {
-      WARNING_LOG() << "playbackInit of topic item with id = " << topicItemId << " failed";
+      WARNING_LOG(m_logger) << "playbackInit of topic item with id = " << topicItemId << " failed";
       
       return;
     }
@@ -2371,9 +2371,9 @@ void ScriptTimelineDialog::playTopic(int topicItemId)
       });
     }
 
-    DEBUG_LOG() << "playback starts at offset = " << positionTime() / 1000 - topicItem.startTime() / 1000;
+    DEBUG_LOG(m_logger) << "playback starts at offset = " << positionTime() / 1000 - topicItem.startTime() / 1000;
     if (!topicItem.replayInterface()->playbackStart(positionTime() / 1000 - topicItem.startTime() / 1000 ))
-      WARNING_LOG() << "playback of topic item with id = " << topicItemId << " failed";
+      WARNING_LOG(m_logger) << "playback of topic item with id = " << topicItemId << " failed";
     m_journal.journalList.append(
           new NextTopicJournal(
             positionTime() / 1000, topicItem.topicType() == TopicEditorBase::TopicType::Situation,
@@ -2383,7 +2383,7 @@ void ScriptTimelineDialog::playTopic(int topicItemId)
   }
   catch (...)
   {
-    ERROR_LOG() << "playback of topic item with id = " << topicItemId << " failed";
+    ERROR_LOG(m_logger) << "playback of topic item with id = " << topicItemId << " failed";
   }
 }
 
@@ -2398,10 +2398,10 @@ void ScriptTimelineDialog::pause()
       TopicItem &topicItem = m_model->topicItem(topicItemId);
       if (!topicItem.replayInterface())
       {
-        DEBUG_LOG() << "pausing topic item with id = " << topicItemId << " failed";
+        DEBUG_LOG(m_logger) << "pausing topic item with id = " << topicItemId << " failed";
         continue;
       }
-      DEBUG_LOG() << "pausing topic item with id = " << topicItemId;
+      DEBUG_LOG(m_logger) << "pausing topic item with id = " << topicItemId;
       topicItem.replayInterface()->playbackPause();
       QString status = tr("Currently paused topic '%1' %2").arg(
                          topicTypeTranslation(topicItem.topicType()), topicItem.description()
@@ -2410,7 +2410,7 @@ void ScriptTimelineDialog::pause()
     }
     catch (...)
     {
-      WARNING_LOG() << "pausing topic item with id = " << topicItemId << " failed";
+      WARNING_LOG(m_logger) << "pausing topic item with id = " << topicItemId << " failed";
     }
   }
   
@@ -2461,7 +2461,7 @@ void ScriptTimelineDialog::stop(bool ended, bool ignoreFireEventFlashing)
     if (m_sitMapSession->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(sitMapIfc))
       sitMapIfc->enableFireEventFlashing(true);
     else
-      WARNING_LOG() << "Cannot update sit map fire event flashing";
+      WARNING_LOG(m_logger) << "Cannot update sit map fire event flashing";
   }
   m_model->setEditable(true);
   enableTopicEditors(true);
@@ -2482,7 +2482,7 @@ qint64 ScriptTimelineDialog::previousTopicTime() const
       if (time < itemPtr->startTime() && itemPtr->startTime() < positionTime())
         time = itemPtr->startTime();
   }
-  catch (...) { WARNING_LOG() << "checking audio track for previous topic time failed"; }
+  catch (...) { WARNING_LOG(m_logger) << "checking audio track for previous topic time failed"; }
 
   try
   {
@@ -2490,7 +2490,7 @@ qint64 ScriptTimelineDialog::previousTopicTime() const
       if (time < itemPtr->startTime() && itemPtr->startTime() < positionTime())
         time = itemPtr->startTime();
   }
-  catch (...) { WARNING_LOG() << "checking replay track for previous topic time failed"; }
+  catch (...) { WARNING_LOG(m_logger) << "checking replay track for previous topic time failed"; }
 
   try
   {
@@ -2504,7 +2504,7 @@ qint64 ScriptTimelineDialog::previousTopicTime() const
           if (time < itemPtr->startTime() && itemPtr->startTime() < positionTime())
             time = itemPtr->startTime();
   }
-  catch (...) { WARNING_LOG() << "checking screen 1 track for previous topic time failed"; }
+  catch (...) { WARNING_LOG(m_logger) << "checking screen 1 track for previous topic time failed"; }
 
   try
   {
@@ -2518,7 +2518,7 @@ qint64 ScriptTimelineDialog::previousTopicTime() const
           if (time < itemPtr->startTime() && itemPtr->startTime() < positionTime())
             time = itemPtr->startTime();
   }
-  catch (...) { WARNING_LOG() << "checking screen 2 track for previous topic time failed"; }
+  catch (...) { WARNING_LOG(m_logger) << "checking screen 2 track for previous topic time failed"; }
 
   return time;
 }
@@ -2534,7 +2534,7 @@ qint64 ScriptTimelineDialog::nextTopicTime() const
       if (time > itemPtr->startTime() && itemPtr->startTime() > positionTime())
         time = itemPtr->startTime();
   }
-  catch (...) { WARNING_LOG() << "checking audio track for next topic time failed"; }
+  catch (...) { WARNING_LOG(m_logger) << "checking audio track for next topic time failed"; }
 
   try
   {
@@ -2542,7 +2542,7 @@ qint64 ScriptTimelineDialog::nextTopicTime() const
       if (time > itemPtr->startTime() && itemPtr->startTime() > positionTime())
         time = itemPtr->startTime();
   }
-  catch (...) { WARNING_LOG() << "checking replay track for next topic time failed"; }
+  catch (...) { WARNING_LOG(m_logger) << "checking replay track for next topic time failed"; }
 
   try
   {
@@ -2556,7 +2556,7 @@ qint64 ScriptTimelineDialog::nextTopicTime() const
           if (time > itemPtr->startTime() && itemPtr->startTime() > positionTime())
             time = itemPtr->startTime();
   }
-  catch (...) { WARNING_LOG() << "checking screen 1 track for next topic time failed"; }
+  catch (...) { WARNING_LOG(m_logger) << "checking screen 1 track for next topic time failed"; }
 
   try
   {
@@ -2570,7 +2570,7 @@ qint64 ScriptTimelineDialog::nextTopicTime() const
           if (time > itemPtr->startTime() && itemPtr->startTime() > positionTime())
             time = itemPtr->startTime();
   }
-  catch (...) { WARNING_LOG() << "checking screen 2 track for next topic time failed"; }
+  catch (...) { WARNING_LOG(m_logger) << "checking screen 2 track for next topic time failed"; }
 
   return time == LLONG_MAX ? -1 : time;
 }
@@ -2612,7 +2612,7 @@ void ScriptTimelineDialog::removeTopicItemFromPlaylist(int topicItemId)
   }
   catch (...)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " unknown topic item with id = " << topicItemId;
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " unknown topic item with id = " << topicItemId;
   }
 }
 
@@ -2662,7 +2662,7 @@ void ScriptTimelineDialog::onChangesWereMade()
     const TopicItem &topicItem = m_model->topicItem(m_currentTopicEditor->topicId());
     m_currentTopicEditor->setDuration(topicItem.duration());
   }
-  catch (...) { WARNING_LOG() << "update of length in topic editor failed for topic with id = " << m_currentTopicEditor->topicId(); }
+  catch (...) { WARNING_LOG(m_logger) << "update of length in topic editor failed for topic with id = " << m_currentTopicEditor->topicId(); }
 }
 
 
@@ -2706,7 +2706,7 @@ void ScriptTimelineDialog::onLoad()
   std::shared_ptr<OperatorManagement::Interface::Dtc> opmDtc;
   if (!m_exerciseSession->getDtc<OperatorManagement::DataInterface>(opmDtc))
   {
-    ERROR_LOG() << "opm dtc missing for script chooser ...";
+    ERROR_LOG(m_logger) << "opm dtc missing for script chooser ...";
     return;
   }
   ScriptChooser *scriptChooser = new ScriptChooser(m_dtc, m_ftc, opmDtc, false);
@@ -2747,7 +2747,7 @@ void ScriptTimelineDialog::onExport()
     return;
 
   const QString exportPath(TakeHomePackageGenerator::ExportProcess::exportPath(m_exerciseSession->exerciseId()) + QString::number(m_scriptId));
-  DEBUG_LOG() << "exportPath: " << exportPath;
+  DEBUG_LOG(m_logger) << "exportPath: " << exportPath;
 
   QDir dir(exportPath);
   if (!dir.exists())
@@ -2762,7 +2762,7 @@ void ScriptTimelineDialog::onExport()
 
   if (dir.exists() && !dir.isEmpty())
   {
-    INFO_LOG() << "onExportScript: dir.exists() && !dir.isEmpty()" ;
+    INFO_LOG(m_logger) << "onExportScript: dir.exists() && !dir.isEmpty()" ;
     LtsWidgets::Button button = LtsWidgets::LtsMessageDialog::showMessage(
                                   this, tr("Specified folder already exists and is not empty. Do you want to overwrite this folder?"),
                                   tr("Information: %1").arg(dir.absolutePath()), LtsWidgets::Behaviour::Modal,
@@ -2957,17 +2957,17 @@ void ScriptTimelineDialog::onExport2()
   catch (const ExportError &ee)
   {
     new LtsWidgets::LtsMessageDialogNew(this, ee.userMessage);
-    ERROR_LOG() << "Export failed: " << (ee.logMessage.isEmpty() ? ee.userMessage : ee.logMessage);
+    ERROR_LOG(m_logger) << "Export failed: " << (ee.logMessage.isEmpty() ? ee.userMessage : ee.logMessage);
   }
   catch (const std::exception &ex)
   {
     new LtsWidgets::LtsMessageDialogNew(this, defaultErrorMessage);
-    ERROR_LOG() << "Export failed: " << ex.what();
+    ERROR_LOG(m_logger) << "Export failed: " << ex.what();
   }
   catch (...)
   {
     new LtsWidgets::LtsMessageDialogNew(this, defaultErrorMessage);
-    ERROR_LOG() << "Export failed with unknown error!";
+    ERROR_LOG(m_logger) << "Export failed with unknown error!";
   }
 
   mmm->unfreezeMagicCorner(proj1ScreenId);
@@ -2999,7 +2999,7 @@ QSet<int> CoolExporter::go() noexcept(false)
   
   const int exId = m_this.m_exerciseSession->exerciseId();
   const int scriptIdPure = m_this.m_scriptId;
-  DEBUG_LOG() <<"CoolExporter::go(): exId: "<<m_this.m_exerciseSession->exerciseId()<<" exName: "<<m_this.m_exerciseName
+  DEBUG_LOG(m_logger) <<"CoolExporter::go(): exId: "<<m_this.m_exerciseSession->exerciseId()<<" exName: "<<m_this.m_exerciseName
            <<" scriptId: "<<m_this.scriptId()<<" scriptName: "<<m_this.m_scriptName;
   const QString scriptId(L("%1.%2").arg(exId).arg(scriptIdPure));
 
@@ -3031,7 +3031,7 @@ QSet<int> CoolExporter::go() noexcept(false)
 
 
   QTemporaryDir tmpDir; 
-  ERROR_LOG() << "##### tmpDir: " << tmpDir.path();
+  ERROR_LOG(m_logger) << "##### tmpDir: " << tmpDir.path();
   if (!tmpDir.isValid())
   {
     
@@ -3065,7 +3065,7 @@ QSet<int> CoolExporter::go() noexcept(false)
   if (!m_this.m_exerciseSession->getForeignGuiInterface<FileManagement::ForeignGuiInterface>(flmIfc))
   {
     
-    ERROR_LOG() << "File management interface missing! No file exports possible!";
+    ERROR_LOG(m_logger) << "File management interface missing! No file exports possible!";
   }
 
 
@@ -3098,7 +3098,7 @@ QSet<int> CoolExporter::go() noexcept(false)
       const int id = td.id;
       const QString &channelName = td.channel;
 
-      DEBUG_LOG() << "channel" << channelName << "start" << td.startTime
+      DEBUG_LOG(m_logger) << "channel" << channelName << "start" << td.startTime
                           << "props" << QString::fromUtf8(QJsonDocument(td.properties).toJson()) << "type" << (int)td.topicType;
 
       const QPair<int, int> thpChannelIdAndThpFilterId = findThpChannelIdAndThpFilterId(channelName); 
@@ -3230,7 +3230,7 @@ compiler_warning("TODO: percentage? 0-100?")
 
                   if (filename.isEmpty())
                   {
-                    WARNING_LOG() << L("Image topic with id %1 and file id %2 doesn't have a file name! Guessing extension jpg :(").arg(id).arg(fileId).toStdString();
+                    WARNING_LOG(m_logger) << L("Image topic with id %1 and file id %2 doesn't have a file name! Guessing extension jpg :(").arg(id).arg(fileId).toStdString();
                     return L("jpg");
                   }
 
@@ -3238,7 +3238,7 @@ compiler_warning("TODO: percentage? 0-100?")
 
                   if (filenameComponents.length() < 2)
                   {
-                    WARNING_LOG() << L("Image topic with id %1 and file id %2 doesn't have a file extension. Guessing extension jpg :(").arg(id).arg(fileId).toStdString();
+                    WARNING_LOG(m_logger) << L("Image topic with id %1 and file id %2 doesn't have a file extension. Guessing extension jpg :(").arg(id).arg(fileId).toStdString();
                     return L("jpg");
                   }
 
@@ -3294,7 +3294,7 @@ compiler_warning("TODO: percentage? 0-100?")
         }
       };
 
-      DEBUG_LOG() << "td id: " << id << ", desc: " << td.description << ", x: " << td.x << ", y: " << td.y;
+      DEBUG_LOG(m_logger) << "td id: " << id << ", desc: " << td.description << ", x: " << td.x << ", y: " << td.y;
 
       QMapIterator<QString, QJsonValue> it(specificTopicData);
       while (it.hasNext())
@@ -3310,7 +3310,7 @@ compiler_warning("TODO: percentage? 0-100?")
     catch (const std::exception &ex)
     {
       addFailedTopicId(topicItemId);
-      ERROR_LOG() << "Unable to export topic with id " << topicItemId << ": " << ex.what();
+      ERROR_LOG(m_logger) << "Unable to export topic with id " << topicItemId << ": " << ex.what();
     }
   }
 
@@ -3366,7 +3366,7 @@ compiler_warning("TODO: percentage? 0-100?")
     setStatusText(tr("Exporting pdf and image files"));
 
 
-    DEBUG_LOG() << "topicItemIdsToExportFile count " << topicItemIdsToExportFile.count();
+    DEBUG_LOG(m_logger) << "topicItemIdsToExportFile count " << topicItemIdsToExportFile.count();
 
     
     for (const ExportFileInfo &efi : topicItemIdsToExportFile)
@@ -3374,7 +3374,7 @@ compiler_warning("TODO: percentage? 0-100?")
       
       try
       {
-        DEBUG_LOG() << "Exporting file with file id " << efi.fileId << " for topic id " << efi.topicId << " and extension " << efi.fileExtension;
+        DEBUG_LOG(m_logger) << "Exporting file with file id " << efi.fileId << " for topic id " << efi.topicId << " and extension " << efi.fileExtension;
 
         QByteArray content;
 
@@ -3392,7 +3392,7 @@ compiler_warning("TODO: percentage? 0-100?")
       catch (const std::exception &ex)
       {
         addFailedTopicId(efi.topicId);
-        ERROR_LOG() << "File export for topic " << efi.topicId << " failed: " << ex.what();
+        ERROR_LOG(m_logger) << "File export for topic " << efi.topicId << " failed: " << ex.what();
       }
     }
   }
@@ -3463,13 +3463,13 @@ compiler_warning("TODO: percentage? 0-100?")
     connect(exportNotifier, &TopicEditorBase::ExportNotifier::exportFailed, this, [this, &exportSuccess, exportNotifier]()
     {
       exportSuccess = false;
-      ERROR_LOG() << "Export notifier: export failed!";
+      ERROR_LOG(m_logger) << "Export notifier: export failed!";
       exportNotifier->deleteLater();
     });
     connect(exportNotifier, &TopicEditorBase::ExportNotifier::exportSuccessful, this, [this, &exportSuccess, exportNotifier]()
     {
       exportSuccess = true;
-      DEBUG_LOG() << "Export notifier: export successful";
+      DEBUG_LOG(m_logger) << "Export notifier: export successful";
       exportNotifier->deleteLater();
     });
     connect(exportNotifier, &TopicEditorBase::ExportNotifier::exportFinished, exportNotifier, &QObject::deleteLater, Qt::QueuedConnection);
@@ -3513,7 +3513,7 @@ compiler_warning("TODO: percentage? 0-100?")
         catch (const std::exception &ex)
         {
           addFailedTopicId(topicItemId);
-          ERROR_LOG() << "Report export for topic " << topicItemId << " failed: " << ex.what();
+          ERROR_LOG(m_logger) << "Report export for topic " << topicItemId << " failed: " << ex.what();
         }
       }
     }
@@ -3525,7 +3525,7 @@ compiler_warning("TODO: percentage? 0-100?")
         const int topicItemId = exportReportInfo.first;
         addFailedTopicId(topicItemId);
       }
-      ERROR_LOG() << "Failed to export reports from the report management";
+      ERROR_LOG(m_logger) << "Failed to export reports from the report management";
     }
   }
 
@@ -3583,7 +3583,7 @@ compiler_warning("TODO: percentage? 0-100?")
             QDir xx(avTempDir.path() + QDir::separator() + QString::number(topicItemId));
             for (const QString &f : xx.entryList())
               x += f;
-            DEBUG_LOG() << "files inside " << avTempDir.path() << ": " << x.join(QStringLiteral(", "));
+            DEBUG_LOG(m_logger) << "files inside " << avTempDir.path() << ": " << x.join(QStringLiteral(", "));
           }
           throw std::runtime_error(L("no video file found in directory '%1' in a/v temp dir '%2'!").arg(QString::number(topicItemId), avTempDir.path()).toStdString());
         }
@@ -3600,7 +3600,7 @@ compiler_warning("TODO: percentage? 0-100?")
       catch (const std::exception &ex)
       {
         addFailedTopicId(topicItemId);
-        ERROR_LOG() << "Audio / video export for topic " << topicItemId << " failed: " << ex.what();
+        ERROR_LOG(m_logger) << "Audio / video export for topic " << topicItemId << " failed: " << ex.what();
       }
     }
   } 
@@ -3788,12 +3788,12 @@ compiler_warning("TODO: percentage? 0-100?")
   copyFiles(fileList, &m_this); 
 
 
-  DEBUG_LOG() << "ExId: " << exId << " ScriptId: " << scriptIdPure << " Name: " << m_this.m_scriptName;
+  DEBUG_LOG(m_logger) << "ExId: " << exId << " ScriptId: " << scriptIdPure << " Name: " << m_this.m_scriptName;
 
   
   if (exId == -1 || scriptIdPure == -1 || m_this.m_scriptName == QLatin1String(""))
   {
-    ERROR_LOG() << "Missing values for writing scripts.js";
+    ERROR_LOG(m_logger) << "Missing values for writing scripts.js";
     return failedTopicIds;
   }
 
@@ -3926,7 +3926,7 @@ void ScriptTimelineDialog::onPresentationContent(const GetPresentationContentRep
 
   if (contentList.size() == 0)
   {
-    WARNING_LOG() << "No content for script with id = " << m_scriptId;
+    WARNING_LOG(m_logger) << "No content for script with id = " << m_scriptId;
     __unchange__();
     m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Hide, false); 
     setUnchangeable(false);
@@ -3942,8 +3942,8 @@ void ScriptTimelineDialog::onPresentationContent(const GetPresentationContentRep
       const TopicItem &topicItem = m_model->topicItem(topicItemId);
       m_lastTopicTime = std::max(m_lastTopicTime, topicItem.startTime() + topicItem.duration());
     }
-    catch (const QString &str) { ERROR_LOG() << Q_FUNC_INFO << " " << str; }
-    catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed"; }
+    catch (const QString &str) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " " << str; }
+    catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed"; }
   }
   setUnchangeable(false);
   setPositionTime(0);
@@ -4020,7 +4020,7 @@ void ScriptTimelineDialog::startEssentialsView(int topicItemId, int topicType, b
     }
     catch (...)
     {
-      ERROR_LOG() << "[timeout] Failed to remove failed-to-start replay. domainId: " << m_session->domainId()
+      ERROR_LOG(m_logger) << "[timeout] Failed to remove failed-to-start replay. domainId: " << m_session->domainId()
                             << " - replay id: " << replayId
                             << " - url " << m_session->tcpConnectionUrl().toString();
     }
@@ -4030,7 +4030,7 @@ void ScriptTimelineDialog::startEssentialsView(int topicItemId, int topicType, b
   if (!found)
   {
     new LtsWidgets::LtsMessageDialogNew(this, tr("Cannot start Essentials View because Replay Partition timed out"));
-    WARNING_LOG() << "[timeout] Error while trying to create a replay session: domainId: " << m_session->domainId()
+    WARNING_LOG(m_logger) << "[timeout] Error while trying to create a replay session: domainId: " << m_session->domainId()
                           << " - replay partition does not exist - replay id: " << replayId
                           << " - url " << m_session->tcpConnectionUrl().toString();
     rmPartFn();
@@ -4046,14 +4046,14 @@ void ScriptTimelineDialog::onTopicItemPositionChanged(QWidget *previewWidget, in
   TopicEditorBase::TopicEditor *topicEditor = qobject_cast<TopicEditorBase::TopicEditor *>(sender());
   if (!topicEditor)
   {
-    WARNING_LOG() << Q_FUNC_INFO << " unknown sender";
+    WARNING_LOG(m_logger) << Q_FUNC_INFO << " unknown sender";
     return;
   }
 
   TopicEditorBase::TopicData data = topicEditor->topicData();
   if (data.id == -1)
   {
-    WARNING_LOG() << Q_FUNC_INFO << " received invalid topic data from topic editor";
+    WARNING_LOG(m_logger) << Q_FUNC_INFO << " received invalid topic data from topic editor";
     return;
   }
 
@@ -4115,7 +4115,7 @@ void ScriptTimelineDialog::onTopicItemPositionChanged(QWidget *previewWidget, in
     connect(topicEditor, &TopicEditor::topicDataChanged, this, [this, topicItemId]()
     {
       if(!m_currentTopicDesigner)
-        ERROR_LOG() << " topicDataChanged: No topic designer currently available ";
+        ERROR_LOG(m_logger) << " topicDataChanged: No topic designer currently available ";
       else
         m_currentTopicDesigner->setTopicData(m_model->topicItem(topicItemId).topicData());
     });
@@ -4123,7 +4123,7 @@ void ScriptTimelineDialog::onTopicItemPositionChanged(QWidget *previewWidget, in
   }
   catch (...)
   {
-    ERROR_LOG() << "topic item with id = " << data.id << " not found";
+    ERROR_LOG(m_logger) << "topic item with id = " << data.id << " not found";
   }
 }
 
@@ -4132,14 +4132,14 @@ void ScriptTimelineDialog::onCheckTopicItemDuration(int duration, LtsUtils::Prom
 {
   if (!m_model->isEditable())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " failed because model is currently not editable";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed because model is currently not editable";
     promise->reject();
   }
 
   TopicEditorBase::TopicEditor *topicEditor = qobject_cast<TopicEditorBase::TopicEditor *>(sender());
   if (!topicEditor)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " sender is not a TopicEditor";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " sender is not a TopicEditor";
     new LtsWidgets::LtsMessageDialogNew(this, tr("A check has failed..."));
     promise->reject();
     return;
@@ -4162,13 +4162,13 @@ void ScriptTimelineDialog::onCheckTopicItemDuration(int duration, LtsUtils::Prom
   }
   catch (const QString &str)
   {
-    DEBUG_LOG() << Q_FUNC_INFO << " " << str;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " " << str;
     promise->resolve();
   }
 
   catch (...)
   {
-    DEBUG_LOG() << Q_FUNC_INFO << " failed for topic item with id = " << topicEditor->topicId();
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " failed for topic item with id = " << topicEditor->topicId();
     promise->resolve();
   }
 }
@@ -4179,13 +4179,13 @@ void ScriptTimelineDialog::onTopicItemModified()
   TopicEditorBase::TopicEditor *topicEditor = qobject_cast<TopicEditorBase::TopicEditor *>(sender());
   if (!topicEditor)
   {
-    WARNING_LOG() << Q_FUNC_INFO << " unknown sender";
+    WARNING_LOG(m_logger) << Q_FUNC_INFO << " unknown sender";
     return;
   }
 
   if (!m_model->isEditable())
   {
-    INFO_LOG() << Q_FUNC_INFO << " called but model is not editable";
+    INFO_LOG(m_logger) << Q_FUNC_INFO << " called but model is not editable";
     onUpdateTopicEditor(topicEditor->topicId());
     return;
   }
@@ -4223,7 +4223,7 @@ void ScriptTimelineDialog::onTopicItemModified()
   }
   catch (...)
   {
-    DEBUG_LOG() << "unknown topic item with id = " << topicItemId;
+    DEBUG_LOG(m_logger) << "unknown topic item with id = " << topicItemId;
   }
   onChangesMade();
 }
@@ -4238,8 +4238,8 @@ void ScriptTimelineDialog::onTopicItemRemoved(int topicItemId)
   {
     m_model->removeItem(topicItemId);
   }
-  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " failed: " << errMsg; }
-  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed"; }
+  catch (const QString &errMsg) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed: " << errMsg; }
+  catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed"; }
 
   if (m_currentTopicEditor && m_currentTopicEditor->topicId() == topicItemId)
   {
@@ -4285,8 +4285,8 @@ void ScriptTimelineDialog::onTopicItemSelectionChanged(const QVector<int> &selec
     }
     m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Edit, selectedItemIds.size() == 1);
   }
-  catch (const QString &errMsg) { WARNING_LOG() << Q_FUNC_INFO << " failed: " << errMsg; }
-  catch (...) { DEBUG_LOG() << Q_FUNC_INFO << " failed"; }
+  catch (const QString &errMsg) { WARNING_LOG(m_logger) << Q_FUNC_INFO << " failed: " << errMsg; }
+  catch (...) { DEBUG_LOG(m_logger) << Q_FUNC_INFO << " failed"; }
 }
 
 
@@ -4308,8 +4308,8 @@ void ScriptTimelineDialog::onUpdateTopicEditor(int topicItemId)
 
     topicEditor->setTopicData(topicItem.topicData());
   }
-  catch (const QString &str) { ERROR_LOG() << Q_FUNC_INFO << " " << str; }
-  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed for item with id = " << topicItemId; }
+  catch (const QString &str) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " " << str; }
+  catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed for item with id = " << topicItemId; }
 }
 
 
@@ -4317,7 +4317,7 @@ void ScriptTimelineDialog::onTopicDesignerChangesMade()
 {
   if (!m_currentTopicDesigner)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " failed because no topic designer currently available";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed because no topic designer currently available";
     return;
   }
 
@@ -4336,14 +4336,14 @@ void ScriptTimelineDialog::onTopicDesignerChangesMade()
     if(!m_modifiedTopicTypesList.contains(data.topicType))
       m_modifiedTopicTypesList.append(data.topicType);
   }
-  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " failed: " << errMsg; }
-  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed"; }
+  catch (const QString &errMsg) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed: " << errMsg; }
+  catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed"; }
 }
 
 
 void ScriptTimelineDialog::onTopicEditorChangesSaved(const TopicData &data)
 {
-  WARNING_LOG()<<" onTopicEditorChangesSaved(): Reset previewTopic modify flag.";
+  WARNING_LOG(m_logger)<<" onTopicEditorChangesSaved(): Reset previewTopic modify flag.";
 
   if(m_modifiedTopicTypesList.contains(data.topicType))
     try{ m_modifiedTopicTypesList.removeAll(data.topicType); } catch(...){};
@@ -4409,7 +4409,7 @@ void ScriptTimelineDialog::onEditTopicItem(int itemId)
     TopicEditorBase::TopicEditor *editor = createTopicEditor(data);
     if (!editor)
     {
-      ERROR_LOG() << "cannot create topic editor for topic item with id = " << data.id;
+      ERROR_LOG(m_logger) << "cannot create topic editor for topic item with id = " << data.id;
       return;
     }
 
@@ -4419,8 +4419,8 @@ void ScriptTimelineDialog::onEditTopicItem(int itemId)
     addDialog(editor, m_menuGroup, identifier, LtsWidgets::LayoutArea::eDialogTab, true, true );
 
   }
-  catch (const QString &str) { ERROR_LOG() << Q_FUNC_INFO << " " << str; }
-  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed for item with id = " << itemId; }
+  catch (const QString &str) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " " << str; }
+  catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed for item with id = " << itemId; }
 }
 
 
@@ -4443,8 +4443,8 @@ void ScriptTimelineDialog::onRemoveSelectedTopics()
       }
       m_model->removeItem(topicItemId);
     }
-    catch (const QString &str) { ERROR_LOG() << Q_FUNC_INFO << " " << str; }
-    catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed"; }
+    catch (const QString &str) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " " << str; }
+    catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed"; }
   }
   for (const int &topicItemId : std::as_const(mainTopicItemIds))
   {
@@ -4452,8 +4452,8 @@ void ScriptTimelineDialog::onRemoveSelectedTopics()
     {
       m_model->removeItem(topicItemId);
     }
-    catch (const QString &str) { ERROR_LOG() << Q_FUNC_INFO << " " << str; }
-    catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed"; }
+    catch (const QString &str) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " " << str; }
+    catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed"; }
   }
   m_ui->timeline->view()->clearSelectedItems();
 }
@@ -4502,7 +4502,7 @@ void ScriptTimelineDialog::onTimeout()
     }
     catch (...)
     {
-      WARNING_LOG() << "unknown topic item with id = " << topicItemId;
+      WARNING_LOG(m_logger) << "unknown topic item with id = " << topicItemId;
     }
   }
   m_playlistTopicItemIds = playlist;
@@ -4520,7 +4520,7 @@ void ScriptTimelineDialog::onTimeout()
     }
     catch (...)
     {
-      WARNING_LOG() << "unknown topic item with id = " << topicItemId;
+      WARNING_LOG(m_logger) << "unknown topic item with id = " << topicItemId;
     }
   }
 
@@ -4542,7 +4542,7 @@ void ScriptTimelineDialog::onTimeout()
       }
       catch (...)
       {
-        WARNING_LOG() << "unknown topic item with id = " << topicItemId;
+        WARNING_LOG(m_logger) << "unknown topic item with id = " << topicItemId;
       }
     }
     if (m_stopAfterPlayingFilterTopic) 
@@ -4670,7 +4670,7 @@ void ScriptTimelineDialog::onPlay()
       }
       catch (...)
       {
-        WARNING_LOG() << "unknown topic item with id = " << topicItemId;
+        WARNING_LOG(m_logger) << "unknown topic item with id = " << topicItemId;
       }
     }
     m_playlistTopicItemIds = playlist;
@@ -4681,26 +4681,26 @@ void ScriptTimelineDialog::onPlay()
         TopicItem &topicItem = m_model->topicItem(topicItemId);
         if (topicItemId != m_ignoreTopicForReplay && topicItem.replayInterface())
         {
-          DEBUG_LOG() << "start/resume playback with offset = " << positionTime() / 1000 - topicItem.startTime() / 1000;
+          DEBUG_LOG(m_logger) << "start/resume playback with offset = " << positionTime() / 1000 - topicItem.startTime() / 1000;
           if (!topicItem.replayInterface()->playbackStart(positionTime() / 1000 - topicItem.startTime() / 1000))
-            WARNING_LOG() << "playing topic item with id = " << topicItemId << " failed";
+            WARNING_LOG(m_logger) << "playing topic item with id = " << topicItemId << " failed";
         }
         if (topicItem.topicType() == TopicEditorBase::TopicType::Snapshot)
         {
-          DEBUG_LOG() << Q_FUNC_INFO << " disable FireEventFlashing";
+          DEBUG_LOG(m_logger) << Q_FUNC_INFO << " disable FireEventFlashing";
           if (!enableFireEventFlash(false))
-            WARNING_LOG() << Q_FUNC_INFO << " disableFireEventFlashing failed";
+            WARNING_LOG(m_logger) << Q_FUNC_INFO << " disableFireEventFlashing failed";
         }
         else if (topicItem.topicType() == TopicEditorBase::TopicType::SituationReplay)
         {
-          DEBUG_LOG() << Q_FUNC_INFO << " enable FireEventFlashing";
+          DEBUG_LOG(m_logger) << Q_FUNC_INFO << " enable FireEventFlashing";
           if (!enableFireEventFlash(true))
-            WARNING_LOG() << Q_FUNC_INFO << " enableFireEventFlashing failed";
+            WARNING_LOG(m_logger) << Q_FUNC_INFO << " enableFireEventFlashing failed";
         }
       }
       catch (...)
       {
-        WARNING_LOG() << "unknown topic item with id = " << topicItemId;
+        WARNING_LOG(m_logger) << "unknown topic item with id = " << topicItemId;
       }
     }
     m_nextPauseTime = -1; 
@@ -4751,7 +4751,7 @@ void ScriptTimelineDialog::onPause()
   if (m_sitMapSession->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(sitMapIfc))
     sitMapIfc->enableFireEventFlashing(false);
   else
-    WARNING_LOG() << "Cannot update sit map fire event flashing";
+    WARNING_LOG(m_logger) << "Cannot update sit map fire event flashing";
 }
 
 
@@ -4794,7 +4794,7 @@ void ScriptTimelineDialog::onPlayUntilNextTopic()
   qint64 time = nextTopicTime();
   if (time < 0)
   {
-    DEBUG_LOG() << "There is no next topic to play until!";
+    DEBUG_LOG(m_logger) << "There is no next topic to play until!";
     return;
   }
   m_nextPauseTime = time;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.h
index 02eb73b5e..ec4c37bea 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.h
@@ -218,7 +218,7 @@ private:
 
     if (!m_exerciseSession->interfaceFromGui<TopicEditorInterface>(topicEditorIfc))
     {
-      ERROR_LOG() << "getTopicEditorIfc failed: Cannot add topic type "
+      ERROR_LOG(m_logger) << "getTopicEditorIfc failed: Cannot add topic type "
                           << TopicEditorBase::topicTypeString(topicType)
                           << " because topic editor ifc is missing.";
       return nullptr;
@@ -234,7 +234,7 @@ private:
 
     if (!m_replaySession->interfaceFromGui<TopicReplayInterface>(topicReplayFactory))
     {
-      ERROR_LOG() << "getTopicIfcFactory failed: Cannot add topic type "
+      ERROR_LOG(m_logger) << "getTopicIfcFactory failed: Cannot add topic type "
                           << TopicEditorBase::topicTypeString(topicType)
                           << " because topic ifc factory is missing.";
       return nullptr;
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 792732359..923ee38ce 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
@@ -164,8 +164,8 @@ int ScriptModel::addItem(const QString &trackName, TopicItem &&_topicItem, qint6
         return lambda(m_screen2TrackId, std::move(_topicItem));
     }
   }
-  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " " << errMsg; }
-  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed for item with trackName = " << trackName << " failed"; }
+  catch (const QString &errMsg) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " " << errMsg; }
+  catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed for item with trackName = " << trackName << " failed"; }
   return -1;
 }
 
@@ -216,8 +216,8 @@ std::vector<TopicItem> ScriptModel::topicItems() const
           for (const ItemPtr &_itemPtr: _trackPtr->items())
             ret.push_back(static_cast<const TopicItem &>(*_itemPtr.get()).copy());
   }
-  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " " << errMsg; }
-  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed"; }
+  catch (const QString &errMsg) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " " << errMsg; }
+  catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed"; }
   return ret;
 }
 
@@ -243,11 +243,11 @@ std::vector<TopicItem> ScriptModel::topicItemsByTrackId(int trackId) const
   }
   catch (const QString &errMsg)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " " << errMsg;
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " " << errMsg;
   }
   catch (...)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " failed";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed";
   }
 
   return ret;
@@ -279,8 +279,8 @@ QVector<int> ScriptModel::mainTopicItemIds() const
       for (const ItemPtr &_itemPtr: _screen2Track.items())
         ret.append(_itemPtr->id());
   }
-  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " failed: " << errMsg; }
-  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed"; }
+  catch (const QString &errMsg) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed: " << errMsg; }
+  catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed"; }
   return ret;
 }
 
@@ -344,8 +344,8 @@ QVector<int> ScriptModel::filterTopicItemIds() const
           for (const ItemPtr &_itemPtr: _trackPtr->items())
             ret.append(_itemPtr->id());
   }
-  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " failed: " << errMsg; }
-  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed"; }
+  catch (const QString &errMsg) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed: " << errMsg; }
+  catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed"; }
   return ret;
 }
 
@@ -363,8 +363,8 @@ QVector<int> ScriptModel::filterTopicItemIds(int _topicItemId) const
       if (_trackPtr->isItemsBetween(_topicItem.startTime(), end, {}))
         ret += _trackPtr->itemIdsBetween(_topicItem.startTime(), end, false, true);
   }
-  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " failed: " << errMsg; }
-  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed"; }
+  catch (const QString &errMsg) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed: " << errMsg; }
+  catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed"; }
   return ret;
 }
 
@@ -402,8 +402,8 @@ qint64 ScriptModel::firstTopicStart() const
         firstStart = std::min(firstStart, time);
     }
   }
-  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " failed: " << errMsg; }
-  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed"; }
+  catch (const QString &errMsg) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed: " << errMsg; }
+  catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed"; }
   return firstStart == LLONG_MAX ? -1 : firstStart;
 }
 
@@ -428,8 +428,8 @@ qint64 ScriptModel::lastTopicEnd() const
     if (time != -1)
       lastEnd = std::max(lastEnd, time);
   }
-  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " failed: " << errMsg; }
-  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed"; }
+  catch (const QString &errMsg) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed: " << errMsg; }
+  catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed"; }
   return lastEnd;
 }
 
@@ -460,7 +460,7 @@ bool ScriptModel::isMainTrack(int _trackId) const
   {
     return track(_trackId).parentId() == m_rootTrack.id();
   }
-  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " " << errMsg; }
+  catch (const QString &errMsg) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " " << errMsg; }
   catch (...) {}
   return false;
 }
@@ -476,7 +476,7 @@ bool ScriptModel::isFilterTrack(int _trackId) const
   {
     return track(_trackId).parentId() != m_rootTrack.id(); 
   }
-  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " " << errMsg; }
+  catch (const QString &errMsg) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " " << errMsg; }
   catch (...) {}
   return false;
 }
@@ -676,12 +676,12 @@ bool ScriptModel::import(const QVector<PresentationContent> &contents) noexcept(
     }
     catch (const QString &errMsg)
     {
-      ERROR_LOG() << Q_FUNC_INFO << " failed: " << errMsg;
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed: " << errMsg;
       return false;
     }
     catch (...)
     {
-      ERROR_LOG() << Q_FUNC_INFO << " failed";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed";
       return false;
     }
   }
@@ -706,12 +706,12 @@ bool ScriptModel::import(const QVector<PresentationContent> &contents) noexcept(
   }
   catch (const QString &errMsg)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " failed: " << errMsg;
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed: " << errMsg;
     return false;
   }
   catch (...)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " failed";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed";
     return false;
   }
 
@@ -763,8 +763,8 @@ void ScriptModel::insertTopicItem(int _trackId, TopicItem &&__topicItem)
     if (isFilterTrack(_topicTrack.id()))
       _topicItem.setParentChannel(static_cast<const TopicTrack &>(track(_topicTrack.parentId())).internalName());
   }
-  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " " << errMsg; }
-  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed"; }
+  catch (const QString &errMsg) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " " << errMsg; }
+  catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed"; }
 }
 
 
@@ -926,8 +926,8 @@ bool ScriptModel::canDropItem(const Item &_item, int _trackId, qint64 start) con
 
     return !isTopicItemBlocked(_topicItem, static_cast<const TopicTrack &>(track(_trackId)), start, _topicItem.duration());
   }
-  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " failed: "  << errMsg; }
-  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed"; }
+  catch (const QString &errMsg) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed: "  << errMsg; }
+  catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed"; }
   return false;
 }
 
@@ -980,8 +980,8 @@ bool ScriptModel::canMoveItem(const Item &_item, qint64 start) const
       static_cast<const TopicItem &>(_item), static_cast<const TopicTrack &>(track(_item.parentTrackId())), start, _item.duration()
     );
   }
-  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " " << errMsg; }
-  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed for item with id = " << _item.id(); }
+  catch (const QString &errMsg) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " " << errMsg; }
+  catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed for item with id = " << _item.id(); }
   return false;
 }
 
@@ -1050,8 +1050,8 @@ bool ScriptModel::canResizeItem(const Item &_item, qint64 start, int duration) c
       static_cast<const TopicItem &>(_item), static_cast<const TopicTrack &>(track(_item.parentTrackId())), start, duration
     );
   }
-  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " " << errMsg; }
-  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed for item with id = " << _item.id(); }
+  catch (const QString &errMsg) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " " << errMsg; }
+  catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed for item with id = " << _item.id(); }
   return false;
 }
 
@@ -1068,7 +1068,7 @@ void ScriptModel::copyToClipboard(const QVector<int> &_itemIds) noexcept(false)
     _topicItemPtr->m_parentTrackId = _topicItem.m_parentTrackId;
     minTime = std::min(minTime, _topicItem.startTime());
     m_clipboard.push_back(std::move(_topicItemPtr));
-    DEBUG_LOG() << Q_FUNC_INFO << " copied item with id = " << _topicItem.id() << " to clipboard";
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " copied item with id = " << _topicItem.id() << " to clipboard";
   };
 
   for (int _topicItemId : _itemIds)
@@ -1181,8 +1181,8 @@ void ScriptModel::pasteFromClipboard(qint64 time) noexcept(false)
       _topicItem.setTopicId(_itemId);
       _topicItem.topicData().startTime = _topicItem.startTime() / 1000LL;
     }
-    catch (const QString &errMsg) { ERROR_LOG() << "adding item failed: " << errMsg; }
-    catch (...) { ERROR_LOG() << "adding item failed"; }
+    catch (const QString &errMsg) { ERROR_LOG(m_logger) << "adding item failed: " << errMsg; }
+    catch (...) { ERROR_LOG(m_logger) << "adding item failed"; }
   }
   m_clipboard.clear();
 
@@ -1214,12 +1214,12 @@ ScriptModel::PasteTestResult ScriptModel::canPasteFromClipboard(qint64 time) con
     }
     catch (const QString &errMsg)
     {
-      ERROR_LOG() << "checking for collision failed: " << errMsg;
+      ERROR_LOG(m_logger) << "checking for collision failed: " << errMsg;
       return PasteTestResult::No;
     }
     catch (...)
     {
-      ERROR_LOG() << "checking for collision failed";
+      ERROR_LOG(m_logger) << "checking for collision failed";
       return PasteTestResult::No;
     }
   }
@@ -1386,7 +1386,7 @@ bool ScriptModel::canDropTopicType(TopicType _topicType, int _trackId) const
     }
     return true;
   }
-  catch (const QString &errMsg) { ERROR_LOG() << errMsg; }
+  catch (const QString &errMsg) { ERROR_LOG(m_logger) << errMsg; }
   catch (...) {}
   return false;
 }
@@ -1469,8 +1469,8 @@ bool ScriptModel::isTopicItemBlocked(const TopicItem &_topicItem, const TopicTra
       return false;
     }
   }
-  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " " << errMsg; }
-  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed for itemId = " << _topicItem.id() << " and trackId = " << _topicTrack.id(); }
+  catch (const QString &errMsg) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " " << errMsg; }
+  catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed for itemId = " << _topicItem.id() << " and trackId = " << _topicTrack.id(); }
   return false;
 }
 
@@ -1500,8 +1500,8 @@ void ScriptModel::getActualFilterTopicRange(int parentTrackId, TopicItem &_topic
     if (_topicItem.startTime() + _topicItem.duration() > _mainTopicAtItemEnd.startTime() + _mainTopicAtItemEnd.duration())
       _topicItem.setDuration(_mainTopicAtItemEnd.startTime() + _mainTopicAtItemEnd.duration() - _topicItem.startTime());
   }
-  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " " << errMsg; }
-  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed for parentTrackId = " << parentTrackId; }
+  catch (const QString &errMsg) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " " << errMsg; }
+  catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed for parentTrackId = " << parentTrackId; }
 }
 
 
@@ -1524,8 +1524,8 @@ void ScriptModel::onInsertTrack(const QModelIndex &idx)
     emit dataChanged(idx, idx); 
     m_dialog->timeline()->view()->expand(idx);
   }
-  catch (const QString &errMsg) { ERROR_LOG() << errMsg; }
-  catch (...) { ERROR_LOG() << "Adding child track to track with id = " << idx.internalId() << " failed"; }
+  catch (const QString &errMsg) { ERROR_LOG(m_logger) << errMsg; }
+  catch (...) { ERROR_LOG(m_logger) << "Adding child track to track with id = " << idx.internalId() << " failed"; }
 }
 
 void ScriptModel::onRemoveTrack(const QModelIndex &idx)
@@ -1554,8 +1554,8 @@ void ScriptModel::onRemoveTrack(const QModelIndex &idx)
     }
     emit dataChanged(parentIndex, parentIndex);
   }
-  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " " << errMsg; }
-  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed"; }
+  catch (const QString &errMsg) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " " << errMsg; }
+  catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed"; }
 }
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_model.h
index 47fafa8a0..7dc92feef 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_model.h
@@ -117,6 +117,8 @@ public:
   bool canDropTopicType(TopicType _topicType, int _trackId) const;
 
 private:
+
+NGL::INGLLogger &m_logger;
   bool isTopicItemBlocked(const TopicItem &_topicItem, const TopicTrack &_topicTrack, qint64 start, int duration) const;
 
   void getActualFilterTopicRange(int parentTrackId, TopicItem &_topicItem) const noexcept(false);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_storyboard.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_storyboard.h
index e59b474bb..fbea3a345 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_storyboard.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_storyboard.h
@@ -43,6 +43,7 @@ public slots:
   void onPrint();
   void onColumnWidthChanged();
 private:
+NGL::INGLLogger &m_logger;
   LtsSession::LtsSession *m_session;
 
   std::vector<TopicItem> m_topicItems;
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 44b482689..4085d82af 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
@@ -26,15 +26,14 @@ static QString s_program(L("ffmpeg"));
 
 TopicRecorder::TopicRecorder(const int topicId, const QString &topicName, const Screen *screen, qint32 offset,
                              qint64 startTime, qint64 stopTime, const double topicX, const double topicY,
-                             const double topicW, const double topicH, QObject *parent)
-  : QObject(parent)
+                             const double topicW, const double topicH, QObject *parent) : QObject(parent)
   , m_recordingProcess(new QProcess(this))  
   , m_startTime(startTime)
   , m_stopTime(stopTime)
   , m_topicName(topicName)
   , m_topicId(topicId)
-  , m_length((m_stopTime - (m_startTime - offset)) / 1000)
-{
+  , m_length((m_stopTime - (m_startTime - offset)) / 1000),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   const auto screenGlobalPos = screen->mapToGlobal({0,0});
   const auto screenGeo = screen->geometry();
 
@@ -53,20 +52,20 @@ TopicRecorder::TopicRecorder(const int topicId, const QString &topicName, const
   const qint32 inputW = (qint32)(fullscreen ? screenW : screenW * topicW);
   const qint32 inputH = (qint32)(fullscreen ? screenH : screenH * topicH);
 
-  ERROR_LOG() << "TopicRecorder: fullscreen? " << fullscreen;
-  ERROR_LOG() << "TopicRecorder: topic  - x: " << topicX << ", y: " << topicY << ", w: " << topicW << ", h: " << topicH;
-  ERROR_LOG() << "TopicRecorder: screen - x: " << screenX << ", y: " << screenY << ", w: " << screenW << ", h: " << screenH;
-  ERROR_LOG() << "TopicRecorder: input  - x: " << inputX << ", y: " << inputY << ", w: " << inputW << ", h: " << inputH;
+  ERROR_LOG(m_logger) << "TopicRecorder: fullscreen? " << fullscreen;
+  ERROR_LOG(m_logger) << "TopicRecorder: topic  - x: " << topicX << ", y: " << topicY << ", w: " << topicW << ", h: " << topicH;
+  ERROR_LOG(m_logger) << "TopicRecorder: screen - x: " << screenX << ", y: " << screenY << ", w: " << screenW << ", h: " << screenH;
+  ERROR_LOG(m_logger) << "TopicRecorder: input  - x: " << inputX << ", y: " << inputY << ", w: " << inputW << ", h: " << inputH;
 
   if (!m_tmpRecordingFile.open()) 
     throw std::runtime_error(L("Failed to open temporary recording file: %1").arg(m_tmpRecordingFile.errorString()).toStdString());
 
   m_recordingProcess->setProgram(s_program);
   m_recordingProcess->setArguments(L("-hide_banner -f x11grab -s %1x%2 -i :0.0+%3,%4 -c:v libx264 -y -map 0 -movflags +faststart -f %5 %6").arg(inputW).arg(inputH).arg(inputX).arg(inputY).arg(s_container).arg(m_tmpRecordingFile.fileName()).split(L(" ")));
-  ERROR_LOG() << "args: " << m_recordingProcess->arguments().join(L(" "));
-  connect(m_recordingProcess, &QProcess::readyReadStandardOutput, [this]() { ERROR_LOG() << "REC [ ]: " << QString::fromUtf8(m_recordingProcess->readAllStandardOutput()); });
-  connect(m_recordingProcess, &QProcess::readyReadStandardError, [this]() { ERROR_LOG() << "REC [!]: " << QString::fromUtf8(m_recordingProcess->readAllStandardError()); });
-  connect(m_recordingProcess, &QProcess::started, [this]() { ERROR_LOG() << "REC started successfully!"; });
+  ERROR_LOG(m_logger) << "args: " << m_recordingProcess->arguments().join(L(" "));
+  connect(m_recordingProcess, &QProcess::readyReadStandardOutput, [this]() { ERROR_LOG(m_logger) << "REC [ ]: " << QString::fromUtf8(m_recordingProcess->readAllStandardOutput()); });
+  connect(m_recordingProcess, &QProcess::readyReadStandardError, [this]() { ERROR_LOG(m_logger) << "REC [!]: " << QString::fromUtf8(m_recordingProcess->readAllStandardError()); });
+  connect(m_recordingProcess, &QProcess::started, [this]() { ERROR_LOG(m_logger) << "REC started successfully!"; });
 
   if (!m_tmpCuttingFile.open()) 
     throw std::runtime_error(L("Failed to open temporary cutting file: %1").arg(m_tmpCuttingFile.errorString()).toStdString());
@@ -96,11 +95,11 @@ void TopicRecorder::cut()
   cuttingProcess->setProgram(s_program);
   
   cuttingProcess->setArguments(L("-hide_banner -y -sseof -%1 -i %2 -c:v libx264 -f %3 %4").arg(m_length).arg(m_tmpRecordingFile.fileName(), s_container, m_tmpCuttingFile.fileName()).split(L(" ")));
-  connect(cuttingProcess, &QProcess::readyReadStandardOutput, this, [this, cuttingProcess]() { ERROR_LOG() << "CUT [ ]: " << QString::fromUtf8(cuttingProcess->readAllStandardOutput()); });
-  connect(cuttingProcess, &QProcess::readyReadStandardError, this, [this, cuttingProcess]() { ERROR_LOG() << "CUT [!]: " << QString::fromUtf8(cuttingProcess->readAllStandardError()); });
-  connect(cuttingProcess, &QProcess::started, this, [this]() { ERROR_LOG() << "CUT started successfully!"; });
+  connect(cuttingProcess, &QProcess::readyReadStandardOutput, this, [this, cuttingProcess]() { ERROR_LOG(m_logger) << "CUT [ ]: " << QString::fromUtf8(cuttingProcess->readAllStandardOutput()); });
+  connect(cuttingProcess, &QProcess::readyReadStandardError, this, [this, cuttingProcess]() { ERROR_LOG(m_logger) << "CUT [!]: " << QString::fromUtf8(cuttingProcess->readAllStandardError()); });
+  connect(cuttingProcess, &QProcess::started, this, [this]() { ERROR_LOG(m_logger) << "CUT started successfully!"; });
 
-  ERROR_LOG() << "start cut";
+  ERROR_LOG(m_logger) << "start cut";
 
   cuttingProcess->start();
 
@@ -119,7 +118,7 @@ void TopicRecorder::cut()
   }
   catch (...)
   {
-    ERROR_LOG() << "cut failed (error) with exitCode=" << cuttingProcess->exitCode() << " and exitStatus=" << (cuttingProcess->exitStatus() == QProcess::ExitStatus::CrashExit ? "Crash" : "Normal Exit");
+    ERROR_LOG(m_logger) << "cut failed (error) with exitCode=" << cuttingProcess->exitCode() << " and exitStatus=" << (cuttingProcess->exitStatus() == QProcess::ExitStatus::CrashExit ? "Crash" : "Normal Exit");
     m_failed = true;
     cuttingProcess->deleteLater();
     return;
@@ -127,14 +126,14 @@ void TopicRecorder::cut()
 
   if (cuttingProcess->exitCode() != 0)
   {
-    ERROR_LOG() << "cut failed with non-zero exitCode=" << cuttingProcess->exitCode() << " and exitStatus=" << (cuttingProcess->exitStatus() == QProcess::ExitStatus::CrashExit ? "Crash" : "Normal Exit");
+    ERROR_LOG(m_logger) << "cut failed with non-zero exitCode=" << cuttingProcess->exitCode() << " and exitStatus=" << (cuttingProcess->exitStatus() == QProcess::ExitStatus::CrashExit ? "Crash" : "Normal Exit");
     m_failed = true;
     cuttingProcess->deleteLater();
     return;
   }
 
 
-  ERROR_LOG() << "cut done";
+  ERROR_LOG(m_logger) << "cut done";
   cuttingProcess->deleteLater();
 }
 
@@ -173,7 +172,7 @@ void TopicRecorder::onExportFailed(const QProcess::ProcessError error)
 
 void TopicRecorder::onExportFailed(const QString &errorMessage)
 {
-  ERROR_LOG() << "Export failed for topic '" << m_topicName << "': " << errorMessage;
+  ERROR_LOG(m_logger) << "Export failed for topic '" << m_topicName << "': " << errorMessage;
   emit exportFailed(errorMessage);
 }
 
@@ -214,16 +213,16 @@ void TopicRecorder::waitForFinishedRecording()
   }
   catch (...)
   {
-    ERROR_LOG() << "waitForFinishedRecording: catch!";
+    ERROR_LOG(m_logger) << "waitForFinishedRecording: catch!";
   }
 
-  ERROR_LOG() << "waitForFinishedRecording: done waiting!";
+  ERROR_LOG(m_logger) << "waitForFinishedRecording: done waiting!";
 }
 
 
 void TopicRecorder::onNewTime(qint64 time)
 {
-  ERROR_LOG() << "onNewTime: " << time << ", startTime: " << m_startTime;
+  ERROR_LOG(m_logger) << "onNewTime: " << time << ", startTime: " << m_startTime;
 
   switch (m_recordingState)
   {
@@ -231,9 +230,9 @@ void TopicRecorder::onNewTime(qint64 time)
     if (time < m_startTime)
       return;
 
-    ERROR_LOG() << "onNewTime: started at " << time << " while startTime is " << m_startTime;
+    ERROR_LOG(m_logger) << "onNewTime: started at " << time << " while startTime is " << m_startTime;
 
-    ERROR_LOG() << "Starting \"" << processToString(m_recordingProcess) << "\"";
+    ERROR_LOG(m_logger) << "Starting \"" << processToString(m_recordingProcess) << "\"";
 
     m_recordingProcess->start();
 
@@ -244,7 +243,7 @@ void TopicRecorder::onNewTime(qint64 time)
     if (time < m_stopTime)
       return;
 
-    ERROR_LOG() << "Stopping recording for " << m_topicName;
+    ERROR_LOG(m_logger) << "Stopping recording for " << m_topicName;
 
     m_recordingProcess->terminate();
 
@@ -261,7 +260,7 @@ void TopicRecorder::onNewTime(qint64 time)
 void TopicRecorder::onRecordingProcessFinished(int exitCode, QProcess::ExitStatus exitStatus)
 {
   m_recordingState = RecordingState::Done;
-  ERROR_LOG() << "Recording finished for " << m_topicName << ", with exitCode=" << exitCode << " and exitStatus=" << exitStatus;
+  ERROR_LOG(m_logger) << "Recording finished for " << m_topicName << ", with exitCode=" << exitCode << " and exitStatus=" << exitStatus;
 
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_recorder.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_recorder.h
index 712b1dbdc..373cf88ea 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_recorder.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_recorder.h
@@ -44,6 +44,8 @@ public Q_SLOTS:
   void onNewTime(qint64 time);
 
 private: 
+
+NGL::INGLLogger &m_logger;
   enum class RecordingState
   {
     Waiting,
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 f57859c18..913873803 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
@@ -14,8 +14,7 @@ namespace PresentationManagement
 
 TopicShotter::TopicShotter(const int topicId, const QString &topicName, const Screen *screen, qint32 offset,
                            qint64 startTime, qint64 stopTime, const double topicX, const double topicY,
-                           const double topicW, const double topicH, const bool isFilterTopic, const QString &desc, QObject *parent)
-  : QObject(parent)
+                           const double topicW, const double topicH, const bool isFilterTopic, const QString &desc, QObject *parent) : QObject(parent)
   , m_startTime(startTime)
   , m_topicName(topicName)
   , m_topicId(topicId)
@@ -25,8 +24,8 @@ TopicShotter::TopicShotter(const int topicId, const QString &topicName, const Sc
   , m_topicW(topicW)
   , m_topicH(topicH)
   , m_desc(desc)
-  , m_isFilterTopic(isFilterTopic)
-{}
+  , m_isFilterTopic(isFilterTopic),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 
 TopicShotter::~TopicShotter()
@@ -48,7 +47,7 @@ void TopicShotter::saveRecording(const QString &saveToPath)
 
 void TopicShotter::onExportFailed(const QString &errorMessage)
 {
-  ERROR_LOG() << "Export failed for topic '" << m_topicName << "': " << errorMessage;
+  ERROR_LOG(m_logger) << "Export failed for topic '" << m_topicName << "': " << errorMessage;
   emit exportFailed(errorMessage);
 }
 
@@ -59,7 +58,7 @@ void TopicShotter::onNewTime(qint64 time)
   const qint64 filterTopicDelay = (m_isFilterTopic ? 1000 : 0);
   const qint64 startTime = m_startTime + filterTopicDelay + 1000 ;
 
-  DEBUG_LOG() << "onNewTime: " << time << ", startTime: " << startTime << ", isFilterTopic? " << m_isFilterTopic << ", desc: " << m_desc;
+  DEBUG_LOG(m_logger) << "onNewTime: " << time << ", startTime: " << startTime << ", isFilterTopic? " << m_isFilterTopic << ", desc: " << m_desc;
 
   if (time < startTime)
     return;
@@ -68,7 +67,7 @@ void TopicShotter::onNewTime(qint64 time)
     return;
   isStarted = true;
 
-  DEBUG_LOG() << "onNewTime: started at " << time << " while startTime is " << startTime;
+  DEBUG_LOG(m_logger) << "onNewTime: started at " << time << " while startTime is " << startTime;
 
   if (!m_tmpFile.open()) 
   {
@@ -101,7 +100,7 @@ void TopicShotter::onNewTime(qint64 time)
   connect(t, &QTimer::timeout, this, [this, inputX, inputY, inputW, inputH, _screen]() 
   {
     const WId winId = m_screen->winId();
-    DEBUG_LOG() << "## CHEESE! ## grabWindow: x: " << inputX << ", y: " << inputY << ", w: " << inputW << ", h: " << inputH << ", name: " << m_topicName << ", id: " << m_topicId << ", desc: " << m_desc;
+    DEBUG_LOG(m_logger) << "## CHEESE! ## grabWindow: x: " << inputX << ", y: " << inputY << ", w: " << inputW << ", h: " << inputH << ", name: " << m_topicName << ", id: " << m_topicId << ", desc: " << m_desc;
     const QPixmap pix = _screen->grabWindow(winId, inputX, inputY, inputW, inputH); 
 
     if (!pix.save(&m_tmpFile, "PNG"))
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_shotter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_shotter.h
index 1985dd24c..9a43de7bc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_shotter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_shotter.h
@@ -41,6 +41,8 @@ private Q_SLOTS:
   void onExportFailed(const QString &errorMessage);
 
 private: 
+
+NGL::INGLLogger &m_logger;
   const qint64 m_startTime;
   const QString m_topicName;
   QTemporaryFile m_tmpFile;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Common/pws_vnc_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Common/pws_vnc_handler.cpp
index 54270257d..b6d28c8c8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Common/pws_vnc_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Common/pws_vnc_handler.cpp
@@ -61,10 +61,10 @@ bool VncHandler::handleData(QDataStream &stream)
     if (handleVersion(version))
     {
       setNextExpectedMessageType(RfbProtocol::STC::RFB_SUP_SECURITY_TYPES);
-      DEBUG_LOG() << "RfbVersion handled Successfully!";
+      DEBUG_LOG(m_logger) << "RfbVersion handled Successfully!";
       return true;
     }
-    ERROR_LOG() << "RfbVersion handshake Error!";
+    ERROR_LOG(m_logger) << "RfbVersion handshake Error!";
     break;
   }
   
@@ -78,10 +78,10 @@ bool VncHandler::handleData(QDataStream &stream)
     if (handleSupportedSecurityTypes(supTypes))
     {
       setNextExpectedMessageType(RfbProtocol::STC::RFB_VNC_AUTHENTICATION);
-      DEBUG_LOG() << "RfbSecurityType handled Successfully!";
+      DEBUG_LOG(m_logger) << "RfbSecurityType handled Successfully!";
       return true;
     }
-    ERROR_LOG() << "RfbSecurityType handshake Error!";
+    ERROR_LOG(m_logger) << "RfbSecurityType handshake Error!";
     break;
   }
   
@@ -95,10 +95,10 @@ bool VncHandler::handleData(QDataStream &stream)
     if (handleVncAuthentication(auth))
     {
       setNextExpectedMessageType(RfbProtocol::STC::RFB_SECURITY_RESULT);
-      DEBUG_LOG() << "RfbVncAuthentication handled Successfully!";
+      DEBUG_LOG(m_logger) << "RfbVncAuthentication handled Successfully!";
       return true;
     }
-    ERROR_LOG() << "RfbVncAuthentication Error!";
+    ERROR_LOG(m_logger) << "RfbVncAuthentication Error!";
     break;
   }
   
@@ -112,10 +112,10 @@ bool VncHandler::handleData(QDataStream &stream)
     if (handleSecurityResult(result))
     {
       setNextExpectedMessageType(RfbProtocol::STC::RFB_SERVER_INIT);
-      DEBUG_LOG() << "RfbSecurityResult handled Successfully!";
+      DEBUG_LOG(m_logger) << "RfbSecurityResult handled Successfully!";
       return true;
     }
-    ERROR_LOG() << "RfbSecurityResult Error!";
+    ERROR_LOG(m_logger) << "RfbSecurityResult Error!";
     break;
   }
   
@@ -140,7 +140,7 @@ bool VncHandler::handleData(QDataStream &stream)
       emit connected();
       m_socket->write(RfbProtocol::CTS::RfbFrameBufferUpdateRequest(false, 0, 0, 1920, 1200));
       setNextExpectedMessageType(RfbProtocol::STC::RFB_FRAMEBUFFER_UPDATE);
-      DEBUG_LOG() << "RfbServerInit handled Successfully!";
+      DEBUG_LOG(m_logger) << "RfbServerInit handled Successfully!";
     }
     return true;
   }
@@ -155,7 +155,7 @@ bool VncHandler::handleData(QDataStream &stream)
     stream.startTransaction();
     quint8 msgType;
     stream >> msgType;
-    DEBUG_LOG() << "got message from server: " << QString::number(msgType, 16);
+    DEBUG_LOG(m_logger) << "got message from server: " << QString::number(msgType, 16);
     switch (msgType)
     {
     case RfbProtocol::STC::RFB_FRAMEBUFFER_UPDATE:
@@ -167,7 +167,7 @@ bool VncHandler::handleData(QDataStream &stream)
     case RfbProtocol::STC::RFB_SERVER_CUTTEXT:
       return handleServerCuttext(stream);
     default:
-      WARNING_LOG() << "Unknown message type from server (" << QString::number(msgType, 16) << ") - reconnecting";
+      WARNING_LOG(m_logger) << "Unknown message type from server (" << QString::number(msgType, 16) << ") - reconnecting";
       stream.abortTransaction();
       slotOnDisconnected();
       return false;
@@ -241,7 +241,7 @@ void VncHandler::writeData(const QByteArray &data)
 
 void VncHandler::error()
 {
-  ERROR_LOG() << "SocketError " << m_socket->errorString();
+  ERROR_LOG(m_logger) << "SocketError " << m_socket->errorString();
 }
 
 void VncHandler::resetHandler()
@@ -261,7 +261,7 @@ bool VncHandler::handleVersion(const RfbProtocol::STC::RfbVersion &version)
                                                  version.minorVersion()));
     return true;
   }
-  ERROR_LOG() << "Unsupported Version: " << version.majorVersion() << "." << version.minorVersion();
+  ERROR_LOG(m_logger) << "Unsupported Version: " << version.majorVersion() << "." << version.minorVersion();
   return false;
 }
 
@@ -276,7 +276,7 @@ bool VncHandler::handleSupportedSecurityTypes(const RfbProtocol::STC::RfbSupport
   for (quint8 type : supportedTypes.types())
     typesString.append(QString::number(type)).append(QLatin1Char(' '));
   if (typesString.isEmpty()) typesString = QStringLiteral("EMPTY");
-  ERROR_LOG() << "Unsupported Security Types: " << typesString;
+  ERROR_LOG(m_logger) << "Unsupported Security Types: " << typesString;
   return false;
 }
 
@@ -327,7 +327,7 @@ bool VncHandler::handleSecurityResult(const RfbProtocol::STC::RfbSecurityResult
   }
   else
   {
-    ERROR_LOG() << result.reason();
+    ERROR_LOG(m_logger) << result.reason();
     return false;
   }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Common/pws_vnc_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Common/pws_vnc_handler.h
index 0149794f6..bad42fc3d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Common/pws_vnc_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Common/pws_vnc_handler.h
@@ -39,6 +39,8 @@ private slots:
   void error();
 
 private:
+
+NGL::INGLLogger &m_logger;
   bool handleData(QDataStream &stream);
   bool handleFrameBufferUpdate(QDataStream &stream);
   bool handleSetColormap(QDataStream &stream);
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 69299546b..e64f7183e 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
@@ -137,7 +137,7 @@ bool ControlDialog::init(LtsSession::LtsSession *session,
     if (info.addresses().size() > 0)
       m_host = info.addresses().at(0);
     else
-      ERROR_LOG() << "Address for host " << m_ui->cbxWorkstations->currentText() << " not found!";
+      ERROR_LOG(m_logger) << "Address for host " << m_ui->cbxWorkstations->currentText() << " not found!";
   }
   return true;
 }
@@ -160,7 +160,7 @@ void ControlDialog::aboutToClose()
 
 void ControlDialog::slotOnConnectClicked()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, this=" << this;
   if (!m_isConnected)
   {
     initWebSocketHandler();
@@ -178,9 +178,9 @@ void ControlDialog::slotOnConnectClicked()
       m_webSocketClient->webSocket()->close();
     }
   }
-  DEBUG_LOG() << Q_FUNC_INFO << " connect clicked, this=" << this;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " connect clicked, this=" << this;
   updateConnectButton();
-  TRACE_LOG() << Q_FUNC_INFO << " END, this=" << this;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, this=" << this;
 }
 
 void ControlDialog::slotOnLogoutClicked()
@@ -190,7 +190,7 @@ void ControlDialog::slotOnLogoutClicked()
     m_webSocketClient->addReply((new LtsProjectionWorkstation::CTS::LogoutRequest(QUuid::createUuid().toString()))->toReplyMessage());
     m_webSocketClient->webSocket()->close();
   }
-  DEBUG_LOG() << Q_FUNC_INFO << " logout clicked, this=" << this;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " logout clicked, this=" << this;
   updateConnectButton();
 }
 
@@ -210,7 +210,7 @@ void ControlDialog::slotOnWebSocketConnected()
     if (workspaceIdToUse.isEmpty())
     {
       workspaceIdToUse = QUuid::createUuid().toString();
-      INFO_LOG() << "workspaceIdToUse " << workspaceIdToUse;
+      INFO_LOG(m_logger) << "workspaceIdToUse " << workspaceIdToUse;
     }
     m_opmIfc->callWorkspaceSaveUnsaved(workspaceIdToUse);
     LtsUtils::OperatorSettings* opSettings = LtsUtils::OperatorSettings::getInstance();
@@ -229,7 +229,7 @@ void ControlDialog::slotOnWebSocketConnected()
 
 
 
-    INFO_LOG() << " connect userId=" << userId
+    INFO_LOG(m_logger) << " connect userId=" << userId
                        << ", with prio=" << user.projectionPriority()
                        << ", PwsWorkspace/Id='" <<  workspaceIdToUse << "'";
 
@@ -244,7 +244,7 @@ void ControlDialog::slotOnWebSocketConnected()
 
 void ControlDialog::slotOnVncDisconnected()
 {
-  INFO_LOG() << " slotOnVncDisconnected";
+  INFO_LOG(m_logger) << " slotOnVncDisconnected";
 
   if (m_webSocketClient)
   {
@@ -255,7 +255,7 @@ void ControlDialog::slotOnVncDisconnected()
   if (!m_ui || !m_ui->pbnConnect)
     return;
   m_ui->pbnConnect->setEnabled(true);
-  DEBUG_LOG() << Q_FUNC_INFO << " VNC disconnected, this=" << this;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " VNC disconnected, this=" << this;
   updateConnectButton();
 }
 
@@ -267,18 +267,18 @@ void ControlDialog::slotOnWebSocketDisconnected()
   m_isConnected = false;
   if (m_ui && m_ui->pbnConnect)
     m_ui->pbnConnect->setEnabled(true);
-  DEBUG_LOG() << Q_FUNC_INFO << " WEBSOCKET disconnected, this=" << this;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " WEBSOCKET disconnected, this=" << this;
   updateConnectButton();
 }
 
 
 void ControlDialog::slotOnWebSocketError()
 {
-  ERROR_LOG() << m_webSocketClient->webSocket()->errorString();
+  ERROR_LOG(m_logger) << m_webSocketClient->webSocket()->errorString();
   LtsWidgets::LtsMessageDialog::showMessage(this, m_webSocketClient->webSocket()->errorString(), tr("Connection to the presentation workstation failed!"));
   m_isConnected = false;
   m_ui->pbnConnect->setEnabled(true);
-  DEBUG_LOG() << Q_FUNC_INFO << " VWEBSOCKET ERROR, this=" << this;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " VWEBSOCKET ERROR, this=" << this;
   updateConnectButton();
 }
 
@@ -299,7 +299,7 @@ void ControlDialog::slotCbxWorkstationsChanged()
   if (info.addresses().size() > 0)
     m_host = info.addresses().at(0);
   else
-    ERROR_LOG() << "Address for host " << m_ui->cbxWorkstations->currentText() << " not found!";
+    ERROR_LOG(m_logger) << "Address for host " << m_ui->cbxWorkstations->currentText() << " not found!";
 }
 
 
@@ -324,14 +324,14 @@ void ControlDialog::fillCombobox()
 
 void ControlDialog::updateConnectButton()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, this=" << this
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, this=" << this
                      << ", m_isConnected=" << m_isConnected
                      << ",  pbnConnect->text()=" << m_ui->pbnConnect->text();
   if (!m_ui)
     return;
   m_ui->pbnConnect->setText(m_isConnected ? tr("Disonnect") : tr("Connect"));
   m_ui->pbnLogout->setEnabled(m_isConnected);
-  TRACE_LOG() << Q_FUNC_INFO << " END, this=" << this
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, this=" << this
                      << ", m_isConnected=" << m_isConnected
                      << ",  pbnConnect->text()=" << m_ui->pbnConnect->text();
 }
@@ -358,7 +358,7 @@ void ControlDialog::handleMessage(LtsWebSocket::AbstractClientMessage *message)
                     LtsWidgets::LayoutArea::eDialogTab, false, false);
         }
       }
-      DEBUG_LOG() << Q_FUNC_INFO << " LoginSuccessful YES, this=" << this;
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " LoginSuccessful YES, this=" << this;
       m_isConnected = true;
       m_ui->pbnConnect->setEnabled(true);
       updateConnectButton();
@@ -377,7 +377,7 @@ void ControlDialog::handleMessage(LtsWebSocket::AbstractClientMessage *message)
       }
 
       LtsWidgets::LtsMessageDialog::showMessage(this, errMsg, tr("Login failed!"));
-      DEBUG_LOG() << Q_FUNC_INFO << " LoginSuccessful NO, this=" << this;
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " LoginSuccessful NO, this=" << this;
       m_isConnected = false;
       m_ui->pbnConnect->setEnabled(true);
       updateConnectButton();
@@ -388,13 +388,13 @@ void ControlDialog::handleMessage(LtsWebSocket::AbstractClientMessage *message)
   LtsProjectionWorkstation::STC::DedicatedDisconnect *disconnect = dynamic_cast<LtsProjectionWorkstation::STC::DedicatedDisconnect *>(message);
   if (disconnect)
   {
-    INFO_LOG() << " DedicatedDisconnect.. "
+    INFO_LOG(m_logger) << " DedicatedDisconnect.. "
                        << ", getOperatorId=" << LtsSessionData::LtsSessionData::getInstance()->getOperatorId()
                        << ", disconnect->userid()=" << disconnect->userid();
     if ( (disconnect->userid() != LtsSessionData::LtsSessionData::getInstance()->getOperatorId()) && m_isConnected)
     {
       slotOnWebSocketDisconnected();
-      INFO_LOG() << " DedicatedDisconnect.. done";
+      INFO_LOG(m_logger) << " DedicatedDisconnect.. done";
 
       
       
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 335e5f47a..6cc2fa99d 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
@@ -32,7 +32,7 @@ bool OperatorSettingsLoader::init(LtsSession::LtsSession *session)
 {
   if (!session->getFtc<OperatorManagement::DataInterface>(m_opmFtc))
   {
-    ERROR_LOG() << "Failed to load OperatorManagement FTC!";
+    ERROR_LOG(m_logger) << "Failed to load OperatorManagement FTC!";
     return false;
   }
   return true;
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 63e6bb7ff..a80eb67cc 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
@@ -29,6 +29,8 @@ public:
 
 private:
 
+
+NGL::INGLLogger &m_logger;
   bool loadOperatorRights();
 
   LtsProjectionWorkstation::
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 89a8533b5..9c0b3bdf6 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
@@ -72,7 +72,7 @@ void VncViewerDialog::retranslate()
 
 void VncViewerDialog::handleServerCuttext(const QString &cutText)
 {
-  DEBUG_LOG() << "Got cuttext: " << cutText;
+  DEBUG_LOG(m_logger) << "Got cuttext: " << cutText;
 }
 
 void VncViewerDialog::slotOnDisconnected()
@@ -240,7 +240,7 @@ void VncRenderAreaWorker::onRfbFrameBufferUpdate(const QVector<RfbProtocol::RfbR
   {
     if (rect.pixelData.isEmpty())
     {
-      WARNING_LOG() << "No valid vnc pixel data... skipping frame";
+      WARNING_LOG(m_logger) << "No valid vnc pixel data... skipping frame";
       continue;
     }
     QImage img(reinterpret_cast<const unsigned char *>(rect.pixelData.data()),
@@ -249,7 +249,7 @@ void VncRenderAreaWorker::onRfbFrameBufferUpdate(const QVector<RfbProtocol::RfbR
                QImage::Format_RGB32);
     if (img.isNull())
     {
-      WARNING_LOG() << "Could not decode image data... skipping vnc frame";
+      WARNING_LOG(m_logger) << "Could not decode image data... skipping vnc frame";
       continue;
     }
     painter.drawImage(QPoint(rect.xpos, rect.ypos), img);
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 a4d1cb911..435da1c08 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
@@ -34,6 +34,7 @@ Q_SIGNALS:
   void newImageAvailable();
   void newScaleSizeAspectRatio(QSize s);
 private:
+NGL::INGLLogger &m_logger;
   QImage m_renderedImage;  
   QImage m_scaledImage;
   mutable QMutex m_mutex;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_aes_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_aes_model.h
index fc4e4ebc9..e545f72eb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_aes_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_aes_model.h
@@ -27,6 +27,7 @@ struct ReportAesEntry
   int id() const { return _id; }
   void setId(int newId) { _id = newId; }
 private:
+NGL::INGLLogger &m_logger;
   int _id = 0;
 };
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_building_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_building_model.h
index 875bd96a8..0598d038f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_building_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_building_model.h
@@ -30,6 +30,8 @@ public:
   QVariant data(const QModelIndex &index, int role) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   LtsSession::LtsSession *m_session;
   std::shared_ptr<InfrastructureManagement::Interface::Dtc> m_ismDtc;
   ReportType m_reportType;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_charge_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_charge_model.h
index 0a06c0dd0..5f5a10ce6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_charge_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_charge_model.h
@@ -31,6 +31,8 @@ public:
   QVariant data(const QModelIndex &index, int role) const override;
 
 protected:
+
+NGL::INGLLogger &m_logger;
   bool isFiltered(const ProjectDataManagement::ChargeType &data, DataModification modType) const override;
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_sanitation_material_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_sanitation_material_model.h
index e23b9610b..e199c2d4e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_sanitation_material_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_sanitation_material_model.h
@@ -29,6 +29,8 @@ public:
   QVariant data(const QModelIndex &index, int role) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_pdmDtc;
   ReportType m_reportType;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_type_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_type_model.h
index 08aa51100..f305f465c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_type_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_type_model.h
@@ -30,6 +30,8 @@ public:
   QVariant data(const QModelIndex &index, int role) const override;
 
 protected:
+
+NGL::INGLLogger &m_logger;
   bool isFiltered(const ParticipantManagement::Type &data, DataModification) const override;
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_air_support_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_air_support_model.cpp
index 16123458c..4b9f2ec24 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_air_support_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_air_support_model.cpp
@@ -109,12 +109,12 @@ bool AirSupportModel::fetchInterfaces()
 {
   if (!m_session->getDtc<ProjectDataManagement::DataInterface>(m_pdmDtc))
   {
-    ERROR_LOG() << "Could not fetch PDM DTC Interface";
+    ERROR_LOG(m_logger) << "Could not fetch PDM DTC Interface";
     return false;
   }
   if (!m_session->getDtc<AreaEffectSimulation::DataInterface>(m_aesDtc))
   {
-    ERROR_LOG() << "Could not fetch PDM DTC Interface";
+    ERROR_LOG(m_logger) << "Could not fetch PDM DTC Interface";
     return false;
   }
   return true;
@@ -328,7 +328,7 @@ QVariant AirSupportModel::headerData(int section, Qt::Orientation orientation, i
 
 void AirSupportModel::fillReportData()
 {
-  DEBUG_LOG() << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
+  DEBUG_LOG(m_logger) << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
 
   int chargeTypeId = -1;
   QMap<int, QVector<int> > sums;
@@ -350,10 +350,10 @@ void AirSupportModel::fillReportData()
     resData.hits[2]       = obj[QStringLiteral("hits")].toInt();
     resData.hits[1]       = resData.hits[2] + resData.hits[3] + resData.hits[0];
 
-    INFO_LOG() << "Charge type id = " << resData.chargeTypeId;
-    INFO_LOG() << "Start time = " << resData.startTime;
-    INFO_LOG() << "VulnerabilityState = " << resData.vulnerabilityState;
-    INFO_LOG() << "Hits = ("
+    INFO_LOG(m_logger) << "Charge type id = " << resData.chargeTypeId;
+    INFO_LOG(m_logger) << "Start time = " << resData.startTime;
+    INFO_LOG(m_logger) << "VulnerabilityState = " << resData.vulnerabilityState;
+    INFO_LOG(m_logger) << "Hits = ("
                        << resData.hits[0] << ", "
                        << resData.hits[1] << ", "
                        << resData.hits[2] << ", "
@@ -362,7 +362,7 @@ void AirSupportModel::fillReportData()
 
     if (chargeTypeId != resData.chargeTypeId) 
     {
-      DEBUG_LOG() << "New chargeTypeId: " << resData.chargeTypeId;
+      DEBUG_LOG(m_logger) << "New chargeTypeId: " << resData.chargeTypeId;
       if (chargeTypeId != -1) 
       {
         resultDataTable totalChargeTypeId;
@@ -380,7 +380,7 @@ void AirSupportModel::fillReportData()
     }
     else
     {
-      DEBUG_LOG() << "Adding values to chargeType id: " << chargeTypeId;
+      DEBUG_LOG(m_logger) << "Adding values to chargeType id: " << chargeTypeId;
       resData.hits[4] = 0;  
       sumUp(sums[chargeTypeId], resData.hits, resData.hits.size());
     }
@@ -414,7 +414,7 @@ void AirSupportModel::fillReportData()
 
 void AirSupportModel::fillPieData()
 {
-  DEBUG_LOG() << "fillPieData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
+  DEBUG_LOG(m_logger) << "fillPieData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
 
   QMap<QPair<int,double>, QVector<int> > sums;
 
@@ -430,9 +430,9 @@ void AirSupportModel::fillPieData()
     resPieData.hits[2]       = obj[QStringLiteral("hits")].toInt();
     resPieData.hits[1]       = resPieData.hits[2] + resPieData.hits[3];
 
-    INFO_LOG() << "Charge type id = " << resPieData.chargeTypeId;
-    INFO_LOG() << "Start time = " << resPieData.startTime;
-    INFO_LOG() << "Hits = ("
+    INFO_LOG(m_logger) << "Charge type id = " << resPieData.chargeTypeId;
+    INFO_LOG(m_logger) << "Start time = " << resPieData.startTime;
+    INFO_LOG(m_logger) << "Hits = ("
                        << resPieData.hits[0] << ", "
                        << resPieData.hits[1] << ", "
                        << resPieData.hits[2] << ", "
@@ -458,10 +458,10 @@ void AirSupportModel::fillPieData()
     resPie.startTime = key.second;
     resPie.hits = sums[key];
 
-    INFO_LOG() << "ChargeType: " << resPie.chargeTypeId;
-    INFO_LOG() << "StartTime: " << resPie.startTime;
+    INFO_LOG(m_logger) << "ChargeType: " << resPie.chargeTypeId;
+    INFO_LOG(m_logger) << "StartTime: " << resPie.startTime;
     for(int i = 0; i < resPie.hits.size(); ++i)
-      INFO_LOG() << "Hits = ("
+      INFO_LOG(m_logger) << "Hits = ("
                          << resPie.hits[0] << ", "
                          << resPie.hits[1] << ", "
                          << resPie.hits[2] << ", "
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_building_damage_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_building_damage_model.cpp
index 47d172a0b..2781a8454 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_building_damage_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_building_damage_model.cpp
@@ -160,7 +160,7 @@ QVariant BuildingDamageModel::headerData(int section, Qt::Orientation orientatio
 
 void BuildingDamageModel::fillReportData()
 {
-  DEBUG_LOG() << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
+  DEBUG_LOG(m_logger) << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
 
   for (const QJsonValue &arrVal : std::as_const(m_reportJsonArray))
   {
@@ -176,10 +176,10 @@ void BuildingDamageModel::fillReportData()
     resData.damages[4]   = obj[QStringLiteral("damage_100")].toInt();
     resData.buildingDamagePercent = obj[QStringLiteral("damage_percent")].toInt();
 
-    INFO_LOG() << "Building Id = " << resData.buildingId;
-    INFO_LOG() << "Time point = " << resData.timePoint;
-    INFO_LOG() << "Damages = " << resData.damages;
-    INFO_LOG() << "Building Damage Percent = " << resData.buildingDamagePercent;
+    INFO_LOG(m_logger) << "Building Id = " << resData.buildingId;
+    INFO_LOG(m_logger) << "Time point = " << resData.timePoint;
+    INFO_LOG(m_logger) << "Damages = " << resData.damages;
+    INFO_LOG(m_logger) << "Building Damage Percent = " << resData.buildingDamagePercent;
 
     m_data.append(std::move(resData));
   }
@@ -190,7 +190,7 @@ bool BuildingDamageModel::fetchInterfaces()
 {
   if (!m_session->getDtc<InfrastructureManagement::DataInterface>(m_ismDtc))
   {
-    ERROR_LOG() << "Could not fetch ISM DTC Interface";
+    ERROR_LOG(m_logger) << "Could not fetch ISM DTC Interface";
     return false;
   }
   return true;
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 08277d753..fa9c56937 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
@@ -57,7 +57,7 @@ bool ChargeAdministrationModel::fetchInterfaces()
 {
   if (!m_session->getDtc<ProjectDataManagement::DataInterface>(m_pdmDtc))
   {
-    ERROR_LOG() << "Could not fetch PDM DTC Interface";
+    ERROR_LOG(m_logger) << "Could not fetch PDM DTC Interface";
     return false;
   }
   return true;
@@ -184,7 +184,7 @@ QVariant ChargeAdministrationModel::headerData(int section, Qt::Orientation orie
 
 void ChargeAdministrationModel::fillReportData()
 {
-  DEBUG_LOG() << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
+  DEBUG_LOG(m_logger) << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
 
   int sums[6] = {0, 0, 0, 0, 0, 0};
   int bigTotal[6] = {0, 0, 0, 0, 0, 0};
@@ -204,15 +204,15 @@ void ChargeAdministrationModel::fillReportData()
     resData.charges[4] = obj[QStringLiteral("charge_planned")].toInt();
     resData.charges[5] = obj[QStringLiteral("charge_available")].toInt();
 
-    INFO_LOG() << "Charge type id = " << resData.chargeTypeId;
-    INFO_LOG() << "Effect Source id = " << resData.effectSourceId;
-    INFO_LOG() << "Charges = (" << resData.charges[0] << ", " << resData.charges[1] << ", " << resData.charges[2] << ", " << resData.charges[3] << ", "
+    INFO_LOG(m_logger) << "Charge type id = " << resData.chargeTypeId;
+    INFO_LOG(m_logger) << "Effect Source id = " << resData.effectSourceId;
+    INFO_LOG(m_logger) << "Charges = (" << resData.charges[0] << ", " << resData.charges[1] << ", " << resData.charges[2] << ", " << resData.charges[3] << ", "
                        << resData.charges[4] << ", " << resData.charges[5] << ")";
 
     
     if (effectSourceId != resData.effectSourceId)
     {
-      DEBUG_LOG() << "New effectSourceId: " << resData.effectSourceId;
+      DEBUG_LOG(m_logger) << "New effectSourceId: " << resData.effectSourceId;
       if (effectSourceId != ProjectDataManagement::EffectSource::ES_Unknown)
       {
         resultData totalEffectSource;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_administration_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_administration_model.h
index 93b1f16c1..e4e1d89e2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_administration_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_administration_model.h
@@ -23,6 +23,8 @@ class ChargeAdministrationModel final : public AbstractModel
   bool fetchInterfaces() override final;
 
   private:
+
+  NGL::INGLLogger &m_logger;
   explicit ChargeAdministrationModel(const ReportManagement::ReportInfo &report, LtsSession::LtsSession *session, QObject *parent);
   void fillReportData() override final;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_resupply_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_resupply_model.cpp
index f384b4fbb..ddfc412bc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_resupply_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_resupply_model.cpp
@@ -99,12 +99,12 @@ bool ChargeResupplyModel::fetchInterfaces()
 {
   if (!m_session->getDtc<ProjectDataManagement::DataInterface>(m_pdmDtc))
   {
-    ERROR_LOG() << "Could not fetch PDM DTC Interface";
+    ERROR_LOG(m_logger) << "Could not fetch PDM DTC Interface";
     return false;
   }
   if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
   {
-    ERROR_LOG() << "Could not fetch PPM DTC Interface";
+    ERROR_LOG(m_logger) << "Could not fetch PPM DTC Interface";
     return false;
   }
   return true;
@@ -251,7 +251,7 @@ QVariant ChargeResupplyModel::headerData(int section, Qt::Orientation orientatio
 
 void ChargeResupplyModel::fillReportData()
 {
-  DEBUG_LOG() << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
+  DEBUG_LOG(m_logger) << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
 
   int participantTypeId = -1;
   QMap<int, QVector<int> > sums;
@@ -271,9 +271,9 @@ void ChargeResupplyModel::fillReportData()
     resData.charges[3]   = obj[QStringLiteral("charge_end")].toInt();
     resData.charges[4]   = obj[QStringLiteral("charge_fired")].toInt();
 
-    INFO_LOG() << "Participant type id = " << resData.participantTypeId;
-    INFO_LOG() << "Charge type id = " << resData.chargeTypeId;
-    INFO_LOG() << "Charges = ("
+    INFO_LOG(m_logger) << "Participant type id = " << resData.participantTypeId;
+    INFO_LOG(m_logger) << "Charge type id = " << resData.chargeTypeId;
+    INFO_LOG(m_logger) << "Charges = ("
                        << resData.charges[0] << ", "
                        << resData.charges[1] << ", "
                        << resData.charges[2] << ", "
@@ -282,7 +282,7 @@ void ChargeResupplyModel::fillReportData()
 
     if (participantTypeId != resData.participantTypeId) 
     {
-      DEBUG_LOG() << "New participant type id: " << resData.participantTypeId;
+      DEBUG_LOG(m_logger) << "New participant type id: " << resData.participantTypeId;
       if (participantTypeId != -1) 
       {
         resultData totalType;
@@ -299,7 +299,7 @@ void ChargeResupplyModel::fillReportData()
     }
     else
     {
-      DEBUG_LOG() << "Adding values to participant type id: " << participantTypeId;
+      DEBUG_LOG(m_logger) << "Adding values to participant type id: " << participantTypeId;
       sumUp(sums[participantTypeId], resData.charges, resData.charges.size());
     }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_firings_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_firings_model.cpp
index d048c43f6..fcf14a07c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_firings_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_firings_model.cpp
@@ -108,7 +108,7 @@ bool FiringsModel::fetchInterfaces()
 {
   if (!m_session->getDtc<ProjectDataManagement::DataInterface>(m_pdmDtc))
   {
-    ERROR_LOG() << "Could not fetch PDM DTC Interface";
+    ERROR_LOG(m_logger) << "Could not fetch PDM DTC Interface";
     return false;
   }
   return true;
@@ -314,7 +314,7 @@ QVariant FiringsModel::headerData(int section, Qt::Orientation orientation, int
 
 void FiringsModel::fillReportData()
 {
-  DEBUG_LOG() << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
+  DEBUG_LOG(m_logger) << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
 
   int chargeTypeId = -1;
   QMap<int, QVector<int> > sums;
@@ -335,10 +335,10 @@ void FiringsModel::fillReportData()
     resData.hits[2]       = obj[QStringLiteral("hits")].toInt();
     resData.hits[1]       = resData.hits[2] + resData.hits[3];
 
-    INFO_LOG() << "Charge type id = " << resData.chargeTypeId;
-    INFO_LOG() << "Start time = " << resData.startTime;
-    INFO_LOG() << "VulnerabilityState = " << resData.vulnerabilityState;
-    INFO_LOG() << "Hits = ("
+    INFO_LOG(m_logger) << "Charge type id = " << resData.chargeTypeId;
+    INFO_LOG(m_logger) << "Start time = " << resData.startTime;
+    INFO_LOG(m_logger) << "VulnerabilityState = " << resData.vulnerabilityState;
+    INFO_LOG(m_logger) << "Hits = ("
                        << resData.hits[0] << ", "
                        << resData.hits[1] << ", "
                        << resData.hits[2] << ", "
@@ -346,7 +346,7 @@ void FiringsModel::fillReportData()
 
     if (chargeTypeId != resData.chargeTypeId) 
     {
-      DEBUG_LOG() << "New charge type id: " << resData.chargeTypeId;
+      DEBUG_LOG(m_logger) << "New charge type id: " << resData.chargeTypeId;
       if (chargeTypeId != -1) 
       {
         resultDataTable totalChargeType;
@@ -364,7 +364,7 @@ void FiringsModel::fillReportData()
     }
     else
     {
-      DEBUG_LOG() << "Adding values to charge type id: " << chargeTypeId;
+      DEBUG_LOG(m_logger) << "Adding values to charge type id: " << chargeTypeId;
       sumUp(sums[chargeTypeId], resData.hits, resData.hits.size());
     }
 
@@ -397,7 +397,7 @@ void FiringsModel::fillReportData()
 
 void FiringsModel::fillPieData()
 {
-  DEBUG_LOG() << "fillPieData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
+  DEBUG_LOG(m_logger) << "fillPieData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
 
   QMap<QPair<int,double>, QVector<int> > sums;
 
@@ -414,9 +414,9 @@ void FiringsModel::fillPieData()
     resPieData.hits[2]       = obj[QStringLiteral("hits")].toInt();
     resPieData.hits[1]       = resPieData.hits[2] + resPieData.hits[3];
 
-    INFO_LOG() << "Charge type id = " << resPieData.chargeTypeId;
-    INFO_LOG() << "Start time = " << resPieData.startTime;
-    INFO_LOG() << "Hits = ("
+    INFO_LOG(m_logger) << "Charge type id = " << resPieData.chargeTypeId;
+    INFO_LOG(m_logger) << "Start time = " << resPieData.startTime;
+    INFO_LOG(m_logger) << "Hits = ("
                        << resPieData.hits[0] << ", "
                        << resPieData.hits[1] << ", "
                        << resPieData.hits[2] << ", "
@@ -440,10 +440,10 @@ void FiringsModel::fillPieData()
     resPie.startTime = key.second;
     resPie.hits = sums[key];
 
-    INFO_LOG() << "ChargeType: " << resPie.chargeTypeId;
-    INFO_LOG() << "StartTime: " << resPie.startTime;
+    INFO_LOG(m_logger) << "ChargeType: " << resPie.chargeTypeId;
+    INFO_LOG(m_logger) << "StartTime: " << resPie.startTime;
     for(int i = 0; i < resPie.hits.size(); ++i)
-      INFO_LOG() << "Hits = ("
+      INFO_LOG(m_logger) << "Hits = ("
                          << resPie.hits[0] << ", "
                          << resPie.hits[1] << ", "
                          << resPie.hits[2] << ", "
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 dc888e558..e9a560c83 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
@@ -16,10 +16,9 @@
 using namespace ReportManagement;
 
 
-MaintenanceModel::MaintenanceModel(const ReportInfo &report, LtsSession::LtsSession *session, QObject *parent)
-  : AbstractModel(report, session, parent)
-  , m_ppmDtc(nullptr)
-{
+MaintenanceModel::MaintenanceModel(const ReportInfo &report, LtsSession::LtsSession *session, QObject *parent) : AbstractModel(report, session, parent)
+  , m_ppmDtc(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   if (!fetchInterfaces())
     return;
 
@@ -68,7 +67,7 @@ bool MaintenanceModel::fetchInterfaces()
 {
   if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
   {
-    ERROR_LOG() << "Could not fetch PPM DTC Interface";
+    ERROR_LOG(m_logger) << "Could not fetch PPM DTC Interface";
     return false;
   }
   return true;
@@ -197,7 +196,7 @@ QVariant MaintenanceModel::headerData(int section, Qt::Orientation orientation,
 
 void MaintenanceModel::fillReportData()
 {
-  DEBUG_LOG() << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
+  DEBUG_LOG(m_logger) << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
 
   for (const QJsonValue &arrVal : std::as_const(m_reportJsonArray))
   {
@@ -212,11 +211,11 @@ void MaintenanceModel::fillReportData()
     resData.time_position       = obj[QStringLiteral("time_position_changed")].toDouble();
     resData.time_vulnerability  = obj[QStringLiteral("time_vulnerability")].toDouble();
 
-    INFO_LOG() << "Participant id = " << resData.participantId;
-    INFO_LOG() << "Participant type id = " << resData.participantTypeId;
-    INFO_LOG() << "Time event = " << resData.time_event;
-    INFO_LOG() << "Time pos = " << resData.time_position;
-    INFO_LOG() << "Time vulnerability = " << resData.time_vulnerability;
+    INFO_LOG(m_logger) << "Participant id = " << resData.participantId;
+    INFO_LOG(m_logger) << "Participant type id = " << resData.participantTypeId;
+    INFO_LOG(m_logger) << "Time event = " << resData.time_event;
+    INFO_LOG(m_logger) << "Time pos = " << resData.time_position;
+    INFO_LOG(m_logger) << "Time vulnerability = " << resData.time_vulnerability;
 
     m_data.append(std::move(resData));
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_medevac_nine_liner_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_medevac_nine_liner_model.cpp
index 98ecfb9bd..f66041e5e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_medevac_nine_liner_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_medevac_nine_liner_model.cpp
@@ -52,7 +52,7 @@ bool MedevacNineLinerModel::fetchInterfaces()
 {
   if (!m_session->getDtc<Evaluations::DataInterface>(m_evlDtc))
   {
-    ERROR_LOG() << "Could not fetch EVL DTC Interface";
+    ERROR_LOG(m_logger) << "Could not fetch EVL DTC Interface";
     return false;
   }
   return true;
@@ -162,7 +162,7 @@ QVariant MedevacNineLinerModel::headerData(int section, Qt::Orientation orientat
 
 void MedevacNineLinerModel::fillReportData()
 {
-  ERROR_LOG() << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
+  ERROR_LOG(m_logger) << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
 
   for (const QJsonValue &arrVal : std::as_const(m_reportJsonArray))
   {
@@ -170,7 +170,7 @@ void MedevacNineLinerModel::fillReportData()
 
     resultData resData;
     resData.nineLinerId  = obj[QStringLiteral("nine_liner_id")].toInt();
-    DEBUG_LOG() << "Nine Liner id = " << resData.nineLinerId;
+    DEBUG_LOG(m_logger) << "Nine Liner id = " << resData.nineLinerId;
 
     Evaluations::SanNineLiner crtNineLiner = m_evlDtc->sanNineLiner(resData.nineLinerId);
     if (crtNineLiner.id() <= 0 )
@@ -184,7 +184,7 @@ void MedevacNineLinerModel::fillReportData()
     
     QVector<Evaluations::Database::SanCategoryLine> linesCategory = Evaluations::SanCategoryLine::fromJson(crtNineLiner.lines(), crtNineLiner.id());
 
-    INFO_LOG() << "linesCategory size: " << linesCategory.size();
+    INFO_LOG(m_logger) << "linesCategory size: " << linesCategory.size();
 
     for (const Evaluations::Database::SanCategoryLine &cl : std::as_const(linesCategory))
     {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_mine_area_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_mine_area_model.cpp
index c810c3522..70863da6b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_mine_area_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_mine_area_model.cpp
@@ -72,7 +72,7 @@ bool MineAreaModel::fetchInterfaces()
 {
   if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
   {
-    ERROR_LOG() << "Could not fetch PPM DTC Interface";
+    ERROR_LOG(m_logger) << "Could not fetch PPM DTC Interface";
     return false;
   }
   return true;
@@ -203,7 +203,7 @@ QVariant MineAreaModel::headerData(int section, Qt::Orientation orientation, int
 
 void MineAreaModel::fillReportData()
 {
-  DEBUG_LOG() << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
+  DEBUG_LOG(m_logger) << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
 
   int mineAreaId = -1;
   QString mineAreaName;
@@ -223,10 +223,10 @@ void MineAreaModel::fillReportData()
     resData.hits[2]             = obj[QStringLiteral("hit_friendly_fire")].toInt();
     resData.hits[1]             = resData.hits[0] - resData.hits[2];
 
-    INFO_LOG() << "Mine area id = " << resData.mineAreaId;
-    INFO_LOG() << "Mine area name = " << resData.mineAreaName;
-    INFO_LOG() << "Participant type id = " << resData.participantTypeId;
-    INFO_LOG() << "Hits = ("
+    INFO_LOG(m_logger) << "Mine area id = " << resData.mineAreaId;
+    INFO_LOG(m_logger) << "Mine area name = " << resData.mineAreaName;
+    INFO_LOG(m_logger) << "Participant type id = " << resData.participantTypeId;
+    INFO_LOG(m_logger) << "Hits = ("
                        << resData.hits[0] << ", "
                        << resData.hits[1] << ", "
                        << resData.hits[2] << ")" ;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_nbc_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_nbc_model.cpp
index ba9cdac72..4d5ca1eda 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_nbc_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_nbc_model.cpp
@@ -105,12 +105,12 @@ bool NbcModel::fetchInterfaces()
 {
   if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
   {
-    ERROR_LOG() << "Could not fetch PPM DTC Interface";
+    ERROR_LOG(m_logger) << "Could not fetch PPM DTC Interface";
     return false;
   }
   if (!m_session->getDtc<ProjectDataManagement::DataInterface>(m_pdmDtc))
   {
-    ERROR_LOG() << "Could not fetch PDM DTC Interface";
+    ERROR_LOG(m_logger) << "Could not fetch PDM DTC Interface";
     return false;
   }
   return true;
@@ -256,7 +256,7 @@ QVariant NbcModel::headerData(int section, Qt::Orientation orientation, int role
 
 void NbcModel::fillReportData()
 {
-  DEBUG_LOG() << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
+  DEBUG_LOG(m_logger) << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
 
   int nbcId = -1;
   QString nbcName;
@@ -278,10 +278,10 @@ void NbcModel::fillReportData()
     resData.hits[0]             = obj[QStringLiteral("hit")].toInt();
     resData.hits[1]             = obj[QStringLiteral("protection")].toInt();
 
-    INFO_LOG() << "Nbc id = " << resData.nbcId;
-    INFO_LOG() << "Nbc name = " << resData.nbcName;
-    INFO_LOG() << "Participant type id = " << resData.participantTypeId;
-    INFO_LOG() << "Hits = ("
+    INFO_LOG(m_logger) << "Nbc id = " << resData.nbcId;
+    INFO_LOG(m_logger) << "Nbc name = " << resData.nbcName;
+    INFO_LOG(m_logger) << "Participant type id = " << resData.participantTypeId;
+    INFO_LOG(m_logger) << "Hits = ("
                        << resData.hits[0] << ", "
                        << resData.hits[1];
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_participant_distance_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_participant_distance_model.cpp
index dd425af50..3bec186b7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_participant_distance_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_participant_distance_model.cpp
@@ -71,7 +71,7 @@ bool ParticipantDistanceModel::fetchInterfaces()
 {
   if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
   {
-    ERROR_LOG() << "Could not fetch PPM DTC Interface";
+    ERROR_LOG(m_logger) << "Could not fetch PPM DTC Interface";
     return false;
   }
   return true;
@@ -199,7 +199,7 @@ QVariant ParticipantDistanceModel::headerData(int section, Qt::Orientation orien
 
 void ParticipantDistanceModel::fillReportData()
 {
-  DEBUG_LOG() << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
+  DEBUG_LOG(m_logger) << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
 
   int participantTypeId = -1;
   long bigTotal = 0;
@@ -216,9 +216,9 @@ void ParticipantDistanceModel::fillReportData()
     resData.participantEqNo     = obj[QStringLiteral("participant_equipment_number")].toInt();
     resData.distance            = obj[QStringLiteral("distance")].toDouble();
 
-    INFO_LOG() << "Participant id = " << resData.participantId;
-    INFO_LOG() << "Participant type id = " << resData.participantTypeId;
-    INFO_LOG() << "Participant distance = " << resData.distance;
+    INFO_LOG(m_logger) << "Participant id = " << resData.participantId;
+    INFO_LOG(m_logger) << "Participant type id = " << resData.participantTypeId;
+    INFO_LOG(m_logger) << "Participant distance = " << resData.distance;
 
     if (participantTypeId != resData.participantTypeId) 
     {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_sanitation_material_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_sanitation_material_model.cpp
index 3fc3a84d0..df7c71213 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_sanitation_material_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_sanitation_material_model.cpp
@@ -93,7 +93,7 @@ bool SanitationMaterialModel::fetchInterfaces()
 {
   if (!m_session->getDtc<ProjectDataManagement::DataInterface>(m_pdmDtc))
   {
-    ERROR_LOG() << "Could not fetch PDM DTC Interface";
+    ERROR_LOG(m_logger) << "Could not fetch PDM DTC Interface";
     return false;
   }
   return true;
@@ -235,7 +235,7 @@ QVariant SanitationMaterialModel::headerData(int section, Qt::Orientation orient
 
 void SanitationMaterialModel::fillReportData()
 {
-  DEBUG_LOG() << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
+  DEBUG_LOG(m_logger) << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
 
 
   
@@ -256,11 +256,11 @@ void SanitationMaterialModel::fillReportData()
     resData.amounts[3]    = obj[QStringLiteral("amount_used")].toInt();
     resData.duration      = obj[QStringLiteral("duration")].toDouble();
 
-    ERROR_LOG() << "Unique id = " << resData.uniqueId;
-    ERROR_LOG() << "qualification = " << resData.qualification;
-    ERROR_LOG() << "Material id = " << resData.materialId;
-    ERROR_LOG() << "Duration with no stock = " << resData.duration;
-    ERROR_LOG() << "Amounts = ("
+    ERROR_LOG(m_logger) << "Unique id = " << resData.uniqueId;
+    ERROR_LOG(m_logger) << "qualification = " << resData.qualification;
+    ERROR_LOG(m_logger) << "Material id = " << resData.materialId;
+    ERROR_LOG(m_logger) << "Duration with no stock = " << resData.duration;
+    ERROR_LOG(m_logger) << "Amounts = ("
                         << resData.amounts[0] << ", "
                         << resData.amounts[1] << ", "
                         << resData.amounts[2] << ", "
@@ -291,7 +291,7 @@ void SanitationMaterialModel::fillReportData()
       totalMatId.qualification = 0;
       totalMatId.amounts = totals[matId];
 
-      DEBUG_LOG() << "Totals per material id = " << matId << " : "
+      DEBUG_LOG(m_logger) << "Totals per material id = " << matId << " : "
                           << totalMatId.amounts[0] << ", "
                           << totalMatId.amounts[1] << ", "
                           << totalMatId.amounts[2] << ", "
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 775afe282..c26f843ef 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
@@ -20,11 +20,10 @@
 using namespace ReportManagement;
 
 
-TreatmentModel::TreatmentModel(const ReportInfo &report, LtsSession::LtsSession *session, QObject *parent)
-  : AbstractModel(report, session, parent)
+TreatmentModel::TreatmentModel(const ReportInfo &report, LtsSession::LtsSession *session, QObject *parent) : AbstractModel(report, session, parent)
   , m_ppmDtc(nullptr)
-  , m_pdmDtc(nullptr)
-{
+  , m_pdmDtc(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   if (!fetchInterfaces())
     return;
 
@@ -115,12 +114,12 @@ bool TreatmentModel::fetchInterfaces()
 {
   if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
   {
-    ERROR_LOG() << "Could not fetch PPM DTC Interface";
+    ERROR_LOG(m_logger) << "Could not fetch PPM DTC Interface";
     return false;
   }
   if (!m_session->getDtc<ProjectDataManagement::DataInterface>(m_pdmDtc))
   {
-    ERROR_LOG() << "Could not fetch PDM DTC Interface";
+    ERROR_LOG(m_logger) << "Could not fetch PDM DTC Interface";
     return false;
   }
   return true;
@@ -252,7 +251,7 @@ QVariant TreatmentModel::data(const QModelIndex &index, int role) const
   if (m_report.visualisationType() == VisualisationType::Bar && m_report.reportType() == ReportType::Treatment)
   {
     int sanResult = index.row();
-    DEBUG_LOG() << "SanRes  = " << sanResult;
+    DEBUG_LOG(m_logger) << "SanRes  = " << sanResult;
     const resultDataPieEvaluation &pieInfo = m_bars[sanResult];
     if (role == Qt::EditRole)
       return pieInfo.groupId;
@@ -428,7 +427,7 @@ QVariant TreatmentModel::headerData(int section, Qt::Orientation orientation, in
 
 void TreatmentModel::fillReportData()
 {
-  DEBUG_LOG() << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
+  DEBUG_LOG(m_logger) << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
 
   
   resultDataPie pie;
@@ -490,11 +489,11 @@ void TreatmentModel::fillReportData()
     {
       if (resData.timeTreatmentVulnerability < (10 * 60 * 1000))
         resData.inbetween10Minutes = true;
-      DEBUG_LOG() << "qualification: " << resData.qualification;
+      DEBUG_LOG(m_logger) << "qualification: " << resData.qualification;
       if (resData.timeTreatmentVulnerability < (60 * 60 * 1000) && resData.qualification == ParticipantManagement::Qualification_def::SANPers)
       {
         resData.goldenHour = true;
-        DEBUG_LOG() << "golden hour particpantId: " << resData.participantId;
+        DEBUG_LOG(m_logger) << "golden hour particpantId: " << resData.participantId;
       }
     }
     if (resData.sanitationResult == ParticipantManagement::SanitationResult_def::Optimal)
@@ -505,7 +504,7 @@ void TreatmentModel::fillReportData()
 
     
     int key = getParticipantKey(resData.participantId);
-    DEBUG_LOG() << "getParticipantKey: " << key;
+    DEBUG_LOG(m_logger) << "getParticipantKey: " << key;
 
     
     countVulnerabilityState(key, resData);
@@ -533,12 +532,12 @@ void TreatmentModel::fillReportData()
     
     if (resData.timeEnterArea <= 0)
     {
-      DEBUG_LOG() << "1. not entered RS: " << resData.participantId;
+      DEBUG_LOG(m_logger) << "1. not entered RS: " << resData.participantId;
       if (!m_rescueStationNotTreated[key].contains(resData.participantId) &&
           !m_rescueStationTreated[key].contains(resData.participantId))
       {
         m_treatmentIntervalMap[key][PIE_notEnteredRecueArea].insert(resData.participantId);
-        DEBUG_LOG() << "2. not entered RS: " << resData.participantId;
+        DEBUG_LOG(m_logger) << "2. not entered RS: " << resData.participantId;
       }
     }
     
@@ -581,19 +580,19 @@ void TreatmentModel::fillReportData()
     resDataTable.amountLightlyWounded  = tmpVulMap.value(ProjectDataManagement::VulnerabilityState_def::LightDamage).size();
     resDataTotal.amountLightlyWounded += resDataTable.amountLightlyWounded;
     for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState_def::LightDamage))
-      INFO_LOG() << "participantId: lightlyWouned: " << id;
+      INFO_LOG(m_logger) << "participantId: lightlyWouned: " << id;
 
     
     resDataTable.amountMediumWounded  = tmpVulMap.value(ProjectDataManagement::VulnerabilityState_def::MediumDamage).size();
     resDataTotal.amountMediumWounded += resDataTable.amountMediumWounded;
     for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState_def::MediumDamage))
-      INFO_LOG() << "participantId: mediumWouned: " << id;
+      INFO_LOG(m_logger) << "participantId: mediumWouned: " << id;
 
     
     resDataTable.amountHeavyWounded  = tmpVulMap.value(ProjectDataManagement::VulnerabilityState_def::HeavyDamage).size();
     resDataTotal.amountHeavyWounded += resDataTable.amountHeavyWounded;
     for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState_def::HeavyDamage))
-      INFO_LOG() << "participantId: heavyWouned: " << id;
+      INFO_LOG(m_logger) << "participantId: heavyWouned: " << id;
 
     
     resDataTable.amountInjuryTotal = resDataTable.amountLightlyWounded + resDataTable.amountMediumWounded
@@ -607,7 +606,7 @@ void TreatmentModel::fillReportData()
     
     for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState_def::CatastrophicKill))
     {
-      INFO_LOG() << "participantId: KIA: " << id;
+      INFO_LOG(m_logger) << "participantId: KIA: " << id;
       m_rescueStationTreated[resDataTable.participantId].remove(id);
       m_rescueStationNotTreated[resDataTable.participantId].remove(id);
     }
@@ -618,7 +617,7 @@ void TreatmentModel::fillReportData()
     
     for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState_def::TemporarySeverance))
     {
-      INFO_LOG() << "participantId: kiaAfterWia: " << id;
+      INFO_LOG(m_logger) << "participantId: kiaAfterWia: " << id;
       m_rescueStationTreated[resDataTable.participantId].remove(id);
       m_rescueStationNotTreated[resDataTable.participantId].remove(id);
     }
@@ -627,7 +626,7 @@ void TreatmentModel::fillReportData()
     resDataTable.amountTreated  = m_treatmentAmount.value(resDataTable.participantId).size();
     resDataTotal.amountTreated += resDataTable.amountTreated;
     for ( int id : m_treatmentAmount.value(resDataTable.participantId))
-      INFO_LOG() << "participantId: treated " << id;
+      INFO_LOG(m_logger) << "participantId: treated " << id;
 
     resDataTable.amountPlatin         = m_treatmentIntervalMap[resDataTable.participantId][PIE_platin].size();
     resDataTable.amountGoldenHour     = m_treatmentIntervalMap[resDataTable.participantId][PIE_goldenHour].size();
@@ -645,13 +644,13 @@ void TreatmentModel::fillReportData()
     resDataTable.amountEnterRescueStationNotTreated  = m_rescueStationNotTreated.value(resDataTable.participantId).size();
     resDataTotal.amountEnterRescueStationNotTreated += resDataTable.amountEnterRescueStationNotTreated;
     for ( int id : m_rescueStationNotTreated.value(resDataTable.participantId))
-      INFO_LOG() << "participantId: in RescueStation - not treated: " << id;
+      INFO_LOG(m_logger) << "participantId: in RescueStation - not treated: " << id;
 
     
     resDataTable.amountEnterRescueStationTreated  = m_rescueStationTreated.value(resDataTable.participantId).size();
     resDataTotal.amountEnterRescueStationTreated += resDataTable.amountEnterRescueStationTreated;
     for ( int id : m_rescueStationTreated.value(resDataTable.participantId))
-      INFO_LOG() << "participantId: in RescueStation - treated: " << id;
+      INFO_LOG(m_logger) << "participantId: in RescueStation - treated: " << id;
 
     m_dataTable.append(std::move(resDataTable));
   }
@@ -664,7 +663,7 @@ void TreatmentModel::fillReportData()
   
   for ( const QMap<int,QSet<int>> &map : std::as_const(m_treatmentIntervalMap))
   {
-    INFO_LOG() << "not entered RS: " << map[PIE_notEnteredRecueArea].size();
+    INFO_LOG(m_logger) << "not entered RS: " << map[PIE_notEnteredRecueArea].size();
     pie.results[PIE_platin]              += map[PIE_platin].size();
     pie.results[PIE_goldenHour]          += map[PIE_goldenHour].size();    
     pie.results[PIE_notEnteredRecueArea] += map[PIE_notEnteredRecueArea].size();
@@ -682,28 +681,28 @@ void TreatmentModel::fillReportData()
   for (auto it = m_bars.begin(); it != m_bars.end(); ++it)
   {
     resultDataPieEvaluation data = it.value();
-    DEBUG_LOG() << it.key() << ", GroupId = " << data.groupId << ", results = {" << data.results[0] << "," << data.results[1] << "," << data.results[2] << "}";
+    DEBUG_LOG(m_logger) << it.key() << ", GroupId = " << data.groupId << ", results = {" << data.results[0] << "," << data.results[1] << "," << data.results[2] << "}";
   }
 
-  INFO_LOG() << "Pie Results: ";
-  INFO_LOG() << "Inbetween 10 min: " << pie.results[PIE_platin];
-  INFO_LOG() << "Golden Hour:      " << pie.results[PIE_goldenHour];
-  INFO_LOG() << "KIA:              " << pie.results[PIE_KIA];
-  INFO_LOG() << "Enter RS:         " << pie.results[PIE_enterRescueArea];
-  INFO_LOG() << "Not Enter RS:     " << pie.results[PIE_notEnteredRecueArea];
-  INFO_LOG() << "Total:            " << pie.results[PIE_total];
+  INFO_LOG(m_logger) << "Pie Results: ";
+  INFO_LOG(m_logger) << "Inbetween 10 min: " << pie.results[PIE_platin];
+  INFO_LOG(m_logger) << "Golden Hour:      " << pie.results[PIE_goldenHour];
+  INFO_LOG(m_logger) << "KIA:              " << pie.results[PIE_KIA];
+  INFO_LOG(m_logger) << "Enter RS:         " << pie.results[PIE_enterRescueArea];
+  INFO_LOG(m_logger) << "Not Enter RS:     " << pie.results[PIE_notEnteredRecueArea];
+  INFO_LOG(m_logger) << "Total:            " << pie.results[PIE_total];
 
   for (auto it = m_vulnerabilityMap.begin(); it != m_vulnerabilityMap.end(); ++it)
   {
-    INFO_LOG() << "UnitId: " << it.key();
+    INFO_LOG(m_logger) << "UnitId: " << it.key();
     for (auto it2 = it.value().begin(); it2 != it.value().end(); ++it2)
-      INFO_LOG() << "VulnerabilityState: " << it2.key() << ", Count: " << it2.value().size();
+      INFO_LOG(m_logger) << "VulnerabilityState: " << it2.key() << ", Count: " << it2.value().size();
   }
 
   for (auto it = m_rescueStationTreated.begin(); it != m_rescueStationTreated.end(); ++it)
-    INFO_LOG() << "troupId: " << it.key() << ", amount RescueStation - treated: " << it.value().size();
+    INFO_LOG(m_logger) << "troupId: " << it.key() << ", amount RescueStation - treated: " << it.value().size();
   for (auto it = m_rescueStationNotTreated.begin(); it != m_rescueStationNotTreated.end(); ++it)
-    INFO_LOG() << "troupId: " << it.key() << ", amount RescueStation - not treated: " << it.value().size();
+    INFO_LOG(m_logger) << "troupId: " << it.key() << ", amount RescueStation - not treated: " << it.value().size();
 
 
   m_dataPie.append(std::move(pie));
@@ -716,7 +715,7 @@ void TreatmentModel::fillParticipantMap()
   for (const Superior &sup : m_report.superiorIds())
     m_partSuperiorMap.insert(sup.participantId(), sup.superiorId());
 
-  DEBUG_LOG() << "size m_partSuperiorMap: " << m_partSuperiorMap.size();
+  DEBUG_LOG(m_logger) << "size m_partSuperiorMap: " << m_partSuperiorMap.size();
   QMapIterator<int,int> it(m_partSuperiorMap);
   QList<int> unitIdsNull;
 
@@ -727,7 +726,7 @@ void TreatmentModel::fillParticipantMap()
     if (it.value() == 0)
     {
       unitIdsNull.append(it.key());
-      DEBUG_LOG() << "unitId: " << it.key();
+      DEBUG_LOG(m_logger) << "unitId: " << it.key();
     }
   }
 
@@ -740,10 +739,10 @@ void TreatmentModel::fillParticipantMap()
       m_participantMap.insert(it.key(), QSet<int>());
   }
 
-  DEBUG_LOG() << "size m_participantMap: " << m_participantMap.size();
+  DEBUG_LOG(m_logger) << "size m_participantMap: " << m_participantMap.size();
   const auto &ids = m_participantMap.keys();
   for (int id : ids)  
-    DEBUG_LOG() << "TroupId: " << id;
+    DEBUG_LOG(m_logger) << "TroupId: " << id;
 
   
   it.toFront();
@@ -759,7 +758,7 @@ void TreatmentModel::fillParticipantMap()
   while(it2.hasNext())
   {
     it2.next();
-    DEBUG_LOG() << "TroupId: " << it2.key();
+    DEBUG_LOG(m_logger) << "TroupId: " << it2.key();
     QMap<int,QSet<int>> vulnMap;
     QSet<int> partIds;
 
@@ -775,7 +774,7 @@ void TreatmentModel::fillParticipantMap()
     m_rescueStationNotTreated.insert(it2.key(), partIds);
 
     for (int participantId : it2.value())
-      DEBUG_LOG() << "  Participants: " << participantId;
+      DEBUG_LOG(m_logger) << "  Participants: " << participantId;
   }
 }
 
@@ -808,7 +807,7 @@ int TreatmentModel::getParticipantKey(int participantId)
   while(it.hasNext())
   {
     it.next();
-    DEBUG_LOG() << "it.key: " << it.key() << ", participantId: " << participantId;
+    DEBUG_LOG(m_logger) << "it.key: " << it.key() << ", participantId: " << participantId;
     if (it.value().contains(participantId) || it.key() == participantId)
     {
       key = it.key();
@@ -829,7 +828,7 @@ void TreatmentModel::countVulnerabilityState( int key, const resultData &data)
   if ( key <= 0)
     return;
 
-  DEBUG_LOG() << "key: " << key << ", participantId: " << data.participantId;
+  DEBUG_LOG(m_logger) << "key: " << key << ", participantId: " << data.participantId;
   QMap<int,QSet<int>> vulMapTemp = m_vulnerabilityMap.value(key);
   QMapIterator<int,QSet<int>> itVul(vulMapTemp);
 
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 053e282d0..c1f1f0c11 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
@@ -18,11 +18,10 @@
 using namespace ReportManagement;
 
 
-TreatmentTimelineModel::TreatmentTimelineModel(const ReportInfo &report, LtsSession::LtsSession *session, QObject *parent)
-  : AbstractModel(report, session, parent)
+TreatmentTimelineModel::TreatmentTimelineModel(const ReportInfo &report, LtsSession::LtsSession *session, QObject *parent) : AbstractModel(report, session, parent)
   , m_ppmDtc(nullptr)
-  , m_pdmDtc(nullptr)
-{
+  , m_pdmDtc(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   if (!fetchInterfaces())
     return;
 
@@ -137,12 +136,12 @@ bool TreatmentTimelineModel::fetchInterfaces()
 {
   if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
   {
-    ERROR_LOG() << "Could not fetch PPM DTC Interface";
+    ERROR_LOG(m_logger) << "Could not fetch PPM DTC Interface";
     return false;
   }
   if (!m_session->getDtc<ProjectDataManagement::DataInterface>(m_pdmDtc))
   {
-    ERROR_LOG() << "Could not fetch PDM DTC Interface";
+    ERROR_LOG(m_logger) << "Could not fetch PDM DTC Interface";
     return false;
   }
   return true;
@@ -311,7 +310,7 @@ QVariant TreatmentTimelineModel::headerData(int section, Qt::Orientation orienta
 
 void TreatmentTimelineModel::fillReportData()
 {
-  DEBUG_LOG() << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
+  DEBUG_LOG(m_logger) << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
 
   for (const QJsonValue &arrVal : std::as_const(m_reportJsonArray))
   {
@@ -329,11 +328,11 @@ void TreatmentTimelineModel::fillReportData()
     resData.eventTypeId           = static_cast<ReportManagement::EventType::type>(obj[QStringLiteral("event_type_id")].toInt());
     resData.properties            = obj[QStringLiteral("properties")].toString();
 
-    DEBUG_LOG() << "Participant type id = " << resData.participantTypeId;
-    DEBUG_LOG() << "Participant id = " << resData.participantId;
-    DEBUG_LOG() << "Event type = " << resData.eventTypeId;
-    DEBUG_LOG() << "Event time = " << resData.eventTime;
-    DEBUG_LOG() << "Properties = " << resData.properties;
+    DEBUG_LOG(m_logger) << "Participant type id = " << resData.participantTypeId;
+    DEBUG_LOG(m_logger) << "Participant id = " << resData.participantId;
+    DEBUG_LOG(m_logger) << "Event type = " << resData.eventTypeId;
+    DEBUG_LOG(m_logger) << "Event time = " << resData.eventTime;
+    DEBUG_LOG(m_logger) << "Properties = " << resData.properties;
 
     m_data.append(std::move(resData));
   }
@@ -342,7 +341,7 @@ void TreatmentTimelineModel::fillReportData()
 
 QString TreatmentTimelineModel::getAreaName(const QString& properties) const
 {
-  DEBUG_LOG() << "getAreaName from " << properties;
+  DEBUG_LOG(m_logger) << "getAreaName from " << properties;
 
   QJsonDocument doc = QJsonDocument::fromJson(properties.toUtf8());
   const QJsonObject obj = doc.object();
@@ -356,7 +355,7 @@ QString TreatmentTimelineModel::getAreaName(const QString& properties) const
 
 QColor TreatmentTimelineModel::eventColor(ReportManagement::EventType eventTypeId) const
 {
-  DEBUG_LOG() << "eventColor for event type " << eventTypeId;
+  DEBUG_LOG(m_logger) << "eventColor for event type " << eventTypeId;
   switch (eventTypeId.underlying())
   {
   case ReportManagement::EventType::VBGChanged:          return QColor(Qt::red);
@@ -376,7 +375,7 @@ QColor TreatmentTimelineModel::eventColor(ReportManagement::EventType eventTypeI
 
 QString TreatmentTimelineModel::getSanProcs(const QString& properties) const
 {
-  DEBUG_LOG() << "getSanProcs from " << properties;
+  DEBUG_LOG(m_logger) << "getSanProcs from " << properties;
 
   QString sanProcs;
 
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 11e08382a..654c96b1c 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
@@ -15,10 +15,9 @@
 using namespace ReportManagement;
 
 
-UnitPowerModel::UnitPowerModel(const ReportInfo &report, LtsSession::LtsSession *session, QObject *parent)
-  : AbstractModel(report, session, parent)
-  , m_ppmDtc(nullptr)
-{
+UnitPowerModel::UnitPowerModel(const ReportInfo &report, LtsSession::LtsSession *session, QObject *parent) : AbstractModel(report, session, parent)
+  , m_ppmDtc(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   if (!fetchInterfaces())
     return;
 
@@ -50,7 +49,7 @@ bool UnitPowerModel::fetchInterfaces()
 {
   if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
   {
-    ERROR_LOG() << "Could not fetch PPM DTC Interface";
+    ERROR_LOG(m_logger) << "Could not fetch PPM DTC Interface";
     return false;
   }
   return true;
@@ -179,7 +178,7 @@ QVariant UnitPowerModel::headerData(int section, Qt::Orientation orientation, in
 
 void UnitPowerModel::fillReportData()
 {
-  DEBUG_LOG() << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
+  DEBUG_LOG(m_logger) << "fillReportData(): m_reportJsonArray.size() = " << m_reportJsonArray.size();
   for (const QJsonValue &arrVal : std::as_const(m_reportJsonArray))
   {
     const QJsonObject obj = arrVal.toObject();
@@ -202,10 +201,10 @@ void UnitPowerModel::fillReportData()
     resData.notReadyVbgs[9]  = obj[QStringLiteral("vulnerability_state10")].toInt();
     resData.notReadyVbgs[10] = obj[QStringLiteral("vulnerability_state11")].toInt();
 
-    INFO_LOG() << "Group id = " << resData.groupId;
-    INFO_LOG() << "Ready = " << resData.ready;
-    INFO_LOG() << "Not ready = " << resData.notReady;
-    INFO_LOG() << "Start time = " << resData.startTime;
+    INFO_LOG(m_logger) << "Group id = " << resData.groupId;
+    INFO_LOG(m_logger) << "Ready = " << resData.ready;
+    INFO_LOG(m_logger) << "Not ready = " << resData.notReady;
+    INFO_LOG(m_logger) << "Start time = " << resData.startTime;
 
     m_data.append(std::move(resData));
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/TopicEditor/topic_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/TopicEditor/topic_editor.cpp
index 5934bd082..3b3887024 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/TopicEditor/topic_editor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/TopicEditor/topic_editor.cpp
@@ -66,7 +66,7 @@ ReportTopicEditor::~ReportTopicEditor()
 
 void ReportTopicEditor::updateInternalData()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   if (m_topicData.x < 0 && m_topicData.y < 0 && m_topicData.h < 0 && m_topicData.w < 0)
   {
@@ -81,7 +81,7 @@ void ReportTopicEditor::updateInternalData()
 
   if (m_reportId > 0) 
   {
-    DEBUG_LOG() << Q_FUNC_INFO << " report id = " << m_reportId;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " report id = " << m_reportId;
 
     QModelIndex idx = m_reportModel->findIndexForId(m_reportId);
     const ReportManagement::ReportInfo report = m_reportModel->getRowData(idx.row());
@@ -91,7 +91,7 @@ void ReportTopicEditor::updateInternalData()
       m_ui->reportsDataView->selectRow(idx);
       m_ui->lblName->setText(QString::fromStdString(report.name()));
       m_reportInfo = m_reportModel->getRowData(idx.row());
-      DEBUG_LOG() << Q_FUNC_INFO << " selected report: " << m_reportInfo.name();
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " selected report: " << m_reportInfo.name();
     }
     else
     {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/TopicEditor/topic_editor.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/TopicEditor/topic_editor.h
index f140ae859..2a599a073 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/TopicEditor/topic_editor.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/TopicEditor/topic_editor.h
@@ -36,6 +36,8 @@ public:
   ~ReportTopicEditor();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void updateInternalData() override final;
   void retranslate() override final;
 
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 54c8fc83f..3597b968d 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
@@ -283,8 +283,8 @@ bool ReportEdit::init(const ReportInfo &currReport, LtsSession::LtsSession *sess
   m_minDateTime -= m_minDateTime % 1000;
   m_maxDateTime -= m_maxDateTime % 1000;
 
-  DEBUG_LOG() << "m_minDateTime = " << m_minDateTime;
-  DEBUG_LOG() << "m_maxDateTime = " << m_maxDateTime;
+  DEBUG_LOG(m_logger) << "m_minDateTime = " << m_minDateTime;
+  DEBUG_LOG(m_logger) << "m_maxDateTime = " << m_maxDateTime;
 
   m_ui->dteStart->setRetrieveCurrentTimeCallback([this]() { return m_session->partitionTime(); });
   m_ui->dteEnd->setRetrieveCurrentTimeCallback([this]() { return m_session->partitionTime(); });
@@ -1078,7 +1078,7 @@ bool ReportEdit::initInputs()
             });
   }
 
-  DEBUG_LOG() << "m_report effectSources size: " << m_report.effectSources().size();
+  DEBUG_LOG(m_logger) << "m_report effectSources size: " << m_report.effectSources().size();
   if (!m_report.effectSources().empty())
   {
     QStringList toolTip;
@@ -1088,7 +1088,7 @@ bool ReportEdit::initInputs()
       auto it = std::find(m_report.effectSources().begin(), m_report.effectSources().end(), effectSourceId.underlying());
       if (it != m_report.effectSources().end())
       {
-        DEBUG_LOG() << "To be checked: effectSourceId: " << effectSourceId;
+        DEBUG_LOG(m_logger) << "To be checked: effectSourceId: " << effectSourceId;
         action->setChecked(true);
         toolTip.append(ProjectDataManagement::toString(effectSourceId));
       }
@@ -1113,7 +1113,7 @@ void ReportEdit::fillCbInterval()
   else
   {
     int mins = m_report.intervalTime() / (1000 * 60); 
-    DEBUG_LOG() << "Report interval mins " << mins;
+    DEBUG_LOG(m_logger) << "Report interval mins " << mins;
     m_ui->cbInterval->setCurrentIndex(m_ui->cbInterval->findData(mins));
     if (m_report.visualisationType() == VisualisationType::Pie || m_report.visualisationType() == VisualisationType::Table)
       m_ui->cbInterval->setCurrentIndex(0);
@@ -1128,7 +1128,7 @@ void ReportEdit::getParticipantSuperiorAndUnitIds(std::vector<int> &participantI
   if (!m_ui->treeViewParticipants->selectionModel())
     return;
 
-  DEBUG_LOG() << "getParticipantAndUnitIds";
+  DEBUG_LOG(m_logger) << "getParticipantAndUnitIds";
 
   const QModelIndexList &selIndexs = m_ui->treeViewParticipants->selectionModel()->selectedRows();
 
@@ -1179,7 +1179,7 @@ void ReportEdit::recursiveGetParticipant(int participantId, std::vector<int> &pa
   
   const int superiorId = part.superiorModId();
 
-  ERROR_LOG() << "participantId: " << participantId << ", superiorId: " << superiorId;
+  ERROR_LOG(m_logger) << "participantId: " << participantId << ", superiorId: " << superiorId;
   Superior sup;
   sup.participantId(participantId);
   sup.superiorId(superiorId);
@@ -1421,47 +1421,47 @@ bool ReportEdit::fetchInterfaces()
 {
   if (!m_session->getDtc<ReportManagement::DataInterface>(m_dtc))
   {
-    ERROR_LOG() << "Cannot retrieve ReportManagament Dtc interface!";
+    ERROR_LOG(m_logger) << "Cannot retrieve ReportManagament Dtc interface!";
     return false;
   }
   if (!m_session->getFtc<ReportManagement::DataInterface>(m_ftc))
   {
-    ERROR_LOG() << "Cannot retrieve ReportManagament Ftc interface!";
+    ERROR_LOG(m_logger) << "Cannot retrieve ReportManagament Ftc interface!";
     return false;
   }
   if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
   {
-    ERROR_LOG() << "Cannot retrieve ParticipantManagament Dtc interface!";
+    ERROR_LOG(m_logger) << "Cannot retrieve ParticipantManagament Dtc interface!";
     return false;
   }
   if (!m_session->getFtc<ParticipantManagement::DataInterface>(m_ppmFtc))
   {
-    ERROR_LOG() << "Cannot retrieve ParticipantManagament Ftc interface!";
+    ERROR_LOG(m_logger) << "Cannot retrieve ParticipantManagament Ftc interface!";
     return false;
   }
   if (!m_session->getDtc<AreaEffectSimulation::DataInterface>(m_aesDtc))
   {
-    ERROR_LOG() << "Cannot retrieve AreaEffectSimulation Dtc interface!";
+    ERROR_LOG(m_logger) << "Cannot retrieve AreaEffectSimulation Dtc interface!";
     return false;
   }
   if (!m_session->getDtc<ProjectDataManagement::DataInterface>(m_pdmDtc))
   {
-    ERROR_LOG() << "Cannot retrieve ProjectDataManagement Dtc interface!";
+    ERROR_LOG(m_logger) << "Cannot retrieve ProjectDataManagement Dtc interface!";
     return false;
   }
   if (!m_session->getForeignGuiInterface<ParticipantManagement::ForeignGuiComboboxInterface>(m_ppmGuiCbxIfc))
   {
-    ERROR_LOG() << "Cannot retrieve ParticipantManagement ForeignGuiCombobox interface!";
+    ERROR_LOG(m_logger) << "Cannot retrieve ParticipantManagement ForeignGuiCombobox interface!";
     return false;
   }
   if (!m_session->getDtc<InfrastructureManagement::DataInterface>(m_ismDtc))
   {
-    ERROR_LOG() << "Cannot retrieve InfrastructureManagement Dtc interface!";
+    ERROR_LOG(m_logger) << "Cannot retrieve InfrastructureManagement Dtc interface!";
     return false;
   }
   if (!m_session->getDtc<ExerciseManagement::DataInterface>(m_exmDtc))
   {
-    ERROR_LOG() << "Cannot retrieve ExerciseManagement Dtc interface!";
+    ERROR_LOG(m_logger) << "Cannot retrieve ExerciseManagement Dtc interface!";
     return false;
   }
   m_session->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(m_sitMapGuiIfc);
@@ -1511,7 +1511,7 @@ bool ReportEdit::apply()
               break;
             }
           }
-          WARNING_LOG() << "Too many samples to be generated, max = " << MAX_SAMPLES_KDAB;
+          WARNING_LOG(m_logger) << "Too many samples to be generated, max = " << MAX_SAMPLES_KDAB;
           LtsWidgets::LtsMessageDialog::showMessage(this,
                                                     tr("Please limit time period and save again the report. Interval was changed to minimum value %1.")
                                                         .arg(m_ui->cbInterval->currentText().toInt()));
@@ -1603,7 +1603,7 @@ void ReportEdit::onCheck()
     if ((m_ui->pbEffectSource->isVisible() && m_activeEffectSources.size() == 0))
       enabled = false;
   }
-  DEBUG_LOG() << "onCheck() : " << enabled;
+  DEBUG_LOG(m_logger) << "onCheck() : " << enabled;
   m_buttonBox->getButton(LtsWidgets::DialogButton::Ok)->setEnabled(enabled);
 
   if (enabled)
@@ -1691,13 +1691,13 @@ void ReportEdit::onCreateModifyReportReply(const CreateModifyReportReply &replyO
   switch (replyObject.replyState().underlying())
   {
     case Core::FtReplyState::InProgress:
-      DEBUG_LOG() << "onCreateModifyReportReply InProgress";
+      DEBUG_LOG(m_logger) << "onCreateModifyReportReply InProgress";
       m_ftcTimer->start();
       break;
     case Core::FtReplyState::Completed:
     {
       m_ftcTimer->stop();
-      DEBUG_LOG() << "onCreateModifyReportReply Completed";
+      DEBUG_LOG(m_logger) << "onCreateModifyReportReply Completed";
       m_requestHelper->requestReply(replyObject);
       if (!m_requestHelper->failed())
       {
@@ -1715,12 +1715,12 @@ void ReportEdit::onCreateModifyReportReply(const CreateModifyReportReply &replyO
     }
     case Core::FtReplyState::NotStarted:
     {
-      DEBUG_LOG() << "onCreateModifyReportReply NotStarted";
+      DEBUG_LOG(m_logger) << "onCreateModifyReportReply NotStarted";
       break;
     }
     case Core::FtReplyState::Error:
     {
-      DEBUG_LOG() << "onCreateModifyReportReply Error";
+      DEBUG_LOG(m_logger) << "onCreateModifyReportReply Error";
       m_ftcTimer->stop();
       m_requestHelper->requestReply(replyObject);
       break;
@@ -1731,7 +1731,7 @@ void ReportEdit::onCreateModifyReportReply(const CreateModifyReportReply &replyO
 
 void ReportEdit::onFtcTimerTimeout()
 {
-  ERROR_LOG() << "onFtcTimerTimeout";
+  ERROR_LOG(m_logger) << "onFtcTimerTimeout";
   m_requestHelper->failure();
   m_ftcTimer->stop();
 }
@@ -1739,13 +1739,13 @@ void ReportEdit::onFtcTimerTimeout()
 
 void ReportEdit::onPreviewReport()
 {
-  DEBUG_LOG() << "onPreviewReport";
+  DEBUG_LOG(m_logger) << "onPreviewReport";
 
   ReportPreview *dialog = new ReportPreview(m_session, this);
   if (dialog->init(m_report))
     dialog->previewReport();
   else
-    ERROR_LOG() << "Can not preview report!";
+    ERROR_LOG(m_logger) << "Can not preview report!";
 }
 
 
@@ -1868,11 +1868,11 @@ void ReportEdit::onSelectInterval()
     if (res != QDialog::Accepted)
     {
       delete dialog;
-      DEBUG_LOG() << "Select dialog closed by user";
+      DEBUG_LOG(m_logger) << "Select dialog closed by user";
       return;
     }
 
-    DEBUG_LOG() << "Set new values for start time = " << dialog->getStartTime();
+    DEBUG_LOG(m_logger) << "Set new values for start time = " << dialog->getStartTime();
 
     m_ui->dteStart->setMsecsSinceEpoch(dialog->getStartTime());
     m_ui->dteEnd->setMsecsSinceEpoch(dialog->getEndTime());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_edit.h
index 64c5ca1c8..1774a50a6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_edit.h
@@ -68,6 +68,8 @@ class ReportEdit
   void onCreateModifyReportReply(const CreateModifyReportReply &replyObject) override final; 
 
   private:
+
+  NGL::INGLLogger &m_logger;
   void retranslate() override;
   VisualisationType getVisualization() const;
   bool initInputs();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_interval.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_interval.cpp
index 8e1dd839a..240053acd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_interval.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_interval.cpp
@@ -34,7 +34,7 @@ bool ReportIntervalDialog::init(LtsSession::LtsSessionDataDds *session, const st
   m_session = session;
   m_exmDtc = exmDtc;
 
-  DEBUG_LOG() << "Exercise id = " << m_session->exerciseId();
+  DEBUG_LOG(m_logger) << "Exercise id = " << m_session->exerciseId();
 
   m_phaseModel = new ReportIntervalModel(this);
   m_phaseModel->initModel(m_session->exerciseId(), m_exmDtc);
@@ -63,8 +63,8 @@ void ReportIntervalDialog::selectPhase()
   m_startTime = phase.beginTime();
   m_endTime = phase.endTime();
 
-  ERROR_LOG() << "Start time: " << m_startTime;
-  ERROR_LOG() << "End time: " << m_endTime;
+  ERROR_LOG(m_logger) << "Start time: " << m_startTime;
+  ERROR_LOG(m_logger) << "End time: " << m_endTime;
 
   accept();
   close();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_interval_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_interval_model.cpp
index 6d8a610f9..652d1fc0a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_interval_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_interval_model.cpp
@@ -30,7 +30,7 @@ bool ReportIntervalModel::initModel(int exerciseId, const std::shared_ptr<Exerci
 
   
   m_exmDtc->exercisePhases([this](const ExerciseManagement::ExercisePhase &item) { insertRow(item); });
-  INFO_LOG() << "initModel - #exercise phases: " << m_vecData.size();
+  INFO_LOG(m_logger) << "initModel - #exercise phases: " << m_vecData.size();
   return true;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_interval_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_interval_model.h
index b33c7ca61..adcb31311 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_interval_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_interval_model.h
@@ -33,6 +33,8 @@ public:
   QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override final;
 
 protected:
+
+NGL::INGLLogger &m_logger;
   bool isFiltered(const ExerciseManagement::ExercisePhase &data, DataModification modType) const override
   {
     if (data.exerciseId() != m_exerciseId)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_list.cpp
index f18a9d1a3..aae6c0a01 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_list.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_list.cpp
@@ -143,14 +143,14 @@ void ReportList::onSelectionChanged()
 
 void ReportList::onEditReport()
 {
-  DEBUG_LOG() << "onEditReport";
+  DEBUG_LOG(m_logger) << "onEditReport";
 
   QModelIndex selIndex = m_ui->widget->currentIndex();
   if (!selIndex.isValid())
     return;
 
   ReportManagement::ReportInfo data = m_model->getRowData(m_ui->widget->currentIndex().row());
-  DEBUG_LOG() << "onEditReport Id = " << data.id();
+  DEBUG_LOG(m_logger) << "onEditReport Id = " << data.id();
 
   ReportEdit *dialog = new ReportEdit(m_session, this);
   if (!dialog->init(data, m_session))
@@ -165,14 +165,14 @@ void ReportList::onEditReport()
 
 void ReportList::onShowReport()
 {
-  DEBUG_LOG() << "onShowReport";
+  DEBUG_LOG(m_logger) << "onShowReport";
 
   QModelIndex selIndex = m_ui->widget->currentIndex();
   if (!selIndex.isValid())
     return;
 
   ReportManagement::ReportInfo data = m_model->getRowData(m_ui->widget->currentIndex().row());
-  DEBUG_LOG() << "onShowReport Id = " << data.id();
+  DEBUG_LOG(m_logger) << "onShowReport Id = " << data.id();
 
   ReportPreview *dialog = new ReportPreview(m_session, this);
   if (dialog->init(data))
@@ -186,10 +186,10 @@ void ReportList::onRemoveReport()
   if (!selIndex.isValid())
     return;
 
-  DEBUG_LOG() << "onRemoveReport";
+  DEBUG_LOG(m_logger) << "onRemoveReport";
 
   ReportManagement::ReportInfo data = m_model->getRowData(m_ui->widget->currentIndex().row());
-  INFO_LOG() << "Removing report with id = " << data.id();
+  INFO_LOG(m_logger) << "Removing report with id = " << data.id();
   Core::RemoveElementRequest req(data.id());
   m_requestHelper->startSingleRequest([req, this]()
   {
@@ -197,20 +197,20 @@ void ReportList::onRemoveReport()
   });
 
   if (m_requestHelper->failed())
-    ERROR_LOG() << "Failed to remove report";
+    ERROR_LOG(m_logger) << "Failed to remove report";
 }
 
 
 void ReportList::slotDelete()
 {
-  DEBUG_LOG() << "ReportList::slotDelete";
+  DEBUG_LOG(m_logger) << "ReportList::slotDelete";
   changeStatus(FileStatus::Deleted);
 }
 
 
 void ReportList::slotRestore()
 {
-  DEBUG_LOG() << "ReportList::slotRestore";
+  DEBUG_LOG(m_logger) << "ReportList::slotRestore";
   changeStatus(FileStatus::Valid);
 }
 
@@ -224,39 +224,39 @@ void ReportList::onPrint()
 
 void ReportList::onPreviewReport()
 {
-  DEBUG_LOG() << "onPreviewReport";
+  DEBUG_LOG(m_logger) << "onPreviewReport";
 
   QModelIndex selIndex = m_ui->widget->currentIndex();
   if (!selIndex.isValid())
     return;
 
   ReportManagement::ReportInfo data = m_model->getRowData(m_ui->widget->currentIndex().row());
-  DEBUG_LOG() << "onPreviewReport Id = " << data.id();
+  DEBUG_LOG(m_logger) << "onPreviewReport Id = " << data.id();
 
   ReportPreview *dialog = new ReportPreview(m_session, this);
   if (dialog->init(data))
     dialog->previewReport();
   else
-    ERROR_LOG() << "Can not preview report with id = " << data.id();
+    ERROR_LOG(m_logger) << "Can not preview report with id = " << data.id();
 }
 
 
 void ReportList::onExportReport()
 {
-  DEBUG_LOG() << "onExportReport";
+  DEBUG_LOG(m_logger) << "onExportReport";
 
   QModelIndex selIndex = m_ui->widget->currentIndex();
   if (!selIndex.isValid())
     return;
 
   ReportManagement::ReportInfo data = m_model->getRowData(m_ui->widget->currentIndex().row());
-  DEBUG_LOG() << "onExportReport Id = " << data.id();
+  DEBUG_LOG(m_logger) << "onExportReport Id = " << data.id();
 
   ReportPreview *dialog = new ReportPreview(m_session, this);
   if (dialog->init(data))
     dialog->onExport();
   else
-    ERROR_LOG() << "Can not export report with id = " << data.id();
+    ERROR_LOG(m_logger) << "Can not export report with id = " << data.id();
 }
 
 
@@ -274,7 +274,7 @@ void ReportList::changeStatus(const FileStatus &fs)
 
   m_requestHelper->startSingleRequest([ = ]()
   {
-    DEBUG_LOG() << "Changing status for report id = " << rep.id();
+    DEBUG_LOG(m_logger) << "Changing status for report id = " << rep.id();
 
     ReportChangeStatusRequest req;
     req.id(rep.id());
@@ -287,7 +287,7 @@ void ReportList::changeStatus(const FileStatus &fs)
   });
 
   if (m_requestHelper->failed())
-    ERROR_LOG() << "Failed to change status for report with id = " << rep.id();
+    ERROR_LOG(m_logger) << "Failed to change status for report with id = " << rep.id();
 
 }
 
@@ -302,37 +302,37 @@ bool ReportList::fetchInterfaces()
 {
   if (!m_session->getDtc<ReportManagement::DataInterface>(m_dtc))
   {
-    ERROR_LOG() << "Cannot retrieve ReportManagament Dtc interface!";
+    ERROR_LOG(m_logger) << "Cannot retrieve ReportManagament Dtc interface!";
     return false;
   }
   if (!m_session->getFtc<ReportManagement::DataInterface>(m_ftc))
   {
-    ERROR_LOG() << "Cannot retrieve ReportManagament Ftc interface!";
+    ERROR_LOG(m_logger) << "Cannot retrieve ReportManagament Ftc interface!";
     return false;
   }
   if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
   {
-    ERROR_LOG() << "Cannot retrieve ParticipantManagament Dtc interface!";
+    ERROR_LOG(m_logger) << "Cannot retrieve ParticipantManagament Dtc interface!";
     return false;
   }
   if (!m_session->getDtc<AreaEffectSimulation::DataInterface>(m_aesDtc))
   {
-    ERROR_LOG() << "Cannot retrieve AreaEffectSimulation Dtc interface!";
+    ERROR_LOG(m_logger) << "Cannot retrieve AreaEffectSimulation Dtc interface!";
     return false;
   }
   if (!m_session->getDtc<ProjectDataManagement::DataInterface>(m_pdmDtc))
   {
-    ERROR_LOG() << "Cannot retrieve ProjectDataManagement Dtc interface!";
+    ERROR_LOG(m_logger) << "Cannot retrieve ProjectDataManagement Dtc interface!";
     return false;
   }
   if (!m_session->getForeignGuiInterface<ParticipantManagement::ForeignGuiComboboxInterface>(m_ppmGuiCbxIfc))
   {
-    ERROR_LOG() << "Cannot retrieve ParticipantManagement ForeignGuiCombobox interface!";
+    ERROR_LOG(m_logger) << "Cannot retrieve ParticipantManagement ForeignGuiCombobox interface!";
     return false;
   }
   if (!m_session->getDtc<OperatorManagement::DataInterface>(m_opmDtc))
   {
-    ERROR_LOG() << "Cannot retrieve OperatorManagement Dtc interface!";
+    ERROR_LOG(m_logger) << "Cannot retrieve OperatorManagement Dtc interface!";
     return false;
   }
   return true;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_list.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_list.h
index 93f8fc5b5..3abaa7585 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_list.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_list.h
@@ -44,6 +44,8 @@ public:
   void onReportChangeStatusReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void onSelectionChanged();
   bool fetchInterfaces();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_model.h
index 32c56ca20..b2d66dc88 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_model.h
@@ -49,6 +49,7 @@ public:
   QVariant data(const QModelIndex &, int) const override final;
   QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
 protected:
+NGL::INGLLogger &m_logger;
   void onUpdateComboboxFilterData();
   void updateComboboxFilterData(const QSet<ReportType> &availableReportTypes,
                                 const QSet<VisualisationType> &availableVisualisationTypes,
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 387b8c1aa..796190d37 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
@@ -116,7 +116,7 @@ bool ReportPreview::init(const ReportManagement::ReportInfo &report)
       (m_useAes && m_report.mineAreaIds().size() == 0 && m_report.nbcIds().size() == 0) ||
       (m_useCharge && m_report.chargeTypeIds().size() == 0))
   {
-    ERROR_LOG() << "Empty selection for report: m_report.id() = " << m_report.id();
+    ERROR_LOG(m_logger) << "Empty selection for report: m_report.id() = " << m_report.id();
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("Not possible to preview this report! No elements selected!"));
     return false;
   }
@@ -126,8 +126,8 @@ bool ReportPreview::init(const ReportManagement::ReportInfo &report)
 
   
   m_dataModel = AbstractModel::create(m_report, m_session, this);
-  DEBUG_LOG() << "m_dataModel.rowCount() = " << m_dataModel->rowCount(QModelIndex());
-  DEBUG_LOG() << "m_dataModel.columnCount() = " << m_dataModel->columnCount();
+  DEBUG_LOG(m_logger) << "m_dataModel.rowCount() = " << m_dataModel->rowCount(QModelIndex());
+  DEBUG_LOG(m_logger) << "m_dataModel.columnCount() = " << m_dataModel->columnCount();
 
   
   m_headerDataModel = new QStandardItemModel(this);
@@ -179,7 +179,7 @@ bool ReportPreview::displayReport()
     displayReportAsTable();
     break;
   default:
-    ERROR_LOG() << "Unknown visualisation type for report id = " << m_report.id()
+    ERROR_LOG(m_logger) << "Unknown visualisation type for report id = " << m_report.id()
                         << ": " << m_report.visualisationType().underlying();
     return false;
   }
@@ -203,17 +203,17 @@ void ReportPreview::onExport()
     fileName += reportName;
     fileName += QStringLiteral(".jpg");
 
-    DEBUG_LOG() << "Trying to export Report to " << fileName;
+    DEBUG_LOG(m_logger) << "Trying to export Report to " << fileName;
 
     bool ret = m_reportDisplay->exportToImage(QSize(1200, 1600), fileName, "jpg");
-    INFO_LOG() << "Exported to " << fileName << " - " << ret;
+    INFO_LOG(m_logger) << "Exported to " << fileName << " - " << ret;
 
     if (ret)
     {
       QFile file(fileName);
       if (!file.open(QIODevice::ReadOnly))
       {
-        ERROR_LOG() << "Cannot read file " << fileName;
+        ERROR_LOG(m_logger) << "Cannot read file " << fileName;
         return;
       }
 
@@ -222,8 +222,8 @@ void ReportPreview::onExport()
       int exeFolderId = m_flmDtc->getExerciseFolderId(m_session->exerciseId());
       int folderId = m_flmDtc->findFolder(exeFolderId,QStringLiteral("Reports"));
 
-      DEBUG_LOG() << "ExeFolderId = " << exeFolderId;
-      DEBUG_LOG() << "FolderId = " << folderId;
+      DEBUG_LOG(m_logger) << "ExeFolderId = " << exeFolderId;
+      DEBUG_LOG(m_logger) << "FolderId = " << folderId;
 
       FileManagement::FileContentModifyRequest req;
       req.id(0);
@@ -247,19 +247,19 @@ void ReportPreview::onExport()
 
       if (m_requestHelper->failed())
       {
-        ERROR_LOG() << "Failed to save file content";
+        ERROR_LOG(m_logger) << "Failed to save file content";
         LtsWidgets::LtsMessageDialog::showMessage(this, tr("Failed to save report image into library."));
       }
       else
       {
-        INFO_LOG() << "Successfully exported to FLM (folderId, fileId, fileName) = (" << folderId << ", " << m_requestHelper->getRepliedId() << ", " << reportName;
+        INFO_LOG(m_logger) << "Successfully exported to FLM (folderId, fileId, fileName) = (" << folderId << ", " << m_requestHelper->getRepliedId() << ", " << reportName;
         LtsWidgets::LtsMessageDialog::showMessage(this, tr("Successfully saved report image into library."));
       }
     }
   }
   else
     
-    WARNING_LOG() << "Failed to create report content";
+    WARNING_LOG(m_logger) << "Failed to create report content";
 }
 
 
@@ -267,49 +267,49 @@ bool ReportPreview::fetchInterfaces()
 {
   if (!m_session->getFtc<ReportManagement::DataInterface>(m_ftc))
   {
-    DEBUG_LOG() << "Failed to fetch Report Management FTC interface";
+    DEBUG_LOG(m_logger) << "Failed to fetch Report Management FTC interface";
     return false;
   }
 
   if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
   {
-    DEBUG_LOG() << "Failed to fetch Participant Management DTC interface";
+    DEBUG_LOG(m_logger) << "Failed to fetch Participant Management DTC interface";
     return false;
   }
 
   if (!m_session->getDtc<ExerciseManagement::DataInterface>(m_exmDtc))
   {
-    DEBUG_LOG() << "Failed to fetch Exercise Management DTC interface";
+    DEBUG_LOG(m_logger) << "Failed to fetch Exercise Management DTC interface";
     return false;
   }
 
   if (!m_session->getDtc<ProjectDataManagement::DataInterface>(m_pdmDtc))
   {
-    DEBUG_LOG() << "Failed to fetch ProjectDataManagement DTC interface";
+    DEBUG_LOG(m_logger) << "Failed to fetch ProjectDataManagement DTC interface";
     return false;
   }
 
   if (!m_session->getDtc<AreaEffectSimulation::DataInterface>(m_aesDtc))
   {
-    DEBUG_LOG() << "Failed to fetch AreaEffectSimulation DTC interface";
+    DEBUG_LOG(m_logger) << "Failed to fetch AreaEffectSimulation DTC interface";
     return false;
   }
 
   if (!m_session->getDtc<InfrastructureManagement::DataInterface>(m_ismDtc))
   {
-    DEBUG_LOG() << "Failed to fetch InfrastructureManagement DTC interface";
+    DEBUG_LOG(m_logger) << "Failed to fetch InfrastructureManagement DTC interface";
     return false;
   }
 
   if (!m_session->getFtc<FileManagement::DataInterface>(m_flmFtc))
   {
-    DEBUG_LOG() << "Failed to fetch FileManagement FTC interface";
+    DEBUG_LOG(m_logger) << "Failed to fetch FileManagement FTC interface";
     return false;
   }
 
   if (!m_session->getDtc<FileManagement::DataInterface>(m_flmDtc))
   {
-    DEBUG_LOG() << "Failed to fetch FileManagement DTC interface";
+    DEBUG_LOG(m_logger) << "Failed to fetch FileManagement DTC interface";
     return false;
   }
 
@@ -508,7 +508,7 @@ bool ReportPreview::displayReportAsTable()
     {
       int groupId = m_dataModel->data(m_dataModel->index(i, 0), Qt::EditRole).toInt();
       QString title = m_dataModel->data(m_dataModel->index(i, 0), Qt::UserRole).toString();
-      DEBUG_LOG() << "Group Id = " << groupId << ", title = " << title;
+      DEBUG_LOG(m_logger) << "Group Id = " << groupId << ", title = " << title;
 
       if (!m_groupIds.contains(groupId))
       {
@@ -563,7 +563,7 @@ bool ReportPreview::displayReportAsPie()
   for (int i = 0; i < m_dataModel->rowCount(QModelIndex()); ++i)
   {
     int groupId = m_dataModel->data(m_dataModel->index(i, 0), Qt::EditRole).toInt();
-    DEBUG_LOG() << "Group Id = " << groupId;
+    DEBUG_LOG(m_logger) << "Group Id = " << groupId;
 
     if (!m_groupIds.contains(groupId))
     {
@@ -593,14 +593,14 @@ bool ReportPreview::displayReportAsLine()
   for (int i = 0; i < m_dataModel->rowCount(QModelIndex()); ++i)
   {
     int groupId = m_dataModel->data(m_dataModel->index(i, 0), Qt::EditRole).toInt();
-    DEBUG_LOG() << "displayReportAsLine: Group Id = " << groupId;
+    DEBUG_LOG(m_logger) << "displayReportAsLine: Group Id = " << groupId;
 
     if (!m_groupIds.contains(groupId))
     {
       m_groupIds.append(groupId);
 
       QString title = m_dataModel->data(m_dataModel->index(i, 0), Qt::UserRole).toString();
-      DEBUG_LOG() << "displayReportAsLine: Group title = " << title;
+      DEBUG_LOG(m_logger) << "displayReportAsLine: Group title = " << title;
 
       AbstractProxyModel *proxyModel = new AbstractProxyModel(this);
       proxyModel->setSourceModel(m_dataModel);
@@ -629,7 +629,7 @@ bool ReportPreview::displayReportAsBar()
   for (int i = 0; i < m_dataModel->rowCount(QModelIndex()); ++i)
   {
     int groupId = m_dataModel->data(m_dataModel->index(i, 0), Qt::EditRole).toInt();
-    DEBUG_LOG() << "Group Id = " << groupId;
+    DEBUG_LOG(m_logger) << "Group Id = " << groupId;
 
     if (!m_groupIds.contains(groupId))
     {
@@ -673,7 +673,7 @@ void ReportPreview::addToHeaderData(const QString &strLeft, const QString &strRi
   item = new QStandardItem(strRight);
   itemList += item;
 
-  DEBUG_LOG() << "Added to header: " << strRight;
+  DEBUG_LOG(m_logger) << "Added to header: " << strRight;
 
   m_headerDataModel->appendRow(itemList);
 }
@@ -983,7 +983,7 @@ KDChart::Chart *ReportPreview::createNewChart(const ChartType &chartType, bool h
 
   if (!diagram)
   {
-    ERROR_LOG() << "Got unkown chart type. Aborting.";
+    ERROR_LOG(m_logger) << "Got unkown chart type. Aborting.";
     return result;
   }
 
@@ -1124,8 +1124,8 @@ KDChart::Chart *ReportPreview::createNewChart(const ChartType &chartType, bool h
       int eventTypeId = diagram->model()->data(diagram->model()->index(iRow, 0), Qt::UserRole + 1).toInt();
       QColor eventColor = m_eventsModel->eventColor(static_cast<ReportManagement::EventType::type>(eventTypeId));
 
-      DEBUG_LOG() << "Row " << iRow << ", eventTypeId " << eventTypeId;
-      DEBUG_LOG() << "Event color " << eventColor.name();
+      DEBUG_LOG(m_logger) << "Row " << iRow << ", eventTypeId " << eventTypeId;
+      DEBUG_LOG(m_logger) << "Event color " << eventColor.name();
       for (int iColumn = 0; iColumn < colCount; ++iColumn )
       {
         QModelIndex mi = diagram->model()->index(iRow, iColumn);
@@ -1281,7 +1281,7 @@ void EventTypeModel::initModel()
 
 QColor EventTypeModel::eventColor(ReportManagement::EventType eventTypeId) const
 {
-  DEBUG_LOG() << "eventColor for event type " << eventTypeId;
+  DEBUG_LOG(m_logger) << "eventColor for event type " << eventTypeId;
   switch (eventTypeId.underlying())
   {
   case ReportManagement::EventType::VBGChanged:          return QColor(Qt::red);
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 22cc653a2..096ddf6be 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
@@ -67,6 +67,8 @@ public:
   int columnCount(const QModelIndex &parent) const override final;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 class ReportPreview : public LtsWidgets::LtsFramelessDialog
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_viewer_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_viewer_gui_plugin.cpp
index 42d00ca39..fe6f62cd6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_viewer_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_viewer_gui_plugin.cpp
@@ -47,12 +47,12 @@ bool InterfaceImpl::fetchInterfaces()
 {
   if (!m_session->getDtc<ReportManagement::DataInterface>(m_dtc))
   {
-    DEBUG_LOG() << "Failed to fetch ReportManagement DTC interface!";
+    DEBUG_LOG(m_logger) << "Failed to fetch ReportManagement DTC interface!";
     return false;
   }
   if (!m_session->getFtc<ReportManagement::DataInterface>(m_ftc))
   {
-    DEBUG_LOG() << "Failed to fetch ReportManagement FTC interface!";
+    DEBUG_LOG(m_logger) << "Failed to fetch ReportManagement FTC interface!";
     return false;
   }
 
@@ -60,22 +60,22 @@ bool InterfaceImpl::fetchInterfaces()
   
   if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
   {
-    DEBUG_LOG() << "Failed to fetch ParticipantManagement DTC interface!";
+    DEBUG_LOG(m_logger) << "Failed to fetch ParticipantManagement DTC interface!";
     return false;
   }
   if (!m_session->getForeignGuiInterface<ParticipantManagement::ForeignGuiComboboxInterface>(m_ppmGuiCbxIfc))
   {
-    DEBUG_LOG() << "Failed to fetch ParticipantManagement ForeignGuiComboboxInterface!";
+    DEBUG_LOG(m_logger) << "Failed to fetch ParticipantManagement ForeignGuiComboboxInterface!";
     return false;
   }
   if (!m_session->getDtc<AreaEffectSimulation::DataInterface>(m_aesDtc))
   {
-    DEBUG_LOG() << "Failed to fetch AreaEffectSimulation DTC interface!";
+    DEBUG_LOG(m_logger) << "Failed to fetch AreaEffectSimulation DTC interface!";
     return false;
   }
   if (!m_session->getDtc<ProjectDataManagement::DataInterface>(m_pdmDtc))
   {
-    DEBUG_LOG() << "Failed to fetch ProjectDataManagement DTC interface!";
+    DEBUG_LOG(m_logger) << "Failed to fetch ProjectDataManagement DTC interface!";
     return false;
   }
 
@@ -85,7 +85,7 @@ bool InterfaceImpl::fetchInterfaces()
 
   if (!m_session->getDtc<OperatorManagement::DataInterface>(m_opmDtc))
   {
-    DEBUG_LOG() << "Failed to fetch OperatorManagement DTC interface!";
+    DEBUG_LOG(m_logger) << "Failed to fetch OperatorManagement DTC interface!";
     return false;
   }
   return true;
@@ -478,29 +478,29 @@ bool InterfaceImpl::TopicReplayInterface::playbackInit(const QJsonObject &attrib
   if (reportId > 0)
     ri = m_dtc->reportInfo(reportId);
 
-  DEBUG_LOG() << "Report Id = " << ri.id();
+  DEBUG_LOG(m_logger) << "Report Id = " << ri.id();
 
   if (!m_previewDialog)
   {
-    ERROR_LOG() << "Widgets1 not available, playback not possible for report id = "<< ri.id();
+    ERROR_LOG(m_logger) << "Widgets1 not available, playback not possible for report id = "<< ri.id();
     return false;
   }
 
 
   if ( !m_previewReport)
   {
-    ERROR_LOG() << "Widgets2 not available, playback not possible for report id = "<< ri.id();
+    ERROR_LOG(m_logger) << "Widgets2 not available, playback not possible for report id = "<< ri.id();
     return false;
   }
 
   if (!m_previewWidget)
   {
-    ERROR_LOG() << "Widgets3 not available, playback not possible for report id = "<< ri.id();
+    ERROR_LOG(m_logger) << "Widgets3 not available, playback not possible for report id = "<< ri.id();
     return false;
   }
   if (!m_previewDialog->init(ri))
   {
-    ERROR_LOG() << "Preview dialog could not be initialized!";
+    ERROR_LOG(m_logger) << "Preview dialog could not be initialized!";
     return false;
   }
   m_previewDialog->getReportDisplay()->exportToFile(QStringLiteral("/tmp/rep.pdf"));
@@ -549,7 +549,7 @@ bool InterfaceImpl::TopicReplayInterface::exportTopic(const QJsonObject &attribu
   const int reportId = attributes.value(QStringLiteral("ReportId")).toInt(0);
   if (reportId < 1)
   {
-    ERROR_LOG() << "No valid report id given";
+    ERROR_LOG(m_logger) << "No valid report id given";
     pExportNotifier->setExportFailed();
     return false;
   }
@@ -563,14 +563,14 @@ bool InterfaceImpl::TopicReplayInterface::exportTopic(const QJsonObject &attribu
   ReportManagement::ReportInfo ri = m_dtc->reportInfo(reportId);
   if (ri.fileStatus() != ReportManagement::FileStatus::Valid)
   {
-    ERROR_LOG() << "Report with id " << reportId << " was deleted";
+    ERROR_LOG(m_logger) << "Report with id " << reportId << " was deleted";
     pExportNotifier->setExportFailed();
     return false;
   }
 
   if (!m_previewDialog->init(ri))
   {
-    ERROR_LOG() << "Could not init preview for report id = " << reportId;
+    ERROR_LOG(m_logger) << "Could not init preview for report id = " << reportId;
     pExportNotifier->setExportFailed();
     return false;
   }
@@ -578,14 +578,14 @@ bool InterfaceImpl::TopicReplayInterface::exportTopic(const QJsonObject &attribu
   KDReports::Report* rp = m_previewDialog->getReportDisplay();
   if (rp == nullptr)
   {
-    ERROR_LOG() << "Could not retrieve KDReport for report id = " << reportId;
+    ERROR_LOG(m_logger) << "Could not retrieve KDReport for report id = " << reportId;
     pExportNotifier->setExportFailed();
     return false;
   }
 
   rp->exportToFile(strPathToFile + strFileName);
   pExportNotifier->setExportSuccessful(strFileName);
-  INFO_LOG() << "Successfully exported topic for report with id " << reportId;
+  INFO_LOG(m_logger) << "Successfully exported topic for report with id " << reportId;
   rp->deleteLater();
 
   return true;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_viewer_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_viewer_gui_plugin.h
index a4749d6b1..3bfc056cc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_viewer_gui_plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_viewer_gui_plugin.h
@@ -63,6 +63,8 @@ public:
   TopicEditorBase::TopicEditor *createTopicEditor(const TopicEditorBase::TopicData &data) override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   LtsWidgets::LtsDialog *onShowReportList(QWidget *parent);
   LtsWidgets::LtsDialog *onShowAddReport(QWidget *parent, const ReportType &reportType);
   QString getAESNbcReportTypeName();
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 a09e0b7d5..b9876d4d8 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
@@ -103,7 +103,7 @@ QString SaaChooser::rdesktopCodeToString(RdesktopCodes code)
 
 SaaChooser::RdesktopCodes SaaChooser::getRdesktopInterpretation(int code) const
 {
-  DEBUG_LOG()<<">> getRdesktopInterpretation: rdesktop error code: "<<code;
+  DEBUG_LOG(m_logger)<<">> getRdesktopInterpretation: rdesktop error code: "<<code;
   switch (code)
   {
   case 0:
@@ -129,7 +129,7 @@ SaaChooser::RdesktopCodes SaaChooser::getRdesktopInterpretation(int code) const
 
 bool SaaChooser::normalExit(int code) const
 {
-  DEBUG_LOG()<<">> process finished!! exitCode: "<<code;
+  DEBUG_LOG(m_logger)<<">> process finished!! exitCode: "<<code;
   return getRdesktopInterpretation(code) == RdesktopCodes::Normal;
 }
 
@@ -175,7 +175,7 @@ void SaaChooser::slotSelectSaa()
   {
     if (process != qobject_cast<QProcess *>(sender()) || process.isNull())
       return;
-    ERROR_LOG() << ">> SAA Remote desktop: error:" << process->readAllStandardError();
+    ERROR_LOG(m_logger) << ">> SAA Remote desktop: error:" << process->readAllStandardError();
   });
 
   
@@ -184,7 +184,7 @@ void SaaChooser::slotSelectSaa()
   {
     if (process != qobject_cast<QProcess *>(sender()) || process.isNull())
       return;
-    INFO_LOG() << ">> SAA Remote desktop: " << process->readAllStandardOutput();
+    INFO_LOG(m_logger) << ">> SAA Remote desktop: " << process->readAllStandardOutput();
   });
 
   
@@ -196,7 +196,7 @@ void SaaChooser::slotSelectSaa()
     if (process->state() != QProcess::Running)
       LtsWidgets::LtsGlobalWaitDialog::getInstance()->done();
 
-    WARNING_LOG()<<">> saa with id ("<<asset.id()<<")"<<" started ";
+    WARNING_LOG(m_logger)<<">> saa with id ("<<asset.id()<<")"<<" started ";
     
   });
 
@@ -204,7 +204,7 @@ void SaaChooser::slotSelectSaa()
   connect(process, &QProcess::started,
           this, [this, asset]()
   {
-    WARNING_LOG()<<">> saa with id ("<<asset.id()<<")"<<" started ";
+    WARNING_LOG(m_logger)<<">> saa with id ("<<asset.id()<<")"<<" started ";
 
     LtsWidgets::LtsGlobalWaitDialog::getInstance()->done();
     
@@ -219,11 +219,11 @@ void SaaChooser::slotSelectSaa()
        << QStringLiteral("-p")<< assetProps.password
        << saaIp;
 
-  DEBUG_LOG()<<">> Process rdesktop: "<<args.join(QStringLiteral(" "));
+  DEBUG_LOG(m_logger)<<">> Process rdesktop: "<<args.join(QStringLiteral(" "));
   process->start(program, args);
   if (!process->waitForStarted())
   {
-    ERROR_LOG() << "Could not start saa process "<<process->program() <<" " << process->arguments().join(QStringLiteral(" "));
+    ERROR_LOG(m_logger) << "Could not start saa process "<<process->program() <<" " << process->arguments().join(QStringLiteral(" "));
     process->deleteLater();
   }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/SAAChooser/saa_chooser.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/SAAChooser/saa_chooser.h
index 1efe97dd9..352c86e0a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/SAAChooser/saa_chooser.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/SAAChooser/saa_chooser.h
@@ -62,6 +62,7 @@ private slots:
   void enaDisa();
 
 private:
+  NGL::INGLLogger &m_logger;
   void tableColumnOrganiserSetting() override;
 
   Ui::SaaChooser *m_ui;
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 8bde0936b..c315245b0 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
@@ -17,30 +17,30 @@ SaaDialogModel::SaaDialogModel(QObject *parent)
     : LtsWidgets::LtsAbstractTableModel<AssetManagement::Asset>({tr("Id"), tr("Name"), tr("scenario is running"), tr("Used by Party")}, parent)
     , m_ppmDtc(nullptr)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 SaaDialogModel::~SaaDialogModel()
 {
   stopPing();
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool SaaDialogModel::initModel(LtsSession::LtsSession *session)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_session = session;
 
   if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
   {
-    ERROR_LOG() << " ppmDtc not set!!! " << m_logger.getLoggerName();
+    ERROR_LOG(m_logger) << " ppmDtc not set!!! " << m_logger.getLoggerName();
     return false;
   }
   if (!m_session->getDtc<AssetManagement::DataInterface>(m_asmDtc))
   {
-    ERROR_LOG() << " asmDtc not set!!! " << m_logger.getLoggerName();
+    ERROR_LOG(m_logger) << " asmDtc not set!!! " << m_logger.getLoggerName();
     return false;
   }
 
@@ -67,13 +67,13 @@ bool SaaDialogModel::initModel(LtsSession::LtsSession *session)
         onDataChanged(asset, DataModification::eAdded);
       });
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
 void SaaDialogModel::pingAllSaa()
 {
-  DEBUG_LOG() << "====> pingAllSaa: saaList count: " << m_saaPingItems.count();
+  DEBUG_LOG(m_logger) << "====> pingAllSaa: saaList count: " << m_saaPingItems.count();
 
   if (m_saaPingItems.isEmpty())
     return;
@@ -98,7 +98,7 @@ void SaaDialogModel::pingAllSaa()
             {
               ParticipantManagement::Party party;
               getPartyWithAssetId(pi.assetId, party);
-              DEBUG_LOG() << " 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();
@@ -122,13 +122,13 @@ void SaaDialogModel::saaConnected(int assetId, bool state)
 
 void SaaDialogModel::stopPing()
 {
-  WARNING_LOG() << ">> stop ping saa...";
+  WARNING_LOG(m_logger) << ">> stop ping saa...";
   for (auto &pi : m_saaPingItems)
   {
     
     if (pi.process)
     {
-      WARNING_LOG() << ">> kill process saaId: " << pi.assetId;
+      WARNING_LOG(m_logger) << ">> kill process saaId: " << pi.assetId;
       pi.process->kill();
       pi.process->deleteLater();
       pi.process = nullptr;
@@ -146,7 +146,7 @@ void SaaDialogModel::updateView()
 void SaaDialogModel::onPartyDataChanged(const ParticipantManagement::Party &data, DataModification modType)
 {
   Q_UNUSED(modType)
-  DEBUG_LOG() << ">>> 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();
 }
 
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 5ff9eaef7..959964d6c 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
@@ -41,6 +41,7 @@ public:
   void pingAllSaa();
   void saaConnected(int assetId, bool state);
 protected:
+  NGL::INGLLogger &m_logger;
   void stopPing();
   void updateView();
   void onPartyDataChanged(const ParticipantManagement::Party &data, DataModification modType);
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 f44a69798..f31be71fb 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
@@ -50,7 +50,7 @@ bool ScreenRecordingDialog::init(LtsSession::LtsSession *session)
 
   if (m_baseLayoutPtr == nullptr)
   {
-    ERROR_LOG() << "base layout is nullptr";
+    ERROR_LOG(m_logger) << "base layout is nullptr";
     return false;
   } 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/screen_recording_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/screen_recording_dialog.h
index 3d7c6b2c3..7efcd2d41 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/screen_recording_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/screen_recording_dialog.h
@@ -78,6 +78,7 @@ private slots:
 
 
 private:
+  NGL::INGLLogger &m_logger;
   Ui::ScreenRecordingDialog       *m_ui{nullptr};
   LtsWidgets::LtsBaseLayoutWidget *m_baseLayoutPtr{nullptr};
   QWidget                         *m_recAreaWidget{nullptr};
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 0137c0b40..2dba1dcef 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
@@ -188,7 +188,7 @@ bool ScreenRecordingWorker::takeScreenshot(const QFileInfo &fileInfo, LtsWidgets
 {
   if (!s_imageFormats.contains(fileInfo.suffix()))
   {
-    DEBUG_LOG() << "file format not supported (must be .jpg, .jpeg or .png)";
+    DEBUG_LOG(m_logger) << "file format not supported (must be .jpg, .jpeg or .png)";
     return false;
   }
 
@@ -205,7 +205,7 @@ bool ScreenRecordingWorker::takeScreenshot(const QFileInfo &fileInfo, LtsWidgets
 
   if (!proc->waitForStarted())
   {
-    ERROR_LOG() << QLatin1String("Could not start process '") + EXECUTABLE
+    ERROR_LOG(m_logger) << QLatin1String("Could not start process '") + EXECUTABLE
                            + QLatin1String("' with arguments '") + args.join(QLatin1String("', '")) + QLatin1String("'\n");
     proc->deleteLater();
     return false;
@@ -213,7 +213,7 @@ bool ScreenRecordingWorker::takeScreenshot(const QFileInfo &fileInfo, LtsWidgets
 
   if (!proc->waitForFinished())
   {
-    ERROR_LOG() << QLatin1String("Could not finish process '") + EXECUTABLE
+    ERROR_LOG(m_logger) << QLatin1String("Could not finish process '") + EXECUTABLE
                            + QLatin1String("' with arguments '") + args.join(QLatin1String("', '")) + QLatin1String("'\n");
     proc->deleteLater();
     return false;
@@ -226,7 +226,7 @@ bool ScreenRecordingWorker::stopRecording()
 {
   if (!m_isBusy)
   {
-    DEBUG_LOG() << "no running process";
+    DEBUG_LOG(m_logger) << "no running process";
     return false;
   }
 
@@ -247,13 +247,13 @@ bool ScreenRecordingWorker::onStartRecording(const RecordingData &data)
 {
   if (m_isBusy)
   {
-    DEBUG_LOG() << "process is already running";
+    DEBUG_LOG(m_logger) << "process is already running";
     return false;
   }
 
   if (data.filePath.suffix() != s_videoFormat)
   {
-    DEBUG_LOG() << "file format not supported (must be .mp4)";
+    DEBUG_LOG(m_logger) << "file format not supported (must be .mp4)";
     return false;
   }
 
@@ -263,7 +263,7 @@ bool ScreenRecordingWorker::onStartRecording(const RecordingData &data)
 
   if (!m_recProc->waitForStarted())
   {
-    ERROR_LOG() << QLatin1String("Could not start process '") + EXECUTABLE
+    ERROR_LOG(m_logger) << QLatin1String("Could not start process '") + EXECUTABLE
                            + QLatin1String("' with arguments '") + data.toStringList().join(QLatin1String("', '")) + QLatin1String("'\n");
     m_recProc->deleteLater();
     m_isBusy = false;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/screen_recording_worker.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/screen_recording_worker.h
index a8922e3fa..b23f20236 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/screen_recording_worker.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ScreenRecording/Gui/ScreenRecorder/screen_recording_worker.h
@@ -102,6 +102,7 @@ public slots:
 
 
 private:
+  NGL::INGLLogger &m_logger;
   QProcess        *m_recProc{nullptr};
   bool             m_isBusy{false};
 };
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 941a2d548..1db0cba94 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
@@ -68,13 +68,13 @@ bool ServiceManagementDialog::init(const std::shared_ptr<ServiceManagement::Inte
 
   if (groupInfo.isEmpty())
   {
-    INFO_LOG() << "initModel - no groups!";
+    INFO_LOG(m_logger) << "initModel - no groups!";
     return true;
   }
 
   m_ui->lbNoServices->hide();
 
-  INFO_LOG() << "initModel - #group information: " << groupInfo.size();
+  INFO_LOG(m_logger) << "initModel - #group information: " << groupInfo.size();
 
 
   
@@ -128,7 +128,7 @@ GroupWidget *ServiceManagementDialog::addGroup(const Core::ServiceGroupType &gro
 
   QVBoxLayout *l = qobject_cast<QVBoxLayout *>(m_ui->groupLayoutWidget->layout());
   if (!l)
-    WARNING_LOG() << "ServiceManagementDialog::addGroup: group layout failed, cannot add group";
+    WARNING_LOG(m_logger) << "ServiceManagementDialog::addGroup: group layout failed, cannot add group";
   else
     l->addWidget(group, 0, Qt::AlignTop);
 
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 0c0a2410b..1186968d7 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
@@ -61,6 +61,8 @@ public:
   }
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
 
   static QString craftBaseName(const QString &server, const QString &exercise) { return server + QLatin1Char('.') + exercise + QLatin1Char('.'); }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_dialog.h
index 7c3cab5f0..2d15420cf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_dialog.h
@@ -40,6 +40,8 @@ public slots:
   void onPrint();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void tableColumnOrganiserSetting() override;
 
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 e7331c960..4a2637d1a 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
@@ -42,7 +42,7 @@ bool EquipmentErrorRegistrationModel::initModel(LtsSession::LtsSession *session,
 
   if (!m_exmDtc->enableExercise())
   {
-    ERROR_LOG() << " Could not enable Exercise Data-Topic in EXM DTC!";
+    ERROR_LOG(m_logger) << " Could not enable Exercise Data-Topic in EXM DTC!";
     return false;
   }
 
@@ -135,7 +135,7 @@ void EquipmentErrorRegistrationModel::onLiveEvent(const ExerciseEventManagement:
 {
   if (ev.eventTypeId() != ProjectDataManagement::EventType_def::EquipmentErrorReport)
     return;
-  INFO_LOG() << "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 1fa0eeb2e..ddda28cc0 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
@@ -52,6 +52,8 @@ signals:
   void chunksUpdated(int chunksReceived, int chunksRequested);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void onRequestedDataAvailable(TimeLineManagement::TimelineDataProviderInterface *request);
   void onLiveEvent(const ExerciseEventManagement::Event &ev);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_dialog.h
index c28e1b8b2..ab7fa32ae 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_dialog.h
@@ -74,6 +74,8 @@ private slots:
   void onSelectionChanged();
 
 private:
+
+NGL::INGLLogger &m_logger;
   bool hasValidPosition();
   void retranslate() override;
   void tableColumnOrganiserSetting() override;
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 350085bf5..a674e84df 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
@@ -67,44 +67,44 @@ bool HgrAndMineSearchModel::initModel(LtsSession::LtsSession *session,
 
   if (!m_ppmDtc->enableEquipmentSystemEventFtcReply())
   {
-    ERROR_LOG() << " Could not enable EquipmentSystemEventFtcReply Data-Topic in PPM DTC!";
+    ERROR_LOG(m_logger) << " Could not enable EquipmentSystemEventFtcReply Data-Topic in PPM DTC!";
     return false;
   }
 
   if (!m_ppmFtc->enableEquipmentSystemEventData())
   {
-    ERROR_LOG() << " Could not enable EquipmentSystemEventData Function-Topic in PPM FTC!";
+    ERROR_LOG(m_logger) << " Could not enable EquipmentSystemEventData Function-Topic in PPM FTC!";
     return false;
   }
 
   if (!m_exmDtc->enableExercise())
   {
-    ERROR_LOG() << " Could not enable Exercise Data-Topic in EXM DTC!";
+    ERROR_LOG(m_logger) << " Could not enable Exercise Data-Topic in EXM DTC!";
     return false;
   }
 
 
   if (!m_pdmDtc->enableEquipmentSystemEventFilter())
   {
-    ERROR_LOG() << " Could not enable EquipmentSystemEventFilter Data-Topic in PDM DTC!";
+    ERROR_LOG(m_logger) << " Could not enable EquipmentSystemEventFilter Data-Topic in PDM DTC!";
     return false;
   }
 
   if (!m_pdmDtc->enableEventFilterHgrMineSearch())
   {
-    ERROR_LOG() << " Could not enable EventFilterHgrMineSearch Data-Topic in PDM DTC!";
+    ERROR_LOG(m_logger) << " Could not enable EventFilterHgrMineSearch Data-Topic in PDM DTC!";
     return false;
   }
 
   if (!m_aesDtc->enableMineArea())
   {
-    ERROR_LOG() << " Could not enable MineArea Data-Topic in AES DTC!";
+    ERROR_LOG(m_logger) << " Could not enable MineArea Data-Topic in AES DTC!";
     return false;
   }
 
   if (!m_aesDtc->enableDusMineState())
   {
-    ERROR_LOG() << " Could not enable DusMineState Data-Topic in AES DTC!";
+    ERROR_LOG(m_logger) << " Could not enable DusMineState Data-Topic in AES DTC!";
     return false;
   }
 
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 9252505f1..0d0a5c035 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
@@ -67,6 +67,8 @@ signals:
   void chunksUpdated(int chunksReceived, int chunksRequested);
 
 protected:
+
+NGL::INGLLogger &m_logger;
   QIcon iconFromPartyId(int partyId) const;
   QVariant stringFromPartyId(int partyId) const;
   void onUpdateComboboxFilterData();
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 22afb1846..bb3da64da 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
@@ -145,7 +145,7 @@ void BaseEquipmentCheck::onMappedEquipTimeout(int participantId, QTimer *timer)
 
 void BaseEquipmentCheck::onSelectionChanged()
 {
-  DEBUG_LOG() << "onSelectionChanged";
+  DEBUG_LOG(m_logger) << "onSelectionChanged";
 
   bool enable = false;
   const auto selectedIndexes = view()->selectedRows();
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 f8558276d..361094cfc 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
@@ -66,6 +66,8 @@ protected slots:
   void onPrint();
 
 protected:
+
+NGL::INGLLogger &m_logger;
   virtual LtsDataView::LtsDataView *view() = 0;
   virtual const LtsDataView::LtsDataView *view() const = 0;
 protected:
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 a0b3dc0a5..9152f5201 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
@@ -66,7 +66,7 @@ bool BasePlayerModel::initModel(LtsSession::LtsSessionDataDds *session)
   if (!session)
     return false;
 
-  DEBUG_LOG() << "**** initModel";
+  DEBUG_LOG(m_logger) << "**** initModel";
   m_session = session;
   m_partitionTime = m_session->partitionTime();
 
@@ -482,7 +482,7 @@ int BasePlayerModel::findRowForEquipmentNumber(int equipNo) const
 
     if (data.equipmentNumber == equipNo)
     {
-      DEBUG_LOG() << "** findRowForEquipmentNumber: "
+      DEBUG_LOG(m_logger) << "** findRowForEquipmentNumber: "
                           << equipNo << "--> " << i;
       return i;
     }
@@ -493,7 +493,7 @@ int BasePlayerModel::findRowForEquipmentNumber(int equipNo) const
 void BasePlayerModel::onDynamicParticipantChanged(const ParticipantManagement::DynamicParticipantData &data,
                                                   DataModification modType)
 {
-  DEBUG_LOG() << "**** onDynamicParticipantChanged: " << data;
+  DEBUG_LOG(m_logger) << "**** onDynamicParticipantChanged: " << data;
 
   int row = findRowForId(data.participantId());
   if (row < 0)
@@ -687,7 +687,7 @@ void BasePlayerModel::onPositionChanged(const ParticipantManagement::Participant
 {
   if (modType == DataModification::eRemoved)
     return;
-  DEBUG_LOG() << "**** onPositionChanged: " << position;
+  DEBUG_LOG(m_logger) << "**** onPositionChanged: " << position;
 
   m_positions[position.participantId()] = position;
 
@@ -718,7 +718,7 @@ void BasePlayerModel::onBiteChanged(const ParticipantManagement::Bite &bite,
 {
   if (modType == DataModification::eRemoved)
     return;
-  DEBUG_LOG() << "**** onBiteChanged: " << bite;
+  DEBUG_LOG(m_logger) << "**** onBiteChanged: " << bite;
 
   m_bites[bite.equipmentNumber()] = bite;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_player_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_player_model.h
index 8c22e4d25..f4fa35778 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_player_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_player_model.h
@@ -126,6 +126,8 @@ protected slots:
   void onUpdatePositionAge();
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void updateUsedPartyIds();
   void setBiteResult(int row, qint64 sampleTime, const QString &biteResult, const QString &warnings);
   QString getBitResult(const ParticipantManagement::Bite &bite, int equipmnetNumber) const;
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 1d37edc24..e2cdb3797 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
@@ -22,7 +22,7 @@ BiteModel::BiteModel(QObject *parent)
 bool BiteModel::initModel(const std::shared_ptr<ParticipantManagement::Interface::Dtc> &ppmDtc,
                           const std::shared_ptr<ProjectDataManagement::Interface::Dtc> &pdmDtc)
 {
-  DEBUG_LOG() << "initModel";
+  DEBUG_LOG(m_logger) << "initModel";
 
   m_ppmDtc = ppmDtc;
   if (!m_ppmDtc)
@@ -103,7 +103,7 @@ QString BiteModel::checkBit(const ParticipantManagement::Bite &bite, quint32 bit
       break;
     }
   }
-  DEBUG_LOG() << "** name: " << name;
+  DEBUG_LOG(m_logger) << "** name: " << name;
 
   QString ret;
   if (available)
@@ -148,7 +148,7 @@ QString BiteModel::checkBatteryBit(int state, qint64 bitValue) const
       break;
     }
   }
-  DEBUG_LOG() << "** name: " << name;
+  DEBUG_LOG(m_logger) << "** name: " << name;
 
   if ((state & bitValue) == bitValue)
     return name;
@@ -223,7 +223,7 @@ int BiteModel::findRowForEquipmentNumber(int equipNo) const
   {
     if (m_vecData.at(i).equipmentNumber() == equipNo)
     {
-      DEBUG_LOG() << "findRowForEquipmentNumber: "
+      DEBUG_LOG(m_logger) << "findRowForEquipmentNumber: "
                           << equipNo << "-->" << i;
       return i;
     }
@@ -234,7 +234,7 @@ int BiteModel::findRowForEquipmentNumber(int equipNo) const
 void BiteModel::biteDataChanged(const ParticipantManagement::Bite &data,
                                               DataModification modType)
 {
-  DEBUG_LOG() << "biteDataChanged";
+  DEBUG_LOG(m_logger) << "biteDataChanged";
 
   const int equipNo = data.equipmentNumber();
   const int row = findRowForEquipmentNumber(equipNo);
@@ -244,7 +244,7 @@ void BiteModel::biteDataChanged(const ParticipantManagement::Bite &data,
   case DataModification::eAdded:
   case DataModification::eModified:
   {
-    DEBUG_LOG() << " Modified bite msg";
+    DEBUG_LOG(m_logger) << " Modified bite msg";
 
     if (row < 0)
     {
@@ -265,7 +265,7 @@ void BiteModel::biteDataChanged(const ParticipantManagement::Bite &data,
   }
   case DataModification::eRemoved:
   {
-    DEBUG_LOG() << " Remove bite msg";
+    DEBUG_LOG(m_logger) << " Remove bite msg";
     removeRow(row);
     break;
   }
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 97209e2c8..1d46587ff 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
@@ -54,6 +54,8 @@ private slots:
 
 private:
 
+
+NGL::INGLLogger &m_logger;
   QString checkBit(const ParticipantManagement::Bite &bite,
                    quint32 bitValue) const;
 
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 6ed8eb6aa..770446c86 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
@@ -25,7 +25,7 @@ CtasErrorModel:: CtasErrorModel(QObject *parent)
 
 bool CtasErrorModel::initModel(const std::shared_ptr<ParticipantManagement::Interface::Dtc> &ppmDtc)
 {
-  DEBUG_LOG() << "initModel";
+  DEBUG_LOG(m_logger) << "initModel";
 
   if (!ppmDtc)
     return false;
@@ -252,11 +252,11 @@ QString CtasErrorModel::telegramId2Text(int id) const
 void CtasErrorModel::ctasErrorChanged(const ParticipantManagement::CtaError &data,
                                       DataModification modType)
 {
-  DEBUG_LOG() << "ctasErrorChanged";
+  DEBUG_LOG(m_logger) << "ctasErrorChanged";
 
   if (modType == DataModification::eAdded || modType == DataModification::eModified)
   {
-    DEBUG_LOG() << " Added Fehlermeldung GFD";
+    DEBUG_LOG(m_logger) << " Added Fehlermeldung GFD";
     insertRow(data);
     return;
   }
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 8f66516cb..0bc5f9b30 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
@@ -39,6 +39,8 @@ private slots:
                         DataModification modType);
 
 private:
+
+NGL::INGLLogger &m_logger;
   QString telegramId2Text(int id) const;
 
   std::shared_ptr<ParticipantManagement::Interface::Dtc>  m_ppmDtc;
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 9068a83a9..844c6619d 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
@@ -259,11 +259,11 @@ void ServiceMonitorDialog::onTableViewClicked(const QModelIndex &index)
         delete dlg;
     }
   }
-  TRACE_LOG() << Q_FUNC_INFO << " START, index=" << index.row() << " - " << index.column();
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, index=" << index.row() << " - " << index.column();
   if (!m_ui->ltsDataView->sourceModel())
     return;
   onParticipantClicked(participantId(index));
-  TRACE_LOG() << Q_FUNC_INFO << " END, index=" << index.row() << " - " << index.column();
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, index=" << index.row() << " - " << index.column();
 }
 
 void ServiceMonitorDialog::onEditItem()
@@ -300,7 +300,7 @@ void ServiceMonitorDialog::onAllAuto()
 
 void ServiceMonitorDialog::onTableViewSelectionChanged(const QItemSelection &selected)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (m_monitor == Monitor::Egcu)
   {
     
@@ -326,12 +326,12 @@ void ServiceMonitorDialog::onTableViewSelectionChanged(const QItemSelection &sel
   {
     onParticipantClicked(participantId(mil.first()));
   }
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void ServiceMonitorDialog::onParticipantClicked(int participantId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, participantId=" << participantId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, participantId=" << participantId;
   if (!m_session)
     return;
 
@@ -344,9 +344,9 @@ void ServiceMonitorDialog::onParticipantClicked(int participantId)
     sitMapGuiIfc->removeObjectIndicator();
   else
     if (!sitMapGuiIfc->objectIndicatorToParticipant(participantId))
-      ERROR_LOG() << Q_FUNC_INFO << " objectIndicatorToParticipant failed for participantId = " << participantId;
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " objectIndicatorToParticipant failed for participantId = " << participantId;
 
-  TRACE_LOG() << Q_FUNC_INFO << " END, participantId=" << participantId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, participantId=" << participantId;
 }
 
 void ServiceMonitorDialog::leaveEvent(QEvent *e)
@@ -367,7 +367,7 @@ void ServiceMonitorDialog::onPrint()
 
 int ServiceMonitorDialog::participantId(const QModelIndex &index) const
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, index=" << index.row() << " - " << index.column();
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, index=" << index.row() << " - " << index.column();
   if (!m_ui->ltsDataView->sourceModel())
     return -1;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_dialog.h
index 0b2b9220d..0c4c443cf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_dialog.h
@@ -70,6 +70,8 @@ private slots:
   void onShowContextMenu(const QPoint &position);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void setAllOverrides(InfrastructureManagement::EffectOverride eo);
   void retranslate() override;
   void onPrint();
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 67dc7575c..c246d5344 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
@@ -252,7 +252,7 @@ bool EgcuEdit::apply()
   }
 
   properties= structureElement.properties();
-  DEBUG_LOG() << "structureElementId=" << m_egcuData.mountingPoint.id()
+  DEBUG_LOG(m_logger) << "structureElementId=" << m_egcuData.mountingPoint.id()
                       << " properties=" << properties;
 
   QJsonArray arrRelays;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_edit.h
index 73ab17cc4..158022acf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_edit.h
@@ -47,6 +47,7 @@ public:
 
   bool apply() override;
 private:
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   static void getRoomIds(QTreeWidgetItem *twi, QVariantList &vl);
   void updateRelays();
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 71dccd168..b6619ba04 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
@@ -98,7 +98,7 @@ QVariant EgcuModel::data(const QModelIndex &index, int role) const
       switch (index.column())
       {
       case Id:
-        DEBUG_LOG() << "EGCU DATA= "
+        DEBUG_LOG(m_logger) << "EGCU DATA= "
                              << " instrumentationAsset.id=" << instrumentationAsset.id()
                              << " hostname=" << instrumentationAsset.hostname()
                              << " name=" << instrumentationAsset.name()
@@ -234,7 +234,7 @@ QString EgcuModel::getOverridesString(const EgcuData &data) const
 
 QString EgcuModel::getRelaisStates(const EgcuData &data) const
 {
-  DEBUG_LOG() << "getRelaisStates"
+  DEBUG_LOG(m_logger) << "getRelaisStates"
                        << " offlineTime=" << data.relayState.offlineTime()
                        << " stateTime=" << data.relayState.stateTime()
                        << " mountingPoint.id=" << data.mountingPoint.id()
@@ -253,14 +253,14 @@ QString EgcuModel::getRelaisStates(const EgcuData &data) const
   QStringList sl;
 
   Buildings::RelayState relayState = m_bldDtc->relayState(data.mountingPointAsset.assetId());
-  DEBUG_LOG() << "relayState id=" << relayState.id()
+  DEBUG_LOG(m_logger) << "relayState id=" << relayState.id()
                        << " offlineTime=" << relayState.offlineTime()
                        << " stateTime=" << relayState.stateTime()
                        << " relayStates().size=" << relayState.relayStates().size();
 
   if (relayState.offlineTime() > relayState.stateTime())
   {
-    DEBUG_LOG() << QString(tr("Connection Error"));
+    DEBUG_LOG(m_logger) << QString(tr("Connection Error"));
     sl << QString(tr("Connection Error"));
     sl << QStringLiteral(" - ");
   }
@@ -270,7 +270,7 @@ QString EgcuModel::getRelaisStates(const EgcuData &data) const
   {
       AssetManagement::RelayInfo relayInfo = m_asmDtc->relayInfo(relayState.relayStates()[i].id());
       bool state = relayState.relayStates().at(i).state();
-      DEBUG_LOG() << "relayInfo id=" << relayInfo.id()
+      DEBUG_LOG(m_logger) << "relayInfo id=" << relayInfo.id()
                            << " name=" << relayInfo.name()
                            << " property=" << relayInfo.property()
                            << " state=" << state;
@@ -359,7 +359,7 @@ bool EgcuModel::initModel(LtsSession::LtsSession *session)
 
   initData();
 
-  DEBUG_LOG() << "initModel successfull";
+  DEBUG_LOG(m_logger) << "initModel successfull";
   return true;
 }
 
@@ -370,7 +370,7 @@ QModelIndex EgcuModel::getIndexOfVisableRootItem() const
 
 bool EgcuModel::mseHasMountedAsset(const InfrastructureManagement::MainStructureElement &mse, InfrastructureManagement::MountingPointType mpType)
 {
-  DEBUG_LOG() << "mseHasMountedBsm mse.id=" << mse.id()
+  DEBUG_LOG(m_logger) << "mseHasMountedBsm mse.id=" << mse.id()
                        << " name=" << mse.name();
   for (const InfrastructureManagement::StructureElement &element : std::as_const(mse.elements()))
   {
@@ -378,7 +378,7 @@ bool EgcuModel::mseHasMountedAsset(const InfrastructureManagement::MainStructure
     if (element.mountingPointTypeId() != mpType)
       continue;
     
-    DEBUG_LOG() << "Mountpoint BSM:" << element.id()
+    DEBUG_LOG(m_logger) << "Mountpoint BSM:" << element.id()
                          << " name=" << element.name();
     if (isMounted(element.id()))
       return true;
@@ -388,10 +388,10 @@ bool EgcuModel::mseHasMountedAsset(const InfrastructureManagement::MainStructure
 
 bool EgcuModel::isMounted(int mountingPointId)
 {
-  DEBUG_LOG() << "isMounted id=" << mountingPointId;
+  DEBUG_LOG(m_logger) << "isMounted id=" << mountingPointId;
   for (const InfrastructureManagement::MountingPointAsset &asset : std::as_const(m_mountingPointAssets))
   {
-    DEBUG_LOG() << "assetId=" << asset.structureElementId()
+    DEBUG_LOG(m_logger) << "assetId=" << asset.structureElementId()
                          << " mountingPointId=" << mountingPointId;
     if (asset.structureElementId() == mountingPointId)
       return true;
@@ -424,7 +424,7 @@ void EgcuModel::initData()
 
     if ( !m_dtc->isElementAssignedToExercise( mse, m_session->exerciseId()))
     {
-      DEBUG_LOG() << "EgcuModel::initData mseId=" << mse.id() << " not in Exercise";
+      DEBUG_LOG(m_logger) << "EgcuModel::initData mseId=" << mse.id() << " not in Exercise";
       continue;
     }
 
@@ -456,9 +456,9 @@ void EgcuModel::initData()
         parentIndex = treeIndices.value(path.at(path.size() - 2), indexFromItem(m_rootItem)); 
         if (!parentIndex.isValid())
         {
-          INFO_LOG() << "Did not find parent for structure element with id " << currentElement.id() << " mseid: " << mse.id();
+          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() << "   se: " << se.id() << ", " << se.name();
+            INFO_LOG(m_logger) << "   se: " << se.id() << ", " << se.name();
         }
       }
       else
@@ -496,7 +496,7 @@ NGLTreeItem* EgcuModel::createItemFromMountingPoint(const InfrastructureManageme
   {
     
     
-    DEBUG_LOG() << "mountingPoint Id=" << mountingPoint.buildingId()
+    DEBUG_LOG(m_logger) << "mountingPoint Id=" << mountingPoint.buildingId()
                          << " properties=" << mountingPoint.properties()
                          << " associatedAssetId=" << mountingPoint.associatedAssetId()
                          << " isUsed=" << mountingPoint.data().isUsed()
@@ -540,7 +540,7 @@ NGLTreeItem* EgcuModel::createItemFromMountingPoint(const InfrastructureManageme
 
 NGLTreeItem* EgcuModel::createItemFromStructureElement(const InfrastructureManagement::StructureElement &currentElement)
 {
-  DEBUG_LOG() << "createItemFromStructureElement" << currentElement.displayName();
+  DEBUG_LOG(m_logger) << "createItemFromStructureElement" << currentElement.displayName();
   return new NGLTreeItem(QVariant::fromValue(currentElement));
 }
 
@@ -1191,7 +1191,7 @@ bool EgcuModel::readAllowance(InfrastructureManagement::EffectOverride eo, const
 QMap<int,QModelIndex> EgcuModel::setSelectedStructureElements(const QVector<int> &structureElementIds)
 {
   QMap<int,QModelIndex> map;
-  ERROR_LOG() << "structureElementIds.size=" << structureElementIds.size()
+  ERROR_LOG(m_logger) << "structureElementIds.size=" << structureElementIds.size()
                       << " id[0]=" << structureElementIds[0];
   findStructureElementChildrenByIds(m_rootItem, structureElementIds, map);
   return map;
@@ -1299,13 +1299,12 @@ void EgcuData::update(const InfrastructureManagement::InstrumentationAsset &ia,
   instrumentationAsset = ia;
 }
 
-EgcuData::EgcuData(const InfrastructureManagement::InstrumentationAsset &ia, const InfrastructureManagement::MountingPoint &mp, const InfrastructureManagement::MainStructureElement &mse, const Buildings::RelayState &rs, const InfrastructureManagement::MountingPointAsset &mpa, const QSet<int> &relayIds)
-  : instrumentationAsset(ia)
+EgcuData::EgcuData(const InfrastructureManagement::InstrumentationAsset &ia, const InfrastructureManagement::MountingPoint &mp, const InfrastructureManagement::MainStructureElement &mse, const Buildings::RelayState &rs, const InfrastructureManagement::MountingPointAsset &mpa, const QSet<int> &relayIds) : instrumentationAsset(ia)
   , mountingPoint(mp)
   , mainStructureElement(mse)
   , relayState(rs)
-  , mountingPointAsset(mpa)
-{
+  , mountingPointAsset(mpa),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   for (int relayId : relayIds)
     effectOverrides.insert(relayId, InfrastructureManagement::EffectOverride_def::Automatic);
 
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 fc3e1922f..5d644ad89 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
@@ -150,6 +150,8 @@ signals:
   void invalidateFilter(const QModelIndex &mi = QModelIndex());
 
 private:
+
+NGL::INGLLogger &m_logger;
   void initData();
   void removeUnused(NGLTreeItem *item);
   bool isMountpointEgcu(const QByteArray &properties);
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 7e84931f0..332768146 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
@@ -211,7 +211,7 @@ void FaultMessageDialog::onSpecificsEquipmentChanged(const TrainingAreaBaseOC::S
 
   m_ownEquipmentId = data.equipmentNumber();
   if (m_ownEquipmentId <= 0)
-    WARNING_LOG() << "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_fault_message_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_fault_message_dialog.h
index 5e7630032..ba60fd25a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_fault_message_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_fault_message_dialog.h
@@ -36,6 +36,8 @@ public:
   }
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   bool apply() override;
   void tableColumnOrganiserSetting() override;
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 fed61c964..99aa24608 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
@@ -20,7 +20,7 @@ ManipulationModel::ManipulationModel(QObject *parent)
 bool ManipulationModel::initModel(const std::shared_ptr<ParticipantManagement::Interface::Dtc> &ppmDtc,
                                   const std::shared_ptr<ProjectDataManagement::Interface::Dtc> &pdmDtc)
 {
-  DEBUG_LOG() << "----- initModel";
+  DEBUG_LOG(m_logger) << "----- initModel";
 
   if (!pdmDtc || !ppmDtc)
     return false;
@@ -76,7 +76,7 @@ QVariant ManipulationModel::data(const QModelIndex &index,
 void ManipulationModel::manipulationDataChanged(const ParticipantManagement::DynamicParticipantData &data,
                                                 DataModification modType)
 {
-  DEBUG_LOG() << "manipulationDataChanged: " << data.manipulation().size() << ", " << modType;
+  DEBUG_LOG(m_logger) << "manipulationDataChanged: " << data.manipulation().size() << ", " << modType;
 
   const bool isManipulated = data.manipulation().size() > 0;
 
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 d1df8317d..cfa3bdb49 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
@@ -53,6 +53,8 @@ private slots:
   void participantChanged(const ParticipantManagement::Participant &data, DataModification modType);
 
 private:
+
+NGL::INGLLogger &m_logger;
   ManipulationData buildManipulationData(const ParticipantManagement::DynamicParticipantData &data) const;
   QString buildCanDeviceString(const std::vector<ParticipantManagement::ManipulationInformation>& manipulations) const;
 
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 d9d756175..853738400 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
@@ -132,7 +132,7 @@ bool StructureElementEdit::apply()
   QByteArray content_neu;
 
   properties= m_structureElement.properties();
-  DEBUG_LOG() << "structureElementId=" << m_structureElement.id()
+  DEBUG_LOG(m_logger) << "structureElementId=" << m_structureElement.id()
                       << " properties=" << properties
                       << " MountingPointType=" << m_structureElement.mountingPointTypeId()
                       << " structureElementTypeId=" << m_structureElement.structureElementTypeId();
@@ -149,7 +149,7 @@ bool StructureElementEdit::apply()
     return true;
 
   m_structureElement.properties(content_neu.toStdString());
-  ERROR_LOG() << "properties=" << m_structureElement.properties()
+  ERROR_LOG(m_logger) << "properties=" << m_structureElement.properties()
                       << " name=" << m_structureElement.name()
                       << " seId=" << m_structureElement.id()
                       << " mountingPointId=" << m_structureElement.mountingPointId();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_structure_element_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_structure_element_edit.h
index 41f6c5420..b5681b7b5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_structure_element_edit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_structure_element_edit.h
@@ -43,6 +43,7 @@ public:
 
   bool apply() override;
 private:
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void updateComboBoxes();
 
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 13c199803..e7d790e99 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
@@ -83,11 +83,10 @@
 namespace SituationMap
 {
 
-AdapterDds::AdapterDds(QObject *parent)
-  : QObject(parent)
-{
-  TRACE_LOG() << Q_FUNC_INFO << " START DDDDDDDD" ;
-  TRACE_LOG() << Q_FUNC_INFO << " END" ;
+AdapterDds::AdapterDds(QObject *parent) : QObject(parent),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START DDDDDDDD" ;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
 }
 
 AdapterDds::~AdapterDds()
@@ -120,7 +119,7 @@ AdapterDds::~AdapterDds()
 
 bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<MovementTrackManager> &movementTrackMgr, bool resourceMode)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START" ;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START" ;
 
   if (!map || !pluginProvider)
     return false;
@@ -143,7 +142,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
                                                                                           participantLayername,
                                                                                           "Participant2SituationMap"));
     if (!m_particpants->init(&m_map->layerFactory(), m_pluginProvider))
-      ERROR_LOG() << Q_FUNC_INFO << " init failed";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
 
 
     
@@ -169,7 +168,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
                                                                                                          drawOrder,
                                                                                                          "HitlineInfo2SituationMap"));
       if (!m_hitlineInfo2SituationMap->init(m_pluginProvider))
-        ERROR_LOG() << Q_FUNC_INFO << " init failed";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
     }
 
     {
@@ -183,7 +182,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
                                                                                                                             drawOrder,
                                                                                                                             "BldHitlineInfo2SituationMap"));
       if (!m_bldHitlineInfo2SituationMap->init(m_pluginProvider))
-        ERROR_LOG() << Q_FUNC_INFO << " init failed";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
     }
 
   }
@@ -243,7 +242,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
         m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
       }
       if(!sim2Map->init(m_pluginProvider))
-        ERROR_LOG() << Q_FUNC_INFO << " init failed";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
     }
 
     
@@ -274,7 +273,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
         m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
       }
       if (!sim2Map->init(m_pluginProvider))
-        ERROR_LOG() << Q_FUNC_INFO << " init failed";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
     }
 
     {
@@ -288,7 +287,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
         m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
       }
       if (!sim2Map->init(m_pluginProvider))
-        ERROR_LOG() << Q_FUNC_INFO << " init failed";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
     }
 
     {
@@ -302,7 +301,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
         m_aes2MapCont[static_cast<int>(contIdx)] = sim2Map;
       }
       if (!sim2Map->init(m_pluginProvider))
-        ERROR_LOG() << Q_FUNC_INFO << " init failed";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
     }
 
     {
@@ -316,7 +315,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
         m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
       }
       if (!sim2Map->init(m_pluginProvider))
-        ERROR_LOG() << Q_FUNC_INFO << " init failed";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
     }
 
     {
@@ -330,7 +329,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
         m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
       }
       if (!sim2Map->init(m_pluginProvider))
-        ERROR_LOG() << Q_FUNC_INFO << " init failed";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
     }
 
     
@@ -355,7 +354,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
           m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
         }
         if (!sim2Map->init(m_pluginProvider))
-          ERROR_LOG() << Q_FUNC_INFO << " init failed";
+          ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
       }
 
       int drawOrder = 0;
@@ -374,7 +373,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
           m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
         }
         if (!sim2Map->init(m_pluginProvider))
-          ERROR_LOG() << Q_FUNC_INFO << " init failed";
+          ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
       }
       
       {
@@ -391,7 +390,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
           m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
         }
         if (!sim2Map->init(m_pluginProvider))
-          ERROR_LOG() << Q_FUNC_INFO << " init failed";
+          ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
       }
 
       
@@ -403,16 +402,16 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
                                                                                     drawOrder++,
                                                                                     "ChargeEffectToMap"));
           if (!m_chargeEffects->init(m_pluginProvider))
-            ERROR_LOG() << Q_FUNC_INFO << " init failed (ChargeEffectToMap)";
+            ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed (ChargeEffectToMap)";
           else
-            DEBUG_LOG() << Q_FUNC_INFO << " ChargeEffect2Map for ChargeEffect prepared";
+            DEBUG_LOG(m_logger) << Q_FUNC_INFO << " ChargeEffect2Map for ChargeEffect prepared";
         }
       }
 
 
       if (m_map->mode() == Mode::Mode_3D)
       {
-        INFO_LOG() << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral";
+        INFO_LOG(m_logger) << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral";
         initRenderer3D_AesCentral_Booby(layernameAesCentral, {AreaEffectSimulation::AesType_def::AtBoobyTrap, AreaEffectSimulation::AesType_def::AtOffRouteMine});
       }
 
@@ -427,7 +426,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
           m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
         }
         if (!sim2Map->init(m_pluginProvider))
-          ERROR_LOG()<<Q_FUNC_INFO <<" init failed";
+          ERROR_LOG(m_logger)<<Q_FUNC_INFO <<" init failed";
       }
 
       {
@@ -441,7 +440,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
           m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
         }
         if (!sim2Map->init(m_pluginProvider))
-          ERROR_LOG()<<Q_FUNC_INFO <<" init failed";
+          ERROR_LOG(m_logger)<<Q_FUNC_INFO <<" init failed";
       }
 
     }
@@ -460,7 +459,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
         m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
       }
       if (!sim2Map->init(m_pluginProvider))
-        ERROR_LOG() << Q_FUNC_INFO << " init failed";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
     }
 
     {
@@ -474,7 +473,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
         m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
       }
       if (!sim2Map->init(m_pluginProvider))
-        ERROR_LOG() << Q_FUNC_INFO << " init failed";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
     }
 
     {
@@ -488,7 +487,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
         m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
       }
       if (!sim2Map->init(m_pluginProvider))
-        ERROR_LOG() << Q_FUNC_INFO << " init failed";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
     }
 
     {
@@ -502,7 +501,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
         m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
       }
       if (!sim2Map->init(m_pluginProvider))
-        ERROR_LOG() << Q_FUNC_INFO << " init failed";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
     }
 
     
@@ -519,7 +518,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
         m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
       }
       if (!sim2Map->init(m_pluginProvider))
-        ERROR_LOG() << Q_FUNC_INFO << " init failed";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
     }
 
     
@@ -536,7 +535,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
         m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
       }
       if (!sim2Map->init(m_pluginProvider))
-        ERROR_LOG() << Q_FUNC_INFO << " init failed";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
     }
 
     
@@ -554,7 +553,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
         m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
       }
       if (!sim2Map->init(m_pluginProvider))
-        ERROR_LOG() << Q_FUNC_INFO << " init failed";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
     }
 
     
@@ -570,7 +569,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
         m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
       }
       if (!sim2Map->init(m_pluginProvider))
-        ERROR_LOG() << Q_FUNC_INFO << " init failed";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
     }
 
 
@@ -609,9 +608,9 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
                                                                                    emergencyCallLayername,
                                                                                    0, "EmergencyCallToMap"));
       if (!m_emergencyCalls->init(m_pluginProvider))
-        ERROR_LOG() << Q_FUNC_INFO << " init failed (EmergencyCallToMap)";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed (EmergencyCallToMap)";
       else
-        DEBUG_LOG() << Q_FUNC_INFO << " EmergencyCallToMap for AlmEmergencyCalls prepared";
+        DEBUG_LOG(m_logger) << Q_FUNC_INFO << " EmergencyCallToMap for AlmEmergencyCalls prepared";
     }
   }
 
@@ -627,7 +626,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
   const bool enableDamageVisualization =
       ps->value(QStringLiteral("SituationMap"), QStringLiteral("enableDamageVisualizationAtBuilding2Map")).toBool();
   if (!m_buildings->init(m_pluginProvider, enableDamageVisualization))
-    ERROR_LOG() << Q_FUNC_INFO << " init failed";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
 
 
   
@@ -641,7 +640,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
                                                                                                 drawOrder++,
                                                                                                 "TrainingAreaToSituationMap"));
     if (!m_trainingAreas->init(m_pluginProvider))
-      ERROR_LOG() << Q_FUNC_INFO << " init failed";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
   }
 
   m_specialAreas = QSharedPointer<SpecialAreaToSituationMap>(new SpecialAreaToSituationMap(m_map->objectFactory(),
@@ -649,7 +648,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
                                                                                               drawOrder++,
                                                                                               "SpecialAreaToSituationMap"));
   if (!m_specialAreas->init(m_pluginProvider))
-    ERROR_LOG() << Q_FUNC_INFO << " init failed";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
 
 
   
@@ -658,7 +657,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
                                                                                drawOrder++,
                                                                                "MountingPointToMap"));
   if (!m_mountingPoints->init(m_pluginProvider, resourceMode))
-    ERROR_LOG() << Q_FUNC_INFO << " init failed";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
 
 
   
@@ -667,7 +666,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
                                                                    drawOrder++,
                                                                    "SoundAreaToMap"));
   if (!m_soundAreas->init(m_pluginProvider, resourceMode))
-    ERROR_LOG() << Q_FUNC_INFO << " init failed";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
 
 
   if (!resourceMode) 
@@ -678,7 +677,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
                                                                   drawOrder++,
                                                                   "MsePointToMap"));
     if (!m_msePoints->init(m_pluginProvider))
-      ERROR_LOG() << Q_FUNC_INFO << " init failed";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
 
     
     m_mseBridges = QSharedPointer<MSEBridgeToMap>(new MSEBridgeToMap(m_map->objectFactory(),
@@ -686,7 +685,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
                                                                      drawOrder++,
                                                                      "MseBridgeToMap"));
     if (!m_mseBridges->init(m_pluginProvider))
-      ERROR_LOG() << Q_FUNC_INFO << " init failed";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
   }
 
   
@@ -695,7 +694,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
                                                                                                  drawOrder++,
                                                                                                  "ShootbackAreaToSituationMap"));
   if (!m_shootbackAreas->init(m_pluginProvider))
-    ERROR_LOG() << Q_FUNC_INFO << " init failed";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
 
   const bool bIsOfTypeOrganizer =
       (m_pluginProvider->operatorId() == 99) ||     
@@ -709,7 +708,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
                                                                                drawOrder++,
                                                                                "GuezIed2SituationMap"));
     if (!m_guezIeds->init(m_pluginProvider))
-      ERROR_LOG() << Q_FUNC_INFO << " init failed";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
   }
 
 
@@ -719,7 +718,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
                                                                                                     drawOrder++,
                                                                                                     "NineLiner2SituationMap"));
   if (!m_guezNasat9Liner->init(m_pluginProvider))
-    ERROR_LOG() << Q_FUNC_INFO << " init failed";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
 
 
   
@@ -730,14 +729,14 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
 
   if (m_buildingOwnership)
     if (!m_buildingOwnership->init(m_map, m_pluginProvider))
-      ERROR_LOG() << Q_FUNC_INFO << " init failed";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
 
   if ((m_map->mode() == Mode::Mode_3D) && (m_buildingContamination.isNull()))
     m_buildingContamination = QSharedPointer<BuildingContamination>(new BuildingContamination(drawOrder++, this));
 
   if (m_buildingContamination)
     if (!m_buildingContamination->init(m_map, m_pluginProvider))
-      ERROR_LOG() << Q_FUNC_INFO << " init failed";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
   
 
   
@@ -776,7 +775,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
   } 
 
 
-  TRACE_LOG() << Q_FUNC_INFO << " END" ;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
   return true;
 }
 
@@ -785,7 +784,7 @@ bool AdapterDds::initRenderer3D_AesExtrusion()
   if (m_map->mode() != Mode::Mode_3D)
     return false;
 
-  INFO_LOG() << Q_FUNC_INFO << " START";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   
   
@@ -800,15 +799,15 @@ bool AdapterDds::initRenderer3D_AesExtrusion()
 
     
     connect(m_map, &Map::partysChangedDelayed, this, [this] () {
-      DEBUG_LOG() << Q_FUNC_INFO << " partysChangedDelayed ********";
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " partysChangedDelayed ********";
 
       
       bool successAes = assignUniqueValueRendererAesCentral3DExtrusion(layernameAes);
       if (successAes)
-        INFO_LOG() << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral3DExtrusion okay" << " ('" << layernameAes << "')";
+        INFO_LOG(m_logger) << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral3DExtrusion okay" << " ('" << layernameAes << "')";
       else
         for (int i=0; i<5; ++i)
-          ERROR_LOG() << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral3DExtrusion failed" << " ('" << layernameAes << "')";
+          ERROR_LOG(m_logger) << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral3DExtrusion failed" << " ('" << layernameAes << "')";
 
       
       
@@ -824,14 +823,14 @@ bool AdapterDds::initRenderer3D_AesExtrusion()
     
     bool successAes = assignUniqueValueRendererAesCentral3DExtrusion(layernameAes);
     if (successAes)
-      INFO_LOG() << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral3DExtrusion okay" << " ('" << layernameAes << "')";
+      INFO_LOG(m_logger) << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral3DExtrusion okay" << " ('" << layernameAes << "')";
     else
       for (int i=0; i<5; ++i)
-        ERROR_LOG() << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral3DExtrusion failed" << " ('" << layernameAes << "')";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral3DExtrusion failed" << " ('" << layernameAes << "')";
   });
 
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
@@ -844,18 +843,18 @@ bool AdapterDds::initRenderer3D_AesCentral_Booby(const QString &layernameAesCent
   
   
 
-  INFO_LOG() << Q_FUNC_INFO << " START, layernameAesCentral=" << layernameAesCentral;
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " START, layernameAesCentral=" << layernameAesCentral;
 
   connect(m_map, &Map::partysChangedDelayed, this, [this, layernameAesCentral, aesTypesForReRunIfPartyColorChanges] () {
-    DEBUG_LOG() << Q_FUNC_INFO << " partysChangedDelayed ********";
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " partysChangedDelayed ********";
 
     
     bool successAesCentral = assignUniqueValueRendererAesCentral(layernameAesCentral);
     if (successAesCentral)
-      DEBUG_LOG() << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral okay" << " ('" << layernameAesCentral << "')";
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral okay" << " ('" << layernameAesCentral << "')";
     else
       for (int i=0; i<5; ++i)
-        ERROR_LOG() << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral failed" << " ('" << layernameAesCentral << "')";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral failed" << " ('" << layernameAesCentral << "')";
 
     
     
@@ -873,18 +872,18 @@ bool AdapterDds::initRenderer3D_AesCentral_Booby(const QString &layernameAesCent
 
   bool successAesCentral = assignUniqueValueRendererAesCentral(layernameAesCentral);
   if (successAesCentral)
-    DEBUG_LOG() << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral okay" << " ('" << layernameAesCentral << "')";
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral okay" << " ('" << layernameAesCentral << "')";
   else
     for (int i=0; i<5; ++i)
-      ERROR_LOG() << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral failed" << " ('" << layernameAesCentral << "')";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral failed" << " ('" << layernameAesCentral << "')";
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
 bool AdapterDds::assignUniqueValueRendererAesCentral(const QString &layername)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, layername ='" << layername << "'" ;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, layername ='" << layername << "'" ;
 
   QVector<LayerFactory::UniqueValueDataAesCentral::TYPE> typeVec;
   typeVec << LayerFactory::UniqueValueDataAesCentral::TYPE::CONE;
@@ -893,7 +892,7 @@ bool AdapterDds::assignUniqueValueRendererAesCentral(const QString &layername)
   const PartyIdToColorFunctor::ColorMap &colorMap = m_map->partyIdToColorFunctor().colorMap();
   if (colorMap.isEmpty())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " colorMap is empty";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " colorMap is empty";
     return false;
   }
   QVector<QColor> colVec;
@@ -904,7 +903,7 @@ bool AdapterDds::assignUniqueValueRendererAesCentral(const QString &layername)
 
     for (const PartyIdToColorFunctor::PartyData &partyData : std::as_const(colorMap))
     {
-      DEBUG_LOG() << Q_FUNC_INFO << " partyName=" << partyData.m_name << "'" << " partyColor=" << partyData.m_color.name() << "'";
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " partyName=" << partyData.m_name << "'" << " partyColor=" << partyData.m_color.name() << "'";
       colVec << partyData.m_color;
       
       
@@ -972,7 +971,7 @@ bool AdapterDds::assignUniqueValueRendererAesCentral(const QString &layername)
       } 
     } 
 
-    INFO_LOG() << Q_FUNC_INFO
+    INFO_LOG(m_logger) << Q_FUNC_INFO
                        << " typeVec.size() = " << typeVec.size()
                        << " colVec.size() = " << colVec.size() << " (colorMap.size() = " << colorMap.size() << ")"
                        << " radiuss.size() = " << radiuss.size()
@@ -990,27 +989,27 @@ bool AdapterDds::assignUniqueValueRendererAesCentral(const QString &layername)
                                                                         uvCont);
   }
 
-  TRACE_LOG() << Q_FUNC_INFO << " END, layername ='" << layername << "'" ;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, layername ='" << layername << "'" ;
   return success;
 }
 
 bool AdapterDds::assignUniqueValueRendererAesCentral3DExtrusion(const QString &layername)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START, layername ='" << layername << "'" ;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, layername ='" << layername << "'" ;
 
   QVector<QColor> colVec;
   {
     const PartyIdToColorFunctor::ColorMap &colorMap = m_map->partyIdToColorFunctor().colorMap();
     if (colorMap.isEmpty())
     {
-      ERROR_LOG() << Q_FUNC_INFO << " colorMap is empty";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " colorMap is empty";
       return false;
     }
 
     colVec.reserve(colorMap.size());
     for (const PartyIdToColorFunctor::PartyData &partyData : colorMap)
     {
-      DEBUG_LOG() << Q_FUNC_INFO << " partyName=" << partyData.m_name << "'" << " partyColor=" << partyData.m_color.name() << "'";
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " partyName=" << partyData.m_name << "'" << " partyColor=" << partyData.m_color.name() << "'";
       colVec << partyData.m_color
              << partyData.m_lightColor;
     }
@@ -1062,18 +1061,18 @@ bool AdapterDds::assignUniqueValueRendererAesCentral3DExtrusion(const QString &l
                                                                                       fieldnames,
                                                                                       uvCont);
 
-  TRACE_LOG() << Q_FUNC_INFO << " END, layername ='" << layername << "'"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, layername ='" << layername << "'"
                       << " success = " << success;
   return success;
 }
 
 bool AdapterDds::run()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   if (m_isRunning)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " already running" ;
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " already running" ;
     return false;
   }
 
@@ -1129,11 +1128,11 @@ bool AdapterDds::run()
   m_isRunning = success;
 
 
-  INFO_LOG() << Q_FUNC_INFO << " connect to SymbolDictionary::changed" ;
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " connect to SymbolDictionary::changed" ;
   connect(&m_map->symbolDictionary(), &AdvancedSymbology::SymbolDictionary::changed,
           this, &AdapterDds::startChangedDelayTimer, Qt::UniqueConnection);
 
-  TRACE_LOG() << Q_FUNC_INFO << " END" ;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
   return success;
 }
 
@@ -1144,12 +1143,12 @@ bool AdapterDds::isRunning() const
 
 bool AdapterDds::stop()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START" ;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START" ;
 
   if (m_pluginProvider && !m_pluginProvider->isSessionValid())
   {
     m_isRunning = false;
-    DEBUG_LOG() << Q_FUNC_INFO << " no session anymore: ignore 'stop' -> return";
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " no session anymore: ignore 'stop' -> return";
     return false;
   }
 
@@ -1195,13 +1194,13 @@ bool AdapterDds::stop()
 
   m_isRunning = false;
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
 void AdapterDds::clearObjects()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   const QList<Sim2SituationMapBase *> &sim2Map = listOfSim2Map();
   for (Sim2SituationMapBase *item : std::as_const(sim2Map))
@@ -1247,23 +1246,23 @@ void AdapterDds::clearObjects()
 
 
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 ResourceManagerMode AdapterDds::resourceManagerMode() const
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (!m_mountingPoints)
     return ResourceManagerMode::Undefined;
 
   ResourceManagerMode rmm = m_mountingPoints->resourceManagerMode();
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return rmm;
 }
 
 bool AdapterDds::setResourceManagerMode(ResourceManagerMode rmm)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (!m_mountingPoints)
     return false;
 
@@ -1272,26 +1271,26 @@ bool AdapterDds::setResourceManagerMode(ResourceManagerMode rmm)
   
   emit resourceManagerModeChanged(m_mountingPoints->resourceManagerMode());
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return success;
 }
 
 bool AdapterDds::showExpiredEmergencyCalls(bool bShowExpired)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   if (!m_emergencyCalls)
     return false;
 
   m_emergencyCalls->showExpired(bShowExpired);
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
 
 bool AdapterDds::uniqueMapId2SimId(UniqueMapId uniqueMapIdIn, int32_t &simIdOut)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
                       << " uniqueMapId=" << uniqueMapIdIn;
 
   if (!SituationMap::isUniqueMapIdValid(uniqueMapIdIn))
@@ -1309,7 +1308,7 @@ bool AdapterDds::uniqueMapId2SimId(UniqueMapId uniqueMapIdIn, int32_t &simIdOut)
 
 bool AdapterDds::unifiedMapObjectData(UniqueMapId uniqueMapIdIn, UnifiedMapObjectData &umodOut) const
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
                       << " uniqueMapId=" << uniqueMapIdIn;
 
   if (!SituationMap::isUniqueMapIdValid(uniqueMapIdIn))
@@ -1332,14 +1331,14 @@ UniqueMapId AdapterDds::simId2UniqueMapIdParticipant(int32_t simId) const
 }
 RefPointer<Participant> AdapterDds::simId2Participant(int32_t simId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId ;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, simId=" << simId ;
 
   UniqueMapId mapId = simId2UniqueMapIdParticipant(simId);
   if (!isUniqueMapIdValid(mapId))
     return RefPointer<Participant>();
 
   RefPointer<Participant> mapObj = m_map->objectFactory().get<Participant>(mapId);
-  TRACE_LOG() << Q_FUNC_INFO << " END" ;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
   return mapObj;
 }
 
@@ -1355,14 +1354,14 @@ UniqueMapId AdapterDds::simId2UniqueMapIdAes(int32_t simId) const
 }
 RefPointer<AbstractMapObject> AdapterDds::simId2Aes(int32_t simId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId ;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, simId=" << simId ;
 
   UniqueMapId mapId = simId2UniqueMapIdAes(simId);
   if (!isUniqueMapIdValid(mapId))
     return RefPointer<AbstractMapObject>();
 
   RefPointer<AbstractMapObject> mapObj = m_map->objectFactory().get(mapId);
-  TRACE_LOG() << Q_FUNC_INFO << " END" ;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
   return mapObj;
 }
 
@@ -1375,14 +1374,14 @@ UniqueMapId AdapterDds::simId2UniqueMapIdBuilding(int32_t simId) const
 }
 RefPointer<BuildingOutline> AdapterDds::simId2Building(int32_t simId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, simId=" << simId;
 
   UniqueMapId mapId = simId2UniqueMapIdBuilding(simId);
   if (!isUniqueMapIdValid(mapId))
     return RefPointer<BuildingOutline>();
 
   RefPointer<BuildingOutline> mapObj = m_map->objectFactory().get<BuildingOutline>(mapId);
-  TRACE_LOG() << Q_FUNC_INFO << " END" ;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
   return mapObj;
 }
 
@@ -1394,14 +1393,14 @@ UniqueMapId AdapterDds::simId2UniqueMapIdBridge(int32_t simId) const
 }
 RefPointer<BuildingOutline> AdapterDds::simId2Bridge(int32_t simId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, simId=" << simId;
 
   UniqueMapId mapId = simId2UniqueMapIdBridge(simId);
   if (!isUniqueMapIdValid(mapId))
     return RefPointer<BuildingOutline>();
 
   RefPointer<BuildingOutline> mapObj = m_map->objectFactory().get<BuildingOutline>(mapId);
-  TRACE_LOG() << Q_FUNC_INFO << " END" ;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
   return mapObj;
 }
 
@@ -1414,14 +1413,14 @@ UniqueMapId AdapterDds::simId2UniqueMapIdMountingPoint(int32_t simId) const
 
 RefPointer<GeoImage> AdapterDds::simId2MountingPoint(int32_t simId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, simId=" << simId;
 
   UniqueMapId mapId = simId2UniqueMapIdMountingPoint(simId);
   if (!isUniqueMapIdValid(mapId))
     return RefPointer<GeoImage>();
 
   RefPointer<GeoImage> mapObj = m_map->objectFactory().get<GeoImage>(mapId);
-  TRACE_LOG() << Q_FUNC_INFO << " END" ;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
   return mapObj;
 }
 
@@ -1433,14 +1432,14 @@ UniqueMapId AdapterDds::simId2UniqueMapIdGuezIed(int32_t simId) const
 }
 RefPointer<Participant> AdapterDds::simId2GuezIed(int32_t simId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, simId=" << simId;
 
   UniqueMapId mapId = simId2UniqueMapIdGuezIed(simId);
   if (!isUniqueMapIdValid(mapId))
     return RefPointer<Participant>();
 
   RefPointer<Participant> mapObj = m_map->objectFactory().get<Participant>(mapId);
-  TRACE_LOG() << Q_FUNC_INFO << " END" ;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
   return mapObj;
 }
 
@@ -1453,14 +1452,14 @@ UniqueMapId AdapterDds::simId2UniqueMapIdChargeEffect(int32_t simId) const
 
 RefPointer<SingleFire> AdapterDds::simId2ChargeEffect(int32_t simId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, simId=" << simId;
 
    UniqueMapId mapId = simId2UniqueMapIdChargeEffect(simId);
    if (!isUniqueMapIdValid(mapId))
      return RefPointer<SingleFire>();
 
    RefPointer<SingleFire> mapObj = m_map->objectFactory().get<SingleFire>(mapId);
-   TRACE_LOG() << Q_FUNC_INFO << " END" ;
+   TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
    return mapObj;
 }
 
@@ -1473,7 +1472,7 @@ UniqueMapId AdapterDds::simId2UniqueMapIdTrainingArea(int32_t simId) const
 
 RefPointer<Polygon> AdapterDds::simId2TrainingArea(int32_t simId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, simId=" << simId;
 
   UniqueMapId mapId = simId2UniqueMapIdTrainingArea(simId);
   if (!isUniqueMapIdValid(mapId))
@@ -1481,7 +1480,7 @@ RefPointer<Polygon> AdapterDds::simId2TrainingArea(int32_t simId)
 
   using MAP_T = TrainingAreaToSituationMap::MAP_T; 
   RefPointer<MAP_T> mapObj = m_map->objectFactory().get<MAP_T>(mapId);
-  TRACE_LOG() << Q_FUNC_INFO << " END" ;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
   return mapObj;
 }
 
@@ -1494,7 +1493,7 @@ UniqueMapId AdapterDds::simId2UniqueMapIdSpecialArea(int32_t simId) const
 
 RefPointer<Polygon> AdapterDds::simId2SpecialArea(int32_t simId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, simId=" << simId;
 
   UniqueMapId mapId = simId2UniqueMapIdSpecialArea(simId);
   if (!isUniqueMapIdValid(mapId))
@@ -1502,7 +1501,7 @@ RefPointer<Polygon> AdapterDds::simId2SpecialArea(int32_t simId)
 
   using MAP_T = SpecialAreaToSituationMap::MAP_T; 
   RefPointer<MAP_T> mapObj = m_map->objectFactory().get<MAP_T>(mapId);
-  TRACE_LOG() << Q_FUNC_INFO << " END" ;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
   return mapObj;
 }
 
@@ -1515,7 +1514,7 @@ UniqueMapId AdapterDds::simId2UniqueMapIdShootbackArea(int32_t simId) const
 
 RefPointer<Polygon> AdapterDds::simId2ShootbackArea(int32_t simId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, simId=" << simId;
 
   UniqueMapId mapId = simId2UniqueMapIdShootbackArea(simId);
   if (!isUniqueMapIdValid(mapId))
@@ -1523,7 +1522,7 @@ RefPointer<Polygon> AdapterDds::simId2ShootbackArea(int32_t simId)
 
   using MAP_T = ShootbackAreaToSituationMap::MAP_T; 
   RefPointer<MAP_T> mapObj = m_map->objectFactory().get<MAP_T>(mapId);
-  TRACE_LOG() << Q_FUNC_INFO << " END" ;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
   return mapObj;
 }
 
@@ -1551,7 +1550,7 @@ UniqueMapId AdapterDds::simId2UniqueMapId(MapObjectType mot, int32_t simId) cons
   case MapObjectType::MOT_Aes:
   case MapObjectType::MOT_GuezIed:
   {
-    ERROR_LOG() << " not supported yet!!!";
+    ERROR_LOG(m_logger) << " not supported yet!!!";
     Q_FALLTHROUGH();
   }
   default:
@@ -1589,7 +1588,7 @@ QVector<UniqueMapId> AdapterDds::simIds2UniqueMapIds(MapObjectType mot, QVector<
   case MapObjectType::MOT_Aes:
   case MapObjectType::MOT_GuezIed:
   {
-    ERROR_LOG() << " not supported yet!!!";
+    ERROR_LOG(m_logger) << " not supported yet!!!";
     Q_FALLTHROUGH();
   }
   default:
@@ -1614,7 +1613,7 @@ RefPointer<AbstractMapObject> AdapterDds::simId2MapObject(MapObjectType mot, int
     return {};
 
   RefPointer<AbstractMapObject> mapObj = m_map->objectFactory().get(uniqueMapId);
-  TRACE_LOG() << Q_FUNC_INFO << " END" ;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
   return mapObj;
 }
 
@@ -1640,7 +1639,7 @@ Sim2SituationMapBase *AdapterDds::situationMapBase(MapObjectType mot) const
   case MapObjectType::MOT_Building:
   case MapObjectType::MOT_GuezIed:
   {
-    ERROR_LOG() << " not supported yet!!!";
+    ERROR_LOG(m_logger) << " not supported yet!!!";
     Q_FALLTHROUGH();
   }
   default:
@@ -1778,7 +1777,7 @@ bool AdapterDds::setOwnPositionVisible(bool enable)
 
 void AdapterDds::onSymbolDictionaryChanged()
 {
-  INFO_LOG() << Q_FUNC_INFO << " START, workspaceId" << m_pluginProvider->workspaceId();
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " START, workspaceId" << m_pluginProvider->workspaceId();
 
   if (m_particpants)
     m_particpants->reRenderObjects();
@@ -1798,7 +1797,7 @@ void AdapterDds::onSymbolDictionaryChanged()
   
 
 
-  INFO_LOG() << Q_FUNC_INFO << " END, workspaceId" << m_pluginProvider->workspaceId();
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " END, workspaceId" << m_pluginProvider->workspaceId();
 }
 
 
@@ -1864,7 +1863,7 @@ void AdapterDds::onMapObjectChangedUpdateDrawOrder(UniqueMapId uniqueMapId)
     RefPointer<AbstractMapObject> mapObj = objFac.get<AbstractMapObject>(curUniqueMapId);
     if (!mapObj)
     {
-      WARNING_LOG() << Q_FUNC_INFO << " not found in objFac"
+      WARNING_LOG(m_logger) << Q_FUNC_INFO << " not found in objFac"
                             << " curUniqueMapId = " << curUniqueMapId;
       return;
     }
@@ -1872,10 +1871,10 @@ void AdapterDds::onMapObjectChangedUpdateDrawOrder(UniqueMapId uniqueMapId)
     mapObj->setDrawOrder(++drawOrderCounter);
     if (!mapObj->updateView())
     {
-      ERROR_LOG() << Q_FUNC_INFO << " debugInfo='" << mapObj->debugInfo() << "'"
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " debugInfo='" << mapObj->debugInfo() << "'"
                           << " updateView failed";
     }
-    INFO_LOG() << Q_FUNC_INFO << " debugInfo='" << mapObj->debugInfo() << "'"
+    INFO_LOG(m_logger) << Q_FUNC_INFO << " debugInfo='" << mapObj->debugInfo() << "'"
                        << " set DrawOder to: " << drawOrderCounter;
   } 
 }
@@ -1889,7 +1888,7 @@ void AdapterDds::onMapObjectRemoved(UniqueMapId uniqueMapId)
 
 void AdapterDds::onParticipantOwnPositionChanged(const Point3D &newPos, int64_t sampleTime)
 {
-  DEBUG_LOG() << "Own Position Changed";
+  DEBUG_LOG(m_logger) << "Own Position Changed";
 
   if(!m_map)
     return;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.h
index 2623106d3..1b6be4ebf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.h
@@ -234,12 +234,14 @@ private slots:
   void onParticipantOwnPositionChanged(const Point3D &newPos, int64_t sampleTime);
 
 private:
+  NGL::INGLLogger &m_logger;
   void startChangedDelayTimer();
   void startOwnPositionOutdatedTimer();
   QList<Sim2SituationMapBase *> listOfSim2Map() const;
   QList<Sim2SituationMapBase *> listOfAes2Map() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   bool              m_isShowOwnPosition{true};
   bool              m_isRunning{false};
   QTimer           *m_changedDelayTimer{nullptr};
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 830b58034..650fd5437 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
@@ -135,22 +135,21 @@ public:
 
 
 
-BuildingContamination::BuildingContamination(int drawOrder, QObject *parent)
-  : BaseClass(parent)
-  , d(new Private())
-{
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+BuildingContamination::BuildingContamination(int drawOrder, QObject *parent) : BaseClass(parent)
+  , d(new Private()),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   d->m_drawOrder = drawOrder;
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 BuildingContamination::~BuildingContamination()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   this->stop();
   
   delete d;
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool BuildingContamination::init(Map *map, PluginProvider *pluginProvider)
@@ -178,17 +177,17 @@ void BuildingContamination::removeAllObjects()
 
 bool BuildingContamination::run()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   if (!d->m_map)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no m_map";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no m_map";
     return false;
   }
 
   if (!m_bldDtc)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no m_bldDtc";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no m_bldDtc";
     return false;
   }
 
@@ -223,7 +222,7 @@ bool BuildingContamination::run()
       
       RefPointer<Cube> cube = d->getCreateCube(buildingId, floorId);
       if (!cube)
-        ERROR_LOG() << Q_FUNC_INFO << " no cube created";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " no cube created";
 
       cube->setVisibility(d->m_visible);
       cube->setDrawOrder(d->m_drawOrder);
@@ -234,7 +233,7 @@ bool BuildingContamination::run()
       cube->setHeight(height);
 
       bool success = cube->updateView();
-      INFO_LOG() << Q_FUNC_INFO << " cube->updateView " << success;
+      INFO_LOG(m_logger) << Q_FUNC_INFO << " cube->updateView " << success;
     };
 
     
@@ -245,15 +244,15 @@ bool BuildingContamination::run()
   }
   
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
 void BuildingContamination::stop()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_bldDtc->disconnect(this);
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool BuildingContamination::isVisible() const
@@ -269,7 +268,7 @@ bool BuildingContamination::setVisible(bool visible)
 
 void BuildingContamination::onBuildingStateChanged(const Buildings::BuildingState &data, DataModification modType)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   const int buildingId = data.id();
 
@@ -286,19 +285,19 @@ void BuildingContamination::onBuildingStateChanged(const Buildings::BuildingStat
     break;
 
   } 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void BuildingContamination::onResetBuildingState()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   d->removeCube();
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void BuildingContamination::updateBuilding(int buildingId)
 {
-  DEBUG_LOG() << "update Building " << buildingId;
+  DEBUG_LOG(m_logger) << "update Building " << buildingId;
   
   const Buildings::BuildingState &bos = m_bldDtc->buildingState(buildingId);
 
@@ -307,7 +306,7 @@ void BuildingContamination::updateBuilding(int buildingId)
 
  const auto contaminations = bos.contaminationStates();
 
- DEBUG_LOG() << "Statecount " << contaminations.size();
+ DEBUG_LOG(m_logger) << "Statecount " << contaminations.size();
 
   
   QSet<int> contaminatedFloors;
@@ -320,7 +319,7 @@ void BuildingContamination::updateBuilding(int buildingId)
       rooms.insert(room);
     }
     
-    DEBUG_LOG() << "contaminated rooms " << rooms.size();
+    DEBUG_LOG(m_logger) << "contaminated rooms " << rooms.size();
 
     for (int room : rooms)
     {
@@ -331,7 +330,7 @@ void BuildingContamination::updateBuilding(int buildingId)
     }
   }
 
-  DEBUG_LOG() << "contaminated floors " << contaminatedFloors.size();
+  DEBUG_LOG(m_logger) << "contaminated floors " << contaminatedFloors.size();
 
 
 
@@ -357,7 +356,7 @@ void BuildingContamination::updateBuilding(int buildingId)
     
     const bool isContaminaed = contaminatedFloors.contains(floorId);
 
-    DEBUG_LOG() << Q_FUNC_INFO
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO
                         << " floorId=" << floorId
                         << " height=" << height
                         << " partyId=" << isContaminaed;
@@ -383,7 +382,7 @@ void BuildingContamination::updateBuilding(int buildingId)
     cube->setHeight(height);
 
     if (!cube->updateView())
-      ERROR_LOG() << Q_FUNC_INFO << " cube->updateView() failed";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " cube->updateView() failed";
 
   } 
 
@@ -409,7 +408,7 @@ int BuildingContamination::findFloorIdByRoomId(int roomId) noexcept(false)
   InfrastructureManagement::StructureElement roomSe;
   if (!m_ismDtc->getStructureElementById(roomId, roomSe))
   {
-    ERROR_LOG() << "getStructureElementById roomId=" <<  roomId << " not found";
+    ERROR_LOG(m_logger) << "getStructureElementById roomId=" <<  roomId << " not found";
     return -1;
   }
 
@@ -457,12 +456,12 @@ bool BuildingContamination::getRoom(int roomSeId, InfrastructureManagement::Stru
 
 PositionCont BuildingContamination::retrieveBuildingGeometry(int buildingId, int floorId) const
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
                       << " buildingId=" << buildingId
                       << " floorId=" << floorId;
   if (!m_ismDtc)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no m_ismDtc";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no m_ismDtc";
     return PositionCont();
   }
 
@@ -474,7 +473,7 @@ PositionCont BuildingContamination::retrieveBuildingGeometry(int buildingId, int
   {
     const InfrastructureManagement::MainFootprint &mainFootprint = m_ismDtc->mainFootprint(buildingId);
 
-    TRACE_LOG() << Q_FUNC_INFO << " START"
+    TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
                         << " mainFootprint.elements().size()=" << mainFootprint.elements().size();
 
     relPositions.reserve(mainFootprint.elements().size());
@@ -581,7 +580,7 @@ PositionCont BuildingContamination::retrieveBuildingGeometry(int buildingId, int
     const Esri::ArcGISRuntime::ImmutablePointCollection &pointCollection = immutablePart.points();
     const int size = pointCollection.size();
 
-    INFO_LOG() << " pointCollection.size = " << pointCollection.size()
+    INFO_LOG(m_logger) << " pointCollection.size = " << pointCollection.size()
                          << " - buildingId = " << buildingId
                          << ", mse.name = " << mse.name();
 
@@ -597,7 +596,7 @@ PositionCont BuildingContamination::retrieveBuildingGeometry(int buildingId, int
   }
 #endif 
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return absPositionsGeo;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.h
index e0ba6cd3c..2399d623d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.h
@@ -56,6 +56,7 @@ protected Q_SLOTS:
 
 
 protected:
+  NGL::INGLLogger &m_logger;
   void updateBuilding(int buildingId);
   int findFloorIdByRoomId(int roomId);
   bool getRoom(int roomSeId, InfrastructureManagement::StructureElement &roomSe);
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 2db76d882..aa7a9711b 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
@@ -211,22 +211,21 @@ public:
 
 
 
-BuildingOwnership::BuildingOwnership(int drawOrder, QObject *parent)
-  : BaseClass(parent)
-  , d(new Private())
-{
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+BuildingOwnership::BuildingOwnership(int drawOrder, QObject *parent) : BaseClass(parent)
+  , d(new Private()),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   d->m_drawOrder = drawOrder;
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 BuildingOwnership::~BuildingOwnership()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   this->stop();
   
   delete d;
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool BuildingOwnership::init(Map *map, PluginProvider *pluginProvider)
@@ -256,17 +255,17 @@ void BuildingOwnership::removeAllObjects()
 
 bool BuildingOwnership::run()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   if (!d->m_map)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no m_map";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no m_map";
     return false;
   }
 
   if (!m_cesDtc)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no m_cesDtc";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no m_cesDtc";
     return false;
   }
 
@@ -301,7 +300,7 @@ bool BuildingOwnership::run()
       
       RefPointer<Cube> cube = d->getCreateCube(buildingId, floorId);
       if (!cube)
-        ERROR_LOG() << Q_FUNC_INFO << " no cube created";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " no cube created";
 
       cube->setVisibility(d->m_visible);
       cube->setDrawOrder(d->m_drawOrder);
@@ -312,7 +311,7 @@ bool BuildingOwnership::run()
       cube->setHeight(height);
 
       bool success = cube->updateView();
-      INFO_LOG() << Q_FUNC_INFO << " cube->updateView " << success;
+      INFO_LOG(m_logger) << Q_FUNC_INFO << " cube->updateView " << success;
     };
 
     
@@ -323,15 +322,15 @@ bool BuildingOwnership::run()
   }
   
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
 void BuildingOwnership::stop()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_cesDtc->disconnect(this);
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool BuildingOwnership::isVisible() const
@@ -347,7 +346,7 @@ bool BuildingOwnership::setVisible(bool visible)
 
 void BuildingOwnership::onBuildingOwnershipChanged(const CentralEffectSimulation::BuildingOwnership &data, DataModification modType)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   const int buildingId = data.buildingId();
 
@@ -364,14 +363,14 @@ void BuildingOwnership::onBuildingOwnershipChanged(const CentralEffectSimulation
     break;
 
   } 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void BuildingOwnership::onResetBuildingOwnership()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   d->removeCube();
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void BuildingOwnership::updateBuilding(int buildingId)
@@ -416,7 +415,7 @@ void BuildingOwnership::updateBuilding(int buildingId)
     
     const int partyId = floor2Party.value(floorId, -1);  
 
-    DEBUG_LOG() << Q_FUNC_INFO
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO
                         << " floorId=" << floorId
                         << " height=" << height
                         << " partyId=" << partyId;
@@ -436,7 +435,7 @@ void BuildingOwnership::updateBuilding(int buildingId)
     cube->setHeight(height);
 
     if (!cube->updateView())
-      ERROR_LOG() << Q_FUNC_INFO << " cube->updateView() failed";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " cube->updateView() failed";
   } 
 }
 
@@ -447,12 +446,12 @@ PositionCont BuildingOwnership::retrieveBuildingGeometry(int buildingId, int flo
 
 PositionCont BuildingOwnership::retrieveBuildingGeometryInternal(int buildingId, int floorId) const
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
                       << " buildingId=" << buildingId
                       << " floorId=" << floorId;
   if (!m_ismDtc)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no m_ismDtc";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no m_ismDtc";
     return PositionCont();
   }
 
@@ -464,7 +463,7 @@ PositionCont BuildingOwnership::retrieveBuildingGeometryInternal(int buildingId,
   {
     const InfrastructureManagement::MainFootprint &mainFootprint = m_ismDtc->mainFootprint(buildingId);
 
-    TRACE_LOG() << Q_FUNC_INFO << " START"
+    TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
                         << " mainFootprint.elements().size()=" << mainFootprint.elements().size();
 
     relPositions.reserve(mainFootprint.elements().size());
@@ -588,7 +587,7 @@ PositionCont BuildingOwnership::retrieveBuildingGeometryInternal(int buildingId,
   }
 #endif 
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return absPositionsGeo;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_ownership.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_ownership.h
index 02d19755c..4e258e53a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_ownership.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_ownership.h
@@ -56,6 +56,7 @@ protected Q_SLOTS:
 
 
 protected:
+  NGL::INGLLogger &m_logger;
   friend class BuildingGeometryCache;
   void updateBuilding(int buildingId);
   PositionCont retrieveBuildingGeometry(int buildingId, int floorId) const;
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 44fa09c03..c5653e742 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
@@ -33,10 +33,10 @@ bool DusMineStateProxy::init(PluginProvider *pluginProvider)
 
 bool DusMineStateProxy::run()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (!m_aesDtc)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no dtc";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no dtc";
     return false;
   }
 
@@ -59,9 +59,9 @@ bool DusMineStateProxy::run()
 
 void DusMineStateProxy::stop()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   this->disconnect();
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool DusMineStateProxy::dusMineStateAndPositionDatas(const std::function<void (const DusMineStateAndPositionData &)> &cb)
@@ -94,7 +94,7 @@ bool DusMineStateProxy::handleChanged(const AreaEffectSimulation::DusMineState &
   if (ddsData.id() != 0)
     return false;
 
-  TRACE_LOG() << Q_FUNC_INFO << " START, ddsData.id()=" << ddsData.id()
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, ddsData.id()=" << ddsData.id()
                       << " ddsData.mines().size() = " << ddsData.mines().size();
 
   if (modType == DataModification::eRemoved)
@@ -112,7 +112,7 @@ bool DusMineStateProxy::handleChanged(const AreaEffectSimulation::AesItemView &d
   if (ddsData.id() != AreaEffectSimulation::AesType::AtMineAreaSingleMines)
     return false;
 
-  TRACE_LOG() << Q_FUNC_INFO << " START, ddsData.id()=" << ddsData.id()
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, ddsData.id()=" << ddsData.id()
                       << " ddsData.form().size() = " << ddsData.form().size();
 
   if (modType == DataModification::eRemoved)
@@ -158,14 +158,14 @@ bool DusMineStateProxy::publishNewMap()
   
   m_map = mapContVeryNew;
 
-  DEBUG_LOG() << "Publishing new dus-mine map to situationMap adapter";
+  DEBUG_LOG(m_logger) << "Publishing new dus-mine map to situationMap adapter";
 
   return true;
 }
 
 const QMap<int32_t, DusMineStateAndPositionData> DusMineStateProxy::getFromDds()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, ddsData.id()=" << m_lastDusMineState.id()
+  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;
@@ -178,7 +178,7 @@ const QMap<int32_t, DusMineStateAndPositionData> DusMineStateProxy::getFromDds()
     int idx = 0;
     for (const AreaEffectSimulation::DusMine &mine : mines)
     {
-      DEBUG_LOG() << Q_FUNC_INFO
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO
                           << " idx=" << idx++
                           << ", eqId=" << mine.eqId()
                           << ", chargeTypeId=" << mine.chargeTypeId();
@@ -188,14 +188,14 @@ const QMap<int32_t, DusMineStateAndPositionData> DusMineStateProxy::getFromDds()
   
   if (size != m_lastItemView.form().size())
   {
-    ERROR_LOG() << 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();
     return mapCont;
   }
 
-  DEBUG_LOG() << 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();
@@ -211,7 +211,7 @@ const QMap<int32_t, DusMineStateAndPositionData> DusMineStateProxy::getFromDds()
                                            pos
                                           );
 
-    DEBUG_LOG() << 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);
   } 
@@ -248,7 +248,7 @@ bool MineAreaNull2SituationMap::init(PluginProvider *pluginProvider)
   {
     m_dusMineStateProxy = new DusMineStateProxy(this);
     if (!m_dusMineStateProxy->init(pluginProvider))
-      ERROR_LOG() << Q_FUNC_INFO << " init failed for DusMineStateProxy";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed for DusMineStateProxy";
   }
   return true;
 }
@@ -256,11 +256,11 @@ bool MineAreaNull2SituationMap::init(PluginProvider *pluginProvider)
 
 bool MineAreaNull2SituationMap::run()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   if (!m_dusMineStateProxy)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no DusMineStateProxy";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no DusMineStateProxy";
     return false;
   }
 
@@ -275,7 +275,7 @@ bool MineAreaNull2SituationMap::run()
     handleChanged(data, DataModification::eAdded);
   });
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
@@ -330,10 +330,10 @@ bool MineAreaNull2SituationMap::unifiedMapObjectData(UniqueMapId uniqueMapId, Un
 
 bool MineAreaNull2SituationMap::updateVisibility(const Aes2SituationMap::DDS_TYPE &ddsData, RefPointer<Aes2SituationMap::MAP_TYPE> mapObj)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << getSimId(ddsData);
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, simId=" << getSimId(ddsData);
   if (!BaseClass::updateVisibility(ddsData, mapObj))
   {
-    ERROR_LOG() << Q_FUNC_INFO << " BaseClass::updateVisibility failed, simId=" << getSimId(ddsData);
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " BaseClass::updateVisibility failed, simId=" << getSimId(ddsData);
     return false;
   }
 
@@ -350,9 +350,9 @@ bool MineAreaNull2SituationMap::updateVisibility(const Aes2SituationMap::DDS_TYP
   }
 
   if (bUpdateView && !mapObj->updateView())
-      ERROR_LOG()<< Q_FUNC_INFO << " simId = " << getSimId(ddsData) << " XXXX updateView failed";
+      ERROR_LOG(m_logger)<< Q_FUNC_INFO << " simId = " << getSimId(ddsData) << " XXXX updateView failed";
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
@@ -378,7 +378,7 @@ void MineAreaNull2SituationMap::onAesDisplayFilterChanged(AreaEffectSimulation::
 bool MineAreaNull2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsData,
                                                   RefPointer<MAP_T> mapObj)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   
   mapObj->setVisibility(ObjectAppearance::Tactical, false);
@@ -413,7 +413,7 @@ bool MineAreaNull2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T
   mapObj->setTextModifier(Participant::TextModifier::M_HigherFormation, QString::number(simId_eqId));
 
   updateVisibility(ddsData, mapObj);
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
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 ca837a005..76224f5f6 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
@@ -69,6 +69,8 @@ public:
   Core::GeoPosition2D position() const              { return m_form_param;  }
 
 private:
+
+NGL::INGLLogger &m_logger;
   int32_t                             m_id_param;
   AreaEffectSimulation::ChargeStruct  m_chargeStruct;
   Core::GeoPosition2D     m_form_param;
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 b91ebc53a..21b18cfde 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
@@ -25,9 +25,8 @@ QString toString(SpecialChargeType value)
   return QStringLiteral("SpecialChargeTypeERROR");
 }
 
-PdmHandler::PdmHandler(const std::shared_ptr<ProjectDataManagement::Interface::Dtc> &dtcPdm)
-  : m_dtcPdm(dtcPdm)
-{}
+PdmHandler::PdmHandler(const std::shared_ptr<ProjectDataManagement::Interface::Dtc> &dtcPdm) : m_dtcPdm(dtcPdm),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 
 void PdmHandler::initializePdm()
@@ -85,7 +84,7 @@ ProjectDataManagement::ChargeType PdmHandler::chargeTypeFromId(int chargeTypeId)
   auto it = m_chargeTypes.constFind(chargeTypeId);
   if (it == m_chargeTypes.cend())
   {
-    WARNING_LOG() << "Could not find charge type with id " << chargeTypeId;
+    WARNING_LOG(m_logger) << "Could not find charge type with id " << chargeTypeId;
     return ProjectDataManagement::ChargeType();
   }
   return it.value();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/pdm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/pdm_handler.h
index b46db26da..89ca6101f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/pdm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/pdm_handler.h
@@ -67,11 +67,13 @@ public:
   QVector<ProjectDataManagement::CasEffect> casEffects(const AreaEffectSimulation::ChargeStruct &chargeStruct);
 
 private:
+  NGL::INGLLogger &m_logger;
   void initializePdm();
   void onChargeTypeChanged(const ProjectDataManagement::ChargeType &data, DataModification mod);
   void onGearTypeChargeTypeChanged(const ProjectDataManagement::GearTypeChargeType &data, DataModification mod);
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_dtcPdm;
   QMap<int, ProjectDataManagement::ChargeType> m_chargeTypes;
   QMap<int, ProjectDataManagement::GearTypeChargeType> m_gearTypeChargeTypes;
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 eb6ae3d97..4e4c4fdd8 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
@@ -161,7 +161,7 @@ public:
       mapObj->updateView();
 
       if (!mapObj->updateView())
-        ERROR_LOG() << Q_FUNC_INFO << " updateElement failed, "
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " updateElement failed, "
                             << " uniqueMapId = " << uniqueMapId
                             << " debugInfo='" << mapObj->debugInfo() << "'";
     }
@@ -265,7 +265,7 @@ protected:
 
   virtual bool createElement(const DDS_T &ddsData)
   {
-    TRACE_LOG() << Q_FUNC_INFO << " START"
+    TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
                         << " simId = " << getSimId(ddsData);
 
     const int32_t simId = getSimId(ddsData);
@@ -273,7 +273,7 @@ protected:
     
     if (m_simId2UniqueMapId.contains(simId))
     {
-      DEBUG_LOG() << Q_FUNC_INFO << " mapObject already exists"
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " mapObject already exists"
                           << " simId = " << simId;
       return true;
     }
@@ -283,7 +283,7 @@ protected:
     RefPointer<MAP_T> mapObj = m_objFac.create<MAP_T>(layername, debugInfo);
     if (!mapObj)
     {
-      ERROR_LOG() << Q_FUNC_INFO << " creation failed"
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " creation failed"
                           << " simId = " << simId;
       return false;
     }
@@ -297,14 +297,14 @@ protected:
     const UniqueMapId uniqueMapId = mapObj->uniqueMapId();
     if (!isUniqueMapIdValid(uniqueMapId))
     {
-      ERROR_LOG() << Q_FUNC_INFO << " uniqueMapId invalid"
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " uniqueMapId invalid"
                           << " simId = " << simId;
       return false;
     }
     m_simId2UniqueMapId[simId] = uniqueMapId;
     m_uniqueMapId2SimId[uniqueMapId] = simId;
 
-    DEBUG_LOG() << Q_FUNC_INFO << " END";
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
     return true;
   } 
 
@@ -312,7 +312,7 @@ protected:
 
   bool updateElement(const DDS_T &ddsData)
   {
-    DEBUG_LOG() << Q_FUNC_INFO << " START"
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START"
                         << " simId = " << getSimId(ddsData);
     const int32_t simId = getSimId(ddsData);
 
@@ -320,14 +320,14 @@ protected:
     const UniqueMapId uniqueMapId = m_simId2UniqueMapId.value(simId, INVALID_MAP_ID);
     if (!isUniqueMapIdValid(uniqueMapId))
     {
-      ERROR_LOG() << Q_FUNC_INFO << " not found" << " simId = " << simId;
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " not found" << " simId = " << simId;
       return false;
     }
 
     RefPointer<MAP_T> mapObj = m_objFac.get<MAP_T>(uniqueMapId);
     if (!mapObj)
     {
-      ERROR_LOG() << Q_FUNC_INFO << " not found in objFac"
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " not found in objFac"
                           << " simId = " << simId
                           << " uniqueMapId = " << uniqueMapId;
       return false;
@@ -336,7 +336,7 @@ protected:
     bool success = updateElementImpl(ddsData, mapObj);
     if (!success)
     {
-      ERROR_LOG() << Q_FUNC_INFO << " updateElementImpl failed, "
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " updateElementImpl failed, "
                           << " simId = " << getSimId(ddsData);
       return false;
     }
@@ -347,7 +347,7 @@ protected:
 
     if (!mapObj->updateView())
     {
-      ERROR_LOG() << Q_FUNC_INFO << " updateElement failed, "
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " updateElement failed, "
                           << " simId = " << getSimId(ddsData);
       return false;
     }
@@ -355,26 +355,26 @@ protected:
     
     emit mapObjectChanged(uniqueMapId);
 
-    DEBUG_LOG() << Q_FUNC_INFO << " END";
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
     return true;
   } 
 
   bool removeElement(const DDS_T &ddsData)
   {
     const int32_t simId = getSimId(ddsData);
-    DEBUG_LOG() << Q_FUNC_INFO << " START" << " simId = " << simId;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START" << " simId = " << simId;
     return removeElement(simId);
   } 
 
   virtual bool removeElement(const int32_t simId)
   {
-    DEBUG_LOG() << Q_FUNC_INFO << " START" << " simId = " << simId;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START" << " simId = " << simId;
 
     
     const UniqueMapId uniqueMapId = m_simId2UniqueMapId.value(simId, INVALID_MAP_ID);
     if (!isUniqueMapIdValid(uniqueMapId))
     {
-      TRACE_LOG() << Q_FUNC_INFO << " not found"
+      TRACE_LOG(m_logger) << Q_FUNC_INFO << " not found"
                             << ", simId = " << simId;
       return false;
     }
@@ -388,12 +388,12 @@ protected:
     }
     else
     {
-      ERROR_LOG() << Q_FUNC_INFO << " not found in objFac"
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " not found in objFac"
                           << " simId = " << simId
                           << " uniqueMapId = " << uniqueMapId;
     }
 
-    DEBUG_LOG() << Q_FUNC_INFO << " END";
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
 
     
     emit mapObjectRemoved(uniqueMapId);
@@ -422,7 +422,7 @@ protected:
 
   bool handleChanged(const DDS_T &ddsData, DataModification modType)
   {
-    DEBUG_LOG() << Q_FUNC_INFO << " START"
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START"
                         << " modType = " << modType
                         << " simId = " << getSimId(ddsData);
 
@@ -445,7 +445,7 @@ protected:
       success = this->removeElement(ddsData);
       break;
     }  
-    DEBUG_LOG() << Q_FUNC_INFO << " END";
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
     return success;
   } 
 
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 3bf8aebff..b50cf8654 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
@@ -86,11 +86,10 @@ void ConfigureSingleMapUrl::onClose()
 
 
 
-ConfigureMapUrlsWidget::ConfigureMapUrlsWidget(QWidget *parent)
-  : QWidget(parent)
-  , m_ui(new Ui::Configure_Urls_Widget)
-{
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+ConfigureMapUrlsWidget::ConfigureMapUrlsWidget(QWidget *parent) : QWidget(parent)
+  , m_ui(new Ui::Configure_Urls_Widget),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_ui->setupUi(this);
 
   connect(m_ui->pbUp,     &QPushButton::clicked, this, &ConfigureMapUrlsWidget::onUpClicked);
@@ -99,14 +98,14 @@ ConfigureMapUrlsWidget::ConfigureMapUrlsWidget(QWidget *parent)
   connect(m_ui->pbModify, &QPushButton::clicked, this, &ConfigureMapUrlsWidget::onModfiyClicked);
   connect(m_ui->pbRemove, &QPushButton::clicked, this, &ConfigureMapUrlsWidget::onRemoveClicked);
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 ConfigureMapUrlsWidget::~ConfigureMapUrlsWidget()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   delete m_ui;
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void ConfigureMapUrlsWidget::setModel(ConfigureMapUrlModel *model)
@@ -171,7 +170,7 @@ void ConfigureMapUrlsWidget::onAddClicked()
 }
 void ConfigureMapUrlsWidget::addSingleUrl()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   if (!m_configureMapUrlModel)
     return;
@@ -200,7 +199,7 @@ void ConfigureMapUrlsWidget::onModfiyClicked()
 }
 void ConfigureMapUrlsWidget::modifySingleUrl()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   if (!m_configureMapUrlModel)
     return;
@@ -214,7 +213,7 @@ void ConfigureMapUrlsWidget::modifySingleUrl()
 
 void ConfigureMapUrlsWidget::onRemoveClicked()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   int currentRow = m_ui->tvLayer->currentIndex().row();
   m_configureMapUrlModel->removeRow(currentRow);
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 fd0b85c32..1e5f70d46 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,6 +60,8 @@ protected Q_SLOTS:
   void onClose();
 
 private:
+
+NGL::INGLLogger &m_logger;
   Ui::Configure_Single_Url *m_ui;
   LtsWidgets::LtsDialogButtonBox *m_buttonBox;
 };
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 c1df303ee..528b28bde 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
@@ -22,7 +22,7 @@ ConfigureMapUrls::ConfigureMapUrls(QWidget *parent)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
   , m_ui(new Ui::Configure_Urls)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   m_ui->setupUi(this);
 
@@ -56,24 +56,24 @@ ConfigureMapUrls::ConfigureMapUrls(QWidget *parent)
   
   setOnlineHelpFilename(QStringLiteral("Configuration_of_Modells_SLPKs")); 
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 ConfigureMapUrls::~ConfigureMapUrls()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   delete m_ui;
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool ConfigureMapUrls::init(PluginProvider *pluginProvider)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_pluginProvider = pluginProvider;
 
   if (!m_pluginProvider)
   {
-    ERROR_LOG() << Q_FUNC_INFO  << " no pluginProvider";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO  << " no pluginProvider";
     return false;
   }
 
@@ -81,14 +81,14 @@ bool ConfigureMapUrls::init(PluginProvider *pluginProvider)
   m_asmDtc = m_pluginProvider->asmDtc();
   if (!m_asmDtc)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Can not retrieve AssetManagement::DTC";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Can not retrieve AssetManagement::DTC";
     bRet = false;
   }
 
   m_asmFtc = m_pluginProvider->asmFtc();
   if (!m_asmFtc)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Can not retrieve AssetManagement::FTC";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Can not retrieve AssetManagement::FTC";
     bRet = false;
   }
 
@@ -100,16 +100,16 @@ bool ConfigureMapUrls::init(PluginProvider *pluginProvider)
   fillTrainingAreaCbx();
   syncTaToGui();
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return bRet;
 }
 
 void ConfigureMapUrls::fillTrainingAreaCbx()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (!m_asmDtc)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no dtc";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no dtc";
     return;
   }
 
@@ -135,18 +135,18 @@ void ConfigureMapUrls::fillTrainingAreaCbx()
     const int newTrainingAreaId = m_ui->cbTrainingArea->currentData().toInt();
     if (!retrieveTaOfService(newTrainingAreaId))
     {
-      ERROR_LOG() << Q_FUNC_INFO << " retrieveTrainingAreaOfService failed";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " retrieveTrainingAreaOfService failed";
       return;
     }
   }
 
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void ConfigureMapUrls::onSelectedTrainingAreaChanged(const QString & )
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   const int newTrainingAreaId = m_ui->cbTrainingArea->currentData().toInt();
   if (m_trainingArea.id() == newTrainingAreaId)
     return;
@@ -159,23 +159,23 @@ void ConfigureMapUrls::onSelectedTrainingAreaChanged(const QString & )
       apply();
       if (!retrieveTaOfService(newTrainingAreaId))
       {
-        ERROR_LOG() << Q_FUNC_INFO << " retrieveTrainingAreaOfService failed";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " retrieveTrainingAreaOfService failed";
         return;
       }
       break;
     case LtsWidgets::Button::Cancel:
-      INFO_LOG() << Q_FUNC_INFO << " set back to m_trainingArea.id() = " << m_trainingArea.id();
+      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))
       {
-        ERROR_LOG() << Q_FUNC_INFO << " retrieveTrainingAreaOfService failed";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " retrieveTrainingAreaOfService failed";
         return;
       }
       break;
     default:
-      ERROR_LOG() << Q_FUNC_INFO << " got unexpected!!!";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " got unexpected!!!";
       break;
     }
   }
@@ -183,22 +183,22 @@ void ConfigureMapUrls::onSelectedTrainingAreaChanged(const QString & )
   {
     if (!retrieveTaOfService(newTrainingAreaId))
     {
-      ERROR_LOG() << Q_FUNC_INFO << " retrieveTrainingAreaOfService failed";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " retrieveTrainingAreaOfService failed";
       return;
     }
   }
 
   syncTaToGui();
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool ConfigureMapUrls::retrieveTaOfService(int trainingAreaId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, trainingAreaId=" << trainingAreaId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, trainingAreaId=" << trainingAreaId;
 
   if (!m_asmDtc)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no dtc";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no dtc";
     return false;
   }
 
@@ -210,14 +210,14 @@ bool ConfigureMapUrls::retrieveTaOfService(int trainingAreaId)
   AssetManagement::TrainingArea ta = m_asmDtc->trainingArea(trainingAreaId);
   if (ta.id() != trainingAreaId)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " switch to m_trainingArea failed (taId=" << trainingAreaId << ")";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " switch to m_trainingArea failed (taId=" << trainingAreaId << ")";
     return false;
   }
   m_trainingArea = ta;
-  INFO_LOG() << 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() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
@@ -251,7 +251,7 @@ void basicConfig(ConfigureMapUrlsWidget *tv, bool showTypeMinMax = true)
 
 void ConfigureMapUrls::syncTaToGui()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   ConfigureMapUrlsWidget *w;
 
@@ -259,7 +259,7 @@ void ConfigureMapUrls::syncTaToGui()
   if (w && w->model())
   {
     w->model()->setData(vecToVec(m_trainingArea.map2D()));
-    TRACE_LOG() << Q_FUNC_INFO << " model->rowCount()" << w->model()->rowCount();
+    TRACE_LOG(m_logger) << Q_FUNC_INFO << " model->rowCount()" << w->model()->rowCount();
   }
   basicConfig(w);
 
@@ -274,7 +274,7 @@ void ConfigureMapUrls::syncTaToGui()
   if (w && w->model())
   {
     w->model()->setData(vecToVec(m_trainingArea.scene3D()));
-    TRACE_LOG() << Q_FUNC_INFO << " model->rowCount()" << w->model()->rowCount();
+    TRACE_LOG(m_logger) << Q_FUNC_INFO << " model->rowCount()" << w->model()->rowCount();
 }
   basicConfig(w);
 
@@ -288,12 +288,12 @@ void ConfigureMapUrls::syncTaToGui()
     w->model()->setData(vecToVec(m_trainingArea.sceneObjects()));
   basicConfig(w, false);
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void ConfigureMapUrls::syncGuiToTa()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   ConfigureMapUrlsWidget *w;
 
@@ -326,7 +326,7 @@ void ConfigureMapUrls::syncGuiToTa()
     item.mapDescriptionTypeId(AssetManagement::MapDescriptionType_def::SceneObj);
 
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void ConfigureMapUrls::retranslate()
@@ -337,11 +337,11 @@ void ConfigureMapUrls::retranslate()
 
 bool ConfigureMapUrls::apply()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   if (!m_asmFtc)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Can not retrieve AssetManagement::FTC";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Can not retrieve AssetManagement::FTC";
     return false;
   }
 
@@ -352,24 +352,24 @@ bool ConfigureMapUrls::apply()
     return m_asmFtc->trainingAreaModifyRequest(m_trainingArea, this);
   });
 
-  TRACE_LOG() << Q_FUNC_INFO << " END, scucess=" <<   success;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, scucess=" <<   success;
   return success;
 }
 
 void ConfigureMapUrls::onTrainingAreaModifyReply(const Core::FunctionReplyObject &reply)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   if (reply.error())
   {
-    ERROR_LOG() << Q_FUNC_INFO << "Got onTrainingAreaModifyReply error: " << reply();
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << "Got onTrainingAreaModifyReply error: " << reply();
     return;
   }
-  INFO_LOG() << Q_FUNC_INFO << " Got onTrainingAreaModifyReply with id " << reply.id();
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " Got onTrainingAreaModifyReply with id " << reply.id();
 
   m_requestHelper->requestReply(reply);
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_urls.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_urls.h
index 7dfe4819f..e51e2fc58 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_urls.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_urls.h
@@ -46,6 +46,8 @@ public:
   bool init(PluginProvider *pluginProvider);
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void fillTrainingAreaCbx();
   bool retrieveTaOfService(int trainingAreaId);
   void syncTaToGui();
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 6dca05550..fefe5ac73 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
@@ -99,14 +99,14 @@ MapObjectModel::MapObjectModel(QObject *parent)
 },
 parent)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 MapObjectModel::~MapObjectModel()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void MapObjectModel::initModel(Map *map)
@@ -441,7 +441,7 @@ UniqueMapId MapObjectModel::uniqueMapIdOfIndex(const QModelIndex &index) const
 
 void MapObjectModel::onDataChanged(UniqueMapId uniqueMapId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, uniqueMapId=" << uniqueMapId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, uniqueMapId=" << uniqueMapId;
 
   
   int row = findRowForUniqueMapId(uniqueMapId);
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 8d6c9f389..970aa1b31 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
@@ -168,9 +168,11 @@ public:
   void setSourceModel(QAbstractItemModel *sourceModel) override;
 
 protected:
+  NGL::INGLLogger &m_logger;
   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 60f40a641..f51e1ef00 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
@@ -306,40 +306,39 @@ void MapObjectSelectionLtsDialog::onServiceMonitorRequestedAdd()
 
 
 
-MapObjectSelectionWidget::MapObjectSelectionWidget(QWidget *parent)
-  : BaseClass(parent)
-  , m_ui(new Ui::MapObjectSelectionDialog)
-{
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+MapObjectSelectionWidget::MapObjectSelectionWidget(QWidget *parent) : BaseClass(parent)
+  , m_ui(new Ui::MapObjectSelectionDialog),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_ui->setupUi(this);
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 MapObjectSelectionWidget::~MapObjectSelectionWidget()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   
   clearSelectionOfMapObjects(true);
 
   
   delete m_ui;
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool MapObjectSelectionWidget::init(Map *map, AdapterDds *adapterDds)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   if (!map)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no map";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no map";
     return false;
   }
 
   if (!adapterDds)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no adapterDds";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no adapterDds";
     return false;
   }
 
@@ -351,7 +350,7 @@ bool MapObjectSelectionWidget::init(Map *map, AdapterDds *adapterDds)
   connect(&m_map->partyIdToColorFunctor(), &PartyIdToColorFunctor::partyChanged,
           this, &MapObjectSelectionWidget::onPartyIdsChanged, Qt::UniqueConnection);
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
@@ -417,11 +416,11 @@ void MapObjectSelectionWidget::setMapObjectsToDisplay(const Map::RefPointerMapOb
 
 void MapObjectSelectionWidget::setMapObjectsToDisplay(const QVector<UniqueMapId> &uniqueMapIds)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, uniqueMapIds.size()=" << uniqueMapIds.size();
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, uniqueMapIds.size()=" << uniqueMapIds.size();
 
   if (m_map.isNull())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no map";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no map";
     return;
   }
 
@@ -481,7 +480,7 @@ void MapObjectSelectionWidget::setMapObjectsToDisplay(const QVector<UniqueMapId>
     if (m_adapterDds->unifiedMapObjectData(uniqueMapId, umodOut))
       mapObjectDataVec.append(dataFromUnified(uniqueMapId, umodOut));
     else
-      ERROR_LOG() << Q_FUNC_INFO << " unifiedMapObjectData failed, uniqueMapId=" << uniqueMapId;
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " unifiedMapObjectData failed, uniqueMapId=" << uniqueMapId;
 
   } 
 
@@ -491,7 +490,7 @@ void MapObjectSelectionWidget::setMapObjectsToDisplay(const QVector<UniqueMapId>
   m_ui->ltsDataView->setSortIndicator(MapObjectModel::Columns::EQUIPMENT_NUMBER, Qt::AscendingOrder);
   m_ui->ltsDataView->setSortIndicator(MapObjectModel::Columns::PARTY, Qt::AscendingOrder);
 
-  TRACE_LOG() << Q_FUNC_INFO << " END, uniqueMapIds.size()=" << uniqueMapIds.size();
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, uniqueMapIds.size()=" << uniqueMapIds.size();
 }
 
 
@@ -563,7 +562,7 @@ QVector<int> MapObjectSelectionWidget::visibleBuildingIds() const
 
 bool MapObjectSelectionWidget::addMapObject(const UniqueMapId &uniqueMapId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, uniqueMapId=" << uniqueMapId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, uniqueMapId=" << uniqueMapId;
 
   if (m_map.isNull() || m_adapterDds.isNull() || m_mapObjectModel.isNull())
     return false;
@@ -575,13 +574,13 @@ bool MapObjectSelectionWidget::addMapObject(const UniqueMapId &uniqueMapId)
   if (m_adapterDds->unifiedMapObjectData(uniqueMapId, umodOut))
     return m_mapObjectModel->addMapObjectData(dataFromUnified(uniqueMapId, umodOut));
 
-  TRACE_LOG() << Q_FUNC_INFO << " END, uniqueMapId=" << uniqueMapId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, uniqueMapId=" << uniqueMapId;
   return false;
 }
 
 bool MapObjectSelectionWidget::updateMapObject(const UniqueMapId &uniqueMapId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, uniqueMapId=" << uniqueMapId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, uniqueMapId=" << uniqueMapId;
 
   if (m_map.isNull() || m_adapterDds.isNull() || !m_mapObjectModel)
     return false;
@@ -593,20 +592,20 @@ bool MapObjectSelectionWidget::updateMapObject(const UniqueMapId &uniqueMapId)
   if (m_adapterDds->unifiedMapObjectData(uniqueMapId, umodOut))
     return m_mapObjectModel->updateMapObjectData(dataFromUnified(uniqueMapId, umodOut));
 
-  ERROR_LOG() << Q_FUNC_INFO << " unifiedMapObjectData failed, uniqueMapId=" << uniqueMapId;
-  TRACE_LOG() << Q_FUNC_INFO << " END, uniqueMapId=" << uniqueMapId;
+  ERROR_LOG(m_logger) << Q_FUNC_INFO << " unifiedMapObjectData failed, uniqueMapId=" << uniqueMapId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, uniqueMapId=" << uniqueMapId;
   return false;
 }
 
 void MapObjectSelectionWidget::onMapObjectRemoved(UniqueMapId uniqueMapId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, uniqueMapId=" << uniqueMapId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, uniqueMapId=" << uniqueMapId;
 
   if (!m_mapObjectModel)
     return;
 
   m_mapObjectModel->remove(uniqueMapId);
-  TRACE_LOG() << Q_FUNC_INFO << " END, uniqueMapId=" << uniqueMapId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, uniqueMapId=" << uniqueMapId;
 }
 
 void MapObjectSelectionWidget::onPartyIdsChanged()
@@ -647,7 +646,7 @@ void MapObjectSelectionWidget::onMapObjectClicked(UniqueMapId uniqueMapId)
 
 void MapObjectSelectionWidget::onMapObjectEntered(const QModelIndex &index)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   if (!m_mapObjectModel)
     return;
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 c78d1211a..c548624d0 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
@@ -14,10 +14,9 @@
 namespace SituationMap
 {
 
-LayersModel::LayersModel(LtsSession::LtsSession *session, QObject *parent)
-  : QAbstractTableModel(parent)
-  , m_session(session)
-{}
+LayersModel::LayersModel(LtsSession::LtsSession *session, QObject *parent) : QAbstractTableModel(parent)
+  , m_session(session),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 bool LayersModel::initModel(Map *situationMap)
 {
@@ -61,9 +60,9 @@ bool LayersModel::initModel(Map *situationMap)
     insertRow(li);
   }
 
-  INFO_LOG() << "initModel - #layers: " << m_vecData.size();
+  INFO_LOG(m_logger) << "initModel - #layers: " << m_vecData.size();
   for (const LayerInfo &item : std::as_const(m_vecData))
-    INFO_LOG() << "initModel - layers: " << item.layerName;
+    INFO_LOG(m_logger) << "initModel - layers: " << item.layerName;
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/layers_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/layers_model.h
index 5b6bac1e5..ae856f8f7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/layers_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/layers_model.h
@@ -63,6 +63,7 @@ Q_SIGNALS:
   void layerDataChanged(const QString &layerName, int newValue, int column);
   void isVisibleChanged(const QString &layerName, bool isVisible);
 private:
+  NGL::INGLLogger &m_logger;
   LtsSession::LtsSession *m_session{nullptr};
   QVector<LayerInfo> m_vecData;
   QStringList m_layerDisplayNameFilterList{};
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 11c4ed654..d9fa5f59b 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
@@ -113,7 +113,7 @@ static_assert((int)SituationMap::MapFillPattern::Vertical         == (int)Situat
 namespace SituationMap
 {
 
-#define LOG_ERROR_SIT ERROR_LOG() << Q_FUNC_INFO << " no situationMapInit"
+#define LOG_ERROR_SIT ERROR_LOG(m_logger) << Q_FUNC_INFO << " no situationMapInit"
 #define CHECK_SMI_RETVAL if (!(m_situationMapInit)) { LOG_ERROR_SIT; return {}; }
 #define CHECK_SMI if (!(m_situationMapInit)) { LOG_ERROR_SIT; return; }
 
@@ -433,7 +433,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
         bool curVisi = m_situationMapInit->isBuildingOwnershipVisible();
         bool success = m_situationMapInit->setBuildingOwnershipVisible(!curVisi);
         if (!success)
-          WARNING_LOG() << Q_FUNC_INFO << "setBuildingOwnershipVisible failed";
+          WARNING_LOG(m_logger) << Q_FUNC_INFO << "setBuildingOwnershipVisible failed";
 
         if (menueBtnBuildingOwnership)
           menueBtnBuildingOwnership->setChecked(m_situationMapInit->isBuildingOwnershipVisible());
@@ -462,7 +462,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
         bool curVisi = m_situationMapInit->isBuildingContaminationVisible();
         bool success = m_situationMapInit->setBuildingContaminationVisible(!curVisi);
         if (!success)
-          WARNING_LOG() << Q_FUNC_INFO << "setBuildingContaminationVisible failed";
+          WARNING_LOG(m_logger) << Q_FUNC_INFO << "setBuildingContaminationVisible failed";
 
         if (menueBtnBuildingContamination)
           menueBtnBuildingContamination->setChecked(m_situationMapInit->isBuildingContaminationVisible());
@@ -597,7 +597,7 @@ bool InterfaceImpl::fetchInterfaces()
   
   if (!m_session->getForeignGuiInterface<AdvancedSymbology::ForeignGuiFlmSymbolsProxyInterface>(m_asbGuiIfc))
   {
-    DEBUG_LOG() << Q_FUNC_INFO << " getForeignGuiInterface for ForeignGuiFlmSymbolsProxyInterface failed.";
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface for ForeignGuiFlmSymbolsProxyInterface failed.";
     return false;
   }
 
@@ -610,7 +610,7 @@ bool InterfaceImpl::fetchInterfaces()
   std::shared_ptr<FilterManagement::Interface::Dtc> fltDtc = m_pluginProvider->fltDtc();
   if (!fltDtc)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no fltDtc";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no fltDtc";
     return false;
   }
 
@@ -631,7 +631,7 @@ bool InterfaceImpl::fetchInterfaces()
       onTrainingAreaChanged(data, DataModification::eAdded);
     });
   } else {
-    WARNING_LOG() << Q_FUNC_INFO << " no m_asmDtc";
+    WARNING_LOG(m_logger) << Q_FUNC_INFO << " no m_asmDtc";
   }
 
   
@@ -688,7 +688,7 @@ bool InterfaceImpl::clearObjects()
 
 void InterfaceImpl::onChangeModeRequested()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   if (!this->isMapReady())
     return;
@@ -720,7 +720,7 @@ void InterfaceImpl::onChangeModeRequested()
       if (!lp.visible)
       {
         
-        DEBUG_LOG() << Q_FUNC_INFO << " EmergencyCall Timer ...";
+        DEBUG_LOG(m_logger) << Q_FUNC_INFO << " EmergencyCall Timer ...";
 
         
         
@@ -734,7 +734,7 @@ void InterfaceImpl::onChangeModeRequested()
             if (lpCurrent.visible) 
             {
               m_situationMap->layerFactory().switchEmergencyCallLayerOff();
-              DEBUG_LOG() << Q_FUNC_INFO << " EmergencyCall Timer ... Done";
+              DEBUG_LOG(m_logger) << Q_FUNC_INFO << " EmergencyCall Timer ... Done";
             }
           }
         });
@@ -748,7 +748,7 @@ void InterfaceImpl::onChangeModeRequested()
 
 void InterfaceImpl::reCreateSituationMapInitAndAddToLayoutAndReInit()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   if (m_situationMapInit)
   {
@@ -770,13 +770,13 @@ void InterfaceImpl::reCreateSituationMapInitAndAddToLayoutAndReInit()
     m_mapLayerControl->deleteLater(); 
   m_mapLayerControl = nullptr;
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 
 LtsWidgets::LtsDialog *InterfaceImpl::onShowSituationMapDialog(QWidget *parent)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
 
 
@@ -809,7 +809,7 @@ LtsWidgets::LtsDialog *InterfaceImpl::onShowSituationMapDialog(QWidget *parent)
   
   reCreateSituationMapInitAndAddToLayout();
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return m_ltsDialogSitMapWidget;
 }
 
@@ -820,7 +820,7 @@ TopicReplay::Interface *InterfaceImpl::createInterface(TopicEditorBase::TopicTyp
 
 QWidget *InterfaceImpl::reCreateSituationMapInit()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   
   
@@ -838,14 +838,14 @@ QWidget *InterfaceImpl::reCreateSituationMapInit()
   std::shared_ptr<FilterManagement::AesDisplayFilter>                  preventDestruction2;
   if (m_session->isReplayPartition() && fltParticipantIfc && fltAesIfc)
   {
-    INFO_LOG() << Q_FUNC_INFO << " FILTER: PREVENT DESTRUCTION ";
+    INFO_LOG(m_logger) << Q_FUNC_INFO << " FILTER: PREVENT DESTRUCTION ";
 
     const int      operatorId   = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
     const QString &wsId_context = m_session->workspaceId(); 
     preventDestruction1 = fltParticipantIfc->symbolAppearanceForOperator(operatorId, wsId_context);
     preventDestruction2 = fltAesIfc->aesFilterForOperator(operatorId, wsId_context);
   } else {
-    INFO_LOG() << Q_FUNC_INFO << " SKIP FILTER: PREVENT DESTRUCTION ";
+    INFO_LOG(m_logger) << Q_FUNC_INFO << " SKIP FILTER: PREVENT DESTRUCTION ";
   }
 
   
@@ -937,7 +937,7 @@ QWidget *InterfaceImpl::reCreateSituationMapInit()
     {
       
       if (lsd.isEmpty())
-        ERROR_LOG() << Q_FUNC_INFO << " LocalServiceData empty, no viewshedUrl";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " LocalServiceData empty, no viewshedUrl";
 
       m_situationMap->viewshed().setViewshedUrl(lsd.svcUrl().toString());
 
@@ -964,12 +964,12 @@ QWidget *InterfaceImpl::reCreateSituationMapInit()
     {
       connect(mapNotifier.data(), &MapNotifier::mapReadyAndSymbolDictionaryLoaded, this, [this ]()
       {
-        INFO_LOG() << Q_FUNC_INFO << " currentTimeMsec: " << m_session->partitionTime();
+        INFO_LOG(m_logger) << Q_FUNC_INFO << " currentTimeMsec: " << m_session->partitionTime();
 
         if (m_operatorMapSettings2achieve.isEmpty())
-          WARNING_LOG() << Q_FUNC_INFO << " oms empty!?";
+          WARNING_LOG(m_logger) << Q_FUNC_INFO << " oms empty!?";
         else if (!restoreOperatorMapSettingsOverlays(m_operatorMapSettings2achieve))
-          ERROR_LOG() << Q_FUNC_INFO << " restoreOperatorMapSettings failed";
+          ERROR_LOG(m_logger) << Q_FUNC_INFO << " restoreOperatorMapSettings failed";
 
         if (isAutoSetExerciseTimeString())
           showExerciseTimeString(true);
@@ -977,7 +977,7 @@ QWidget *InterfaceImpl::reCreateSituationMapInit()
       if (m_session->app() == LtsAppDescriptor::App::OC)
         connect(mapNotifier.data(), &MapNotifier::mapReadyAndSymbolDictionaryLoaded, this, [this]()
       {
-        INFO_LOG() << Q_FUNC_INFO << " currentTimeMsec: " << m_session->partitionTime();
+        INFO_LOG(m_logger) << Q_FUNC_INFO << " currentTimeMsec: " << m_session->partitionTime();
         QTimer::singleShot(1000, this, &InterfaceImpl::restoreOcSituationRange); 
       });
       mapNotifier->run();
@@ -997,16 +997,16 @@ QWidget *InterfaceImpl::reCreateSituationMapInit()
   
   if (!m_situationMapInit->initAdapter(m_movementTrackManager, resourceMode))
   {
-    ERROR_LOG() << Q_FUNC_INFO << " m_situationMapInit->init failed";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " m_situationMapInit->init failed";
     return nullptr;
   }
 
   bool enableFireEventFlashing = (m_session->app() != LtsAppDescriptor::App::Snapshot);
   if (!m_situationMapInit->enableFireEventFlashing(enableFireEventFlashing))
-    WARNING_LOG() << Q_FUNC_INFO << " enableFireEventFlashing failed";
+    WARNING_LOG(m_logger) << Q_FUNC_INFO << " enableFireEventFlashing failed";
 
   if (!m_situationMapInit->setResourceManagerMode(savedRMM))
-    WARNING_LOG() << Q_FUNC_INFO << " setResourceManagerMode failed";
+    WARNING_LOG(m_logger) << Q_FUNC_INFO << " setResourceManagerMode failed";
 
 
   
@@ -1016,7 +1016,7 @@ QWidget *InterfaceImpl::reCreateSituationMapInit()
     m_registerAppHandler.registerApp(this, m_session);
   }
   else
-    ERROR_LOG() << Q_FUNC_INFO << " no opmDtc/opmFtc, register of active app will not work";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no opmDtc/opmFtc, register of active app will not work";
   
 
 
@@ -1026,7 +1026,7 @@ QWidget *InterfaceImpl::reCreateSituationMapInit()
   
   QTimer::singleShot(0, this, &InterfaceImpl::enableDisable);
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 
   return m_situationMap.data();
 }
@@ -1037,7 +1037,7 @@ void InterfaceImpl::doFindChild()
   const LtsWidgets::LtsBaseLayoutWidget *baseLayout = m_session->baseLayout();
   if (!baseLayout)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no baseLayout found";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no baseLayout found";
     return;
   }
 
@@ -1066,13 +1066,13 @@ void InterfaceImpl::doFindChild()
 
 void InterfaceImpl::enableDisable()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " getAppName()= " << LtsSession::LtsSession::appToString(appId());
-  DEBUG_LOG() << Q_FUNC_INFO << " m_session->partitionType()= " << m_session->partitionType();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " getAppName()= " << LtsSession::LtsSession::appToString(appId());
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " m_session->partitionType()= " << m_session->partitionType();
 
   if (!m_situationMap)
     return;
 
-  DEBUG_LOG() << Q_FUNC_INFO
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO
                       << " m_situationMap->mode()= " << m_situationMap->mode()
                       << " this->isMapReady()= " << this->isMapReady();
 
@@ -1204,20 +1204,20 @@ void InterfaceImpl::enableDisable()
 
 void InterfaceImpl::onInitialOperatorMapSettingsTimeout()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_waitForInitialOperatorMapSettings.clear();
   reCreateSituationMapInitAndAddToLayout();
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 
 void InterfaceImpl::reCreateSituationMapInitAndAddToLayout() 
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   if (!m_ltsDialogSitMapWidget)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no m_ltsDialog";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no m_ltsDialog";
     return;
   }
 
@@ -1309,7 +1309,7 @@ void InterfaceImpl::reCreateSituationMapInitAndAddToLayout()
 #endif
 
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 QPointer<Map> InterfaceImpl::map() const
@@ -1319,7 +1319,7 @@ QPointer<Map> InterfaceImpl::map() const
 
 void InterfaceImpl::setMapUpdatesEnabled(bool bEnabled)
 {
-  INFO_LOG() << Q_FUNC_INFO << " XXX setMapUpdatesEnabled, START, bEnabled= " << bEnabled;
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " XXX setMapUpdatesEnabled, START, bEnabled= " << bEnabled;
 
   
   
@@ -1328,20 +1328,20 @@ void InterfaceImpl::setMapUpdatesEnabled(bool bEnabled)
   
   if (m_ltsDialogSitMapWidget)
   {
-    INFO_LOG() << Q_FUNC_INFO << " XXX setMapUpdatesEnabled, switch from " << m_ltsDialogSitMapWidget->updatesEnabled() << " to " << bEnabled;
+    INFO_LOG(m_logger) << Q_FUNC_INFO << " XXX setMapUpdatesEnabled, switch from " << m_ltsDialogSitMapWidget->updatesEnabled() << " to " << bEnabled;
     m_ltsDialogSitMapWidget->setUpdatesEnabled(bEnabled);
   }
-  INFO_LOG() << Q_FUNC_INFO << " XXX setMapUpdatesEnabled, END, bEnabled= " << bEnabled;
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " XXX setMapUpdatesEnabled, END, bEnabled= " << bEnabled;
 }
 
 bool InterfaceImpl::isMapReady() const
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, m_situationMap" << m_situationMap;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, m_situationMap" << m_situationMap;
   if (!m_situationMap)
     return false;
 
   const bool ret = m_situationMap->isReady() && m_situationMap->isSymbolDictionaryLoaded();
-  TRACE_LOG() << Q_FUNC_INFO << " END, "
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, "
                       << " m_situationMap->isReady()=" << m_situationMap->isReady()
                       << " m_situationMap->isSymbolDictionaryLoaded()=" << m_situationMap->isSymbolDictionaryLoaded()
                       << ", ret = " << ret;
@@ -1352,7 +1352,7 @@ bool InterfaceImpl::setMapReadyCallback(QObject *context, const std::function<vo
 {
   if (m_situationMap.isNull())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no situationMap";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no situationMap";
     return false;
   }
 
@@ -1422,7 +1422,7 @@ bool InterfaceImpl::setResourceManagerModeChangedCallback(QObject *context, cons
 {
   if (m_situationMap.isNull())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no situationMap";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no situationMap";
     return false;
   }
 
@@ -1489,7 +1489,7 @@ void InterfaceImpl::executePayload(LtsWidgets::LtsBackgroundWidget *)
 
 LtsWidgets::LtsDialog *InterfaceImpl::onShowMapWidgetControlDialog(QWidget *parent)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   if (!m_mapWidgetControl)
   {
@@ -1503,13 +1503,13 @@ LtsWidgets::LtsDialog *InterfaceImpl::onShowMapWidgetControlDialog(QWidget *pare
 
   m_mapWidgetControl->show();
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return m_mapWidgetControl;
 }
 
 LtsWidgets::LtsDialog *InterfaceImpl::onShowLayerControlDialog(QWidget *parent)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   if (!m_mapLayerControl)
     m_mapLayerControl = new LayerControlDialog(parent);
@@ -1517,13 +1517,13 @@ LtsWidgets::LtsDialog *InterfaceImpl::onShowLayerControlDialog(QWidget *parent)
   if (m_situationMap)
     m_mapLayerControl->init(m_session, m_situationMap.data());
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return m_mapLayerControl;
 }
 
 LtsWidgets::LtsDialog *InterfaceImpl::onShowConfigureUrlsDialog(QWidget *parent)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   if (!m_pluginProvider)
     return nullptr;
@@ -1534,7 +1534,7 @@ LtsWidgets::LtsDialog *InterfaceImpl::onShowConfigureUrlsDialog(QWidget *parent)
   if (m_configureMapUrls)
     m_configureMapUrls->init(m_pluginProvider);
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return m_configureMapUrls;
 }
 
@@ -1558,14 +1558,14 @@ bool InterfaceImpl::setMovementTrackCallback(QObject *context, const std::functi
 {
   if (m_situationMapInit.isNull())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no m_situationMapInit";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no m_situationMapInit";
     return false;
   }
 
   QPointer<SituationMap::MovementTrackManager> movementTrackManager = m_situationMapInit->movementTrackManager();
   if (!movementTrackManager)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no movementTrackManager";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no movementTrackManager";
     return false;
   }
 
@@ -1797,7 +1797,7 @@ bool InterfaceImpl::getCoordinate(QObject *objectToInform, const char *replySlot
   }
     break;
   case SituationMap::MapMode::Undefined:
-    ERROR_LOG() << Q_FUNC_INFO << " ModeMode == Undefined ";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " ModeMode == Undefined ";
     return false;
     break;
   } 
@@ -1821,13 +1821,13 @@ bool InterfaceImpl::getCorridor(QObject *objectToInform,
   
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return false;
   }
   
   if (m_situationMap && m_situationMap->mode() == Mode::Mode_3D)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " requested Rubberband is not allowd in this mode.";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " requested Rubberband is not allowd in this mode.";
     return false;
   }
 
@@ -1854,7 +1854,7 @@ bool InterfaceImpl::getCorridor(QObject *objectToInform,
   {
     QPolygonF bufferPolygon;
     if (!rubberband->bufferPolygon(bufferPolygon))
-      ERROR_LOG() << Q_FUNC_INFO << " rubberband->bufferPolygon() failed";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " rubberband->bufferPolygon() failed";
 
     m_replySlot.invoke(m_objToInform, Qt::DirectConnection,
                        Q_ARG(double, rubberband->corridorWidth()),
@@ -1877,13 +1877,13 @@ QVector<QPointF> InterfaceImpl::getParallelTranslation(const QVector<QPointF> &l
   
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return QVector<QPointF>();
   }
 
   if (line.size() < 2)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - line has less than 2 coordinates!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - line has less than 2 coordinates!!!";
     return QVector<QPointF>();
   }
 
@@ -1891,7 +1891,7 @@ QVector<QPointF> InterfaceImpl::getParallelTranslation(const QVector<QPointF> &l
 
   if (nullptr == mapCtFunctor)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - coordinate translation to map coordinates is not defined!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - coordinate translation to map coordinates is not defined!!!";
     return QVector<QPointF>();
   }
 
@@ -1899,7 +1899,7 @@ QVector<QPointF> InterfaceImpl::getParallelTranslation(const QVector<QPointF> &l
 
   if (parallelLine.isEmpty())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - calculation of parallel line failed! May be invalid input line!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - calculation of parallel line failed! May be invalid input line!";
     return QVector<QPointF>();
   }
 
@@ -1911,18 +1911,18 @@ QVector<QPointF> InterfaceImpl::getParallelTranslation(const QVector<QPointF> &l
 bool InterfaceImpl::getCircle(QObject *objectToInform, const char *replySlot, const char *errorSlot,
                               double radiusMin, double radiusMax, const QPointF &pos, double initialRadius)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return false;
   }
   
   if (m_situationMap && m_situationMap->mode() == Mode::Mode_3D)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " requested Rubberband is not allowd in this mode.";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " requested Rubberband is not allowd in this mode.";
     return false;
   }
 
@@ -1984,18 +1984,18 @@ void inline getSectorStartEnd(double angle, double rotation, double &aStartRad,
 bool InterfaceImpl::getCircleSectorFixRadius(QObject *objectToInform, const char *replySlot, const char *errorSlot,
                                              double radius, const QPointF &center, double openingAngle, double rotationDegNorth)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return false;
   }
   
   if (m_situationMap && m_situationMap->mode() == Mode::Mode_3D)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " requested Rubberband is not allowd in this mode.";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " requested Rubberband is not allowd in this mode.";
     return false;
   }
 
@@ -2057,18 +2057,18 @@ bool InterfaceImpl::getCircleSector(QObject *objectToInform, const char *replySl
                                     double radiusInitial, double radiusMin, double radiusMax,
                                     const QPointF &pos, double openingAngle, double rotationDegNorth)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return false;
   }
   
   if (m_situationMap && m_situationMap->mode() == Mode::Mode_3D)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " requested Rubberband is not allowd in this mode.";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " requested Rubberband is not allowd in this mode.";
     return false;
   }
 
@@ -2133,18 +2133,18 @@ bool InterfaceImpl::getTwoCircleSector(QObject *objectToInform, const char *repl
                                        double radius2Initial, double radius2Min, double radius2Max,
                                        const QPointF &pos, double openingAngle, double rotationDegNorth)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return false;
   }
   
   if (m_situationMap && m_situationMap->mode() == Mode::Mode_3D)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " requested Rubberband is not allowd in this mode.";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " requested Rubberband is not allowd in this mode.";
     return false;
   }
 
@@ -2226,13 +2226,13 @@ bool InterfaceImpl::getRectangle(QObject *objectToInform, const char *replySlot,
   
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return false;
   }
   
   if (m_situationMap && m_situationMap->mode() == Mode::Mode_3D)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " requested Rubberband is not allowd in this mode.";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " requested Rubberband is not allowd in this mode.";
     return false;
   }
 
@@ -2292,13 +2292,13 @@ bool InterfaceImpl::getRectangleNorth(QObject *objectToInform, const char *reply
   
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return false;
   }
   
   if (m_situationMap && m_situationMap->mode() == Mode::Mode_3D)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " requested Rubberband is not allowd in this mode.";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " requested Rubberband is not allowd in this mode.";
     return false;
   }
 
@@ -2350,13 +2350,13 @@ bool InterfaceImpl::getPolygon(QObject *objectToInform, const char *replySlot, c
   
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return false;
   }
   
   if (m_situationMap && m_situationMap->mode() == Mode::Mode_3D)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " requested Rubberband is not allowd in this mode.";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " requested Rubberband is not allowd in this mode.";
     return false;
   }
 
@@ -2392,13 +2392,13 @@ bool InterfaceImpl::getPolyline(QObject *objectToInform, const char *replySlot,
   
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return false;
   }
   
   if (m_situationMap && m_situationMap->mode() == Mode::Mode_3D)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " requested Rubberband is not allowd in this mode.";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " requested Rubberband is not allowd in this mode.";
     return false;
   }
 
@@ -2430,7 +2430,7 @@ void InterfaceImpl::cancelActiveRubberbands()
 {
   if (!m_situationMap)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no situationMap";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no situationMap";
     return;
   }
 
@@ -2449,7 +2449,7 @@ bool InterfaceImpl::displayPreviewObjects(QObject *parent, const QVector<QPolygo
   
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return false;
   }
 
@@ -2515,7 +2515,7 @@ bool InterfaceImpl::displayPreviewObjects(QObject *parent, const QVector<QPointF
   
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return false;
   }
 
@@ -2563,7 +2563,7 @@ bool InterfaceImpl::displayPreviewObject(QObject *parent, const QPointF &centerP
   
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return false;
   }
 
@@ -2611,7 +2611,7 @@ bool InterfaceImpl::displayPreviewObjects(QObject *parent, const QVector<Preview
   
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return false;
   }
 
@@ -2673,7 +2673,7 @@ void InterfaceImpl::startMeasureLength()
   
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return;
   }
 
@@ -2774,7 +2774,7 @@ bool InterfaceImpl::ocSituationRange_create(const QPointF &origin_lonLatRadiant,
   
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return false;
   }
 
@@ -2789,7 +2789,7 @@ bool InterfaceImpl::ocSituationRange_create(const QPointF &origin_lonLatRadiant,
 
   if (!ocSituationRangeObject)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " create failed";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " create failed";
     return false;
   }
 
@@ -2821,7 +2821,7 @@ bool InterfaceImpl::ocSituationRange_create(const QPointF &origin_lonLatRadiant,
 
   if (!ocSituationRangeObject->updateView())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " updateView failed";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " updateView failed";
     return false;
   }
   return true;
@@ -2834,7 +2834,7 @@ bool InterfaceImpl::ocSituationRange_create(int participantId, double radius_met
   
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return false;
   }
 
@@ -2847,7 +2847,7 @@ bool InterfaceImpl::ocSituationRange_create(int participantId, double radius_met
   RefPointer<Participant> participant = m_situationMapInit->simId2Participant(m_ocRange.participantId);
   if (!participant)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - participantId not found"
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - participantId not found"
                         << " (" << participantId << ")";
     return false;
   }
@@ -2858,7 +2858,7 @@ bool InterfaceImpl::ocSituationRange_create(int participantId, double radius_met
 
   if (!ocSituationRange_create(participant->origin().toPointF(), radius_meter, attributesLocal))
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - ocSituationRange_create failed"
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - ocSituationRange_create failed"
                         << " (" << participantId << ")";
   }
 
@@ -2876,7 +2876,7 @@ bool InterfaceImpl::ocSituationRange_show(bool visible)
   
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return false;
   }
 
@@ -2885,7 +2885,7 @@ bool InterfaceImpl::ocSituationRange_show(bool visible)
 
   if (!ocSituationRangeObject)
   {
-    DEBUG_LOG() << Q_FUNC_INFO << " not found";
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " not found";
     return false;
   }
 
@@ -2893,7 +2893,7 @@ bool InterfaceImpl::ocSituationRange_show(bool visible)
 
   if (ocSituationRangeObject->updateView())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " updateView failed";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " updateView failed";
     return false;
   }
   return true;
@@ -2908,7 +2908,7 @@ bool InterfaceImpl::ocSituationRange_remove()
   
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return false;
   }
 
@@ -2923,7 +2923,7 @@ bool InterfaceImpl::ocSituationRange_remove()
 
   if (!ocSituationRangeObject)
   {
-    DEBUG_LOG() << Q_FUNC_INFO << " not found";
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " not found";
     return false;
   }
 
@@ -2976,7 +2976,7 @@ bool InterfaceImpl::escOrderPosition_create(const QPointF &origin_lonLatRadiant,
   
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return false;
   }
 
@@ -2993,7 +2993,7 @@ bool InterfaceImpl::escOrderPosition_create(const QPointF &origin_lonLatRadiant,
 
     if (!escOrderAreaPositionObject)
     {
-      ERROR_LOG() << Q_FUNC_INFO << " create failed";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " create failed";
       return false;
     }
 
@@ -3030,7 +3030,7 @@ bool InterfaceImpl::escOrderPosition_create(const QPointF &origin_lonLatRadiant,
 
     if (!escOrderAreaPositionObject->updateView())
     {
-      ERROR_LOG() << Q_FUNC_INFO << " updateView failed";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " updateView failed";
       return false;
     }
   }
@@ -3043,7 +3043,7 @@ bool InterfaceImpl::escOrderPosition_create(const QPointF &origin_lonLatRadiant,
 
     if (!escOrderStartPositionObject)
     {
-      ERROR_LOG() << Q_FUNC_INFO << " create failed";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " create failed";
       return false;
     }
 
@@ -3076,7 +3076,7 @@ bool InterfaceImpl::escOrderPosition_create(const QPointF &origin_lonLatRadiant,
 
     if (!escOrderStartPositionObject->updateView())
     {
-      ERROR_LOG() << Q_FUNC_INFO << " updateView failed";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " updateView failed";
       return false;
     }
   }
@@ -3092,7 +3092,7 @@ bool InterfaceImpl::escOrderPosition_show(bool visible)
   
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return false;
   }
 
@@ -3106,7 +3106,7 @@ bool InterfaceImpl::escOrderPosition_show(bool visible)
 
       if (!escOrderAreaPositionObject->updateView())
       {
-        ERROR_LOG() << Q_FUNC_INFO << " updateView failed";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " updateView failed";
         return false;
       }
     }
@@ -3123,7 +3123,7 @@ bool InterfaceImpl::escOrderPosition_show(bool visible)
 
       if (!escOrderStartPositionObject->updateView())
       {
-        ERROR_LOG() << Q_FUNC_INFO << " updateView failed";
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " updateView failed";
         return false;
       }
     }
@@ -3135,7 +3135,7 @@ void InterfaceImpl::showExerciseTimeString(bool visible)
 {
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return;
   }
 
@@ -3152,7 +3152,7 @@ bool InterfaceImpl::escOrderPosition_remove()
   
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return false;
   }
 
@@ -3168,7 +3168,7 @@ bool InterfaceImpl::escOrderPosition_remove()
       m_situationMap->objectFactory().get<ChemicalAgent>(m_escOrderStartPosition.uniqueMapId);
     if (!escOrderStartPositionObject)
     {
-      DEBUG_LOG() << Q_FUNC_INFO << " not found";
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " not found";
       return false;
     }
     escOrderStartPositionObject->removeMySelf();
@@ -3180,7 +3180,7 @@ bool InterfaceImpl::escOrderPosition_remove()
       m_situationMap->objectFactory().get<Polygon>(m_escOrderAreaPosition.uniqueMapId);
     if (!escOrderAreaPositionObject)
     {
-      DEBUG_LOG() << Q_FUNC_INFO << " not found";
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " not found";
       return false;
     }
 
@@ -3195,7 +3195,7 @@ bool InterfaceImpl::isEscOrderPositionVisible()
 {
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return false;
   }
 
@@ -3220,7 +3220,7 @@ void InterfaceImpl::onParticipantPositionChanged(const int32_t participantId, co
   
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return;
   }
 
@@ -3229,7 +3229,7 @@ void InterfaceImpl::onParticipantPositionChanged(const int32_t participantId, co
 
   if (!ocSituationRangeObject)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " not found";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " not found";
     return;
   }
 
@@ -3237,7 +3237,7 @@ void InterfaceImpl::onParticipantPositionChanged(const int32_t participantId, co
   ocSituationRangeObject->setOrigin(newPos);
   if (!ocSituationRangeObject->updateView())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " updateView failed";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " updateView failed";
     return;
   }
   return;
@@ -3245,7 +3245,7 @@ void InterfaceImpl::onParticipantPositionChanged(const int32_t participantId, co
 
 void InterfaceImpl::onTrainingAreaChanged(const AssetManagement::TrainingArea &trainingArea, DataModification modType)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
                       << " TrainingArea = " << trainingArea
                       << ", modType=" << modType;
 
@@ -3321,10 +3321,10 @@ bool InterfaceImpl::setInitialOperatorMapSettings(const QJsonValue &data)
   oms.fromJsonObject(data.toObject());
 
   if (oms.isEmpty())
-    ERROR_LOG() << Q_FUNC_INFO << " oms.isEmpty (mode is undefined)";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " oms.isEmpty (mode is undefined)";
   else
   {
-    INFO_LOG() << Q_FUNC_INFO << " got data :-)"
+    INFO_LOG(m_logger) << Q_FUNC_INFO << " got data :-)"
                        << ", mode = " << oms.mode
                        << ", viewpoint = " << oms.viewpoint
                        << ", camera = " << oms.camera;
@@ -3367,7 +3367,7 @@ QByteArray InterfaceImpl::operatorMapSettingsJson() const
 
 bool InterfaceImpl::setOperatorMapSettingsJson(const QByteArray &data)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START"
                       << ", this->isMapReady()=" << this->isMapReady()
                       << ", data=>>>" << data << "<<<";
   return setOperatorMapSettings(QJsonDocument::fromJson(data).object());
@@ -3386,13 +3386,13 @@ bool InterfaceImpl::setOperatorMapSettings(const QJsonValue &data)
   bool bIsTimerActive = false;
   if (m_waitForInitialOperatorMapSettings)
     bIsTimerActive = m_waitForInitialOperatorMapSettings->isActive();
-  DEBUG_LOG() << Q_FUNC_INFO << " START" << ", this->isMapReady()=" << this->isMapReady()
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START" << ", this->isMapReady()=" << this->isMapReady()
                       << ", data.isNull() =" << data.isNull()
                       << ", m_waitForInitialOperatorMapSettings->isActive() =" << bIsTimerActive;
 
   if (data.isNull() && m_waitForInitialOperatorMapSettings && m_waitForInitialOperatorMapSettings->isActive())
   {
-    INFO_LOG() << Q_FUNC_INFO << " skip waitForInitialOperatorMapSettings";
+    INFO_LOG(m_logger) << Q_FUNC_INFO << " skip waitForInitialOperatorMapSettings";
     m_waitForInitialOperatorMapSettings->start(10);
     return true;
   }
@@ -3413,12 +3413,12 @@ bool InterfaceImpl::setOperatorMapSettings(const QJsonValue &data)
 
     if (oms.mode == Mode::Undefined)
     {
-      ERROR_LOG() << Q_FUNC_INFO << " mode of map settings is invalid (0 / undefined)";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " mode of map settings is invalid (0 / undefined)";
       bRet = false;
     }
     else if (oms.mode != static_cast<Mode>(this->mapMode()))
     {
-      INFO_LOG() << Q_FUNC_INFO << " mode switching required";
+      INFO_LOG(m_logger) << Q_FUNC_INFO << " mode switching required";
 
       
       
@@ -3435,7 +3435,7 @@ bool InterfaceImpl::setOperatorMapSettings(const QJsonValue &data)
   }
   else
   {
-    ERROR_LOG() << Q_FUNC_INFO << " map not ready yet!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " map not ready yet!";
     bRet = false;
   }
   return bRet;
@@ -3453,7 +3453,7 @@ bool InterfaceImpl::setMovementTrackManagerSettingsJSon(const QByteArray &data)
 {
   if (!m_movementTrackManager)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no MovementTrackManager";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no MovementTrackManager";
     return false;
   }
 
@@ -3461,7 +3461,7 @@ bool InterfaceImpl::setMovementTrackManagerSettingsJSon(const QByteArray &data)
   const QJsonDocument jDoc(QJsonDocument::fromJson(data, &parserError));
   if (parserError.error != QJsonParseError::NoError)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Error parsing json document: " << parserError.errorString();
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Error parsing json document: " << parserError.errorString();
     return false;
   }
 
@@ -3469,7 +3469,7 @@ bool InterfaceImpl::setMovementTrackManagerSettingsJSon(const QByteArray &data)
   const QJsonObject &innerObj = object[QLatin1String("MovemenTrackManager")].toObject();
   if (innerObj.isEmpty())
   {
-    ERROR_LOG() << "inner content MovementTracks is empty";
+    ERROR_LOG(m_logger) << "inner content MovementTracks is empty";
     return false;
   }
 
@@ -3490,7 +3490,7 @@ bool InterfaceImpl::setMovementTrackManagerSettings(const QJsonValue &data)
   if (!m_movementTrackManager)
     return false;
 
-  INFO_LOG() << Q_FUNC_INFO << " read MovementTrackManagerSettings";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " read MovementTrackManagerSettings";
   bool success = m_movementTrackManager->read(data.toObject());
 
   return success;
@@ -3501,24 +3501,24 @@ bool InterfaceImpl::restoreOperatorMapSettingsOverlays(OperatorMapSettings &oms)
   CHECK_SMI_RETVAL;
   if (!m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return false;
   }
 
   if (oms.isEmpty())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - oms empty";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - oms empty";
     return false;
   }
 
-  DEBUG_LOG() << Q_FUNC_INFO << " oms = " << QJsonDocument(oms.toJsonObject()).toJson(QJsonDocument::Indented) ;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " oms = " << QJsonDocument(oms.toJsonObject()).toJson(QJsonDocument::Indented) ;
 
   
   m_situationMap->overlayHandler().removeAllOverlays();
 
   
   if (!m_situationMap->restoreOperatorMapSettings(oms))
-    WARNING_LOG() << Q_FUNC_INFO << " restoreOperatorMapSettings failed";
+    WARNING_LOG(m_logger) << Q_FUNC_INFO << " restoreOperatorMapSettings failed";
 
   
 
@@ -3529,7 +3529,7 @@ bool InterfaceImpl::restoreOperatorMapSettingsOverlays(OperatorMapSettings &oms)
 
   
   const QList<int> orderedOverlayIds = oms.orderedOverlays;
-  INFO_LOG() << Q_FUNC_INFO << " restore OverlayIds: " << orderedOverlayIds;
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " restore OverlayIds: " << orderedOverlayIds;
 
   QVector<int> unloadableOverlayIds;
 
@@ -3545,7 +3545,7 @@ bool InterfaceImpl::restoreOperatorMapSettingsOverlays(OperatorMapSettings &oms)
         if (overlayId < 0)
           continue;
 
-        INFO_LOG() << Q_FUNC_INFO << " restore overlayId: " << overlayId;
+        INFO_LOG(m_logger) << Q_FUNC_INFO << " restore overlayId: " << overlayId;
         if (!ovrDtc->loadPlan(overlayId))
         {
           unloadableOverlayIds.append(overlayId);
@@ -3554,7 +3554,7 @@ bool InterfaceImpl::restoreOperatorMapSettingsOverlays(OperatorMapSettings &oms)
       } 
     }
     else
-      WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface for PlanOverlaysPlugin::ForeignGuiInterface failed, but it is optional";
+      WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface for PlanOverlaysPlugin::ForeignGuiInterface failed, but it is optional";
   }
 
   
@@ -3569,7 +3569,7 @@ bool InterfaceImpl::restoreOperatorMapSettingsOverlays(OperatorMapSettings &oms)
   {
     NOTICE_LOG(m_logger) << " due to error on loading, following overlayId is removed: " << unloadableOverlayId;
     if (!m_situationMap->overlayHandler().removeOverlay(unloadableOverlayId))
-      ERROR_LOG() << " due to error on loading, following overlayId is removed: " << unloadableOverlayId
+      ERROR_LOG(m_logger) << " due to error on loading, following overlayId is removed: " << unloadableOverlayId
                           << ", but removeOverlay failed";
   } 
 
@@ -3592,7 +3592,7 @@ bool InterfaceImpl::restoreOcSituationRange()
   CHECK_SMI_RETVAL;
   if (!m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return false;
   }
 
@@ -3624,7 +3624,7 @@ void InterfaceImpl::onTriggerFilterDataChanged(const FilterManagement::TriggerFi
   if (data.operatorId() != operatorId)
     return;
 
-  DEBUG_LOG() << Q_FUNC_INFO << " Someone would like to use our (Filter) settings ";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " Someone would like to use our (Filter) settings ";
 
   std::shared_ptr<FilterManagement::Interface::Ftc>                           fltFtc = m_pluginProvider->fltFtc();
   std::shared_ptr<FilterManagement::ForeignFltParticipantGuiInterface>        fltParticipantIfc = m_pluginProvider->fltParticipantIfc();
@@ -3636,7 +3636,7 @@ void InterfaceImpl::onTriggerFilterDataChanged(const FilterManagement::TriggerFi
       
       )
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no fltIfc/fltFtc";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no fltIfc/fltFtc";
     return;
   }
 
@@ -3660,7 +3660,7 @@ void InterfaceImpl::onTriggerFilterDataChanged(const FilterManagement::TriggerFi
       FilterManagement::AesFilter aesFilter = displayFilter->filterToData();
       req.aesFilterContent(aesFilter.content());
     } else {
-      ERROR_LOG() << Q_FUNC_INFO << " no AesDisplayFilter";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " no AesDisplayFilter";
     }
   }
 
@@ -3673,7 +3673,7 @@ void InterfaceImpl::onTriggerFilterDataChanged(const FilterManagement::TriggerFi
       FilterManagement::SymbolAppearance symApp = symbolAppearanceSettings->settingsToData();
       req.symbolAppearanceContent(symApp.content());
     } else {
-      ERROR_LOG() << Q_FUNC_INFO << " no SymbolAppearanceSettings";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " no SymbolAppearanceSettings";
     }
   }
 
@@ -3690,7 +3690,7 @@ void InterfaceImpl::onTriggerFilterDataChanged(const FilterManagement::TriggerFi
       FilterManagement::BuildingComponentFilter filter = buildingComponentSettings->bldCmpSettingsToData();
       req.buildingComponentsFilterContent(filter.content());
     } else {
-        WARNING_LOG() << Q_FUNC_INFO << " no BuildingComponentSettings";
+        WARNING_LOG(m_logger) << Q_FUNC_INFO << " no BuildingComponentSettings";
     }
   }
   }
@@ -3700,7 +3700,7 @@ void InterfaceImpl::onTriggerFilterDataChanged(const FilterManagement::TriggerFi
     req.operatorMapSettingsContent(operatorMapSettingsJson().constData());
   }
 
-  DEBUG_LOG() << Q_FUNC_INFO << " filterDataUpdateRequest:"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " filterDataUpdateRequest:"
                       << ", OperatorId= " << req.operatorId()
                       << ", screenId= " << req.screenId()
                       << ", screenContainerId= " << req.screenContainerId()
@@ -3747,14 +3747,14 @@ QByteArray InterfaceImpl::planOverlayContent(int id) const
 
 bool InterfaceImpl::planOverlaySetContent(int id, const QString &name, const QByteArray &xmlContent, bool isSnapshot)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
                       << " id=" << id
                       << " name='" << name << "'"
                       << " isSnapshot=" << isSnapshot;
 
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return false;
   }
 
@@ -3782,7 +3782,7 @@ void InterfaceImpl::planOverlayChangeOrder(const QVector<int> &orderOfIds)
 {
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return;
   }
   SituationMap::OverlayHandler &overlayHandler = m_situationMap->overlayHandler();
@@ -3855,7 +3855,7 @@ void InterfaceImpl::setPlanOverlayOpacity(int id, double opacity)
 
 void InterfaceImpl::setPlanOverlayMinScale(int id, double minScale)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " minScale= " << minScale;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " minScale= " << minScale;
   if (!m_situationMap) return;
 
   SituationMap::OverlayHandler &overlayHandler = m_situationMap->overlayHandler();
@@ -3867,7 +3867,7 @@ void InterfaceImpl::setPlanOverlayMinScale(int id, double minScale)
 
 void InterfaceImpl::setPlanOverlayMaxScale(int id, double maxScale)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " maxScale= " << maxScale;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " maxScale= " << maxScale;
   if (!m_situationMap) return;
 
   SituationMap::OverlayHandler &overlayHandler = m_situationMap->overlayHandler();
@@ -3892,7 +3892,7 @@ double InterfaceImpl::getCurrentMapScale() const
 {
   if (!m_situationMap || !m_situationMap->isReady())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure - map is not ready yet!!!";
     return 0.0;
   }
   return m_situationMap->scale();
@@ -3903,13 +3903,13 @@ bool InterfaceImpl::toImage(QObject *context, const std::function<void(const QIm
   Q_UNUSED(context);
   if (!m_situationMap)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no situationMap";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no situationMap";
     return false;
   }
 
   if (!(m_situationMap->isReady() && m_situationMap->isSymbolDictionaryLoaded()))
   {
-    ERROR_LOG() << Q_FUNC_INFO << " not ready yet";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " not ready yet";
     return false;
   }
 
@@ -3918,7 +3918,7 @@ bool InterfaceImpl::toImage(QObject *context, const std::function<void(const QIm
   {
     isFireEventFlashingEnabled = m_situationMapInit->isFireEventFlashingEnabled();
     if (!m_situationMapInit->enableFireEventFlashing(false))
-      ERROR_LOG() << Q_FUNC_INFO << " enableFireEventFlashing failed";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " enableFireEventFlashing failed";
   }
 
   
@@ -4038,7 +4038,7 @@ void InterfaceImpl::onMapObjectsClickedByIds(const QVector<SituationMap::UniqueM
     }
     else
     {
-      ERROR_LOG() << Q_FUNC_INFO << " MapObjectSelectionLtsDialog::init() failed";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " MapObjectSelectionLtsDialog::init() failed";
       delete m_dialogMapObjectSelection;
     }
   }
@@ -4148,7 +4148,7 @@ void InterfaceImpl::adjustMapAccordingRubberband(const QVector<QPointF> &coords)
       break;
     }
 
-  DEBUG_LOG() << Q_FUNC_INFO << " visible"  << visible;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " visible"  << visible;
 
   if (!visible)
     m_situationMap->zoomToArea(coords, 100);
@@ -4247,7 +4247,7 @@ void InterfaceImpl::doPrint()
 
   if (!toImage(this, onImage))
   {
-    ERROR_LOG() << Q_FUNC_INFO << " toImage failed";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " toImage failed";
 
     
     blw->setMenuVisible(menuVisible);
@@ -4291,7 +4291,7 @@ bool TopicReplayInterface::exportTopic(const QJsonObject &attributes,
   QFile f(folderPath + QLatin1Char('/') + filename);
   if (!f.open(QIODevice::WriteOnly))
   {
-    WARNING_LOG() << "Can not open file '" << f.fileName() << "' for writing!";
+    WARNING_LOG(m_logger) << "Can not open file '" << f.fileName() << "' for writing!";
     pExportNotifier->setExportFailed();
     return false;
   }
@@ -4317,11 +4317,11 @@ bool TopicReplayInterface::exportTopic(const QJsonObject &attributes,
   if(arr.empty())
   {
     bool ret = f.remove();
-    WARNING_LOG() << " remove sitmap.json file with empty 'replays' ? " <<ret;
+    WARNING_LOG(m_logger) << " remove sitmap.json file with empty 'replays' ? " <<ret;
     pExportNotifier->setExportSuccessful({});
     return true;
   }
-  DEBUG_LOG() << "SitMap filename: " << f.fileName();
+  DEBUG_LOG(m_logger) << "SitMap filename: " << f.fileName();
   pExportNotifier->setExportSuccessful(filename);
   return true;
 }
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 255234207..65ad382b7 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
@@ -64,6 +64,8 @@ Q_SIGNALS:
   void aboutToCloseSignal();
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void aboutToClose() override;
   void retranslate() override;
 };
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 64c13660b..1d861bc7d 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
@@ -187,20 +187,20 @@ LayerControlDialog::LayerControlDialog(QWidget *parent)
   , m_layersModel(nullptr)
   , m_ui(new Ui::LayerControlDialog)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_ui->setupUi(this);
   m_ui->tvLayer->setItemDelegate(new SpinBoxDelegate(this));
   setOnlineHelpFilename(QStringLiteral("Situation-Layer_Control"));
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 LayerControlDialog::~LayerControlDialog()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   delete m_layersModel;
   delete m_ui;
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void LayerControlDialog::retranslate()
@@ -210,7 +210,7 @@ void LayerControlDialog::retranslate()
 
 bool LayerControlDialog::init(LtsSession::LtsSession *session, SituationMap::Map *map)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START " << " map=" << map;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START " << " map=" << map;
 
   if (!session || !map)
     return false;
@@ -344,7 +344,7 @@ bool LayerControlDialog::init(LtsSession::LtsSession *session, SituationMap::Map
     m_ui->tbBaseSurfaceOpacity->hide();
   }
 
-  TRACE_LOG() << Q_FUNC_INFO << " END " << " map=" << map;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END " << " map=" << map;
   return true;
 }
 
@@ -416,7 +416,7 @@ void LayerControlDialog::onLoadButtonClicked()
 
 void LayerControlDialog::onMapReady()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   
   onZoomSliderInit();
@@ -425,7 +425,7 @@ void LayerControlDialog::onMapReady()
   m_ui->slBaseSurfaceOpacity->setValue(static_cast<int>(m_situationMap->baseSurfaceOpacity()*100.0f));
   m_ui->slBaseSurfaceOpacity->setToolTip(QString::number(m_ui->slBaseSurfaceOpacity->value()));
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void LayerControlDialog::onMapDestroyed()
@@ -435,13 +435,13 @@ void LayerControlDialog::onMapDestroyed()
 
 void LayerControlDialog::onLayerParamterChanged()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " XXXXXXXXX ";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " XXXXXXXXX ";
   if (!m_situationMap)
     return;
 
   if (m_ignoreLayerParameterChanged)
   {
-    DEBUG_LOG() << Q_FUNC_INFO << " skip due to m_ignoreLayerParameterChanged";
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " skip due to m_ignoreLayerParameterChanged";
     return;
   }
 
@@ -472,7 +472,7 @@ void LayerControlDialog::onRotationOfMapChanged(double rotation)
 
 void LayerControlDialog::onZoomSliderInit()
 {
-  TRACE_LOG() << Q_FUNC_INFO <<  "'" << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO <<  "'" << " START";
 
   if (!m_ui || !m_ui->slZoom)
     return;
@@ -483,7 +483,7 @@ void LayerControlDialog::onZoomSliderInit()
 
   if (m_ui->slZoom->minimum() == m_ui->slZoom->maximum())
   {
-    WARNING_LOG() << Q_FUNC_INFO << " min/max value are identical"
+    WARNING_LOG(m_logger) << Q_FUNC_INFO << " min/max value are identical"
                           << " minimum=" << m_ui->slZoom->minimum()
                           << " maximum=" << m_ui->slZoom->maximum()
                           << " value=" << m_ui->slZoom->value();
@@ -491,7 +491,7 @@ void LayerControlDialog::onZoomSliderInit()
     m_ui->slZoom->setMinimum(static_cast<int>(sqrt(500)));
     m_ui->slZoom->setMaximum(static_cast<int>(sqrt(100000)));
 
-    WARNING_LOG() << Q_FUNC_INFO << " min/max value are identical"
+    WARNING_LOG(m_logger) << Q_FUNC_INFO << " min/max value are identical"
                           << " minimum=" << m_ui->slZoom->minimum()
                           << " maximum=" << m_ui->slZoom->maximum()
                           << " value=" << m_ui->slZoom->value();
@@ -504,7 +504,7 @@ void LayerControlDialog::onZoomSliderInit()
   onMapExtentChanged();
   m_ui->slZoom->blockSignals(false);
 
-  TRACE_LOG() << Q_FUNC_INFO <<  "'" << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO <<  "'" << " END";
 }
 
 void LayerControlDialog::onZoomSliderValueChanged()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_layer_control.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_layer_control.h
index dafb6517d..aab302f53 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_layer_control.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_layer_control.h
@@ -39,6 +39,8 @@ public:
   bool init(LtsSession::LtsSession *session, SituationMap::Map *map);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
 
 private Q_SLOTS:
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 a9fe4a55d..7e324b631 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
@@ -17,12 +17,11 @@ static inline bool isScreenIdValid(const OperatorManagement::ActiveApp &item)
 }
 
 
-RegisterAppHandler::RegisterAppHandler()
-  : BaseClass()
-  , m_updateTimer(new QTimer(this))
-{
-  INFO_LOG() << "RAH c_tor";
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+RegisterAppHandler::RegisterAppHandler() : BaseClass()
+  , m_updateTimer(new QTimer(this)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  INFO_LOG(m_logger) << "RAH c_tor";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   m_activeApp.id(-1);
   m_activeApp.appId(-1);
@@ -35,20 +34,20 @@ RegisterAppHandler::RegisterAppHandler()
   m_updateTimer->setSingleShot(true);
   m_updateTimer->setInterval(5000);
   connect(m_updateTimer, &QTimer::timeout, this, &RegisterAppHandler::onUpdateTimeout);
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 RegisterAppHandler::~RegisterAppHandler()
 {
-  INFO_LOG() << "RAH d_tor";
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  INFO_LOG(m_logger) << "RAH d_tor";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   Q_ASSERT(m_finalized);
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void RegisterAppHandler::finalize()
 {
-  INFO_LOG() << "RAH finalize";
+  INFO_LOG(m_logger) << "RAH finalize";
 
   
   QMetaObject::invokeMethod(this, [this]()
@@ -56,7 +55,7 @@ void RegisterAppHandler::finalize()
     if (m_updateTimer)
       m_updateTimer->stop();
     deRegisterApp(m_activeApp);
-    INFO_LOG() << "RAH finalize DONE";
+    INFO_LOG(m_logger) << "RAH finalize DONE";
     deleteLater();
     m_finalized = true;
   });
@@ -122,7 +121,7 @@ void RegisterAppHandler::deRegisterApp(QObject *plugin)
 
 void RegisterAppHandler::registerApp(const OperatorManagement::ActiveApp &item)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START " << item;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START " << item;
 
   if (m_activeApp == item)
     return;
@@ -134,50 +133,50 @@ void RegisterAppHandler::registerApp(const OperatorManagement::ActiveApp &item)
   if (m_activeApp.id() <= 0)
     m_updateTimer->start(); 
 
-  TRACE_LOG() << Q_FUNC_INFO << " END " << item;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END " << item;
 }
 
 void RegisterAppHandler::deRegisterApp(const OperatorManagement::ActiveApp &item)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START " << item;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START " << item;
   if (!isScreenIdValid(item))
     return;
 
   if (m_activeApp.id() <= 0)
   {
-    WARNING_LOG() << Q_FUNC_INFO << " nothing was registered, skip DeRegister - " << m_activeApp;
+    WARNING_LOG(m_logger) << Q_FUNC_INFO << " nothing was registered, skip DeRegister - " << m_activeApp;
     return;
   }
 
   
   if (!removeRequest())
-    WARNING_LOG() << "removeRequest failed";
-  TRACE_LOG() << Q_FUNC_INFO << " END" << item;
+    WARNING_LOG(m_logger) << "removeRequest failed";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" << item;
 }
 
 bool RegisterAppHandler::updateRequest()
 {
   if (!m_opmFtc)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no fltFtc!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no fltFtc!";
     return false;
   }
 
-  INFO_LOG() << Q_FUNC_INFO << " startSingleRequest " << m_activeApp;
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " startSingleRequest " << m_activeApp;
 
   try
   {
-    INFO_LOG() << "RAH update";
+    INFO_LOG(m_logger) << "RAH update";
     m_activeApp.id(m_opmFtc->activeAppUpdateRequest(m_activeApp));
   }
   catch(const std::runtime_error &err)
   {
-    ERROR_LOG() << "failed to update active app: " << err.what();
+    ERROR_LOG(m_logger) << "failed to update active app: " << err.what();
     Q_ASSERT(false);
     return false;
   }
 
-  DEBUG_LOG() << Q_FUNC_INFO << " m_requestHelper->getRepliedId() " << m_activeApp.id();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " m_requestHelper->getRepliedId() " << m_activeApp.id();
 
   return true;
 }
@@ -188,7 +187,7 @@ bool RegisterAppHandler::removeRequest()
 
   if (!m_opmFtc)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no fltFtc!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no fltFtc!";
     return false;
   }
 
@@ -197,13 +196,13 @@ bool RegisterAppHandler::removeRequest()
 
   try
   {
-    INFO_LOG() << "RAH remove";
+    INFO_LOG(m_logger) << "RAH remove";
     m_opmFtc->activeAppRemoveRequest(Core::RemoveElementRequest(m_activeApp.id()));
     return true;
   }
   catch (const std::runtime_error &err)
   {
-    ERROR_LOG() << "failed to remove active app: " << err.what();
+    ERROR_LOG(m_logger) << "failed to remove active app: " << err.what();
     Q_ASSERT(false);
     return false;
   }
@@ -211,9 +210,9 @@ bool RegisterAppHandler::removeRequest()
 
 void RegisterAppHandler::onUpdateTimeout()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START" << " m_opmFtc = " << m_opmFtc
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START" << " m_opmFtc = " << m_opmFtc
                       << " m_activeApp = " << m_activeApp;
-  INFO_LOG() << "RAH timer";
+  INFO_LOG(m_logger) << "RAH timer";
   updateRequest();
 }
 
@@ -226,22 +225,22 @@ void RegisterAppHandler::handleSvcStartupRequest(const OperatorManagement::Activ
   if ((data.operatorId() < 0) &&      
       (m_activeApp.appId() >= 0))     
   {
-    INFO_LOG() << Q_FUNC_INFO << " startUpRequest recognized, reDo updateRequest";
+    INFO_LOG(m_logger) << Q_FUNC_INFO << " startUpRequest recognized, reDo updateRequest";
     updateRequest();
   }
 }
 
 void RegisterAppHandler::onScreenIdChanged(int screenId, int screenContainerId, int screenTypeId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, screenId=" << screenId << ", screenContainerId=" << screenContainerId << ", screenTypeId=" << screenTypeId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, screenId=" << screenId << ", screenContainerId=" << screenContainerId << ", screenTypeId=" << screenTypeId;
 
-  INFO_LOG() << Q_FUNC_INFO << " screenId: " << m_activeApp.screenId() << " -> " << screenId;
+  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() << Q_FUNC_INFO << " END, screenId=" << screenId;
+  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 f4aff320b..ed72a1fa0 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
@@ -29,19 +29,19 @@ MapWidgetControl::MapWidgetControl(const QString &menuGroup, QWidget *parent)
   , m_tb2D3D(nullptr)
   , m_session(nullptr)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_ui->setupUi(this);
 
   setOnlineHelpFilename(QStringLiteral("Situation-Map_Widgets"));
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 MapWidgetControl::~MapWidgetControl()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   delete m_ui;
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void MapWidgetControl::retranslate()
@@ -52,7 +52,7 @@ void MapWidgetControl::retranslate()
 
 bool MapWidgetControl::init(SituationMap::Map *map, LtsSession::LtsSession *session )
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START " << " map=" << map;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START " << " map=" << map;
 
   if (!map)
     return false;
@@ -62,12 +62,12 @@ bool MapWidgetControl::init(SituationMap::Map *map, LtsSession::LtsSession *sess
 
   if (m_situationMap == nullptr)
   {
-    ERROR_LOG() << "invalid situation map given";
+    ERROR_LOG(m_logger) << "invalid situation map given";
     return false;
   }
 
   reBuildUi();
-  TRACE_LOG() << Q_FUNC_INFO << " END " << " map=" << map;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END " << " map=" << map;
   return true;
 }
 
@@ -88,7 +88,7 @@ bool MapWidgetControl::isReplay() const
 {
   if (m_situationMap == nullptr)
   {
-    ERROR_LOG() << "cannot check if situation map is in replay, no situation map available";
+    ERROR_LOG(m_logger) << "cannot check if situation map is in replay, no situation map available";
     return false;
   }
   return m_situationMap->isReplay();
@@ -104,7 +104,7 @@ void MapWidgetControl::onChangeModeRequested()
 {
   if (m_tb2D3D == nullptr)
   {
-    ERROR_LOG() << "cannot process change mode request, no 2D/3D option available";
+    ERROR_LOG(m_logger) << "cannot process change mode request, no 2D/3D option available";
     return;
   }
   m_tb2D3D->setEnabled(false);
@@ -133,7 +133,7 @@ void MapWidgetControl::reBuildUi()
 
   if (m_situationMap == nullptr)
   {
-    ERROR_LOG() << "cannot rebuild ui, no situation map available";
+    ERROR_LOG(m_logger) << "cannot rebuild ui, no situation map available";
     return;
   }
 
@@ -344,12 +344,12 @@ void MapWidgetControl::enaDisa()
 
   if (m_situationMap == nullptr)
   {
-    ERROR_LOG() << "cannot enable/disable ui, no situation map available";
+    ERROR_LOG(m_logger) << "cannot enable/disable ui, no situation map available";
     return;
   }
   if ( m_tb2D3D && !enable3dMap)
   {
-    DEBUG_LOG() << "m_tb2D3D->hide();"
+    DEBUG_LOG(m_logger) << "m_tb2D3D->hide();"
                          << "m_enable3dMap=" << enable3dMap;
      m_tb2D3D->hide();
   }
@@ -362,13 +362,13 @@ void MapWidgetControl::enaDisa()
     case Mode::Mode_2D:
       m_tb2D3D->setText(tr("Switch to 3D"));
       m_tb2D3D->setIcon(QIcon(QLatin1String("icon:map_3d.svg")));
-      DEBUG_LOG() << "m_tb2D3D Switch to 3D"
+      DEBUG_LOG(m_logger) << "m_tb2D3D Switch to 3D"
                            << "enable3dMap=" << enable3dMap;
       break;
     case Mode::Mode_3D:
       m_tb2D3D->setText(tr("Switch to 2D"));
       m_tb2D3D->setIcon(QIcon(QLatin1String("icon:map_2d.svg")));
-      DEBUG_LOG() << "m_tb2D3D Switch to 2D"
+      DEBUG_LOG(m_logger) << "m_tb2D3D Switch to 2D"
                            << "enable3dMap=" << enable3dMap;
       break;
     default:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_widget_control.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_widget_control.h
index 2afc72f0b..5520d559d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_widget_control.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_widget_control.h
@@ -47,6 +47,8 @@ private Q_SLOTS:
 
 private:
 
+
+NGL::INGLLogger &m_logger;
   struct MenuWidgetPosition
   {
     int row;
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 36d91504a..b7935ad5f 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
@@ -174,24 +174,24 @@ SituationMapInit::SituationMapInit(QObject *parent)
   : QObject(parent)
   , m_logger(SituationMap::getLogger("SituationMapInit"))
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 SituationMapInit::~SituationMapInit()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   if (m_pluginProvider == nullptr)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " !m_pluginProvider";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " !m_pluginProvider";
     m_adapterDds.clear();
     return;
   }
 
   if (!m_pluginProvider->isSessionValid())
   {
-    INFO_LOG() << Q_FUNC_INFO << " no session anymore: return";
+    INFO_LOG(m_logger) << Q_FUNC_INFO << " no session anymore: return";
     m_adapterDds.clear();
     return;
   }
@@ -211,30 +211,30 @@ SituationMapInit::~SituationMapInit()
 
   if (m_situationMap)
   {
-    DEBUG_LOG() << Q_FUNC_INFO << " MapCache: DELETE ...., isNull = " << m_situationMap->property(MapCacheState).isNull();
-    DEBUG_LOG() << Q_FUNC_INFO << " MapCache: DELETE ...., property = '" << (m_situationMap ? m_situationMap->property(MapCacheState).toString().toStdString() : "-") << "'";
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " MapCache: DELETE ...., isNull = " << m_situationMap->property(MapCacheState).isNull();
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " MapCache: DELETE ...., property = '" << (m_situationMap ? m_situationMap->property(MapCacheState).toString().toStdString() : "-") << "'";
 
     if (m_situationMap->property(MapCacheState).isNull())
     {
       
-      DEBUG_LOG() << Q_FUNC_INFO << " MapCache: DELETE YES";
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " MapCache: DELETE YES";
       delete m_situationMap;
       m_situationMap.clear();
     } else {
       
-      DEBUG_LOG() << Q_FUNC_INFO << " MapCache: DELETE NO, setParent->null";
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " MapCache: DELETE NO, setParent->null";
       m_situationMap->setParent(nullptr, true); 
       m_situationMap->setProperty(MapCacheState, QVariant()); 
     }
   }
 
 #else
-  DEBUG_LOG() << Q_FUNC_INFO << " DELETE situationMap: YES";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " DELETE situationMap: YES";
   delete m_situationMap;
   m_situationMap.clear();
 #endif 
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 
@@ -244,7 +244,7 @@ ThatPartyIdToColorFunctor::ThatPartyIdToColorFunctor(const std::shared_ptr<Parti
   , m_ppmDtc(ppmDtc)
   , m_logger(SituationMap::getLogger("ThatPartyIdToColorFunctor"))
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   m_ppmDtc->waitForHistoricalDataParty(1000);
 
@@ -255,12 +255,12 @@ ThatPartyIdToColorFunctor::ThatPartyIdToColorFunctor(const std::shared_ptr<Parti
   {
     onPartyChanged(data);
   });
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void ThatPartyIdToColorFunctor::onPartyChanged(const ParticipantManagement::Party &data, DataModification modType)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
                       << ", modType= " << modType
                       << " partyId=" << data.id()
                       << " partyName='" << data.name() << "'"
@@ -286,16 +286,16 @@ void ThatPartyIdToColorFunctor::onPartyChanged(const ParticipantManagement::Part
 
 bool SituationMapInit::initPluginProvider(SituationMap::PluginProvider *pluginProvider)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START " << " session=" << pluginProvider;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START " << " session=" << pluginProvider;
 
   m_pluginProvider = pluginProvider;
 
   if (!m_pluginProvider)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no plugin provider!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no plugin provider!";
     return false;
   }
-  TRACE_LOG() << Q_FUNC_INFO << " START " << " session=" << pluginProvider;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START " << " session=" << pluginProvider;
   return true;
 }
 
@@ -303,11 +303,11 @@ bool SituationMapInit::initPluginProvider(SituationMap::PluginProvider *pluginPr
 
 bool SituationMapInit::initAdapter(QPointer<MovementTrackManager> &movementTrackMgr, bool resourceMode)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   if (!m_pluginProvider)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no plugin provider!";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no plugin provider!";
     return false;
   }
 
@@ -324,7 +324,7 @@ bool SituationMapInit::initAdapter(QPointer<MovementTrackManager> &movementTrack
   
   if (!m_adapterDds->init(m_situationMap, m_pluginProvider, movementTrackMgr, resourceMode))   
   {
-    ERROR_LOG() << Q_FUNC_INFO << " m_adapterDds->init failed";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " m_adapterDds->init failed";
     return false;
   }
 
@@ -356,7 +356,7 @@ bool SituationMapInit::initAdapter(QPointer<MovementTrackManager> &movementTrack
   connect(m_adapterDds.data(), &AdapterDds::participantPositionChanged,
           this, &SituationMapInit::participantPositionChanged);
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
@@ -407,7 +407,7 @@ bool SituationMapInit::clearObjects()
   if (remainingObjectsCount != 0)
   {
     
-    WARNING_LOG() << Q_FUNC_INFO << " remainingObjectsCount should be '0', is: " << remainingObjectsCount;
+    WARNING_LOG(m_logger) << Q_FUNC_INFO << " remainingObjectsCount should be '0', is: " << remainingObjectsCount;
   }
 
   return true;
@@ -468,7 +468,7 @@ bool SituationMapInit::enableGearRanges(int participantId, bool enable)
     return false;
   ptr->setRangesVisibility(enable);
   if (!ptr->updateView())
-    ERROR_LOG() << "Couldn't updateview after setting setRangesVisibility(" << enable << ") for SimId: " << participantId;
+    ERROR_LOG(m_logger) << "Couldn't updateview after setting setRangesVisibility(" << enable << ") for SimId: " << participantId;
 
   return true;
 }
@@ -519,7 +519,7 @@ bool SituationMapInit::centerMapToAesObject(int entityId)
 
   if (!bbox.isValid())
   {
-    WARNING_LOG() << Q_FUNC_INFO
+    WARNING_LOG(m_logger) << Q_FUNC_INFO
                           << " boundingBox not valid: bbox=" << bbox;
     return false;
   }
@@ -542,7 +542,7 @@ bool SituationMapInit::centerMapToBuildingObject(int entityId)
 
   if (!bbox.isValid())
   {
-    WARNING_LOG() << Q_FUNC_INFO
+    WARNING_LOG(m_logger) << Q_FUNC_INFO
                           << " boundingBox not valid: bbox=" << bbox;
     return false;
   }
@@ -587,7 +587,7 @@ bool SituationMapInit::centerMapToMapObject(MapObjectType mot, int entityId)
 
   if (!bbox.isValid())
   {
-    WARNING_LOG() << Q_FUNC_INFO
+    WARNING_LOG(m_logger) << Q_FUNC_INFO
                           << " boundingBox not valid: bbox=" << bbox;
     return false;
   }
@@ -800,7 +800,7 @@ void SituationMapInit::modifyViewshed(double alpha, double innerRadius, double o
     if (m_viewshedId >= 0)
       m_situationMap->viewshed().modify(m_viewshedId, alpha, innerRadius, observerHeight, targetHeight, beamAngle);
     else
-      DEBUG_LOG() << Q_FUNC_INFO << " m_viewshedId invalid (" << m_viewshedId << ")";
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " m_viewshedId invalid (" << m_viewshedId << ")";
   }
 }
 
@@ -886,22 +886,22 @@ SituationMap::RB::RubberbandFactory &SituationMapInit::rubberbandFactory()
 
 ResourceManagerMode SituationMapInit::resourceManagerMode() const
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (!m_adapterDds)
     return ResourceManagerMode::Undefined;
 
   ResourceManagerMode rmm = m_adapterDds->resourceManagerMode();
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return rmm;
 }
 bool SituationMapInit::setResourceManagerMode(ResourceManagerMode rmm)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (!m_adapterDds)
     return false;
 
   bool success = m_adapterDds->setResourceManagerMode(rmm);
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return success;
 }
 
@@ -953,7 +953,7 @@ static QVector<BaseUrl> convertMapDecription2BaseUrlVec(const std::vector<AssetM
 
 bool SituationMapInit::trainingAreaExists() const
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   if (!m_pluginProvider->exmDtc() || !m_pluginProvider->asmDtc())
     return false;
@@ -968,7 +968,7 @@ bool SituationMapInit::trainingAreaExists() const
 
   const AssetManagement::TrainingArea &ta = m_pluginProvider->asmDtc()->trainingArea(trainingAreaId);
 
-  TRACE_LOG() << Q_FUNC_INFO << " END, trainingAreaExists = " << (ta.id() == trainingAreaId);
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, trainingAreaExists = " << (ta.id() == trainingAreaId);
   return (ta.id() == trainingAreaId);
 }
 
@@ -986,7 +986,7 @@ MapSettingsJson SituationMapInit::getMapSettingsFromService() const
 
   if (ta.id() != trainingAreaId)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " TrainingArea does not exists (yet)";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " TrainingArea does not exists (yet)";
     return msj;
   }
 
@@ -1002,7 +1002,7 @@ MapSettingsJson SituationMapInit::getMapSettingsFromService() const
 
 bool SituationMapInit::initMap(bool enableSelection, SituationMap::Mode mapMode, const SituationMap::Viewpoint2D &viewPoint)
 {
-  INFO_LOG() << Q_FUNC_INFO << " START, enableSelection=" << enableSelection
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " START, enableSelection=" << enableSelection
                      << ", mapMode=" << mapMode;
 
 #ifdef USE_MAP_CACHE
@@ -1023,11 +1023,11 @@ bool SituationMapInit::initMap(bool enableSelection, SituationMap::Mode mapMode,
     {
       m_situationMap = mapCacheItemRef.m_mapWidget;
       m_situationMap->setProperty(MapCacheState, QVariant(QStringLiteral("3D/reUsed/taken")));
-      DEBUG_LOG() << Q_FUNC_INFO << " MapCache: ReUse Mode_3D"
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " MapCache: ReUse Mode_3D"
                            << " (updatesEnabled()=" << m_situationMap->updatesEnabled() << ")";
       reUsing = true;
     } else {
-      DEBUG_LOG() << Q_FUNC_INFO << " MapCache: CREATE Mode_3D";
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " MapCache: CREATE Mode_3D";
       m_situationMap = SituationMap::Map::create();
       mapCacheItemRef.m_mapWidget = m_situationMap;
       mapCacheItemRef.m_mapWidget->setProperty(MapCacheState, QVariant(QStringLiteral("3D/created")));
@@ -1081,7 +1081,7 @@ bool SituationMapInit::initMap(bool enableSelection, SituationMap::Mode mapMode,
 #endif 
 
 
-  INFO_LOG() << Q_FUNC_INFO << " ***** initMap:"
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " ***** initMap:"
                      << ", mapMode=" << mapMode
                      << ", m_pluginProvider->toString=" << m_pluginProvider->toString()
                      << ", exerciseId()= " << m_pluginProvider->exerciseId();
@@ -1102,7 +1102,7 @@ bool SituationMapInit::initMap(bool enableSelection, SituationMap::Mode mapMode,
 
     const bool bTrainingAreaExists = this->trainingAreaExists();
 
-    INFO_LOG() << Q_FUNC_INFO  << " bTrainingAreaExists=" << bTrainingAreaExists
+    INFO_LOG(m_logger) << Q_FUNC_INFO  << " bTrainingAreaExists=" << bTrainingAreaExists
                        << ", m_pluginProvider->toString " << m_pluginProvider->toString();
 
     bool bIsOfTypeOrganizer =
@@ -1130,7 +1130,7 @@ bool SituationMapInit::initMap(bool enableSelection, SituationMap::Mode mapMode,
     {
       int tries = waitForTa->property("tries").toInt();
 
-      INFO_LOG() << Q_FUNC_INFO << " waiting for trainingAreaExists " << trainingAreaExists() << ", tries = " << tries;
+      INFO_LOG(m_logger) << Q_FUNC_INFO << " waiting for trainingAreaExists " << trainingAreaExists() << ", tries = " << tries;
 
       if (this->trainingAreaExists())
       {
@@ -1139,7 +1139,7 @@ bool SituationMapInit::initMap(bool enableSelection, SituationMap::Mode mapMode,
 
         const MapSettingsJson &mapSettingsFromService = getMapSettingsFromService();
         if (!initMapPart2(mapMode, viewPoint, &mapSettingsFromService))
-          ERROR_LOG() << Q_FUNC_INFO << " initMapPart2 failed";
+          ERROR_LOG(m_logger) << Q_FUNC_INFO << " initMapPart2 failed";
       }
 
       if (tries > 30)
@@ -1152,7 +1152,7 @@ bool SituationMapInit::initMap(bool enableSelection, SituationMap::Mode mapMode,
                              << " giving up";
 
         if (!initMapPart2(mapMode, viewPoint))
-          ERROR_LOG() << Q_FUNC_INFO << " initMapPart2 failed";
+          ERROR_LOG(m_logger) << Q_FUNC_INFO << " initMapPart2 failed";
         return;
       }
       waitForTa->setProperty("tries", ++tries);
@@ -1163,7 +1163,7 @@ bool SituationMapInit::initMap(bool enableSelection, SituationMap::Mode mapMode,
     return true;
   }
 
-  TRACE_LOG() << Q_FUNC_INFO << " END, success=" << success;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, success=" << success;
   return success;
 }
 
@@ -1171,7 +1171,7 @@ bool SituationMapInit::initMapPart2(SituationMap::Mode mapMode,
                                     const SituationMap::Viewpoint2D &viewPoint,
                                     const MapSettingsJson* mapSettingJson)
 {
-  INFO_LOG() << Q_FUNC_INFO << " mapSettingJson=" << mapSettingJson;
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " mapSettingJson=" << mapSettingJson;
 
   bool success = true;
 
@@ -1183,7 +1183,7 @@ bool SituationMapInit::initMapPart2(SituationMap::Mode mapMode,
     return false;
   }
   else
-    DEBUG_LOG() << Q_FUNC_INFO << " ***** MapIniFile found: " << initFilePath;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " ***** MapIniFile found: " << initFilePath;
 
   
   SituationMap::MapSettings *mapSettings =
@@ -1215,13 +1215,13 @@ bool SituationMapInit::initMapPart2(SituationMap::Mode mapMode,
     SituationMap::FunctionDialog::addButtonToMap(m_situationMap);
 #endif 
 
-  TRACE_LOG() << Q_FUNC_INFO << " END, success=" << success;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, success=" << success;
   return success;
 }
 
 void SituationMapInit::myMapWidgetDialogIsAboutToBeClosed()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   
   if (m_adapterDds)
@@ -1239,7 +1239,7 @@ void SituationMapInit::myMapWidgetDialogIsAboutToBeClosed()
     
     
     
-    INFO_LOG() << Q_FUNC_INFO << " MapCache:  prevent destruction";
+    INFO_LOG(m_logger) << Q_FUNC_INFO << " MapCache:  prevent destruction";
     m_situationMap->setParent(nullptr, true);  
     
   }
@@ -1260,7 +1260,7 @@ bool SituationMapInit::updateAll()
 
   if (!m_situationMap->isReady())
   {
-    INFO_LOG() << Q_FUNC_INFO << " Map Not ready Yet: Skip ";
+    INFO_LOG(m_logger) << Q_FUNC_INFO << " Map Not ready Yet: Skip ";
     return false;
   }
   
@@ -1270,19 +1270,19 @@ bool SituationMapInit::updateAll()
 
 void SituationMapInit::onMapbeginDestroy()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (m_adapterDds)
   {
     m_adapterDds->stop();
     m_adapterDds.clear();
   }
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void SituationMapInit::onMapObjectsClicked(const SituationMap::Map::RefPointerMapObjectList &mapObjList,
                                            const QPointF &viewportPosition)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " ViewPort X: " << viewportPosition.x() << " Y: " << viewportPosition.y();
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " ViewPort X: " << viewportPosition.x() << " Y: " << viewportPosition.y();
   onMapObjectClickedByArea(mapObjList);
 }
 
@@ -1323,7 +1323,7 @@ void SituationMapInit::onMapObjectClickedByArea(const SituationMap::Map::RefPoin
     const auto &mapObj = mapObjList.front();
     {
       if (!m_adapterDds->onMapObjectClicked(mapObj))
-        WARNING_LOG() << Q_FUNC_INFO << " Click on a map object but found no handler for it ... "
+        WARNING_LOG(m_logger) << Q_FUNC_INFO << " Click on a map object but found no handler for it ... "
                               << " mapObj: debugInfo='" << mapObj->debugInfo() << "'"
                               << " uniqueMapId=" << mapObj->uniqueMapId();
     }
@@ -1338,7 +1338,7 @@ void SituationMapInit::onProcessMapObjectClicked(const QVector<SituationMap::Uni
   if (!m_adapterDds)
     return;
   if (!m_adapterDds->onMapObjectsClicked(uniqueMapIds))
-    WARNING_LOG() << Q_FUNC_INFO << " onMapObjectsClicked failed ... ";
+    WARNING_LOG(m_logger) << Q_FUNC_INFO << " onMapObjectsClicked failed ... ";
 }
 
 void SituationMapInit::onContextMenuRequested(const SituationMap::Map::RefPointerMapObjectList &mapObjList,
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init.h
index 7a3e0c969..359c3e5c0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init.h
@@ -162,6 +162,7 @@ private Q_SLOTS:
   void onViewshedFinished(long viewshedId);
 
 protected:
+  NGL::INGLLogger &m_logger;
   virtual bool trainingAreaExists() const;
   virtual MapSettingsJson getMapSettingsFromService() const;
 private:
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 72eb381f3..c5d196ba9 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
@@ -118,6 +118,8 @@ protected Q_SLOTS:
   void onPartyChanged(const ParticipantManagement::Party &data, DataModification modType = DataModification::eAdded);
 
 private:
+
+NGL::INGLLogger &m_logger;
   bool                                                   m_doRemovePartyFlag = true;
   std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
 };
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 20923faad..c5d0cb04a 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
@@ -10,9 +10,8 @@
 
 namespace SituationMap
 {
-TerrainProfileHandler::TerrainProfileHandler(const QString &menuGroup)
-  : m_menuGroup(menuGroup)
-{}
+TerrainProfileHandler::TerrainProfileHandler(const QString &menuGroup) : m_menuGroup(menuGroup),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 TerrainProfileHandler::~TerrainProfileHandler()
 {
@@ -55,7 +54,7 @@ bool TerrainProfileHandler::showTerrainProfileResults(long id, const QVector<QPa
   if (!m_situationMap || !m_session)
     return false;
 
-  DEBUG_LOG() << Q_FUNC_INFO << " START" << " id=" << id << " results.size()=" << results.size();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START" << " id=" << id << " results.size()=" << results.size();
 
   const LtsWidgets::LayoutArea layoutArea = LtsWidgets::LayoutArea::eDialogTab;
   const QString &identifier               = QStringLiteral("TerrainProfile");
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/terrain_profile_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/terrain_profile_handler.h
index 2b03e14c6..2c91fb837 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/terrain_profile_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/terrain_profile_handler.h
@@ -31,6 +31,7 @@ public:
   void clearTerrainProfile();
   bool showTerrainProfileResults(long id, const QVector<QPair<QPointF, double> > &results);
 private:
+  NGL::INGLLogger &m_logger;
   QPointer<LtsSession::LtsSession> m_session;
   QPointer<SituationMap::Map> m_situationMap;
   QPointer<SituationMap::TerrainProfileDialog> m_terrainProfileDialog;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMapScriptFilter/sitmap_script_filter_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMapScriptFilter/sitmap_script_filter_gui_plugin.cpp
index ff49c4143..3466dcfba 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMapScriptFilter/sitmap_script_filter_gui_plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMapScriptFilter/sitmap_script_filter_gui_plugin.cpp
@@ -27,17 +27,17 @@ TopicEditorBase::TopicEditor *InterfaceImpl::createTopicEditor(const TopicEditor
   
 
   if (m_sitmapIfc == nullptr)
-    DEBUG_LOG() << "SituationMapScriptFilter: createTopicEditor: sitmap ifc missing";
+    DEBUG_LOG(m_logger) << "SituationMapScriptFilter: createTopicEditor: sitmap ifc missing";
 
   MarkerManagement::MarkerManagementDialogModel *markerModel = nullptr;
 
   if (m_mrkIfc)
     markerModel = m_mrkIfc->createMarkerModel(); 
   else
-    WARNING_LOG() << "No Mrk Ifc for ScriptFilter Topic Editor";
+    WARNING_LOG(m_logger) << "No Mrk Ifc for ScriptFilter Topic Editor";
 
   if (m_applyFilter == nullptr)
-    DEBUG_LOG() << "SituationMapScriptFilter: createTopicEditor: apply filter missing!";
+    DEBUG_LOG(m_logger) << "SituationMapScriptFilter: createTopicEditor: apply filter missing!";
 
   return new SituationMapScriptFilterTopicEditor(markerModel, &m_sitmapIfc, m_applyFilter);
 }
@@ -60,7 +60,7 @@ bool InterfaceImpl::fetchInterfaces()
 {
   if (!m_session->getForeignGuiInterface<MarkerManagement::ForeignGuiInterface>(m_mrkIfc))
   {
-    DEBUG_LOG() << "getForeignGuiInterface for MarkerManagement::ForeignGuiInterface failed.";
+    DEBUG_LOG(m_logger) << "getForeignGuiInterface for MarkerManagement::ForeignGuiInterface failed.";
     return false;
   }
 
@@ -87,7 +87,7 @@ InterfaceImpl::TopicReplayInterface::~TopicReplayInterface()
 {
   if (m_sitmapIfc == nullptr)
   {
-    WARNING_LOG() << "SitMapIfc missing for SitMapScriptFilter TopicReplayInterface";
+    WARNING_LOG(m_logger) << "SitMapIfc missing for SitMapScriptFilter TopicReplayInterface";
     return;
   }
 
@@ -104,13 +104,13 @@ bool InterfaceImpl::TopicReplayInterface::playbackInit(const QJsonObject &attrib
 {
   if (m_sitmapIfc == nullptr)
   {
-    WARNING_LOG() << "SitMapIfc missing for SitMapScriptFilter TopicReplayInterface";
+    WARNING_LOG(m_logger) << "SitMapIfc missing for SitMapScriptFilter TopicReplayInterface";
     return false;
   }
 
   if (m_applyFilter == nullptr)
   {
-    WARNING_LOG() << "ApplyFilter missing for SitMapScriptFilter TopicReplayInterface";
+    WARNING_LOG(m_logger) << "ApplyFilter missing for SitMapScriptFilter TopicReplayInterface";
     return false;
   }
 
@@ -118,7 +118,7 @@ bool InterfaceImpl::TopicReplayInterface::playbackInit(const QJsonObject &attrib
 
   if (mapConfig.isNull())
   {
-    WARNING_LOG() << "Note: Situation Map Script Filter settings is empty";
+    WARNING_LOG(m_logger) << "Note: Situation Map Script Filter settings is empty";
     return true;
   }
 
@@ -142,7 +142,7 @@ QVector<TopicEditorBase::TopicData> InterfaceImpl::TopicReplayInterface::additio
 {
   if (m_sitmapIfc == nullptr)
   {
-    WARNING_LOG() << "SitMapIfc missing for SitMapScriptFilter TopicReplayInterface";
+    WARNING_LOG(m_logger) << "SitMapIfc missing for SitMapScriptFilter TopicReplayInterface";
     return {};
   }
   const QJsonValue mapConfig = attributes[QStringLiteral("settings")];
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 b17d60a5c..f82513221 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
@@ -112,12 +112,12 @@ SituationReplayEditor::SituationReplayEditor(
   
   if ((*m_essentialsViewsSrpIfc) != nullptr)
   {
-    WARNING_LOG() << "essentials view available - using srp replay control widget as editor!";
+    WARNING_LOG(m_logger) << "essentials view available - using srp replay control widget as editor!";
     onAddReplayControlWidget();
   }
   else
   {
-    WARNING_LOG() << "essentials view not available - using traditional editor";
+    WARNING_LOG(m_logger) << "essentials view not available - using traditional editor";
   }
 
   setOnlineHelpFilename(QStringLiteral("Script_Editor-Add_Situation_Replay_Topic"));
@@ -133,7 +133,7 @@ SituationReplayEditor::~SituationReplayEditor()
 
 void SituationReplayEditor::updateInternalData()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   if (m_firstUpdate)
   {
@@ -181,7 +181,7 @@ void SituationReplayEditor::updateInternalData()
 
 void SituationReplayEditor::updateInternalLength()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   qint64 end = calculateEnd(m_ui->dteStartTime->msecsSinceEpoch(), m_topicData.duration, m_ui->sbSpeed->value(), true);
   bool hasChanges = hasUnsavedChanges(); 
   m_ui->dteEndTime->setMsecsSinceEpoch(end);
@@ -226,19 +226,19 @@ qint64 SituationReplayEditor::calculateEnd(qint64 startTime, int lengthInSeconds
   else
     result /= speed;
   result += startTime;
-  DEBUG_LOG() << Q_FUNC_INFO << " result = " << result;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " result = " << result;
   return result;
 }
 
 qint64 SituationReplayEditor::calculateDuration(qint64 startTime, qint64 endTime, double speed)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " startTime=" << startTime << " endTime=" << endTime << " speed=" << speed;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " startTime=" << startTime << " endTime=" << endTime << " speed=" << speed;
   qint64 duration = endTime - startTime;
   double result = duration;
   result /= speed;
   qint64 result2 = result; 
   result2 += 500; 
-  DEBUG_LOG() << Q_FUNC_INFO << " result = " << result2;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " result = " << result2;
   return result2;
 }
 
@@ -256,7 +256,7 @@ void SituationReplayEditor::setMapSettings(const QByteArray &mapSettings)
 
   if (parseError.error != QJsonParseError::NoError)
   {
-    ERROR_LOG() << "map settings not valid json at" << parseError.errorString();
+    ERROR_LOG(m_logger) << "map settings not valid json at" << parseError.errorString();
     return;
   }
 
@@ -271,7 +271,7 @@ void SituationReplayEditor::setMapFilter(const QByteArray &mapFilter)
 
   if (parseError.error != QJsonParseError::NoError)
   {
-    ERROR_LOG() << "filter settings not valid json at" << parseError.errorString();
+    ERROR_LOG(m_logger) << "filter settings not valid json at" << parseError.errorString();
     return;
   }
 
@@ -345,7 +345,7 @@ bool SituationReplayEditor::apply2()
       m_ui->lblDuration->setText(QStringLiteral(" - "));
     else
     {
-      DEBUG_LOG() << Q_FUNC_INFO << " setText length = " << duration;
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " setText length = " << duration;
       m_ui->lblDuration->setText(tr("%1 sec").arg(m_topicDuration));
     }
   }
@@ -463,7 +463,7 @@ void SituationReplayEditor::onMarkerSelected(const QModelIndex &idx)
 
   if (marker.id() <= 0)
   {
-    ERROR_LOG() << "marker has id 0";
+    ERROR_LOG(m_logger) << "marker has id 0";
     return;
   }
 
@@ -477,13 +477,13 @@ void SituationReplayEditor::onMarkerSelected(const QModelIndex &idx)
 
 void SituationReplayEditor::onChangesMade()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   qint64 start = m_ui->dteStartTime->msecsSinceEpoch();
   qint64 end = m_ui->dteEndTime->msecsSinceEpoch();
   double speed = m_ui->sbSpeed->value();
   qint64 duration = calculateDuration(start, end, speed) / 1000;
-  DEBUG_LOG() << Q_FUNC_INFO << " duration = " << duration;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " duration = " << duration;
 
   if (duration < 0)
     m_ui->lblDuration->setText(QStringLiteral(" - "));
@@ -493,7 +493,7 @@ void SituationReplayEditor::onChangesMade()
     m_topicData.duration = duration;
     m_ui->widget->previewer()->setTopicData(m_topicData);
     m_ui->lblDuration->setText(tr("%1 sec").arg(m_topicDuration));
-    DEBUG_LOG() << Q_FUNC_INFO << " setText duration = " << duration;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " setText duration = " << duration;
   }
 }
 
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 96d8e329f..f58ba8355 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
@@ -38,6 +38,8 @@ public:
   ~SituationReplayEditor();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void updateInternalData() override;
   void updateInternalLength() override;
   void retranslate() override;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_dialog.h
index d8e70751d..a5cd30c30 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_dialog.h
@@ -18,6 +18,8 @@ public:
   explicit SituationReplayControlDialog(SituationReplayControlWidget *replayWidget, QWidget *parent = nullptr);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
 };
 } 
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 c27a1ed1d..7eda68af2 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
@@ -116,7 +116,7 @@ bool SituationReplayControlWidget::init(LtsSession::LtsSession *session,
 
   if (!m_session->getDtc<ExerciseManagement::DataInterface>(m_exmDtc))
   {
-    ERROR_LOG()<<" couldn't init exmDtc!";
+    ERROR_LOG(m_logger)<<" couldn't init exmDtc!";
     return false;
   }
 
@@ -140,7 +140,7 @@ bool SituationReplayControlWidget::init(LtsSession::LtsSession *session,
       {
         m_state = replay.state();
         m_id = replay.id();
-        DEBUG_LOG() << "recycling replay with id" << m_id;
+        DEBUG_LOG(m_logger) << "recycling replay with id" << m_id;
         m_ui->dteStartTime->setMsecsSinceEpoch(replay.beginTime());
         useExistingReplay = true; 
         break;
@@ -220,19 +220,19 @@ bool SituationReplayControlWidget::init(LtsSession::LtsSession *session,
 
         if (beginTime > 0)
         {
-          WARNING_LOG() << "no exc start time set, using exc begin time " << beginTime;
+          WARNING_LOG(m_logger) << "no exc start time set, using exc begin time " << beginTime;
           m_ui->dteStartTime->setMsecsSinceEpoch(beginTime);
         }
         else
         {
-          WARNING_LOG() << "no valid exc for getting exercise start time";
+          WARNING_LOG(m_logger) << "no valid exc for getting exercise start time";
           m_ui->dteStartTime->setMsecsSinceEpoch(QDateTime::currentDateTime().addDays(-5).toMSecsSinceEpoch()); 
         }
       }
     }
     else
     {
-      WARNING_LOG() << "no exc dtc for getting exercise start time";
+      WARNING_LOG(m_logger) << "no exc dtc for getting exercise start time";
       m_ui->dteStartTime->setMsecsSinceEpoch(QDateTime::currentDateTime().addDays(-5).toMSecsSinceEpoch()); 
     }
   }
@@ -294,10 +294,10 @@ qint64 SituationReplayControlWidget::startTime() const
 
 void SituationReplayControlWidget::setStartTime(qint64 startTime)
 {
-  ERROR_LOG() << Q_FUNC_INFO << " " << startTime;
+  ERROR_LOG(m_logger) << Q_FUNC_INFO << " " << startTime;
   if (startTime < 0)
   {
-    DEBUG_LOG() << Q_FUNC_INFO << " called with invalid start time: " << startTime;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " called with invalid start time: " << startTime;
     return;
   }
 
@@ -361,7 +361,7 @@ void SituationReplayControlWidget::pauseReplay()
 
   if (m_id == 0) 
   {
-    WARNING_LOG() << "replay pause requested, but no replay active in this context";
+    WARNING_LOG(m_logger) << "replay pause requested, but no replay active in this context";
     return;
   }
 
@@ -381,13 +381,13 @@ void SituationReplayControlWidget::pauseReplay()
     }))
     {
       enaDisa(); 
-      ERROR_LOG() << "pausing failed for replay " << m_id << ": " << m_requestHelper->getErrorString();
+      ERROR_LOG(m_logger) << "pausing failed for replay " << m_id << ": " << m_requestHelper->getErrorString();
     }
     else
       emit replayPaused();
   }
   else
-    ERROR_LOG() << "pause requested, but replay state was not resumed or started, but " << m_state << " for " << m_id;
+    ERROR_LOG(m_logger) << "pause requested, but replay state was not resumed or started, but " << m_state << " for " << m_id;
 }
 
 
@@ -398,7 +398,7 @@ void SituationReplayControlWidget::stopReplay()
 
   if (m_id == 0) 
   {
-    WARNING_LOG() << "replay stop requested, but no replay active in this context";
+    WARNING_LOG(m_logger) << "replay stop requested, but no replay active in this context";
     return;
   }
 
@@ -424,7 +424,7 @@ void SituationReplayControlWidget::stopReplay()
   else
   {
     enaDisa(); 
-    ERROR_LOG() << "stopping failed for replay " << m_id << ": " << m_requestHelper->getErrorString();
+    ERROR_LOG(m_logger) << "stopping failed for replay " << m_id << ": " << m_requestHelper->getErrorString();
   }
 
   m_requestHelper->setQuiet(wasQuiet);
@@ -453,14 +453,14 @@ void SituationReplayControlWidget::resumeReplay()
   }))
   {
     enaDisa(); 
-    ERROR_LOG() << "resuming failed for replay " << m_id << ": " << m_requestHelper->getErrorString();
+    ERROR_LOG(m_logger) << "resuming failed for replay " << m_id << ": " << m_requestHelper->getErrorString();
   }
 }
 
 
 void SituationReplayControlWidget::onSitReplayChanged(const SitReplay &data, DataModification modType)
 {
-  DEBUG_LOG() << "onSitReplayChanged: id = " << data.id() << ", exId = " << data.exerciseId() << ", repPartitionId = " << data.replayPartitionId()
+  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;
 
   if (m_partitionId != data.replayPartitionId())
@@ -512,7 +512,7 @@ void SituationReplayControlWidget::onMarkerClicked(const QModelIndex &index)
       )
     appFilter = new MarkerManagement::MarkerManagementApplyFilter(m_session, fltParticipantIfc, fltAesIfc, fltBuildingComponentGuiIfc);
   else
-    WARNING_LOG() << "unable to set filters from marker as flt ifc`s are missing";
+    WARNING_LOG(m_logger) << "unable to set filters from marker as flt ifc`s are missing";
 
 
   
@@ -522,7 +522,7 @@ void SituationReplayControlWidget::onMarkerClicked(const QModelIndex &index)
     if (appFilter->applyFilter(mapFilter))
       emit signalSetMapFilter(mapFilter);
     else
-      ERROR_LOG() << "Error while setting filters";
+      ERROR_LOG(m_logger) << "Error while setting filters";
   }
   else
   {
@@ -545,20 +545,20 @@ void SituationReplayControlWidget::onMarkerClicked(const QModelIndex &index)
   if (appFilter)
   {
     QByteArray mapSettings(QByteArray::fromRawData(marker.mapSettings().c_str(), marker.mapSettings().size()));
-    DEBUG_LOG() << "set map settings from marker " << (mapSettings.toStdString());
+    DEBUG_LOG(m_logger) << "set map settings from marker " << (mapSettings.toStdString());
 
     
     
     SituationMap::OperatorMapSettings oms;
     oms.fromJson(mapSettings);
-    DEBUG_LOG() << ">>>> oms.orderedLayers.size() " << oms.orderedLayers.size();
+    DEBUG_LOG(m_logger) << ">>>> oms.orderedLayers.size() " << oms.orderedLayers.size();
 
     static const QLatin1String LayerNameEmergencyCall("EmergencyCall");
     
     auto pos = std::remove_if( oms.orderedLayers.begin(),
                          oms.orderedLayers.end(),
                          [](const QPair<QString, SituationMap::LayerParameter> &pair) { return pair.first == LayerNameEmergencyCall; } );
-    DEBUG_LOG() << ">>>> remove iterator: " << pos << " END: " << oms.orderedLayers.end();
+    DEBUG_LOG(m_logger) << ">>>> remove iterator: " << pos << " END: " << oms.orderedLayers.end();
     if(pos != oms.orderedLayers.end())
       oms.orderedLayers.erase(pos);
 
@@ -569,7 +569,7 @@ void SituationReplayControlWidget::onMarkerClicked(const QModelIndex &index)
     if (appFilter->applyMapSettings(mapSettings))
       emit signalSetMapSettings(mapSettings);
     else
-      ERROR_LOG() << "Error while setting mapSettings";
+      ERROR_LOG(m_logger) << "Error while setting mapSettings";
   }
   delete appFilter;
 }
@@ -634,7 +634,7 @@ bool SituationReplayControlWidget::startReplayDelayed(qint64 start, qint64 end,
   req.endTime(end);
   req.pace(speed);
 
-  ERROR_LOG() << "Start Replay Partition: "
+  ERROR_LOG(m_logger) << "Start Replay Partition: "
                      << "id: " << m_id
                      << ", partition id: " << m_partitionId
                      << ", partition type: " << m_session->partitionType()
@@ -652,15 +652,15 @@ bool SituationReplayControlWidget::startReplayDelayed(qint64 start, qint64 end,
     if (repliedId > 0)
     {
       m_id = repliedId;
-      ERROR_LOG() << "Replied replay id: " << repliedId;
+      ERROR_LOG(m_logger) << "Replied replay id: " << repliedId;
       emit replayStarted();
       return true;
     }
 
-    ERROR_LOG() << "replay start didn't return a replay id!";
+    ERROR_LOG(m_logger) << "replay start didn't return a replay id!";
   }
 
-  ERROR_LOG() << "could not start replay: " << m_requestHelper->getErrorString() << " (" << m_requestHelper->getRepliedId() << ")";
+  ERROR_LOG(m_logger) << "could not start replay: " << m_requestHelper->getErrorString() << " (" << m_requestHelper->getRepliedId() << ")";
   enaDisa(); 
   return false;
 }
@@ -671,7 +671,7 @@ void SituationReplayControlWidget::onStartReplay()
   double speed = m_ui->slSpeed->value();
   speed /= 10;
   qint64 startInSecs = getSecs(m_ui->dteStartTime->msecsSinceEpoch());
-  DEBUG_LOG() << "onStartReplay startInSecs=" << startInSecs;
+  DEBUG_LOG(m_logger) << "onStartReplay startInSecs=" << startInSecs;
   m_ui->slPeriodSlider->setValue(startInSecs);
 
   startReplay(m_ui->dteStartTime->msecsSinceEpoch(), 0 , speed);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_widget.h
index 411bb24ca..d9497e7a2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_widget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_widget.h
@@ -97,6 +97,8 @@ private slots:
   void onDteStartChanged();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void disableAllReplayButtons();
   qint64 getMSecs(qint64 sec);
   qint64 getSecs(qint64 msec);
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 e95409d2a..b9b2c9e3c 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
@@ -82,7 +82,7 @@ public:
     
     
 
-    DEBUG_LOG() << Q_FUNC_INFO << " START"
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START"
                          << ", domainId = " << domainId
                          << ", domainIdReplay = " << domainIdReplay
                          << ", tcpConnectionUrl = " << tcpConnectionUrl.toDisplayString()
@@ -107,7 +107,7 @@ public:
     }
 
 
-    DEBUG_LOG() << Q_FUNC_INFO << " idToUse = " << idToUse;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " idToUse = " << idToUse;
 
 
     
@@ -120,7 +120,7 @@ public:
       connect(repl.proc, &QProcess::errorOccurred,
               this, [this, idToUse](const QProcess::ProcessError &error)
       {
-        ERROR_LOG() << "QProcess::ProcessError occured: "
+        ERROR_LOG(m_logger) << "QProcess::ProcessError occured: "
                             << ", idToUse = " << idToUse;
         qCritical() << "QProcess::ProcessError: " << error;
       } );
@@ -130,11 +130,11 @@ public:
 
       connect(proc, &QProcess::readyReadStandardError, this, [this, idToUse, proc]()
       {
-        DEBUG_LOG() << "REPLAY #" << idToUse << " [!]: " << QString::fromUtf8(proc->readAllStandardError());
+        DEBUG_LOG(m_logger) << "REPLAY #" << idToUse << " [!]: " << QString::fromUtf8(proc->readAllStandardError());
       });
       connect(proc, &QProcess::readyReadStandardOutput, this, [this, idToUse, proc]()
       {
-        DEBUG_LOG() << "REPLAY #" << idToUse << " [ ]: " << QString::fromUtf8(proc->readAllStandardOutput());
+        DEBUG_LOG(m_logger) << "REPLAY #" << idToUse << " [ ]: " << QString::fromUtf8(proc->readAllStandardOutput());
       });
 
       repl.fi = nullptr;
@@ -158,9 +158,9 @@ public:
 
       m_replayPartitions.insert(idToUse, repl);
 
-      DEBUG_LOG() << Q_FUNC_INFO << " repl.proc->start()...";
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " repl.proc->start()...";
       repl.proc->start();
-      DEBUG_LOG() << Q_FUNC_INFO << " repl.proc->start()...DONE";
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " repl.proc->start()...DONE";
 
       if (wait)
       {
@@ -187,7 +187,7 @@ public:
           NOTICE_LOG(m_logger) << " LtsUtils::awaitWithCancelationSignal ... DONE";
 
           processStarted(proc, idToUse);
-          DEBUG_LOG() << "Replay started: " << idToUse;
+          DEBUG_LOG(m_logger) << "Replay started: " << idToUse;
           return idToUse;                                                       
         }
         catch (const std::exception &ex)
@@ -207,7 +207,7 @@ public:
         if (bIsStartedSuccessfully)
         {
           processStarted(proc, idToUse);
-          DEBUG_LOG() << "Replay started: " << idToUse;
+          DEBUG_LOG(m_logger) << "Replay started: " << idToUse;
           return idToUse;                                                       
         }
         else
@@ -250,7 +250,7 @@ public:
 
     if (proc->exitCode() != 0 || proc->exitStatus() != QProcess::NormalExit)
     {
-      WARNING_LOG() << "SituationReplay process exited with error: " << proc->exitCode()
+      WARNING_LOG(m_logger) << "SituationReplay process exited with error: " << proc->exitCode()
                             << ", status: " << proc->exitStatus()
                             << ", stdout: " << proc->readAllStandardOutput()
                             << ", stderr: " << proc->readAllStandardError();
@@ -270,7 +270,7 @@ public:
     auto it = m_replayPartitions.find(replayId);
     if (it == m_replayPartitions.end())
     {
-      WARNING_LOG() << "Got a processStarted signal from a process for replay " << replayId
+      WARNING_LOG(m_logger) << "Got a processStarted signal from a process for replay " << replayId
                             << " but found not corresponding entry in m_replayPartitions";
       return;
     }
@@ -323,7 +323,7 @@ public:
               proc->kill();
             const auto err(proc->readAllStandardError());
             if (!err.isEmpty())
-              WARNING_LOG() << "stderr: " << err;
+              WARNING_LOG(m_logger) << "stderr: " << err;
             delete proc;
           };
 
@@ -332,12 +332,12 @@ public:
           {
             try
             {
-              DEBUG_LOG() << "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() << "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 ebc93b039..07d1f9790 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
@@ -48,6 +48,8 @@ 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;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog.h
index e691975fe..b7d2fd3d6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog.h
@@ -47,6 +47,9 @@ private slots:
 
 
 private:
+
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void tableColumnOrganiserSetting() override;
 
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 619b0f0d2..35949936b 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
@@ -38,6 +38,8 @@ public:
   bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override final;
 
 protected:
+
+NGL::INGLLogger &m_logger;
   bool isFiltered(const Core::ReplayPartition &data, DataModification modType) const override
   {
     if (data.exerciseId() != m_partitionid)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/Common/tpm_exported_scripts_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/Common/tpm_exported_scripts_model.cpp
index 023ed4f87..1858d5c7a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/Common/tpm_exported_scripts_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/Common/tpm_exported_scripts_model.cpp
@@ -31,7 +31,7 @@ bool ExportedScriptsModel::init(const QString &rootDirectoryToScan)
   m_vecData.clear();
 
   QVector <int> localExercises;
-  DEBUG_LOG() << "ExportedScriptsModel::init rootDirectoryToScan=" << rootDirectoryToScan
+  DEBUG_LOG(m_logger) << "ExportedScriptsModel::init rootDirectoryToScan=" << rootDirectoryToScan
                       ;
 
   
@@ -39,10 +39,10 @@ bool ExportedScriptsModel::init(const QString &rootDirectoryToScan)
   
   
   {
-    DEBUG_LOG() << "Get all local exercises rootDirectoryToScan=" << rootDirectoryToScan ;
+    DEBUG_LOG(m_logger) << "Get all local exercises rootDirectoryToScan=" << rootDirectoryToScan ;
     QFile file(rootDirectoryToScan  + QDir::separator() + QStringLiteral("exercises.json"));
     if (!file.open(QFile::ReadOnly)) 
-      WARNING_LOG() << "Cannot open " << file.fileName() << " for read/write: " << file.errorString();
+      WARNING_LOG(m_logger) << "Cannot open " << file.fileName() << " for read/write: " << file.errorString();
 
     const QJsonDocument doc(QJsonDocument::fromJson(file.readAll()));
     const QJsonObject obj = doc.object(); 
@@ -52,7 +52,7 @@ bool ExportedScriptsModel::init(const QString &rootDirectoryToScan)
       localExercises.append(ele.toInt());
   }
 
-  WARNING_LOG() << "local exericses: " << localExercises.count();
+  WARNING_LOG(m_logger) << "local exericses: " << localExercises.count();
 
   
   for (const int exId : std::as_const(localExercises))
@@ -62,7 +62,7 @@ bool ExportedScriptsModel::init(const QString &rootDirectoryToScan)
 
     if (!file.open(QIODevice::ReadOnly))
     {
-      WARNING_LOG() << "Cannot open " << file.fileName() << " for reading: " << file.errorString() << " - not critical";
+      WARNING_LOG(m_logger) << "Cannot open " << file.fileName() << " for reading: " << file.errorString() << " - not critical";
       
       return true;
     }
@@ -71,14 +71,14 @@ bool ExportedScriptsModel::init(const QString &rootDirectoryToScan)
     const QJsonObject obj = doc.object();
     const QJsonArray presentations = obj[QStringLiteral("presentations")].toArray();
 
-    DEBUG_LOG() << "exercise: " << exId << ", presentations: " << presentations.size();
+    DEBUG_LOG(m_logger) << "exercise: " << exId << ", presentations: " << presentations.size();
 
     for (const QJsonValue &val : presentations)
     {
       ExportedScriptInformation esi = ExportedScriptInformation::fromJson(val);
-      DEBUG_LOG() << "obj=" << QJsonDocument(obj).toJson(QJsonDocument::Compact);
+      DEBUG_LOG(m_logger) << "obj=" << QJsonDocument(obj).toJson(QJsonDocument::Compact);
       const QJsonObject presentationObj = val.toObject();
-      DEBUG_LOG() << "presentationObj=" << QJsonDocument(presentationObj).toJson(QJsonDocument::Compact);
+      DEBUG_LOG(m_logger) << "presentationObj=" << QJsonDocument(presentationObj).toJson(QJsonDocument::Compact);
       if (obj.contains(QStringLiteral("exerciseId")))
       {
         esi.exerciseId = obj[QStringLiteral("exerciseId")].toInt();
@@ -90,7 +90,7 @@ bool ExportedScriptsModel::init(const QString &rootDirectoryToScan)
       }
 
       esi.local = true;
-      DEBUG_LOG() << "push_back "
+      DEBUG_LOG(m_logger) << "push_back "
                           << " exportTime=" << esi.exportTime
                           << " scriptId=" << esi.scriptId
                           << " scriptName=" << esi.scriptName
@@ -120,14 +120,14 @@ void ExportedScriptsModel::setServerContent(const QString &jsonArray)
   QMap<int, QVector<int>> exerciseContentScriptIds; 
   QMap<int, QVector<int>> exerciseScriptIds;        
 
-  DEBUG_LOG() << "ExportedScriptsModel::setServerContent jsonArray =" << jsonArray;
+  DEBUG_LOG(m_logger) << "ExportedScriptsModel::setServerContent jsonArray =" << jsonArray;
   QJsonParseError err;
   const QJsonArray presentations = QJsonDocument::fromJson(jsonArray.toUtf8(), &err).array();
-  DEBUG_LOG() << "presentations.size() =" << presentations.size();
+  DEBUG_LOG(m_logger) << "presentations.size() =" << presentations.size();
 
   if (err.error != QJsonParseError::NoError)
   {
-    ERROR_LOG() << "json array invalid at offset " << err.offset << ": " << err.errorString();
+    ERROR_LOG(m_logger) << "json array invalid at offset " << err.offset << ": " << err.errorString();
     return;
   }
 
@@ -135,7 +135,7 @@ void ExportedScriptsModel::setServerContent(const QString &jsonArray)
   for (const auto &data : std::as_const(m_vecData))
   {
     exerciseScriptIds[data.exerciseId].append(data.scriptId);
-    DEBUG_LOG() << "exerciseId=" << data.exerciseId
+    DEBUG_LOG(m_logger) << "exerciseId=" << data.exerciseId
                         << " modelScriptIds.append: " << data.scriptId;
   }
 
@@ -152,7 +152,7 @@ void ExportedScriptsModel::setServerContent(const QString &jsonArray)
   {
     const auto &rowData = m_vecData[i];
     const QVector<int> contentScriptIds = exerciseContentScriptIds.value(rowData.exerciseId);
-    DEBUG_LOG() << "m_vecData.at(" << i << ").scriptId=" << rowData.scriptId
+    DEBUG_LOG(m_logger) << "m_vecData.at(" << i << ").scriptId=" << rowData.scriptId
                         << " exerciseId=" << rowData.exerciseId
                         << " contentScriptIds.contains=" << contentScriptIds.contains(rowData.scriptId)
                         << " rowData.local=" << rowData.local
@@ -165,7 +165,7 @@ void ExportedScriptsModel::setServerContent(const QString &jsonArray)
       {
         
 
-        DEBUG_LOG() << "removeRow(" << i << ")"
+        DEBUG_LOG(m_logger) << "removeRow(" << i << ")"
                             << " ScriptId=" << rowData.scriptId
                             << " ExerciseId=" << rowData.exerciseId;
         removeRow(i);
@@ -185,7 +185,7 @@ void ExportedScriptsModel::setServerContent(const QString &jsonArray)
   {
     ExportedScriptInformation esi = ExportedScriptInformation::fromJson(val, false, ThpAlreadyUploaded);
     QVector<int> modelScriptIds = exerciseScriptIds.value(esi.exerciseId);
-    DEBUG_LOG() << " exportTime=" << esi.exportTime
+    DEBUG_LOG(m_logger) << " exportTime=" << esi.exportTime
                         << " scriptId=" << esi.scriptId
                         << " exerciseId=" << esi.exerciseId
                         << " exerciseName=" << esi.exerciseName
@@ -196,7 +196,7 @@ void ExportedScriptsModel::setServerContent(const QString &jsonArray)
     
     if (!modelScriptIds.contains(esi.scriptId))
     {
-      DEBUG_LOG() << "insertRow()";
+      DEBUG_LOG(m_logger) << "insertRow()";
       insertRow(esi);
       continue;
     }
@@ -208,7 +208,7 @@ void ExportedScriptsModel::setServerContent(const QString &jsonArray)
       if (rowData.scriptId == esi.scriptId &&
           rowData.exerciseId == esi.exerciseId)
       {
-        DEBUG_LOG() << "setUploadState i=" << i
+        DEBUG_LOG(m_logger) << "setUploadState i=" << i
                             << " esi.scriptId=" << esi.scriptId
                             << " esi.exerciseId=" << esi.exerciseId
                             << " esi.fileSize=" << esi.fileSize
@@ -230,7 +230,7 @@ qint64 ExportedScriptsModel::downloadTime(const ExportedScriptInformation &val)
     return 0;
 
   QString filename(QStringLiteral("%1/THP-Download/Exercise_%2/%3/index.html").arg(QDir::tempPath()).arg(val.exerciseId).arg(val.scriptId));
-  DEBUG_LOG() << "downloadTime: filename " << filename;
+  DEBUG_LOG(m_logger) << "downloadTime: filename " << filename;
 
   QFileInfo fi(filename);
   if (!fi.exists())
@@ -334,16 +334,16 @@ bool ExportedScriptsModel::createDataJson(const QString &rootDirectory,
 
   if (!QDir().mkpath(baseDir)) 
   {
-    ERROR_LOG() << "Failed to create path " << baseDir;
+    ERROR_LOG(m_logger) << "Failed to create path " << baseDir;
     return false;
   }
 
   QFile file(baseDir + QStringLiteral("data.json"));
-  DEBUG_LOG() << "createDataJson=" << file.fileName();
+  DEBUG_LOG(m_logger) << "createDataJson=" << file.fileName();
   if (!file.open(QFile::ReadWrite))
   {
     QString msg(tr("Could not open data file in script directory: %1").arg(file.errorString()));
-    ERROR_LOG() << msg << " - " << file.fileName();
+    ERROR_LOG(m_logger) << msg << " - " << file.fileName();
     return false;
   }
 
@@ -351,7 +351,7 @@ bool ExportedScriptsModel::createDataJson(const QString &rootDirectory,
   QJsonObject obj = doc.object();
   if (obj[QStringLiteral("exerciseId")].toInt() == exerciseId)
   {
-    DEBUG_LOG() << baseDir << " exists for exerciseId " << QString::number(exerciseId);
+    DEBUG_LOG(m_logger) << baseDir << " exists for exerciseId " << QString::number(exerciseId);
     return true;
   }
 
@@ -381,18 +381,18 @@ void ExportedScriptsModel::addDownloadData(const ExportedScriptInformation &esi)
   
   {
     
-    DEBUG_LOG() << "Add exercise to ExportRootPath";
+    DEBUG_LOG(m_logger) << "Add exercise to ExportRootPath";
 
     if (!QDir(esi.rootDirectory).exists())
     {
-      ERROR_LOG() << "Cannot modify exercises.json as the info's root directory '"<<esi.rootDirectory<<"' does not exist!";
+      ERROR_LOG(m_logger) << "Cannot modify exercises.json as the info's root directory '"<<esi.rootDirectory<<"' does not exist!";
       return;
     }
 
     QFile file(esi.rootDirectory  + QDir::separator() +  QStringLiteral("exercises.json"));
     if (!file.open(QFile::ReadWrite))
     {
-      WARNING_LOG() << "Can not open " << file.fileName() << " for read/write: " << file.errorString();
+      WARNING_LOG(m_logger) << "Can not open " << file.fileName() << " for read/write: " << file.errorString();
       return;
     }
 
@@ -403,14 +403,14 @@ void ExportedScriptsModel::addDownloadData(const ExportedScriptInformation &esi)
 
     if (!arr.contains(esi.exerciseId))
     {
-      DEBUG_LOG() << "arr.append Exercise=" << esi.exerciseId;
+      DEBUG_LOG(m_logger) << "arr.append Exercise=" << esi.exerciseId;
       arr.append(esi.exerciseId);
     }
 
     obj.insert(key, arr);
     file.resize(0);
     file.write(QJsonDocument(obj).toJson());
-    INFO_LOG() << " file.write " <<  QJsonDocument(obj).toJson();
+    INFO_LOG(m_logger) << " file.write " <<  QJsonDocument(obj).toJson();
     file.close();
   }
 
@@ -419,17 +419,17 @@ void ExportedScriptsModel::addDownloadData(const ExportedScriptInformation &esi)
   const QString baseDir = exercisePath(esi.rootDirectory, esi.exerciseId);
   if (!QDir().mkpath(baseDir)) 
   {
-    ERROR_LOG() << "Cannot create destination path " << baseDir;
+    ERROR_LOG(m_logger) << "Cannot create destination path " << baseDir;
     return;
   }
 
 
   
   QFile file(baseDir  + QDir::separator() +  QStringLiteral("data.json"));
-  DEBUG_LOG() << "File= " << file.fileName();
+  DEBUG_LOG(m_logger) << "File= " << file.fileName();
   if (!file.open(QFile::ReadWrite))
   {
-    WARNING_LOG() << "Can not open " << file.fileName() << " for read/write: " << file.errorString();
+    WARNING_LOG(m_logger) << "Can not open " << file.fileName() << " for read/write: " << file.errorString();
     return;
   }
 
@@ -438,7 +438,7 @@ void ExportedScriptsModel::addDownloadData(const ExportedScriptInformation &esi)
   QJsonObject obj = doc.object();
   QJsonArray arr = obj.value(keyArray).toArray();
   bool exported = false;
-  DEBUG_LOG() << "arr.size=" << arr.size();
+  DEBUG_LOG(m_logger) << "arr.size=" << arr.size();
 
   for (int i = 0; i < arr.size(); ++i)
   {
@@ -454,7 +454,7 @@ void ExportedScriptsModel::addDownloadData(const ExportedScriptInformation &esi)
 
   if (!exported)
   {
-    DEBUG_LOG() << "info scriptId=" << esi.scriptId
+    DEBUG_LOG(m_logger) << "info scriptId=" << esi.scriptId
                         << " Name=" << esi.scriptName
                         << " Exercise=" << esi.exerciseName;
     arr.append(esi.toJson());
@@ -463,7 +463,7 @@ void ExportedScriptsModel::addDownloadData(const ExportedScriptInformation &esi)
   obj.insert(keyArray, arr);
   auto content = QJsonDocument(obj).toJson();
 
-  DEBUG_LOG() << "content =" << content;
+  DEBUG_LOG(m_logger) << "content =" << content;
 
   file.resize(0);
   file.write(content);
@@ -478,7 +478,7 @@ bool ExportedScriptsModel::setLocalState(const int row, const bool localHost)
   data.local = localHost;
   
 
-  DEBUG_LOG() << "setLocalState row=" << row
+  DEBUG_LOG(m_logger) << "setLocalState row=" << row
                       << " scriptId=" << data.scriptId
                       << " data.scriptName=" << data.scriptName
                       << " Exercise=" << data.exerciseName;
@@ -515,12 +515,12 @@ bool ExportedScriptsModel::removeRow(int row)
 
   QString baseDir = exercisePath(data.rootDirectory, data.exerciseId);
   QString filename = baseDir + QStringLiteral("data.json");
-  DEBUG_LOG() << "filename= '" << filename << "'";
+  DEBUG_LOG(m_logger) << "filename= '" << filename << "'";
   QFile file(baseDir + QStringLiteral("data.json"));
 
   if (!file.open(QIODevice::ReadWrite))
   {
-    DEBUG_LOG() << "!file.open '" << filename << "'"
+    DEBUG_LOG(m_logger) << "!file.open '" << filename << "'"
                         << " no local scripts";
     return true;
   }
@@ -539,7 +539,7 @@ bool ExportedScriptsModel::removeRow(int row)
   obj[QStringLiteral("presentations")] = arr;
   file.resize(0);
   auto content = QJsonDocument(obj).toJson();
-  DEBUG_LOG() << "content =" << content;
+  DEBUG_LOG(m_logger) << "content =" << content;
 
   return file.write(QJsonDocument(obj).toJson());
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/Common/tpm_exported_scripts_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/Common/tpm_exported_scripts_model.h
index eabe1d7b4..0546aaaca 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/Common/tpm_exported_scripts_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/Common/tpm_exported_scripts_model.h
@@ -81,6 +81,8 @@ public:
   void addDownloadData(const ExportedScriptInformation &esi);
 
 private:
+
+NGL::INGLLogger &m_logger;
   QString exercisePath(const QString &rootDirectory, const int exerciseId) const;
   qint64 downloadTime(const ExportedScriptInformation &val) const;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpManagement/tpm_exported_scripts_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpManagement/tpm_exported_scripts_dialog.cpp
index 0d241da93..ba447bf8b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpManagement/tpm_exported_scripts_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpManagement/tpm_exported_scripts_dialog.cpp
@@ -36,7 +36,7 @@
 
 
 #ifndef ELOG
-#define ELOG ERROR_LOG() 
+#define ELOG ERROR_LOG(m_logger) 
 #endif
 
 
@@ -44,17 +44,16 @@ namespace TakeHomePackageManager
 {
 
 
-HttpProcess::HttpProcess(ExportedScriptInformation &&esi, QObject *parent)
-  : QObject(parent)
+HttpProcess::HttpProcess(ExportedScriptInformation &&esi, QObject *parent) : QObject(parent)
   , m_esi(esi)
   , m_process(new ProcessOverlay)
   , m_nam(new QNetworkAccessManager(this))
-  , m_timeout(new QTimer(this))
-{
+  , m_timeout(new QTimer(this)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   connect(m_process, &ProcessOverlay::signalCancel,
           this, [this]()
   {
-    DEBUG_LOG() << "m_wasCanceled!!";
+    DEBUG_LOG(m_logger) << "m_wasCanceled!!";
     m_wasCanceled = true;
     m_process->setCancelEnabled(false);
   });
@@ -71,12 +70,12 @@ HttpProcess::HttpProcess(ExportedScriptInformation &&esi, QObject *parent)
     bool k = false;
     int _timeout = timeoutVar.toInt(&k);
 
-    DEBUG_LOG() << "TPM.Timeout debug value set! k = " << k << "_timeout = " << _timeout;
+    DEBUG_LOG(m_logger) << "TPM.Timeout debug value set! k = " << k << "_timeout = " << _timeout;
 
     if (k)
     {
       timeout = _timeout;
-      DEBUG_LOG() << "new timeout set to " << timeout;
+      DEBUG_LOG(m_logger) << "new timeout set to " << timeout;
     }
   }
 
@@ -89,7 +88,7 @@ HttpProcess::HttpProcess(ExportedScriptInformation &&esi, QObject *parent)
   {
     stopTimeout();
     new LtsWidgets::LtsMessageDialogNew(qobject_cast<QWidget *>(this->parent()), tr("Timeout occured during the operation - aborted"));
-    WARNING_LOG() << "Timeout occured during the operation - aborted";
+    WARNING_LOG(m_logger) << "Timeout occured during the operation - aborted";
     m_isTimeout = true;
 
     emit signalTimeout();
@@ -99,7 +98,7 @@ HttpProcess::HttpProcess(ExportedScriptInformation &&esi, QObject *parent)
 
 HttpProcess::~HttpProcess()
 {
-  DEBUG_LOG() << "~HttpProcess";
+  DEBUG_LOG(m_logger) << "~HttpProcess";
   delete m_process;
   
 }
@@ -175,7 +174,7 @@ QNetworkReply *HttpProcess::deleteResource(const QString &path, const QUrlQuery
 
 void HttpProcess::slotSuccess()
 {
-  DEBUG_LOG() << "success";
+  DEBUG_LOG(m_logger) << "success";
 
   stopTimeout();
   if (!m_isError && !m_wasCanceled && !m_isTimeout)
@@ -185,7 +184,7 @@ void HttpProcess::slotSuccess()
 
 void HttpProcess::slotError()
 {
-  DEBUG_LOG() << "error";
+  DEBUG_LOG(m_logger) << "error";
 
   stopTimeout();
 
@@ -207,7 +206,7 @@ void HttpProcess::slotError()
 
 void HttpProcess::slotReadyRead()
 {
-  DEBUG_LOG() << "readyRead";
+  DEBUG_LOG(m_logger) << "readyRead";
   resetTimeout();
 
   QNetworkReply *r = qobject_cast<QNetworkReply *>(sender());
@@ -354,23 +353,23 @@ UploadProcess::UploadProcess(const QString &rootFolder, ExportedScriptInformatio
 
 
 
-  DEBUG_LOG() << "TPM.TestBigFile? " << LtsSessionData::LtsSessionData::getInstance()->debugFlagValue(QStringLiteral("TPM.TestBigFile")).toString();
-  DEBUG_LOG() << "TPM.TestBigFile check? "
+  DEBUG_LOG(m_logger) << "TPM.TestBigFile? " << LtsSessionData::LtsSessionData::getInstance()->debugFlagValue(QStringLiteral("TPM.TestBigFile")).toString();
+  DEBUG_LOG(m_logger) << "TPM.TestBigFile check? "
                       << (LtsSessionData::LtsSessionData::getInstance()->debugFlagValue(QStringLiteral("TPM.TestBigFile")) == QVariant(true));
 
 #ifndef LTS_DEBUG
   if (LtsSessionData::LtsSessionData::getInstance()->debugFlagValue(QStringLiteral("TPM.TestBigFile")) == QVariant(true))
 #endif
   {
-    DEBUG_LOG() << "TPM.TestBigFile!!";
+    DEBUG_LOG(m_logger) << "TPM.TestBigFile!!";
 
     if (QGuiApplication::queryKeyboardModifiers() == Qt::ControlModifier)
     {
       QFile test(QStringLiteral("%1/%2/big.file").arg(ExportedScriptsDialog::getContentFolder(m_rootDir, m_esi.exerciseId), dstDir));
-      DEBUG_LOG() << ">>> BIG FILE ACTIVE ("<<test.fileName()<<")";
+      DEBUG_LOG(m_logger) << ">>> BIG FILE ACTIVE ("<<test.fileName()<<")";
 
       bool ret = test.open(QIODevice::ReadWrite);
-      DEBUG_LOG() << "ret? " << ret;
+      DEBUG_LOG(m_logger) << "ret? " << ret;
       Q_ASSERT(ret);
 
       
@@ -380,7 +379,7 @@ UploadProcess::UploadProcess(const QString &rootFolder, ExportedScriptInformatio
       QFile rng(QStringLiteral("/dev/urandom")); 
 
       ret = rng.open(QIODevice::ReadOnly);
-      DEBUG_LOG() << "ret? " << ret;
+      DEBUG_LOG(m_logger) << "ret? " << ret;
       Q_ASSERT(ret);
 
       int times = 1024 * 1024; 
@@ -391,15 +390,15 @@ UploadProcess::UploadProcess(const QString &rootFolder, ExportedScriptInformatio
         int _times = LtsSessionData::LtsSessionData::getInstance()->debugFlagValue(bigFileSize).toInt(&k);
 
         if (!k)
-          DEBUG_LOG() << "Invalid value for " << bigFileSize;
+          DEBUG_LOG(m_logger) << "Invalid value for " << bigFileSize;
         else
         {
           times = _times;
-          DEBUG_LOG() << "big file size was set to " << times;
+          DEBUG_LOG(m_logger) << "big file size was set to " << times;
         }
       }
       else
-        DEBUG_LOG() << "TPM.TestBigFile.Size not set - using default of " << times;
+        DEBUG_LOG(m_logger) << "TPM.TestBigFile.Size not set - using default of " << times;
 
 
       for (int i = 0; i < times; i++)
@@ -411,7 +410,7 @@ UploadProcess::UploadProcess(const QString &rootFolder, ExportedScriptInformatio
       test.flush();
 
       m_tempFile->setAutoRemove(false);
-      DEBUG_LOG() << "big compressed file: " << m_tempFile->fileName();
+      DEBUG_LOG(m_logger) << "big compressed file: " << m_tempFile->fileName();
     }
   }
 
@@ -419,9 +418,9 @@ UploadProcess::UploadProcess(const QString &rootFolder, ExportedScriptInformatio
   connect(m_compress, &NGL::Compress::finished,
           this, &UploadProcess::compressionDone); 
 
-  DEBUG_LOG() << "compress called...";
+  DEBUG_LOG(m_logger) << "compress called...";
   m_compress->compress(m_tempFile, srcDir, dstDir);
-  DEBUG_LOG() << "...!";
+  DEBUG_LOG(m_logger) << "...!";
 }
 
 
@@ -436,17 +435,17 @@ void UploadProcess::abortCompress()
 
 void UploadProcess::compressionDone()
 {
-  DEBUG_LOG() << "m_wasCanceled = " << m_wasCanceled << ", compress success = " << m_compress->success();
+  DEBUG_LOG(m_logger) << "m_wasCanceled = " << m_wasCanceled << ", compress success = " << m_compress->success();
   stopTimeout();
 
   if (!m_compress->success() || m_wasCanceled) 
   {
-    DEBUG_LOG() << "compression aborted";
+    DEBUG_LOG(m_logger) << "compression aborted";
     deleteLater();
     return;
   }
 
-  DEBUG_LOG() << "okay";
+  DEBUG_LOG(m_logger) << "okay";
 
   QUrlQuery q;
   q.addQueryItem(QStringLiteral("exerciseId"), QString::number(m_esi.exerciseId));
@@ -455,7 +454,7 @@ void UploadProcess::compressionDone()
   q.addQueryItem(QStringLiteral("name"), m_esi.scriptName);
   
 
-  DEBUG_LOG() << "posting file of size " << m_tempFile->size();
+  DEBUG_LOG(m_logger) << "posting file of size " << m_tempFile->size();
   m_tempFile->seek(0);
 
   QNetworkReply *rep = post(QStringLiteral("/thp"), m_tempFile, q);
@@ -463,7 +462,7 @@ void UploadProcess::compressionDone()
   connect(this, &HttpProcess::signalSuccess, 
           this, [this]()
   {
-    DEBUG_LOG() << "Uploaded script successfully";
+    DEBUG_LOG(m_logger) << "Uploaded script successfully";
     new LtsWidgets::LtsMessageDialogNew(qobject_cast<QWidget *>(parent()), tr("Uploaded script successfully"));
     deleteLater();
   });
@@ -612,7 +611,7 @@ void DownloadProcess::downloadFinished()
   {
     stopTimeout();
 
-    DEBUG_LOG() << "m_compress->success()? " << m_compress->success() << ", m_wasCanceled? " << m_wasCanceled << ", m_isError? " << m_isError;
+    DEBUG_LOG(m_logger) << "m_compress->success()? " << m_compress->success() << ", m_wasCanceled? " << m_wasCanceled << ", m_isError? " << m_isError;
     if (m_compress->success() && !m_wasCanceled && !m_isError)
     {
       new LtsWidgets::LtsMessageDialogNew(qobject_cast<QWidget *>(parent()), tr("Downloaded script successfully"));
@@ -858,7 +857,7 @@ bool ExportedScriptsDialog::init(LtsSession::LtsSession *session)
   if (!QDir().mkpath(getContentFolder(m_exerciseId)))
   {
     QString msg(tr("Cannot create script folder at %1").arg(getContentFolder(m_exerciseId)));
-    ERROR_LOG() << msg;
+    ERROR_LOG(m_logger) << msg;
     return false;
   }
 
@@ -875,7 +874,7 @@ bool ExportedScriptsDialog::init(LtsSession::LtsSession *session)
 #else
     NGL::Settings *s = new NGL::Settings(NGL::findProjectConfigFile());
     const QString hostname = s->getString(QStringLiteral("TabOC"), QStringLiteral("remoteServerHostname"), QStringLiteral("exctds01"));
-    WARNING_LOG() << "Hostname used for THP: " << hostname;
+    WARNING_LOG(m_logger) << "Hostname used for THP: " << hostname;
     sock->open(QUrl(QStringLiteral("ws://%1:%2/thp").arg(hostname).arg(NGL::Connections::port(NGL::Connections::eConnection::FLM_THP_SERVER))));
     delete s;
 #endif
@@ -904,7 +903,7 @@ bool ExportedScriptsDialog::init(LtsSession::LtsSession *session)
   connect(sock, &QWebSocket::disconnected,
           this, [this, sock, openFn]()
   {
-    WARNING_LOG() << "disconnected from ws... reconnecting in 3...";
+    WARNING_LOG(m_logger) << "disconnected from ws... reconnecting in 3...";
     setWsConnectionStatus(WsConnectionStatus::Disconnected);
 
     QTimer *t = new QTimer(sock);
@@ -925,7 +924,7 @@ bool ExportedScriptsDialog::init(LtsSession::LtsSession *session)
   connect(sock, &QWebSocket::textMessageReceived,
           this, [this](const QString &msg)
   {
-    DEBUG_LOG() << "new msg: '" << msg << "'";
+    DEBUG_LOG(m_logger) << "new msg: '" << msg << "'";
     m_lastServerContent = msg;
     m_model->setServerContent(msg);
     onSelectionChanged(); 
@@ -938,7 +937,7 @@ bool ExportedScriptsDialog::init(LtsSession::LtsSession *session)
 
 bool ExportedScriptsDialog::initModel()
 {
-  DEBUG_LOG() << "(re)initModel !!";
+  DEBUG_LOG(m_logger) << "(re)initModel !!";
 
   QString rootDirectory(getRootFolder());
 
@@ -1017,7 +1016,7 @@ void ExportedScriptsDialog::downloadScript()
 
     if (!mi.isValid())
     {
-      ERROR_LOG() << "could not update model data after download! cover up..";
+      ERROR_LOG(m_logger) << "could not update model data after download! cover up..";
       return;
     }
 
@@ -1053,7 +1052,7 @@ void ExportedScriptsDialog::removeScriptFromServer()
 
     if (!mi.isValid())
     {
-      ERROR_LOG() << "could not update model data after deletion! cover up..";
+      ERROR_LOG(m_logger) << "could not update model data after deletion! cover up..";
       return;
     }
 
@@ -1090,7 +1089,7 @@ void ExportedScriptsDialog::removeScriptLocal()
   m_buttonBox->getButton(LtsWidgets::DialogButton::Show)->setEnabled(false);
 
   QString currentDirectory = QStringLiteral("%1/%2").arg(getContentFolder(esi.exerciseId), QString::number(esi.scriptId));
-  DEBUG_LOG() << "currentDirectory=" << currentDirectory;
+  DEBUG_LOG(m_logger) << "currentDirectory=" << currentDirectory;
 
   QDir d(currentDirectory);
   if (!d.removeRecursively())
@@ -1118,7 +1117,7 @@ void ExportedScriptsDialog::removeScriptLocal()
   if (err.error != QJsonParseError::NoError)
   {
     new LtsWidgets::LtsMessageDialogNew(this, tr("Cannot read index file"), removingScriptFailedText);
-    ERROR_LOG() << "Cannot read index file at offset" << err.offset << ": " << err.errorString();
+    ERROR_LOG(m_logger) << "Cannot read index file at offset" << err.offset << ": " << err.errorString();
     return;
   }
 
@@ -1145,7 +1144,7 @@ void ExportedScriptsDialog::removeScriptLocal()
 
     if (scriptId == -1)
     {
-      WARNING_LOG() << "cannot find scriptId in presentations array object from data.json";
+      WARNING_LOG(m_logger) << "cannot find scriptId in presentations array object from data.json";
       continue;
     }
 
@@ -1192,7 +1191,7 @@ void ExportedScriptsDialog::openScript()
   args.append(QStringLiteral("-t"));
   args.append(pathToScript);
 
-  DEBUG_LOG() << "pathToScript: " << pathToScript;
+  DEBUG_LOG(m_logger) << "pathToScript: " << pathToScript;
 
 #ifndef WIN32
   QProcess().startDetached(QLatin1String("./thp_viewer"), args, QCoreApplication::applicationDirPath());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpManagement/tpm_exported_scripts_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpManagement/tpm_exported_scripts_dialog.h
index 1107f114a..bb752a50f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpManagement/tpm_exported_scripts_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpManagement/tpm_exported_scripts_dialog.h
@@ -67,6 +67,9 @@ protected slots:
 
 
 private:
+
+
+NGL::INGLLogger &m_logger;
   void doConnections(QNetworkReply *r);
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpUsbManagement/tpm_usb_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpUsbManagement/tpm_usb_dialog.cpp
index 2b32e4f59..348f5ee6e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpUsbManagement/tpm_usb_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpUsbManagement/tpm_usb_dialog.cpp
@@ -68,7 +68,7 @@
 #endif
 
 #ifndef ELOG
-#define ELOG ERROR_LOG() 
+#define ELOG ERROR_LOG(m_logger) 
 #endif
 
 
@@ -431,7 +431,7 @@ void USBDialog::initUsbModel()
   if (!m_usbThpModel->init(m_usbRoot))
   {
     new LtsWidgets::LtsMessageDialogNew(this, tr("The directory '%1' doesn't contain valid THP data.").arg(m_usbRoot));
-    ERROR_LOG() << "cannot initialize usb thp model from usb root" << m_usbRoot;
+    ERROR_LOG(m_logger) << "cannot initialize usb thp model from usb root" << m_usbRoot;
     return;
   }
 
@@ -519,7 +519,7 @@ void USBDialog::slotChangePath()
           if (!m_usbThpModel->createDataJson(m_usbRoot, exmDtc, asmDtc, m_exerciseId))
           {
             
-            ERROR_LOG() << "Failed to initialize data.json";
+            ERROR_LOG(m_logger) << "Failed to initialize data.json";
             return;
           }
 
@@ -550,7 +550,7 @@ void USBDialog::slotCopyMaps()
 
   if (!dstDir.exists())
   {
-    ERROR_LOG() << "dst dir " << m_usbRoot << " is not accessible";
+    ERROR_LOG(m_logger) << "dst dir " << m_usbRoot << " is not accessible";
     return;
   }
 
@@ -559,7 +559,7 @@ void USBDialog::slotCopyMaps()
     return;
 
 
-  DEBUG_LOG() << "mil.size()" << mil.size();
+  DEBUG_LOG(m_logger) << "mil.size()" << mil.size();
 
 
 
@@ -602,13 +602,13 @@ void USBDialog::onNextMap()
   auto path = m_files.firstKey();
   {
     QString src(path);
-    DEBUG_LOG() << "src" << src;
+    DEBUG_LOG(m_logger) << "src" << src;
 
     QDir srcDir(src);
 
     if (!srcDir.exists())
     {
-      ERROR_LOG() << "src dir " << src << " is not accessible";
+      ERROR_LOG(m_logger) << "src dir " << src << " is not accessible";
       return;
     }
     QDir dstDir(getContentFolder(m_usbRoot) + QDir::separator() + QStringLiteral("Maps")); 
@@ -710,12 +710,12 @@ void USBDialog::generateLayerMappingXML()
 
   if (!layersMapping.open(QIODevice::WriteOnly))
   {
-    WARNING_LOG()  << "Couldn't open save file.";
+    WARNING_LOG(m_logger)  << "Couldn't open save file.";
     return;
   }
   if (!layersMappingAtMaps.open(QIODevice::WriteOnly))
   {
-    WARNING_LOG() << "Couldn't open save file in folder Maps.";
+    WARNING_LOG(m_logger) << "Couldn't open save file in folder Maps.";
     return;
   }
   QJsonDocument doc(layers);
@@ -763,13 +763,13 @@ void USBDialog::slotCopyWinBin()
 
   if (!srcDir.exists())
   {
-    ERROR_LOG() << "src dir " << src << " is not accessible";
+    ERROR_LOG(m_logger) << "src dir " << src << " is not accessible";
     return;
   }
 
   QFileInfoList fil;
   fil = prepareFileInfoListForFolder(src, fil);
-  DEBUG_LOG() << "XXXXXXXXXXX filsize is: " << fil.size();
+  DEBUG_LOG(m_logger) << "XXXXXXXXXXX filsize is: " << fil.size();
 
   auto cp = new CopyProcess(srcDir, dstDir, fil, false, this);
   setOverlay(cp->process());
@@ -804,19 +804,19 @@ void USBDialog::slotCopyWinBinP2()
 
   if (initFilePath.isEmpty())
   {
-    ERROR_LOG() << "sitmap init is not accessible";
+    ERROR_LOG(m_logger) << "sitmap init is not accessible";
     return;
   }
 
   QFileInfo fileInfo(initFilePath);
   QFileInfoList fil2;
   fil2.append(fileInfo);
-  DEBUG_LOG() << "XXXXXXXXXXX sitmap is: " << fileInfo.absoluteFilePath();
-  ERROR_LOG() << "XXXXXXXXXXX filsize is: " << fil2.size();
+  DEBUG_LOG(m_logger) << "XXXXXXXXXXX sitmap is: " << fileInfo.absoluteFilePath();
+  ERROR_LOG(m_logger) << "XXXXXXXXXXX filsize is: " << fil2.size();
   
 
   const QDir dstDir2(dstDir.absolutePath() + QDir::separator() + QStringLiteral("thp") + QDir::separator() +  QStringLiteral("share") + QDir::separator() +  QStringLiteral("LTS") + QDir::separator() + QStringLiteral("situation_Map")) ;
-  DEBUG_LOG() << "XXXXXXXXXXX sitmap dst is: " << dstDir2.absolutePath();
+  DEBUG_LOG(m_logger) << "XXXXXXXXXXX sitmap dst is: " << dstDir2.absolutePath();
 
   auto cp2 = new CopyProcess(fileInfo.absoluteDir(), dstDir2, fil2, false, this);
   setOverlay(cp2->process());
@@ -849,15 +849,15 @@ void USBDialog::slotCopyWinBinP3()
   const QString autorunFile = NGL::findFile(NGL::FileType::ConfigFile, QStringLiteral("autorun.inf"));
   if (autorunFile.isEmpty())
   {
-    ERROR_LOG() << "autorunFile init is not accessible";
+    ERROR_LOG(m_logger) << "autorunFile init is not accessible";
     return;
   }
 
   QFileInfo fileInfo2(autorunFile);
   QFileInfoList fil;
   fil = prepareFileInfoListForFolder(fileInfo2.absoluteDir().path(), fil);
-  DEBUG_LOG() << "XXXXXXXXXXX autofinFile is: " << fileInfo2.absoluteDir().path();
-  DEBUG_LOG() << "XXXXXXXXXXX filsize is: " << fil.size();
+  DEBUG_LOG(m_logger) << "XXXXXXXXXXX autofinFile is: " << fileInfo2.absoluteDir().path();
+  DEBUG_LOG(m_logger) << "XXXXXXXXXXX filsize is: " << fil.size();
 
   auto cp3 = new CopyProcess(fileInfo2.absoluteDir(), dstDir, fil, false, this);
   setOverlay(cp3->process());
@@ -1206,7 +1206,7 @@ void USBDialog::scriptDeleted(int scriptId)
   const QFileInfoList fil(dir.entryInfoList());
   if (fil.isEmpty())
   {
-    DEBUG_LOG() << "no scripts left";
+    DEBUG_LOG(m_logger) << "no scripts left";
     
 
 
@@ -1220,7 +1220,7 @@ void USBDialog::scriptDeleted(int scriptId)
     }
     catch (const QString &str)
     {
-      ERROR_LOG() << "ExerciseJsonHandler failed: " << str;
+      ERROR_LOG(m_logger) << "ExerciseJsonHandler failed: " << str;
       return;
     }
 
@@ -1234,7 +1234,7 @@ void USBDialog::scriptDeleted(int scriptId)
   }
   catch (const QString &str)
   {
-    ERROR_LOG() << "DataJsonHandler failed: " << str;
+    ERROR_LOG(m_logger) << "DataJsonHandler failed: " << str;
   }
 }
 
@@ -1276,7 +1276,7 @@ void USBDialog::scriptCopied(int )
   }
   catch (const QString &str)
   {
-    ERROR_LOG() << "DataJsonHandler failed: " << str;
+    ERROR_LOG(m_logger) << "DataJsonHandler failed: " << str;
     return;
   }
 
@@ -1319,7 +1319,7 @@ void USBDialog::slotCopy()
 
   if (!dstDir.exists())
   {
-    ERROR_LOG() << "dst dir " << m_usbRoot << " is not accessible";
+    ERROR_LOG(m_logger) << "dst dir " << m_usbRoot << " is not accessible";
     return;
   }
 
@@ -1327,7 +1327,7 @@ void USBDialog::slotCopy()
 
   if (!dstDir.mkpath(dstDir.absolutePath())) 
   {
-    ERROR_LOG() << "Could not create destination path " << dstDir.absolutePath();
+    ERROR_LOG(m_logger) << "Could not create destination path " << dstDir.absolutePath();
     return;
   }
 
@@ -1343,14 +1343,14 @@ void USBDialog::slotCopy()
     return;
 
   QString src(getScriptFolder(esi.rootDirectory, esi.exerciseId, esi.scriptId));
-  DEBUG_LOG() << "src" << src;
+  DEBUG_LOG(m_logger) << "src" << src;
 
   QDir srcDir(src);
   QDir bldgDir( QStringLiteral("%1/BuildingModels").arg(getContentFolder(esi.rootDirectory, esi.exerciseId)));
 
   if (!srcDir.exists())
   {
-    ERROR_LOG() << "src dir " << src << " is not accessible";
+    ERROR_LOG(m_logger) << "src dir " << src << " is not accessible";
     return;
   }
 
@@ -1395,7 +1395,7 @@ void USBDialog::slotRemove()
     return;
 
 
-  DEBUG_LOG() << "mil.size()" << mil.size();
+  DEBUG_LOG(m_logger) << "mil.size()" << mil.size();
 
 
   for (const QModelIndex &idx : mil)
@@ -1421,7 +1421,7 @@ void USBDialog::slotRemoveMaps()
 
   if (!dir.exists())
   {
-    ERROR_LOG() << "dir " << m_usbRoot << " is not accessible";
+    ERROR_LOG(m_logger) << "dir " << m_usbRoot << " is not accessible";
     return;
   }
 
@@ -1430,12 +1430,12 @@ void USBDialog::slotRemoveMaps()
     return;
 
 
-  DEBUG_LOG() << "mil.size()" << mil.size();
+  DEBUG_LOG(m_logger) << "mil.size()" << mil.size();
 
 
   for (const QModelIndex &idx : mil)
   {
-    DEBUG_LOG() << "rm" << idx.data().toString();
+    DEBUG_LOG(m_logger) << "rm" << idx.data().toString();
     QFile::remove(dir.absolutePath() + QDir::separator() + idx.data().toString());
   }
 
@@ -1515,7 +1515,7 @@ void USBDialog::retranslate()
 
 void USBDialog::initModel()
 {
-  DEBUG_LOG() << "(re)initModel !!";
+  DEBUG_LOG(m_logger) << "(re)initModel !!";
 
   
   
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpUsbManagement/tpm_usb_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpUsbManagement/tpm_usb_dialog.h
index 95a7b3f35..e23dc1287 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpUsbManagement/tpm_usb_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpUsbManagement/tpm_usb_dialog.h
@@ -91,6 +91,10 @@ private slots:
 
 
 private:
+
+
+
+NGL::INGLLogger &m_logger;
   enum class What
   {
     ScriptWasDeletedFromExercise,
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_exported_scripts_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_exported_scripts_model.cpp
index 9ffc8cbea..ef135b794 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_exported_scripts_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_exported_scripts_model.cpp
@@ -208,11 +208,11 @@ void ExportedScriptsModel::setServerContent(const QString &jsonObject)
   }
   catch(const std::runtime_error &err)
   {
-    ERROR_LOG() << "something went wrong: " << err.what();
+    ERROR_LOG(m_logger) << "something went wrong: " << err.what();
   }
   catch(...)
   {
-    ERROR_LOG() << "something went wrong";
+    ERROR_LOG(m_logger) << "something went wrong";
   }  
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_exported_scripts_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_exported_scripts_model.h
index fb0b0df51..66a3cd649 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_exported_scripts_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_exported_scripts_model.h
@@ -43,6 +43,8 @@ public:
   void writeScriptsJson() noexcept(false);
 
 protected:
+
+NGL::INGLLogger &m_logger;
   QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_topics_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_topics_model.h
index 5c62869c4..6981921df 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_topics_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Common2/tpm_topics_model.h
@@ -32,5 +32,7 @@ public:
   QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 }
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 a03142a9c..2e8fb6a80 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
@@ -41,7 +41,7 @@
 
 
 #ifndef ELOG
-#define ELOG ERROR_LOG() 
+#define ELOG ERROR_LOG(m_logger) 
 #endif
 
 using err = std::runtime_error;
@@ -51,9 +51,8 @@ err error(const QString &msg) { return err(msg.toStdString()); }
 namespace TakeHomePackageManager
 {
 
-Compressor::Compressor()
-  : QObject(nullptr)
-{}
+Compressor::Compressor() : QObject(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 
 void Compressor::go(ProcessOverlay *processOverlay, QIODevice &out, const QString &sourceDir, const QString &destRootDir) noexcept(false)
@@ -131,7 +130,7 @@ HttpProcess::HttpProcess(LtsWidgets::LtsDialog *dialog, const QString &statusMes
   connect(m_process, &ProcessOverlay::signalCancel,
           this, [this]()
   {
-    DEBUG_LOG() << "m_wasCanceled!!";
+    DEBUG_LOG(m_logger) << "m_wasCanceled!!";
     m_process->setCancelEnabled(false);
     emit signalCancel();
   });
@@ -143,7 +142,7 @@ HttpProcess::HttpProcess(LtsWidgets::LtsDialog *dialog, const QString &statusMes
 
 HttpProcess::~HttpProcess()
 {
-  DEBUG_LOG() << "~HttpProcess";
+  DEBUG_LOG(m_logger) << "~HttpProcess";
   m_process->deleteLater();
   m_nam->deleteLater();
 }
@@ -361,7 +360,7 @@ void UploadProcess::go(const QString &rootFolder, const ExportedScriptInformatio
   connect(this, &HttpProcess::signalCancel, &compressor, &Compressor::abort);
   compressor.go(m_process, *tempFile.get(), srcDir, dstDir);
 
-  DEBUG_LOG() << "posting file of size " << tempFile->size();
+  DEBUG_LOG(m_logger) << "posting file of size " << tempFile->size();
   tempFile->seek(0);
 
   QNetworkReply *rep = post(L("/thp2"), tempFile.get(), {}, L("application/octet-stream"), { { L("x-thp-info"), QString::fromUtf8(QJsonDocument(esi.toJson().toObject()).toJson(QJsonDocument::JsonFormat::Compact)) } });
@@ -586,7 +585,7 @@ ExportedScriptsDialog::ExportedScriptsDialog(LtsSession::LtsSession *session, QW
   connect(sock, &QWebSocket::disconnected,
           this, [this, sock, openFn]()
   {
-    WARNING_LOG() << "disconnected from ws... reconnecting in 3...";
+    WARNING_LOG(m_logger) << "disconnected from ws... reconnecting in 3...";
     setWsConnectionStatus(WsConnectionStatus::Disconnected);
 
     QTimer *t = new QTimer(sock);
@@ -607,7 +606,7 @@ ExportedScriptsDialog::ExportedScriptsDialog(LtsSession::LtsSession *session, QW
   connect(sock, &QWebSocket::textMessageReceived,
           this, [this](const QString &msg)
   {
-    DEBUG_LOG() << "new msg: '" << msg << "'";
+    DEBUG_LOG(m_logger) << "new msg: '" << msg << "'";
     m_lastServerContent = msg;
     m_model->setServerContent(msg);
     onSelectionChanged(); 
@@ -757,7 +756,7 @@ void ExportedScriptsDialog::setWsConnectionStatusLabel()
 
 void ExportedScriptsDialog::initModel() noexcept(false)
 {
-  DEBUG_LOG() << "(re)initModel !!";
+  DEBUG_LOG(m_logger) << "(re)initModel !!";
 
   const QString rootDirectory(localThpDir());
 
@@ -768,7 +767,7 @@ void ExportedScriptsDialog::initModel() noexcept(false)
   catch(...)
   {
     new LtsWidgets::LtsMessageDialogNew(this, tr("Couldn't Load THP(s)"));
-    WARNING_LOG()<<"  data corrupted  path: "<< localThpDir();
+    WARNING_LOG(m_logger)<<"  data corrupted  path: "<< localThpDir();
   }
 
   m_model->setOC(isOCApp()); 
@@ -805,12 +804,12 @@ void ExportedScriptsDialog::uploadScript()
   }
   catch(const std::runtime_error &err)
   {
-    ERROR_LOG() << "Uploaded script FAILED: " << err.what();
+    ERROR_LOG(m_logger) << "Uploaded script FAILED: " << err.what();
     new LtsWidgets::LtsMessageDialogNew(this, tr("Uploading script failed: %1").arg(QString::fromUtf8(err.what())));
     return;
   }
 
-  DEBUG_LOG() << "Uploaded script successfully";
+  DEBUG_LOG(m_logger) << "Uploaded script successfully";
   new LtsWidgets::LtsMessageDialogNew(this, tr("Uploaded script successfully"));
 }
 
@@ -855,7 +854,7 @@ void ExportedScriptsDialog::downloadScript()
   }
   catch(const std::runtime_error &err)
   {
-    ERROR_LOG() << "Downloading script FAILED: " << err.what();
+    ERROR_LOG(m_logger) << "Downloading script FAILED: " << err.what();
     new LtsWidgets::LtsMessageDialogNew(this, tr("Downloading script failed: %1").arg(QString::fromUtf8(err.what())));
     return;
   }
@@ -863,7 +862,7 @@ void ExportedScriptsDialog::downloadScript()
   
   
 
-  DEBUG_LOG() << "Downloaded script successfully";
+  DEBUG_LOG(m_logger) << "Downloaded script successfully";
   new LtsWidgets::LtsMessageDialogNew(this, tr("Downloaded script successfully"));
 }
 
@@ -888,7 +887,7 @@ void ExportedScriptsDialog::removeScriptFromServer()
   }
   catch (const std::runtime_error &err)
   {
-    ERROR_LOG() << err.what();
+    ERROR_LOG(m_logger) << err.what();
     new LtsWidgets::LtsMessageDialogNew(this, tr("Failed to remove script from server!"));
     return;
   }
@@ -941,7 +940,7 @@ void ExportedScriptsDialog::removeScriptLocal()
   }
   catch (const std::runtime_error &err)
   {
-    ERROR_LOG() << err.what();
+    ERROR_LOG(m_logger) << err.what();
     new LtsWidgets::LtsMessageDialogNew(this, tr("Failed to remove script locally!"));
     return;
   }
@@ -965,7 +964,7 @@ void ExportedScriptsDialog::openScript()
   const auto path(QDir(scriptHtmlLocation(localThpDir(), esi.id())).path());
   const auto url(QUrl::fromLocalFile(path));
   const bool openUrlResult = QDesktopServices::openUrl(url);
-  DEBUG_LOG() << "path: " << path << " - url: " << url.toString() << " - success? " << openUrlResult;
+  DEBUG_LOG(m_logger) << "path: " << path << " - url: " << url.toString() << " - success? " << openUrlResult;
 }
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2Management/tpm2_exported_scripts_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2Management/tpm2_exported_scripts_dialog.h
index 6d279fce3..f9c1145c5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2Management/tpm2_exported_scripts_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2Management/tpm2_exported_scripts_dialog.h
@@ -73,6 +73,8 @@ signals:
   void signalCancel();
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void waitForAnswer(QNetworkReply *r, const int expectedResponseStatus) noexcept(false);
 
   QNetworkReply *post(const QString &path, QIODevice *data, const QUrlQuery &q = QUrlQuery(), const QString &contentType = QStringLiteral("application/octet-stream"), const QMap<QString, QString> &additionalHeaders = {}) noexcept(false);
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 ef43774ce..1c805e2d1 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
@@ -63,7 +63,7 @@ WARNING_LOG(x)
 #endif
 
 #ifndef ELOG
-#define ELOG ERROR_LOG() 
+#define ELOG ERROR_LOG(m_logger) 
 #endif
 
 
@@ -84,7 +84,7 @@ USB2Dialog::USB2Dialog(LtsSession::LtsSession *session, QWidget *parent)
 
   m_ui->setupUi(this);
 
-  WARNING_LOG()<<" USB2Dialog::USB2Dialog() START ";
+  WARNING_LOG(m_logger)<<" USB2Dialog::USB2Dialog() START ";
   connect(m_ui->pbCHange, &QPushButton::clicked,
           this, &USB2Dialog::slotChangePath);
 
@@ -135,13 +135,13 @@ USB2Dialog::USB2Dialog(LtsSession::LtsSession *session, QWidget *parent)
   }
   catch(...)
   {
-    WARNING_LOG()<<"  data corrupted  path: "<< localThpDir();
+    WARNING_LOG(m_logger)<<"  data corrupted  path: "<< localThpDir();
     new LtsWidgets::LtsMessageDialogNew(this, tr("Couldn't Load THP(s)"));
   }
 
   setOnlineHelpFilename(QStringLiteral("Script_Editor-Export_Script_Administration"));
 
-  WARNING_LOG()<<" USB2Dialog::USB2Dialog() END ";
+  WARNING_LOG(m_logger)<<" USB2Dialog::USB2Dialog() END ";
 }
 
 
@@ -185,15 +185,15 @@ void USB2Dialog::unmountUSB(const QString &device)
   while (process.canReadLine())
   {
     QString outputLine = QString::fromUtf8(process.readLine());
-    DEBUG_LOG() << "OutputLine: " << outputLine;
+    DEBUG_LOG(m_logger) << "OutputLine: " << outputLine;
     auto outputDevicePath = outputLine.split(QStringLiteral(" ")).last();
-    DEBUG_LOG() << "OutputDevicePath: " << outputDevicePath;
+    DEBUG_LOG(m_logger) << "OutputDevicePath: " << outputDevicePath;
 
     auto outputPathStripped = outputDevicePath.replace(QLatin1String("\\x20"), QLatin1String(" "));
-    DEBUG_LOG() << "OutputPathStripped: " << outputPathStripped;
+    DEBUG_LOG(m_logger) << "OutputPathStripped: " << outputPathStripped;
 
     auto outputDeviceName = outputPathStripped.split(QStringLiteral("/")).last();
-    DEBUG_LOG() << "OutputDeviceName: " << outputDeviceName;
+    DEBUG_LOG(m_logger) << "OutputDeviceName: " << outputDeviceName;
 
     if (outputDeviceName.trimmed().compare(device.trimmed()) == 0)
     {
@@ -201,7 +201,7 @@ void USB2Dialog::unmountUSB(const QString &device)
 
       auto serialPort = outputLine.split(QStringLiteral(" ")).first();
       QString absPath = QStringLiteral("/dev/") + serialPort;
-      DEBUG_LOG() << "Serial Port: " << absPath;
+      DEBUG_LOG(m_logger) << "Serial Port: " << absPath;
       process.start(QStringLiteral("udisksctl"), QStringList() << QStringLiteral("unmount") << QStringLiteral("-b") << absPath);
       process.waitForFinished();
       reset();
@@ -328,7 +328,7 @@ void USB2Dialog::slotUnmount()
 
   for(const auto &folder : std::as_const(folderNames))
   {
-    DEBUG_LOG() << "Folder: " << folder << " USB Root: " << m_usbRoot;
+    DEBUG_LOG(m_logger) << "Folder: " << folder << " USB Root: " << m_usbRoot;
 
     if(m_usbRoot.contains(folder))
     {
@@ -479,7 +479,7 @@ void USB2Dialog::slotRemove()
   if (mil.size() < 1)
     return;
 
-  DEBUG_LOG() << "mil.size()" << mil.size();
+  DEBUG_LOG(m_logger) << "mil.size()" << mil.size();
 
   QStringList scriptIdList;
   for (const QModelIndex &idx : mil)
@@ -604,7 +604,7 @@ void USB2Dialog::retranslate()
 
 void USB2Dialog::initLocalModel() noexcept(false)
 {
-  DEBUG_LOG() << "(re)initModel !!";
+  DEBUG_LOG(m_logger) << "(re)initModel !!";
 
   
   
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2UsbManagement/tpm_usb_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2UsbManagement/tpm_usb_dialog.h
index d5407fe2f..37ee5a9e6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2UsbManagement/tpm_usb_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/THP2/Thp2UsbManagement/tpm_usb_dialog.h
@@ -52,6 +52,8 @@ private slots:
   void slotUnmount();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void removeScript(const QString &scriptId);
   void reset();
   void initLocalModel() noexcept(false);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/old/tgt_shootback_target_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/old/tgt_shootback_target_model.h
index dfeef7731..fd4cac502 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/old/tgt_shootback_target_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/old/tgt_shootback_target_model.h
@@ -44,6 +44,8 @@ public:
   QVariant data(const QModelIndex &, int) const override;
 
 protected:
+
+NGL::INGLLogger &m_logger;
   bool isFiltered(const ShootbackTarget &data, DataModification modType) const override
   {
     return BaseClass::isFiltered(data, modType);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/old/tgt_shootback_target_view.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/old/tgt_shootback_target_view.h
index 8ca53fd3b..5744dd87a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/old/tgt_shootback_target_view.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/old/tgt_shootback_target_view.h
@@ -35,6 +35,8 @@ public:
             const std::shared_ptr<TargetManagement::Interface::Ftc> &ftc);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
 
 
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 d1e7f74c5..8ad9f2813 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
@@ -55,7 +55,7 @@ bool AreaDialog::init()
     return false;
 
   
-  INFO_LOG() << "AreaDialog::init";
+  INFO_LOG(m_logger) << "AreaDialog::init";
   m_areaModel = new AreaModel(this);
   m_areaModel->initModel(m_dtc);
 
@@ -139,13 +139,13 @@ void AreaDialog::keyPressEvent(QKeyEvent *event)
 
 void AreaDialog::onNewArea()
 {
-  INFO_LOG() << "onNewArea";
+  INFO_LOG(m_logger) << "onNewArea";
 
   AreaEdit *dialog = new AreaEdit(this);
 
   if (!dialog->init(m_dtc, m_ftc, m_sitMapGuiIfc, m_areaModel))
   {
-    ERROR_LOG() << QLatin1String("Can't initialize AreaEdit!");
+    ERROR_LOG(m_logger) << QLatin1String("Can't initialize AreaEdit!");
     delete dialog;
     return;
   }
@@ -175,7 +175,7 @@ void AreaDialog::onEditArea()
   const QModelIndex curIdx = selectedRows.first();
   if (!curIdx.isValid())
     return;
-  INFO_LOG() << " onEditTargetPart";
+  INFO_LOG(m_logger) << " onEditTargetPart";
 
   AreaEdit *dialog = new AreaEdit(this);
 
@@ -183,7 +183,7 @@ void AreaDialog::onEditArea()
 
   if (!dialog->init(m_dtc, m_ftc, m_sitMapGuiIfc, m_areaModel, area))
   {
-    ERROR_LOG() << Q_FUNC_INFO << QLatin1String("Can't initialize AreaEdit!");
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << QLatin1String("Can't initialize AreaEdit!");
     delete dialog;
     return;
   }
@@ -218,7 +218,7 @@ QByteArray AreaDialog::toJson() const
 
   QJsonDocument doc(obj);
 
-  DEBUG_LOG() << " json = " << doc.toJson();
+  DEBUG_LOG(m_logger) << " json = " << doc.toJson();
 
   return doc.toJson(QJsonDocument::Compact);
 }
@@ -259,9 +259,9 @@ void AreaDialog::onExportButtonClicked()
   QByteArray byteArray = toJson();
   int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
   if (fileId > 0)
-    DEBUG_LOG() << Q_FUNC_INFO << "Saved file with id = " << fileId;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << "Saved file with id = " << fileId;
   else
-    ERROR_LOG() << Q_FUNC_INFO << "Could not save file in library ";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << "Could not save file in library ";
 }
 
 void AreaDialog::onImportButtonClicked()
@@ -282,7 +282,7 @@ void AreaDialog::onImportButtonClicked()
 
 void AreaDialog::onImport()
 {
-  INFO_LOG() << Q_FUNC_INFO << "--- onImportButtonClicked() ";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << "--- onImportButtonClicked() ";
 
   QByteArray content;
   int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml},
@@ -318,7 +318,7 @@ void AreaDialog::onImport()
       const QVector<TargetManagement::ShootbackArea> vecDataCandidate(fromJson(content));
       for (ShootbackArea area : vecDataCandidate)
       {
-        DEBUG_LOG() << "area " <<area;
+        DEBUG_LOG(m_logger) << "area " <<area;
 
         area.id(0); 
         m_requestHelper->addRequest([this, area]()
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 ef3035e4b..d1fd5cf2e 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
@@ -44,11 +44,11 @@ bool AreaEdit::init(const std::shared_ptr<TargetManagement::Interface::Dtc> &dtc
                     AreaModel *areaModel,
                     const ShootbackArea &area)
 {
-  DEBUG_LOG() << "AreaEdit::init()";
+  DEBUG_LOG(m_logger) << "AreaEdit::init()";
 
   if (!dtc || !ftc || !sitMapGuiIfc)
   {
-    ERROR_LOG() << "AreaEdit::init() Invalid shared_ptr!";
+    ERROR_LOG(m_logger) << "AreaEdit::init() Invalid shared_ptr!";
     return false;
   }
 
@@ -122,7 +122,7 @@ void AreaEdit::onRectData(const QPointF &centerPoint, double width, double heigh
   m_ui->positionEdit->setCoordinate(centerPoint);
   m_ui->sbWidth->setValue(width);
   m_ui->sbHeight->setValue(height);
-  DEBUG_LOG() << "Pos X: " << centerPoint.x() << " Y: " << centerPoint.y() << " W: " << width << " H: " << height;
+  DEBUG_LOG(m_logger) << "Pos X: " << centerPoint.x() << " Y: " << centerPoint.y() << " W: " << width << " H: " << height;
 
   showPreviewObject();
 }
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 12ee17d8e..46ae7fdbd 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
@@ -39,7 +39,7 @@ bool AreaModel::initModel(const std::shared_ptr<TargetManagement::Interface::Dtc
 
   
   const QMap<qint32, TargetManagement::ShootbackArea> areas = m_tgt_dtc->shootbackAreas();
-  INFO_LOG() << "initModel - #AreaModel: " << areas.size();
+  INFO_LOG(m_logger) << "initModel - #AreaModel: " << areas.size();
 
   connect(m_tgt_dtc.get(), &Interface::Dtc::shootbackAreaChanged,
           this, &AreaModel::onShootbackAreaChanged);
@@ -88,7 +88,7 @@ QVariant AreaModel::headerData(int section, Qt::Orientation orientation, int rol
 
 QVariant AreaModel::data(const QModelIndex &index, int role) const
 {
-  INFO_LOG() << Q_FUNC_INFO << " role=" << role
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " role=" << role
                      << " index = " << index.column();
 
   if (!indexIsValid(index))
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 24c7aa54a..f27984519 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
@@ -96,7 +96,7 @@ bool AssignmentParticipantModel::initModel(const std::shared_ptr<TargetManagemen
 
   
   const QMap<qint32, TargetManagement::TargetAreaAssignment> targetAreaAssignments = m_tgt_dtc->targetAreaAssignments();
-  INFO_LOG() << "initModel - #targetAreaAssignments.size(): " << targetAreaAssignments.size();
+  INFO_LOG(m_logger) << "initModel - #targetAreaAssignments.size(): " << targetAreaAssignments.size();
 
   connect(m_tgt_dtc.get(), &Interface::Dtc::targetAreaAssignmentChanged,
           this, &AssignmentParticipantModel::onTargetAreaAssignmentChanged);
@@ -105,7 +105,7 @@ bool AssignmentParticipantModel::initModel(const std::shared_ptr<TargetManagemen
     auto cb = [this](const TargetManagement::TargetAreaAssignment & d) { onTargetAreaAssignmentChanged(d, DataModification::eAdded); };
     m_tgt_dtc->targetAreaAssignments(cb);
   }
-  INFO_LOG() << "initModel - #targetAreaAssignments.size(): " << targetAreaAssignments.size() << " DONE";
+  INFO_LOG(m_logger) << "initModel - #targetAreaAssignments.size(): " << targetAreaAssignments.size() << " DONE";
 
   
   connect(this, &AssignmentParticipantModel::rowsInserted, this, &AssignmentParticipantModel::updateColumnFilter);
@@ -210,7 +210,7 @@ QVariant handleIsDefault(const TargetManagement::TargetAreaAssignment &assignmen
 
 QVariant AssignmentParticipantModel::data(const QModelIndex &index, int role) const
 {
-  INFO_LOG() << Q_FUNC_INFO << " role=" << role
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " role=" << role
                      << " index = " << index.column();
 
   if (!indexIsValid(index))
@@ -465,7 +465,7 @@ int AssignmentParticipantModel::findRowForAreaTargetParticipantId(int areaId, in
 
 void AssignmentParticipantModel::addGapFillerForArea(int areaId)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START, areaId=" << areaId;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, areaId=" << areaId;
 
   const QSet<int> &associatedParticipantIds = getAssociatedParticipantIdsForArea(areaId);
 
@@ -509,12 +509,12 @@ void AssignmentParticipantModel::addGapFillerForArea(int areaId)
 #endif
 
   this->insertRows(gapFillers);
-  DEBUG_LOG() << Q_FUNC_INFO << " END, areaId=" << areaId;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END, areaId=" << areaId;
 }
 
 void AssignmentParticipantModel::addGapFillerForTargetParticipantId(int targetParticipantId)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START, targetParticipantId=" << targetParticipantId;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, targetParticipantId=" << targetParticipantId;
 
   const QSet<int> &associatedAreaIds = getAssociatedAreasIdsForParticipantId(targetParticipantId);
 
@@ -535,19 +535,19 @@ void AssignmentParticipantModel::addGapFillerForTargetParticipantId(int targetPa
   m_tgt_dtc->shootbackAreas(cb);
 
   this->insertRows(gapFillers);
-  DEBUG_LOG() << Q_FUNC_INFO << " END, targetParticipantId=" << targetParticipantId;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END, targetParticipantId=" << targetParticipantId;
 }
 
 void AssignmentParticipantModel::onTargetAreaAssignmentChanged(const TargetManagement::TargetAreaAssignment &data,
                                                                DataModification modType)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " modType=" << modType << " data=" << data;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " modType=" << modType << " data=" << data;
 
   
   if (modType == DataModification::eAdded)
   {
     int row = findRowForAreaTargetParticipantId(data.areaId(), data.targetParticipantId());
-    DEBUG_LOG() << Q_FUNC_INFO << " row=" << row;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " row=" << row;
     if (row >= 0)
     {
       setRowData(row, data);
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 4bcfe24ad..af9389d5b 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
@@ -87,7 +87,7 @@ QString ParticipantHandler::target_wmsTypeClassToString(const ParticipantManagem
 
 void ParticipantHandler::onShootbackTargetChanged(const TargetManagement::ShootbackTarget &data, const DataModification modType)
 {
-  INFO_LOG() << "onShootbackTargetChanged: " << data << ", " << modType;
+  INFO_LOG(m_logger) << "onShootbackTargetChanged: " << data << ", " << modType;
 
   switch (modType)
   {
@@ -104,7 +104,7 @@ void ParticipantHandler::onShootbackTargetChanged(const TargetManagement::Shootb
 void ParticipantHandler::onTypeChanged(const ParticipantManagement::Type  &data,
                                        const DataModification modType)
 {
-  INFO_LOG() << "onTypeChanged:" << data << ", " << modType;
+  INFO_LOG(m_logger) << "onTypeChanged:" << data << ", " << modType;
 
   switch (modType)
   {
@@ -121,7 +121,7 @@ void ParticipantHandler::onTypeChanged(const ParticipantManagement::Type  &data,
 void ParticipantHandler::onParticipantChanged(const ParticipantManagement::Participant &data,
                                               DataModification modType)
 {
-  TRACE_LOG() << "onParticipantChanged: " << data << ", " << modType;
+  TRACE_LOG(m_logger) << "onParticipantChanged: " << data << ", " << modType;
 
   if (data.isDeleted())
     modType = DataModification::eRemoved;
@@ -137,7 +137,7 @@ void ParticipantHandler::onParticipantChanged(const ParticipantManagement::Parti
   case DataModification::eModified:
   case DataModification::eAdded:
   {
-    DEBUG_LOG() << "DataModification::eAdded Participant"
+    DEBUG_LOG(m_logger) << "DataModification::eAdded Participant"
                         << " Id=" << dataId
                         << " TypeId=" << data.typeId()
                         << " eqId=" << (data.equipmentNumber().is_set() ? data.equipmentNumber().get() : -1)
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 6ba3ecdd0..d8b3be9a7 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
@@ -37,11 +37,11 @@ bool ShootbackTargetEdit::init(const std::shared_ptr<TargetManagement::Interface
                                TargetParticipantModel *targetParticipantModel,
                                const TargetManagement::ShootbackTarget &target)
 {
-  DEBUG_LOG() << "ShootbackTargetEdit::init()";
+  DEBUG_LOG(m_logger) << "ShootbackTargetEdit::init()";
 
   if (!dtc || !ftc)
   {
-    ERROR_LOG() << "ShootbackTargetEdit::init() Invalid shared_ptr!";
+    ERROR_LOG(m_logger) << "ShootbackTargetEdit::init() Invalid shared_ptr!";
     return false;
   }
 
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 c48bdbe1d..30459e755 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
@@ -65,7 +65,7 @@ bool AssignmentDialog::init(MODE mode, int idAccordingToMode)
     return false;
 
   
-  INFO_LOG() << "AssignmentDialog::init";
+  INFO_LOG(m_logger) << "AssignmentDialog::init";
   m_assignmentParticipantModel = new AssignmentParticipantModel(this);
   m_assignmentParticipantModel->initModel(m_dtc, m_ppmDtc, m_ppmGuiCbxIfc, m_session);
 
@@ -246,13 +246,13 @@ void AssignmentDialog::keyPressEvent(QKeyEvent *event)
 
 void AssignmentDialog::onNewAssignment()
 {
-  INFO_LOG() << "onNew";
+  INFO_LOG(m_logger) << "onNew";
 
   AssignmentEditDialog *dialog = new AssignmentEditDialog(this);
 
   if (!dialog->init(m_dtc, m_ftc, m_assignmentParticipantModel))
   {
-    ERROR_LOG() << QLatin1String("Can't initialize AssignmentEditDialog!");
+    ERROR_LOG(m_logger) << QLatin1String("Can't initialize AssignmentEditDialog!");
     delete dialog;
     return;
   }
@@ -290,10 +290,10 @@ void AssignmentDialog::onEditAssignment()
 
   const TargetAreaAssignment &assignment = m_assignmentParticipantModel->getRowData(curIdx.row());
 
-  DEBUG_LOG() << " 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() << Q_FUNC_INFO << QLatin1String("Can't initialize ShootbackTarget!");
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << QLatin1String("Can't initialize ShootbackTarget!");
     delete dialog;
     return;
   }
@@ -308,7 +308,7 @@ void AssignmentDialog::onEditAssignment()
 
 void AssignmentDialog::onUpdateItem(const TargetAreaAssignment &assignment)
 {
-  INFO_LOG() << Q_FUNC_INFO << " got item to update, item=" << assignment;
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " got item to update, item=" << assignment;
 
   if (assignment.id()>0)
   {
@@ -317,7 +317,7 @@ void AssignmentDialog::onUpdateItem(const TargetAreaAssignment &assignment)
     
     QModelIndex mi = m_assignmentParticipantModel->findIndexForId(assignment.id());
     int row = mi.row();
-    INFO_LOG() << Q_FUNC_INFO << " got item to update, row=" << row;
+    INFO_LOG(m_logger) << Q_FUNC_INFO << " got item to update, row=" << row;
     if (row < 0)
     {
       abort();
@@ -329,7 +329,7 @@ void AssignmentDialog::onUpdateItem(const TargetAreaAssignment &assignment)
       if (m_assignmentParticipantModel->getRowData(row) != assignment)
       {
         m_assignmentParticipantModel->setRowData(row, assignment);
-        INFO_LOG() << Q_FUNC_INFO << "  CHANGED  CHANGED CHANGED CHANGED CHANGED, row = " << row;
+        INFO_LOG(m_logger) << Q_FUNC_INFO << "  CHANGED  CHANGED CHANGED CHANGED CHANGED, row = " << row;
         slotChangesMade();
       }
     }
@@ -339,18 +339,18 @@ void AssignmentDialog::onUpdateItem(const TargetAreaAssignment &assignment)
     
     
     int row = m_assignmentParticipantModel->findRowForAreaTargetParticipantId(assignment.areaId(), assignment.targetParticipantId());
-    INFO_LOG() << Q_FUNC_INFO << " got item to update, row=" << row;
+    INFO_LOG(m_logger) << Q_FUNC_INFO << " got item to update, row=" << row;
     if (row < 0)
     {
       m_assignmentParticipantModel->insertRow(assignment);
-      INFO_LOG() << Q_FUNC_INFO << "  CHANGED  CHANGED CHANGED CHANGED CHANGED";
+      INFO_LOG(m_logger) << Q_FUNC_INFO << "  CHANGED  CHANGED CHANGED CHANGED CHANGED";
     }
     else
     {
       if (m_assignmentParticipantModel->getRowData(row) != assignment)
       {
         m_assignmentParticipantModel->setRowData(row, assignment);
-        INFO_LOG() << Q_FUNC_INFO << "  CHANGED  CHANGED CHANGED CHANGED CHANGED, row = " << row;
+        INFO_LOG(m_logger) << Q_FUNC_INFO << "  CHANGED  CHANGED CHANGED CHANGED CHANGED, row = " << row;
         slotChangesMade();
       }
     }
@@ -396,7 +396,7 @@ QByteArray AssignmentDialog::toJson() const
   }
   QJsonDocument doc(obj);
 
-  DEBUG_LOG() << " json = " << doc.toJson();
+  DEBUG_LOG(m_logger) << " json = " << doc.toJson();
 
   return doc.toJson(QJsonDocument::Compact);
 }
@@ -440,7 +440,7 @@ QVector<TargetManagement::TargetAreaAssignment> AssignmentDialog::fromJson(const
 
 bool AssignmentDialog::apply()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " APPLY";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " APPLY";
 
   const QVector<TargetAreaAssignment> &assignments = m_assignmentParticipantModel->getData();
   for (const TargetAreaAssignment &updateCandidate : std::as_const(assignments))
@@ -451,9 +451,9 @@ bool AssignmentDialog::apply()
     if (updateCandidate.isActive() && isDefault(updateCandidate.configuration()))
     {
       
-      ERROR_LOG() << Q_FUNC_INFO << " APPLY NOT ALLOWED - Invalid configuration provided for at least one active assignment";
-      ERROR_LOG() << Q_FUNC_INFO << " APPLY NOT ALLOWED - Invalid configuration provided for at least one active assignment";
-      ERROR_LOG() << Q_FUNC_INFO << " updateCandidate " << updateCandidate;
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " APPLY NOT ALLOWED - Invalid configuration provided for at least one active assignment";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " APPLY NOT ALLOWED - Invalid configuration provided for at least one active assignment";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " updateCandidate " << updateCandidate;
 
       QMessageBox::warning(this, tr("No configuration"),
                            tr("Invalid configuration provided for at least one active assignment.")
@@ -468,7 +468,7 @@ bool AssignmentDialog::apply()
     bool isGapFiller = (assignmentId <= 0);
     if (!isEqual(curAssignment, updateCandidate, isGapFiller))
     {
-      INFO_LOG() << Q_FUNC_INFO << " add request for: assignmentId:" << assignmentId
+      INFO_LOG(m_logger) << Q_FUNC_INFO << " add request for: assignmentId:" << assignmentId
                           << " name: " << QString::fromStdString(updateCandidate.name());
       m_requestHelper->addRequest([this, updateCandidate]()
       {
@@ -493,14 +493,14 @@ void AssignmentDialog::onExportButtonClicked()
   QByteArray byteArray = toJson();
   int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
   if (fileId > 0)
-    DEBUG_LOG() << Q_FUNC_INFO << "Saved file with id = " << fileId;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << "Saved file with id = " << fileId;
   else
-    ERROR_LOG() << Q_FUNC_INFO << "Could not save file in library ";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << "Could not save file in library ";
 }
 
 void AssignmentDialog::onImportButtonClicked()
 {
-  INFO_LOG() << Q_FUNC_INFO << "--- onImportButtonClicked() ";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << "--- onImportButtonClicked() ";
 
   QHash<LtsWidgets::Button, QString>  buttonTexts;
   buttonTexts.insert(LtsWidgets::Button::Ok,     tr("Overwrite"));
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 8dfb79362..2b9d01771 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
@@ -39,11 +39,11 @@ bool AssignmentEditDialog::init(const std::shared_ptr<TargetManagement::Interfac
                                 AssignmentParticipantModel *assignmentParticipantModel,
                                 const TargetManagement::TargetAreaAssignment &assignment)
 {
-  DEBUG_LOG() << "AssignmentEditDialog::init(), assignment=" << assignment;
+  DEBUG_LOG(m_logger) << "AssignmentEditDialog::init(), assignment=" << assignment;
 
   if (!dtc || !ftc)
   {
-    ERROR_LOG() << "AssignmentEditDialog::init() Invalid shared_ptr!";
+    ERROR_LOG(m_logger) << "AssignmentEditDialog::init() Invalid shared_ptr!";
     return false;
   }
 
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 6c88f11d3..f5e0014f4 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
@@ -63,7 +63,7 @@ bool TargetPartDialog::init(TargetManagement::TargetPartDialog::MODE mode)
     return false;
 
   
-  INFO_LOG() << "TargetPartDialog::init";
+  INFO_LOG(m_logger) << "TargetPartDialog::init";
   m_targetParticipantModel = new TargetParticipantModel(this);
   m_targetParticipantModel->initModel(m_dtc, m_ppmDtc, m_ppmGuiCbxIfc, m_session);
 
@@ -189,13 +189,13 @@ void TargetPartDialog::retranslate()
 
 void TargetPartDialog::onNewTargetPart()
 {
-  INFO_LOG() << "onNewTargetPart";
+  INFO_LOG(m_logger) << "onNewTargetPart";
 
   ShootbackTargetEdit *dialog = new ShootbackTargetEdit(this);
 
   if (!dialog->init(m_dtc, m_ftc, m_targetParticipantModel))
   {
-    ERROR_LOG() << QLatin1String("Can't initialize shootbackTargetEdit!");
+    ERROR_LOG(m_logger) << QLatin1String("Can't initialize shootbackTargetEdit!");
     delete dialog;
     return;
   }
@@ -228,7 +228,7 @@ void TargetPartDialog::onEditTargetPart()
   const QModelIndex curIdx = selectedRows.first();
   if (!curIdx.isValid())
     return;
-  INFO_LOG() << " onEditTargetPart";
+  INFO_LOG(m_logger) << " onEditTargetPart";
 
   ShootbackTargetEdit *dialog = new ShootbackTargetEdit(this);
 
@@ -236,7 +236,7 @@ void TargetPartDialog::onEditTargetPart()
 
   if (!dialog->init(m_dtc, m_ftc, m_targetParticipantModel, tgt))
   {
-    ERROR_LOG() << Q_FUNC_INFO << QLatin1String("Can't initialize shootbackTargetEdit!");
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << QLatin1String("Can't initialize shootbackTargetEdit!");
     delete dialog;
     return;
   }
@@ -283,7 +283,7 @@ QByteArray TargetPartDialog::toJson() const
   }
   QJsonDocument doc(obj);
 
-  DEBUG_LOG() << " json = " << doc.toJson();
+  DEBUG_LOG(m_logger) << " json = " << doc.toJson();
 
   return doc.toJson(QJsonDocument::Compact);
 }
@@ -330,9 +330,9 @@ void TargetPartDialog::onExportButtonClicked()
   QByteArray byteArray = toJson();
   int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
   if (fileId > 0)
-    DEBUG_LOG() << Q_FUNC_INFO << "Saved file with id = " << fileId;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << "Saved file with id = " << fileId;
   else
-    ERROR_LOG() << Q_FUNC_INFO << "Could not save file in library ";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << "Could not save file in library ";
 }
 
 void TargetPartDialog::onImportButtonClicked()
@@ -353,7 +353,7 @@ void TargetPartDialog::onImportButtonClicked()
 
 void TargetPartDialog::onImport()
 {
-  INFO_LOG() << Q_FUNC_INFO << "--- onImportButtonClicked() ";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << "--- onImportButtonClicked() ";
 
   QByteArray content;
   int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml},
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 a220d6023..9cb3dafde 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
@@ -73,7 +73,7 @@ bool TargetParticipantModel::initModel(const std::shared_ptr<TargetManagement::I
 
   
   const QMap<qint32, TargetManagement::ShootbackTarget> targetParticipants = m_tgt_dtc->shootbackTargets();
-  INFO_LOG() << "initModel - #TargetParticipantModel: " << targetParticipants.size();
+  INFO_LOG(m_logger) << "initModel - #TargetParticipantModel: " << targetParticipants.size();
 
   connect(m_tgt_dtc.get(), &Interface::Dtc::shootbackTargetChanged,
           this, &TargetParticipantModel::onShootbackTargetChanged);
@@ -150,7 +150,7 @@ QVariant TargetParticipantModel::headerData(int section, Qt::Orientation orienta
 
 QVariant TargetParticipantModel::data(const QModelIndex &index, int role) const
 {
-  INFO_LOG() << Q_FUNC_INFO << " role=" << role
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " role=" << role
                      << " index = " << index.column();
 
   if (!indexIsValid(index))
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 2cd87b976..65b37799c 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
@@ -134,7 +134,7 @@ TimelineDataProvider::TimelineDataProvider(int requestId, const QUrl &url,
 
   realUrl.setQuery(query);
   m_webSocketEem->open(realUrl);
-  DEBUG_LOG() << "requesting data from EEM: " << realUrl.toString();
+  DEBUG_LOG(m_logger) << "requesting data from EEM: " << realUrl.toString();
 }
 
 TimelineDataProvider::~TimelineDataProvider()
@@ -157,13 +157,13 @@ void TimelineDataProvider::textMessageFromEem(const QString &message)
 {
   if (message.isEmpty() || message == QStringLiteral("{}"))
   {
-    DEBUG_LOG() << "textMessageFromEem - finished";
+    DEBUG_LOG(m_logger) << "textMessageFromEem - finished";
     disconnectedFromEem();
     return;
   }
   const QJsonDocument doc(QJsonDocument::fromJson(message.toUtf8()));
   const QJsonArray arr = doc.array();
-  DEBUG_LOG() << "textMessageFromEem - #events: " << arr.size();
+  DEBUG_LOG(m_logger) << "textMessageFromEem - #events: " << arr.size();
   m_eventData.reserve(m_eventData.size() + arr.size());
   using namespace ExerciseEventManagement::Database;
   std::transform(arr.begin(), arr.end(),
@@ -175,7 +175,7 @@ TimelineDataProviderInterface *ForeignInterfaceImpl::requestData(qint64 from, qi
 {
   if (!m_webSocketEem)
   {
-    WARNING_LOG() << "No connection to EEM - can not request data!";
+    WARNING_LOG(m_logger) << "No connection to EEM - can not request data!";
     return nullptr;
   }
   static int s_requestId = 0;
@@ -185,7 +185,7 @@ TimelineDataProviderInterface *ForeignInterfaceImpl::requestData(qint64 from, qi
   connect(tldp, &TimelineDataProvider::finished, this, &ForeignInterfaceImpl::requestFinished);
   connect(tldp, &TimelineDataProvider::destroyed, this, [this, curRequestId]() { m_pendingRequests.remove(curRequestId);});
   m_pendingRequests[curRequestId] = tldp;
-  DEBUG_LOG() << "add to m_pendingRequests: " << curRequestId << ", " << tldp;
+  DEBUG_LOG(m_logger) << "add to m_pendingRequests: " << curRequestId << ", " << tldp;
   return tldp;
 }
 
@@ -208,26 +208,26 @@ void ForeignInterfaceImpl::connectToScm()
   const QUrl scmUrl(QStringLiteral("ws://%1:%2")
                     .arg(NGL::Connections::hostName(NGL::Connections::eConnection::SCM_WEBSOCKET))
                     .arg(NGL::Connections::port(NGL::Connections::eConnection::SCM_WEBSOCKET)));
-  DEBUG_LOG() << "Trying to connect to SCM at " << scmUrl.toString();
+  DEBUG_LOG(m_logger) << "Trying to connect to SCM at " << scmUrl.toString();
   m_webSocketScm->open(scmUrl);
 }
 
 void ForeignInterfaceImpl::connectedToScm()
 {
-  DEBUG_LOG() << "Connected to SCM...";
+  DEBUG_LOG(m_logger) << "Connected to SCM...";
   m_webSocketScm->sendTextMessage(QStringLiteral("{\"type\": \"servicePortsInformationRequest\",\"uuid\": \"7777\"}"));
 }
 
 void ForeignInterfaceImpl::textMessageFromScm(const QString &message)
 {
-  DEBUG_LOG() << "textMessageFromScm from scm: " << message;
+  DEBUG_LOG(m_logger) << "textMessageFromScm from scm: " << message;
   const QJsonDocument doc = QJsonDocument::fromJson(message.toUtf8());
   const QJsonArray exercises = doc.object().value(QStringLiteral("data")).toArray();
   for (const QJsonValue &valEx : exercises)
   {
     const QJsonObject &exercise = valEx.toObject();
     const int exerciseId = exercise.value(QStringLiteral("exerciseId")).toInt();
-    DEBUG_LOG() << "textMessageFromScm from scm - exerciseId " << exerciseId;
+    DEBUG_LOG(m_logger) << "textMessageFromScm from scm - exerciseId " << exerciseId;
 
     if (exerciseId != m_session->exerciseId())
       continue;
@@ -237,7 +237,7 @@ void ForeignInterfaceImpl::textMessageFromScm(const QString &message)
     {
       const QJsonObject &service = valSvc.toObject();
       const QString svcName = service.value(QStringLiteral("nameAbbrevation")).toString().toUpper();
-      DEBUG_LOG() << "textMessageFromScm from scm - svcName " << svcName;
+      DEBUG_LOG(m_logger) << "textMessageFromScm from scm - svcName " << svcName;
 
       if (svcName != QStringLiteral("EEM"))
         continue;
@@ -272,24 +272,24 @@ void ForeignInterfaceImpl::connectToEem()
           this, &ForeignInterfaceImpl::textMessageFromEem);
   QUrl url(eemUrl());
   url.setPath(QStringLiteral("/live"));
-  DEBUG_LOG() << "Trying to connect to EEM at " << url.toString();
+  DEBUG_LOG(m_logger) << "Trying to connect to EEM at " << url.toString();
   m_webSocketEem->open(url);
 }
 
 void ForeignInterfaceImpl::connectedToEem()
 {
-  DEBUG_LOG() << "Connected to EEM...";
+  DEBUG_LOG(m_logger) << "Connected to EEM...";
 }
 
 void ForeignInterfaceImpl::disconnectedFromEem()
 {
-  WARNING_LOG() << "EEM connection closed - try to reconnect";
+  WARNING_LOG(m_logger) << "EEM connection closed - try to reconnect";
   QTimer::singleShot(500, this, &ForeignInterfaceImpl::connectToScm);
 }
 
 void ForeignInterfaceImpl::textMessageFromEem(const QString &message)
 {
-  TRACE_LOG() << "textMessageFromEem: " << message;
+  TRACE_LOG(m_logger) << "textMessageFromEem: " << message;
 
   const QJsonObject obj(QJsonDocument::fromJson(message.toUtf8()).object());
   using namespace ExerciseEventManagement::Database;
@@ -303,16 +303,16 @@ void ForeignInterfaceImpl::requestFinished()
   TimelineDataProvider *tldp = qobject_cast<TimelineDataProvider *>(sender());
   if (!tldp)
   {
-    WARNING_LOG() << "requestFinished without valid sender";
+    WARNING_LOG(m_logger) << "requestFinished without valid sender";
     return;
   }
   auto it = m_pendingRequests.find(tldp->requestId());
   if (it == m_pendingRequests.end())
   {
-    WARNING_LOG() << "requestFinished but request not found in pending requests: " << tldp->requestId() << ", " << tldp;
+    WARNING_LOG(m_logger) << "requestFinished but request not found in pending requests: " << tldp->requestId() << ", " << tldp;
     return;
   }
-  DEBUG_LOG() << "emit requestedDataAvailable for " << tldp->requestId() << ", #events: " << tldp->eventData().size() << ", " << tldp;
+  DEBUG_LOG(m_logger) << "emit requestedDataAvailable for " << tldp->requestId() << ", #events: " << tldp->eventData().size() << ", " << tldp;
   emit requestedDataAvailable(it.value());
   it.value()->deleteLater();
   m_pendingRequests.erase(it);
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 8c9c0c737..63a1bcc9c 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
@@ -44,6 +44,8 @@ public:
   std::shared_ptr<TimeLineManagement::ForeignDataInterface> getForeignDataInterface() override { return m_foreign; }
 
 private:
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<TimeLineManagement::ForeignDataInterface> m_foreign;
 };
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BCContamination/tln_bccontamination_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BCContamination/tln_bccontamination_event_factory.h
index 668b6fa65..e9fe79519 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BCContamination/tln_bccontamination_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BCContamination/tln_bccontamination_event_factory.h
@@ -22,6 +22,8 @@ public:
   AbstractEventFilter *createFilter() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BCContamination/tln_bccontamination_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BCContamination/tln_bccontamination_filter.h
index 37a543cf7..0cf694719 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BCContamination/tln_bccontamination_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BCContamination/tln_bccontamination_filter.h
@@ -28,6 +28,8 @@ public:
   QWidget *widget() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BCContamination/tln_bccontamination_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BCContamination/tln_bccontamination_item.h
index ea9d3c361..55c433b9d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BCContamination/tln_bccontamination_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BCContamination/tln_bccontamination_item.h
@@ -21,6 +21,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BiteMessage/tln_bite_message_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BiteMessage/tln_bite_message_event_factory.h
index 6bd6a0c8a..5f0fc711a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BiteMessage/tln_bite_message_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BiteMessage/tln_bite_message_event_factory.h
@@ -26,6 +26,8 @@ public:
   AbstractEventFilter *createFilter() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   BiteMessageFilter *m_filter{nullptr};
 };
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BiteMessage/tln_bite_message_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BiteMessage/tln_bite_message_filter.h
index a0e9b7109..b7b98decb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BiteMessage/tln_bite_message_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BiteMessage/tln_bite_message_filter.h
@@ -24,6 +24,8 @@ public:
   bool check(const AbstractEventItem &item) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   void updateFilterString() override;
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BiteMessage/tln_bite_message_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BiteMessage/tln_bite_message_item.h
index c51b3d583..bdf5c0475 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BiteMessage/tln_bite_message_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/BiteMessage/tln_bite_message_item.h
@@ -26,6 +26,8 @@ public:
   void addItemInfoRows(QFormLayout *) override {}
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Borderline/tln_borderline_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Borderline/tln_borderline_event_factory.h
index a8feb18f7..e74f85085 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Borderline/tln_borderline_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Borderline/tln_borderline_event_factory.h
@@ -22,6 +22,8 @@ public:
   AbstractEventFilter *createFilter() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Borderline/tln_borderline_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Borderline/tln_borderline_filter.h
index 885bf4070..4f35c14f9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Borderline/tln_borderline_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Borderline/tln_borderline_filter.h
@@ -28,6 +28,8 @@ public:
   QWidget *widget() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Borderline/tln_borderline_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Borderline/tln_borderline_item.h
index bcbdb5c1a..61d8e8094 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Borderline/tln_borderline_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Borderline/tln_borderline_item.h
@@ -21,6 +21,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_event_factory.h
index d2a22f901..234a27b13 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_event_factory.h
@@ -34,6 +34,8 @@ public:
   AbstractEventFilter *createFilter() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   CameraVideoFilter *m_filter{nullptr};
 };
 
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 8fb0dffd2..2e621fef0 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
@@ -70,7 +70,7 @@ bool CameraVideoFilter::init(
   {
     if (!ismDtc)
     {
-      ERROR_LOG() << "Unable to load MainStructureElement IDs from ISM-DTC";
+      ERROR_LOG(m_logger) << "Unable to load MainStructureElement IDs from ISM-DTC";
       return false;
     }
 
@@ -86,7 +86,7 @@ bool CameraVideoFilter::init(
   {
     if (!m_avmDtc || !m_avmDataIfc || !m_avmDataIfc->hasAvsSession() || !m_avmDataIfc->menus())
     {
-      ERROR_LOG() << "Unable to load Video Menus";
+      ERROR_LOG(m_logger) << "Unable to load Video Menus";
       return false;
     }
 
@@ -109,7 +109,7 @@ bool CameraVideoFilter::init(
         if (newActiveVideoMenu == m_activeVideoMenu)
           return;
 
-        DEBUG_LOG() << "Changed active video menu from: " << m_activeVideoMenu << ", to: " << newActiveVideoMenu;
+        DEBUG_LOG(m_logger) << "Changed active video menu from: " << m_activeVideoMenu << ", to: " << newActiveVideoMenu;
 
         m_activeVideoMenu = newActiveVideoMenu;
 
@@ -375,7 +375,7 @@ QStringList CameraVideoFilter::getInternalStreamNamesBySelectedStreams() const
   
   if (!m_avmDtc)
   {
-    ERROR_LOG() << "Unable to get internal stream names (avm dtc missing)";
+    ERROR_LOG(m_logger) << "Unable to get internal stream names (avm dtc missing)";
     return {};
   }
 
@@ -447,7 +447,7 @@ void CameraVideoFilter::onMainStructureElementChanged(const InfrastructureManage
 
   if (parseError.error != QJsonParseError::NoError)
   {
-    INFO_LOG() << "Could not parse JSON props of building with ID "
+    INFO_LOG(m_logger) << "Could not parse JSON props of building with ID "
                        << data.id()
                        << ". Reason: "
                        << parseError.errorString()
@@ -493,7 +493,7 @@ void CameraVideoFilter::onStreamListReceived(const QMap<QString, QString> &mapIn
 {
   if (!m_avmDtc)
   {
-    ERROR_LOG() << "Unable to load Video Menus";
+    ERROR_LOG(m_logger) << "Unable to load Video Menus";
     return;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_filter.h
index ea588d459..cd8827531 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_filter.h
@@ -44,6 +44,8 @@ public:
   static const std::vector<int> s_excluded_mse_ids;
 
 private:
+
+NGL::INGLLogger &m_logger;
   void updateMenuStreams();
   void updateFilterString() override;
   QStringList getInternalStreamNamesBySelectedStreams() const;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_item.cpp
index 791028def..11490d8fc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_item.cpp
@@ -53,7 +53,7 @@ void CameraVideoItem::addItemInfoRows(QFormLayout *form)
   CameraVideoFilter *filter = static_cast<CameraVideoFilter *>(m_factory->filter());
   if (!filter)
   {
-    ERROR_LOG() << "CameraVideoFilter unavailable";
+    ERROR_LOG(m_logger) << "CameraVideoFilter unavailable";
     return;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_item.h
index a5fa90a4a..56f07d95c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_item.h
@@ -29,6 +29,8 @@ public:
   QString internalStreamName() const { return m_streamName; }
 
 private:
+
+NGL::INGLLogger &m_logger;
   int m_mainStructureElementId;
   QString m_streamName;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_event_factory.h
index 51160853d..604672efd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_event_factory.h
@@ -28,6 +28,8 @@ public:
   AbstractEventFilter *createFilter() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   CrossBorderlineFilter *m_filter{nullptr};
 };
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_filter.h
index f8c14c341..f48f2d8d3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_filter.h
@@ -21,6 +21,8 @@ public:
   bool check(const AbstractEventItem &item) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   void updateFilterString() override;
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_item.cpp
index e18b57251..7eea7284d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_item.cpp
@@ -62,7 +62,7 @@ void CrossBorderlineItem::addItemInfoRows(QFormLayout *form)
   CrossBorderlineFilter *filter = static_cast<CrossBorderlineFilter *>(m_factory->filter());
   if (!filter)
   {
-    ERROR_LOG() << "CrossBorderlineFilter unavailable";
+    ERROR_LOG(m_logger) << "CrossBorderlineFilter unavailable";
     return;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_item.h
index f2f3a85cc..2eb5c387a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_item.h
@@ -26,6 +26,8 @@ public:
   void addItemInfoRows(QFormLayout *form) override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/DangerArea/tln_danger_area_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/DangerArea/tln_danger_area_event_factory.h
index 522605282..a14fbf628 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/DangerArea/tln_danger_area_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/DangerArea/tln_danger_area_event_factory.h
@@ -22,6 +22,8 @@ public:
   AbstractEventFilter *createFilter() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/DangerArea/tln_danger_area_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/DangerArea/tln_danger_area_filter.h
index 13fc037ea..07c4063c2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/DangerArea/tln_danger_area_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/DangerArea/tln_danger_area_filter.h
@@ -28,6 +28,8 @@ public:
   QWidget *widget() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/DangerArea/tln_danger_area_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/DangerArea/tln_danger_area_item.h
index 2b5f43efa..880f27f7b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/DangerArea/tln_danger_area_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/DangerArea/tln_danger_area_item.h
@@ -21,6 +21,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EmergencyCall/tln_emergency_call_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EmergencyCall/tln_emergency_call_event_factory.h
index e45bf4a26..442a80353 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EmergencyCall/tln_emergency_call_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EmergencyCall/tln_emergency_call_event_factory.h
@@ -22,6 +22,8 @@ public:
   AbstractEventFilter *createFilter() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EmergencyCall/tln_emergency_call_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EmergencyCall/tln_emergency_call_filter.h
index ca7fa5844..b07c087a4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EmergencyCall/tln_emergency_call_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EmergencyCall/tln_emergency_call_filter.h
@@ -28,6 +28,8 @@ public:
   QWidget *widget() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EmergencyCall/tln_emergency_call_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EmergencyCall/tln_emergency_call_item.h
index 66bd75f0d..449e2ae76 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EmergencyCall/tln_emergency_call_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EmergencyCall/tln_emergency_call_item.h
@@ -21,6 +21,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index, const LtsUtils::QPoint3D &position) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterDangerArea/tln_enter_danger_area_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterDangerArea/tln_enter_danger_area_event_factory.h
index 1aea8bc45..e517d0095 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterDangerArea/tln_enter_danger_area_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterDangerArea/tln_enter_danger_area_event_factory.h
@@ -22,6 +22,8 @@ public:
   AbstractEventFilter *createFilter() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterDangerArea/tln_enter_danger_area_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterDangerArea/tln_enter_danger_area_filter.h
index d076ebb2e..dfddb57c8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterDangerArea/tln_enter_danger_area_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterDangerArea/tln_enter_danger_area_filter.h
@@ -26,6 +26,8 @@ public:
   QWidget *widget() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterDangerArea/tln_enter_danger_area_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterDangerArea/tln_enter_danger_area_item.h
index 91e9ac996..45d75801b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterDangerArea/tln_enter_danger_area_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterDangerArea/tln_enter_danger_area_item.h
@@ -21,6 +21,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterFunctionalArea/tln_enter_functional_area_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterFunctionalArea/tln_enter_functional_area_event_factory.h
index 296c7be35..9b493bb45 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterFunctionalArea/tln_enter_functional_area_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterFunctionalArea/tln_enter_functional_area_event_factory.h
@@ -22,6 +22,8 @@ public:
   AbstractEventFilter *createFilter() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterFunctionalArea/tln_enter_functional_area_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterFunctionalArea/tln_enter_functional_area_filter.h
index fecad3a51..ae6208e85 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterFunctionalArea/tln_enter_functional_area_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterFunctionalArea/tln_enter_functional_area_filter.h
@@ -26,6 +26,8 @@ public:
   QWidget *widget() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterFunctionalArea/tln_enter_functional_area_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterFunctionalArea/tln_enter_functional_area_item.h
index e1a4d814a..9fd0eda16 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterFunctionalArea/tln_enter_functional_area_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterFunctionalArea/tln_enter_functional_area_item.h
@@ -21,6 +21,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterMineArea/tln_enter_mine_area_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterMineArea/tln_enter_mine_area_event_factory.h
index c81c547c4..21e501381 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterMineArea/tln_enter_mine_area_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterMineArea/tln_enter_mine_area_event_factory.h
@@ -22,6 +22,8 @@ public:
   AbstractEventFilter *createFilter() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterMineArea/tln_enter_mine_area_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterMineArea/tln_enter_mine_area_filter.h
index 1396a63a2..8d562972c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterMineArea/tln_enter_mine_area_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterMineArea/tln_enter_mine_area_filter.h
@@ -25,6 +25,8 @@ public:
   QStringList attributeNames() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterMineArea/tln_enter_mine_area_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterMineArea/tln_enter_mine_area_item.h
index 520cf1643..fa8d83cce 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterMineArea/tln_enter_mine_area_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterMineArea/tln_enter_mine_area_item.h
@@ -21,6 +21,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterNuclear/tln_enter_nuclear_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterNuclear/tln_enter_nuclear_event_factory.h
index f6b7edc7a..1247c0ecc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterNuclear/tln_enter_nuclear_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterNuclear/tln_enter_nuclear_event_factory.h
@@ -22,6 +22,8 @@ public:
   AbstractEventFilter *createFilter() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterNuclear/tln_enter_nuclear_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterNuclear/tln_enter_nuclear_filter.h
index 13eff8dc1..47bf8ee66 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterNuclear/tln_enter_nuclear_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterNuclear/tln_enter_nuclear_filter.h
@@ -26,6 +26,8 @@ public:
   QWidget *widget() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterNuclear/tln_enter_nuclear_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterNuclear/tln_enter_nuclear_item.h
index d453792cc..d485333c4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterNuclear/tln_enter_nuclear_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EnterNuclear/tln_enter_nuclear_item.h
@@ -21,6 +21,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EquipmentErrorReport/tln_equipment_error_report_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EquipmentErrorReport/tln_equipment_error_report_event_factory.h
index 3b7b738b6..19b7bd451 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EquipmentErrorReport/tln_equipment_error_report_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EquipmentErrorReport/tln_equipment_error_report_event_factory.h
@@ -26,6 +26,8 @@ public:
   AbstractEventFilter *createFilter() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EquipmentErrorReport/tln_equipment_error_report_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EquipmentErrorReport/tln_equipment_error_report_filter.h
index 6c486d62c..d73b41ab9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EquipmentErrorReport/tln_equipment_error_report_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EquipmentErrorReport/tln_equipment_error_report_filter.h
@@ -28,6 +28,8 @@ public:
   QWidget *widget() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EquipmentErrorReport/tln_equipment_error_report_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EquipmentErrorReport/tln_equipment_error_report_item.h
index b95cc69b5..3b1e02cba 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EquipmentErrorReport/tln_equipment_error_report_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/EquipmentErrorReport/tln_equipment_error_report_item.h
@@ -21,6 +21,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_event_factory.h
index ff29e6638..3f7107251 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_event_factory.h
@@ -31,6 +31,8 @@ public:
   AbstractEventFilter *createFilter() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   FireEventFilter *m_filter{nullptr};
 };
 
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 d382c39cc..2153c8cdc 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
@@ -35,7 +35,7 @@ bool FireEventFilter::init(std::shared_ptr<ProjectDataManagement::Interface::Dtc
 {
   if (!pdmDtc)
   {
-    ERROR_LOG() << "PDM-DTC is not running";
+    ERROR_LOG(m_logger) << "PDM-DTC is not running";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_filter.h
index a1e9fbfa6..732cf44ae 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_filter.h
@@ -34,6 +34,8 @@ public:
   QString chargeType(int id) const { return m_pdmDtc->trChargeTypeShortName(id); }
 
 private:
+
+NGL::INGLLogger &m_logger;
   void updateFilterString() override;
 
 private slots:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_item.cpp
index fd7a48178..8c4f8374c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_item.cpp
@@ -58,7 +58,7 @@ void FireEventItem::addItemInfoRows(QFormLayout *form)
   FireEventFilter *filter = static_cast<FireEventFilter *>(m_factory->filter());
   if (!filter)
   {
-    ERROR_LOG() << "FireEventFilter unavailable";
+    ERROR_LOG(m_logger) << "FireEventFilter unavailable";
     return;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_item.h
index 711b29f4e..87c811945 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_item.h
@@ -26,6 +26,8 @@ public:
   void addItemInfoRows(QFormLayout *form) override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FriendlyFire/tln_friendly_fire_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FriendlyFire/tln_friendly_fire_event_factory.h
index e7596aac6..130182e51 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FriendlyFire/tln_friendly_fire_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FriendlyFire/tln_friendly_fire_event_factory.h
@@ -26,6 +26,8 @@ public:
   AbstractEventFilter *createFilter() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FriendlyFire/tln_friendly_fire_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FriendlyFire/tln_friendly_fire_filter.h
index ed7a87b28..853e42fc8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FriendlyFire/tln_friendly_fire_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FriendlyFire/tln_friendly_fire_filter.h
@@ -28,6 +28,8 @@ public:
   QWidget *widget() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FriendlyFire/tln_friendly_fire_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FriendlyFire/tln_friendly_fire_item.h
index 202719e20..339c8a91c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FriendlyFire/tln_friendly_fire_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FriendlyFire/tln_friendly_fire_item.h
@@ -21,6 +21,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FunctionalArea/tln_functional_area_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FunctionalArea/tln_functional_area_event_factory.h
index bfde93241..835d654bd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FunctionalArea/tln_functional_area_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FunctionalArea/tln_functional_area_event_factory.h
@@ -26,6 +26,8 @@ public:
   AbstractEventFilter *createFilter() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FunctionalArea/tln_functional_area_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FunctionalArea/tln_functional_area_filter.h
index 905261a33..05e697dd2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FunctionalArea/tln_functional_area_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FunctionalArea/tln_functional_area_filter.h
@@ -28,6 +28,8 @@ public:
   QWidget *widget() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FunctionalArea/tln_functional_area_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FunctionalArea/tln_functional_area_item.h
index f5d784adf..7c1dd9459 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FunctionalArea/tln_functional_area_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FunctionalArea/tln_functional_area_item.h
@@ -21,6 +21,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/GasPipe/tln_gas_pipe_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/GasPipe/tln_gas_pipe_event_factory.h
index 7dffa0212..db2cb009c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/GasPipe/tln_gas_pipe_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/GasPipe/tln_gas_pipe_event_factory.h
@@ -26,6 +26,8 @@ public:
   AbstractEventFilter *createFilter() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/GasPipe/tln_gas_pipe_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/GasPipe/tln_gas_pipe_filter.h
index 56ae3f425..14be94b71 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/GasPipe/tln_gas_pipe_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/GasPipe/tln_gas_pipe_filter.h
@@ -28,6 +28,8 @@ public:
   QWidget *widget() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/GasPipe/tln_gas_pipe_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/GasPipe/tln_gas_pipe_item.h
index 56396cb0d..d1956de70 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/GasPipe/tln_gas_pipe_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/GasPipe/tln_gas_pipe_item.h
@@ -21,6 +21,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_event_factory.h
index 36f3e8e10..78921d68d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_event_factory.h
@@ -34,6 +34,8 @@ public:
   AbstractEventFilter *createFilter() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   HitFilter *m_filter{nullptr};
 };
 
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 7f5e4068f..573418ef2 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
@@ -54,12 +54,12 @@ bool HitFilter::init(
 
   if (!m_ppmDtc)
   {
-    ERROR_LOG() << "PPM-DTC is not running";
+    ERROR_LOG(m_logger) << "PPM-DTC is not running";
     return false;
   }
   if (!m_pdmDtc)
   {
-    ERROR_LOG() << "PDM-DTC is not running";
+    ERROR_LOG(m_logger) << "PDM-DTC is not running";
     return false;
   }
 
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 3637fcb11..404399f58 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
@@ -45,6 +45,8 @@ public:
   QString party(int id) const { return ParticipantManagement::trPartyName(m_ppmDtc->party(id).name()); }
 
 private:
+
+NGL::INGLLogger &m_logger;
   void addOriginatorEquipmentNumberWidgetToLayout(QGridLayout *layout, LtsWidgets::LtsDialog *dialog) const;
 
   void updateFilterString() override;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_item.cpp
index 4a87cbc1f..ed2d70bbc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_item.cpp
@@ -59,7 +59,7 @@ void HitItem::addItemInfoRows(QFormLayout *form)
   HitFilter *filter = static_cast<HitFilter *>(m_factory->filter());
   if (!filter)
   {
-    ERROR_LOG() << "HitFilter unavailable";
+    ERROR_LOG(m_logger) << "HitFilter unavailable";
     return;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_item.h
index 9f3083679..2e1166c4a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_item.h
@@ -26,6 +26,8 @@ public:
   void addItemInfoRows(QFormLayout *form) override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitB/tln_hit_b_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitB/tln_hit_b_event_factory.h
index 575c59d69..58d9fd1df 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitB/tln_hit_b_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitB/tln_hit_b_event_factory.h
@@ -26,6 +26,8 @@ public:
   AbstractEventFilter *createFilter() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitB/tln_hit_b_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitB/tln_hit_b_filter.h
index 451fc0959..5918e8a98 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitB/tln_hit_b_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitB/tln_hit_b_filter.h
@@ -28,6 +28,8 @@ public:
   QWidget *widget() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitB/tln_hit_b_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitB/tln_hit_b_item.h
index b893da02b..a43bf3328 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitB/tln_hit_b_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitB/tln_hit_b_item.h
@@ -21,6 +21,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_event_factory.h
index 9797d7722..fd14310c7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_event_factory.h
@@ -37,6 +37,8 @@ public:
   AbstractEventFilter *createFilter() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   HitBuildingFilter *m_filter{nullptr};
 };
 
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 c4a2963f3..958cfe0ce 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
@@ -63,19 +63,19 @@ bool HitBuildingFilter::init(
 
   if (!m_ismDtc)
   {
-    ERROR_LOG() << "ISM-DTC is not running";
+    ERROR_LOG(m_logger) << "ISM-DTC is not running";
     return false;
   }
 
   if (!m_ppmDtc)
   {
-    ERROR_LOG() << "PPM-DTC is not running";
+    ERROR_LOG(m_logger) << "PPM-DTC is not running";
     return false;
   }
 
   if (!m_pdmDtc)
   {
-    ERROR_LOG() << "PDM-DTC is not running";
+    ERROR_LOG(m_logger) << "PDM-DTC is not running";
     return false;
   }
 
@@ -228,7 +228,7 @@ QString HitBuildingFilter::getChargeTypeShortName(int id)
 {
   if(!m_pdmDtc)
   {
-    ERROR_LOG() << "Unable to load ChargeType IDs from PDM-DTC";
+    ERROR_LOG(m_logger) << "Unable to load ChargeType IDs from PDM-DTC";
     return {};
   }
   return m_pdmDtc->trChargeTypeShortName(id);
@@ -377,7 +377,7 @@ void HitBuildingFilter::onMainStructureElementChanged(const InfrastructureManage
 
   if (parseError.error != QJsonParseError::NoError)
   {
-    INFO_LOG() << "Could not parse JSON props of building with ID "
+    INFO_LOG(m_logger) << "Could not parse JSON props of building with ID "
                        << data.id()
                        << ". Reason: "
                        << parseError.errorString()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_filter.h
index a182d9b88..35e70ac77 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_filter.h
@@ -49,6 +49,9 @@ public:
   
 
 private:
+  
+
+NGL::INGLLogger &m_logger;
   void addOriginatorEquipmentNumberWidgetToLayout(QGridLayout *layout, LtsWidgets::LtsDialog *dialog) const;
 
   void updateFilterString() override;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_item.cpp
index c3df2f3e9..6bfbf1b89 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_item.cpp
@@ -60,7 +60,7 @@ void HitBuildingItem::addItemInfoRows(QFormLayout *form)
   HitBuildingFilter *filter = static_cast<HitBuildingFilter *>(m_factory->filter());
   if (!filter)
   {
-    ERROR_LOG() << "HitBuildingFilter unavailable";
+    ERROR_LOG(m_logger) << "HitBuildingFilter unavailable";
     return;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_item.h
index 48b58fd68..2114c5aa6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_item.h
@@ -28,6 +28,8 @@ public:
   void addItemInfoRows(QFormLayout *form) override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   int m_mainStructureElementId;
 };
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitC/tln_hit_c_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitC/tln_hit_c_event_factory.h
index e4ce84392..6cff80175 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitC/tln_hit_c_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitC/tln_hit_c_event_factory.h
@@ -26,6 +26,8 @@ public:
   AbstractEventFilter *createFilter() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitC/tln_hit_c_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitC/tln_hit_c_filter.h
index 314eb70f3..2892b6d38 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitC/tln_hit_c_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitC/tln_hit_c_filter.h
@@ -28,6 +28,8 @@ public:
   QWidget *widget() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitC/tln_hit_c_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitC/tln_hit_c_item.h
index 698fabdb8..df616b467 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitC/tln_hit_c_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitC/tln_hit_c_item.h
@@ -21,6 +21,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_event_factory.h
index 69067bdb3..ff22eaa5b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_event_factory.h
@@ -32,6 +32,8 @@ public:
   AbstractEventFilter *createFilter() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   HitEffectSimulationFilter *m_filter{nullptr};
 };
 
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 0be3d0d50..1a41025fe 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
@@ -45,7 +45,7 @@ bool HitEffectSimulationFilter::init(std::shared_ptr<ProjectDataManagement::Inte
 
   if (!m_pdmDtc)
   {
-    ERROR_LOG() << "PDM-DTC is not running";
+    ERROR_LOG(m_logger) << "PDM-DTC is not running";
     return false;
   }
 
@@ -84,7 +84,7 @@ bool HitEffectSimulationFilter::init(std::shared_ptr<ProjectDataManagement::Inte
     }
     catch (...)
     {
-      ERROR_LOG() << "Unable to load AesTypes from AES";
+      ERROR_LOG(m_logger) << "Unable to load AesTypes from AES";
       return false;
     }
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_filter.h
index 8b84f7c6b..5f416596a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_filter.h
@@ -40,6 +40,8 @@ public:
   static const std::vector<int> s_originatorChargeTypesIds;
 
 private:
+
+NGL::INGLLogger &m_logger;
   void updateFilterString() override;
 
 private slots:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_item.cpp
index ad7c4da4e..79044f440 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_item.cpp
@@ -61,7 +61,7 @@ void HitEffectSimulationItem::addItemInfoRows(QFormLayout *form)
   HitEffectSimulationFilter *filter = static_cast<HitEffectSimulationFilter *>(m_factory->filter());
   if (!filter)
   {
-    ERROR_LOG() << "HitEffectSimulationFilter unavailable";
+    ERROR_LOG(m_logger) << "HitEffectSimulationFilter unavailable";
     return;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_item.h
index 39f570927..cfce1a989 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_item.h
@@ -26,6 +26,8 @@ public:
   void addItemInfoRows(QFormLayout *form) override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitGasPipe/tln_hit_gas_pipe_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitGasPipe/tln_hit_gas_pipe_event_factory.h
index fa07b42b2..fbc79d72f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitGasPipe/tln_hit_gas_pipe_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitGasPipe/tln_hit_gas_pipe_event_factory.h
@@ -26,6 +26,8 @@ public:
   AbstractEventFilter *createFilter() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitGasPipe/tln_hit_gas_pipe_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitGasPipe/tln_hit_gas_pipe_filter.h
index 892f6d9fe..fd7cc75b3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitGasPipe/tln_hit_gas_pipe_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitGasPipe/tln_hit_gas_pipe_filter.h
@@ -28,6 +28,8 @@ public:
   QWidget *widget() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitGasPipe/tln_hit_gas_pipe_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitGasPipe/tln_hit_gas_pipe_item.h
index 99b2a5381..6d54ba687 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitGasPipe/tln_hit_gas_pipe_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitGasPipe/tln_hit_gas_pipe_item.h
@@ -21,6 +21,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitMine/tln_hit_mine_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitMine/tln_hit_mine_event_factory.h
index 45f94d88b..9978ae4bc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitMine/tln_hit_mine_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitMine/tln_hit_mine_event_factory.h
@@ -26,6 +26,8 @@ public:
   AbstractEventFilter *createFilter() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitMine/tln_hit_mine_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitMine/tln_hit_mine_filter.h
index aa28049eb..a5a6600f5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitMine/tln_hit_mine_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitMine/tln_hit_mine_filter.h
@@ -28,6 +28,8 @@ public:
   QWidget *widget() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitMine/tln_hit_mine_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitMine/tln_hit_mine_item.h
index 6f4f4f760..15007e1b5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitMine/tln_hit_mine_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitMine/tln_hit_mine_item.h
@@ -21,6 +21,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitN/tln_hit_n_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitN/tln_hit_n_event_factory.h
index aeae4d518..089f5c034 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitN/tln_hit_n_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitN/tln_hit_n_event_factory.h
@@ -26,6 +26,8 @@ public:
   AbstractEventFilter *createFilter() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitN/tln_hit_n_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitN/tln_hit_n_filter.h
index b72b5ac49..7f8fe81d9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitN/tln_hit_n_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitN/tln_hit_n_filter.h
@@ -28,6 +28,8 @@ public:
   QWidget *widget() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitN/tln_hit_n_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitN/tln_hit_n_item.h
index 73e7f1c84..f3a2d7af9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitN/tln_hit_n_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitN/tln_hit_n_item.h
@@ -21,6 +21,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveDangerArea/tln_leave_danger_area_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveDangerArea/tln_leave_danger_area_event_factory.h
index 8f6fd6c24..813021982 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveDangerArea/tln_leave_danger_area_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveDangerArea/tln_leave_danger_area_event_factory.h
@@ -26,6 +26,8 @@ public:
   AbstractEventFilter *createFilter() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveDangerArea/tln_leave_danger_area_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveDangerArea/tln_leave_danger_area_filter.h
index 60cc54698..3572da11a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveDangerArea/tln_leave_danger_area_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveDangerArea/tln_leave_danger_area_filter.h
@@ -28,6 +28,8 @@ public:
   QWidget *widget() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveDangerArea/tln_leave_danger_area_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveDangerArea/tln_leave_danger_area_item.h
index dbcc69a91..290f7c23c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveDangerArea/tln_leave_danger_area_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveDangerArea/tln_leave_danger_area_item.h
@@ -21,6 +21,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveFunctionalArea/tln_leave_functional_area_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveFunctionalArea/tln_leave_functional_area_event_factory.h
index 47e91f7ee..bd375c359 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveFunctionalArea/tln_leave_functional_area_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveFunctionalArea/tln_leave_functional_area_event_factory.h
@@ -26,6 +26,8 @@ public:
   AbstractEventFilter *createFilter() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveFunctionalArea/tln_leave_functional_area_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveFunctionalArea/tln_leave_functional_area_filter.h
index 6a344d726..3d5c859bf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveFunctionalArea/tln_leave_functional_area_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveFunctionalArea/tln_leave_functional_area_filter.h
@@ -28,6 +28,8 @@ public:
   QWidget *widget() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveFunctionalArea/tln_leave_functional_area_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveFunctionalArea/tln_leave_functional_area_item.h
index a4bceec12..1572645db 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveFunctionalArea/tln_leave_functional_area_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveFunctionalArea/tln_leave_functional_area_item.h
@@ -21,6 +21,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveMineArea/tln_leave_mine_area_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveMineArea/tln_leave_mine_area_event_factory.h
index c3383e7bc..cd0935c10 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveMineArea/tln_leave_mine_area_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveMineArea/tln_leave_mine_area_event_factory.h
@@ -26,6 +26,8 @@ public:
   AbstractEventFilter *createFilter() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveMineArea/tln_leave_mine_area_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveMineArea/tln_leave_mine_area_filter.h
index 32c556e32..c1a51868d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveMineArea/tln_leave_mine_area_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveMineArea/tln_leave_mine_area_filter.h
@@ -28,6 +28,8 @@ public:
   QWidget *widget() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveMineArea/tln_leave_mine_area_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveMineArea/tln_leave_mine_area_item.h
index 4d0576f4e..8e60a4df5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveMineArea/tln_leave_mine_area_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveMineArea/tln_leave_mine_area_item.h
@@ -21,6 +21,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveNuclear/tln_leave_nuclear_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveNuclear/tln_leave_nuclear_event_factory.h
index aa7f882cf..b7f45af03 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveNuclear/tln_leave_nuclear_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveNuclear/tln_leave_nuclear_event_factory.h
@@ -26,6 +26,8 @@ public:
   AbstractEventFilter *createFilter() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveNuclear/tln_leave_nuclear_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveNuclear/tln_leave_nuclear_filter.h
index deecee776..f8431f307 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveNuclear/tln_leave_nuclear_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveNuclear/tln_leave_nuclear_filter.h
@@ -28,6 +28,8 @@ public:
   QWidget *widget() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveNuclear/tln_leave_nuclear_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveNuclear/tln_leave_nuclear_item.h
index 7d89dc37f..108504283 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveNuclear/tln_leave_nuclear_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/LeaveNuclear/tln_leave_nuclear_item.h
@@ -21,6 +21,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Manipulation/tln_manipulation_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Manipulation/tln_manipulation_event_factory.h
index 3d17c269e..05d3f609b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Manipulation/tln_manipulation_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Manipulation/tln_manipulation_event_factory.h
@@ -26,6 +26,8 @@ public:
   AbstractEventFilter *createFilter() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   ManipulationFilter *m_filter{nullptr};
 };
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Manipulation/tln_manipulation_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Manipulation/tln_manipulation_filter.h
index 6abe24a10..d47bcf1f8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Manipulation/tln_manipulation_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Manipulation/tln_manipulation_filter.h
@@ -24,6 +24,8 @@ public:
   bool check(const AbstractEventItem &item) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   void updateFilterString() override;
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Manipulation/tln_manipulation_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Manipulation/tln_manipulation_item.h
index 8150ca7c2..e200974b0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Manipulation/tln_manipulation_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Manipulation/tln_manipulation_item.h
@@ -26,6 +26,8 @@ public:
   void addItemInfoRows(QFormLayout *form) override {}
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_event_factory.h
index a68c2735e..ca9d049bd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_event_factory.h
@@ -36,6 +36,8 @@ public:
   AbstractEventFilter *createFilter() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   MarkerFilter *m_filter{nullptr};
 };
 
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 4ed464f4d..2b018123e 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
@@ -39,7 +39,7 @@ bool MarkerFilter::init(std::shared_ptr<OperatorManagement::Interface::Dtc> opmD
   {
     if (!opmDtc)
     {
-      ERROR_LOG() << "Unable to load Users/Operators from OPM-DTC";
+      ERROR_LOG(m_logger) << "Unable to load Users/Operators from OPM-DTC";
       return false;
     }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_filter.h
index bb64c777d..e6ea08662 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_filter.h
@@ -37,6 +37,8 @@ public:
   QString user(int id) const { return m_users.value(id, QApplication::tr("unknown")); }
 
 private:
+
+NGL::INGLLogger &m_logger;
   void updateFilterString() override;
 
 private slots:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_item.cpp
index 495c8eaad..1c7ea2469 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_item.cpp
@@ -56,7 +56,7 @@ void MarkerItem::addItemInfoRows(QFormLayout *form)
   MarkerFilter *filter = static_cast<MarkerFilter *>(m_factory->filter());
   if (!filter)
   {
-    ERROR_LOG() << "MarkerFilter unavailable";
+    ERROR_LOG(m_logger) << "MarkerFilter unavailable";
     return;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_item.h
index 45eeafc6f..193b7827e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Marker/tln_marker_item.h
@@ -26,6 +26,8 @@ public:
   void addItemInfoRows(QFormLayout *form) override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineArea/tln_mine_area_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineArea/tln_mine_area_event_factory.h
index c8cb56d01..84f089d60 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineArea/tln_mine_area_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineArea/tln_mine_area_event_factory.h
@@ -26,6 +26,8 @@ public:
   AbstractEventFilter *createFilter() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineArea/tln_mine_area_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineArea/tln_mine_area_filter.h
index caf45d4cb..3b2f0a9ba 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineArea/tln_mine_area_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineArea/tln_mine_area_filter.h
@@ -28,6 +28,8 @@ public:
   QWidget *widget() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineArea/tln_mine_area_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineArea/tln_mine_area_item.h
index c18739927..4dd7ab6d7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineArea/tln_mine_area_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineArea/tln_mine_area_item.h
@@ -21,6 +21,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineCorridor/tln_mine_corridor_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineCorridor/tln_mine_corridor_event_factory.h
index ddef627ff..ce25cb29b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineCorridor/tln_mine_corridor_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineCorridor/tln_mine_corridor_event_factory.h
@@ -26,6 +26,8 @@ public:
   AbstractEventFilter *createFilter() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineCorridor/tln_mine_corridor_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineCorridor/tln_mine_corridor_filter.h
index 67cd045b0..4a328dfdf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineCorridor/tln_mine_corridor_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineCorridor/tln_mine_corridor_filter.h
@@ -28,6 +28,8 @@ public:
   QWidget *widget() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineCorridor/tln_mine_corridor_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineCorridor/tln_mine_corridor_item.h
index 1ec09acf6..273b809ab 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineCorridor/tln_mine_corridor_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/MineCorridor/tln_mine_corridor_item.h
@@ -21,6 +21,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/NContamination/tln_n_contamination_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/NContamination/tln_n_contamination_event_factory.h
index 5cf218fb7..ef54ee3fe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/NContamination/tln_n_contamination_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/NContamination/tln_n_contamination_event_factory.h
@@ -26,6 +26,8 @@ public:
   AbstractEventFilter *createFilter() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/NContamination/tln_n_contamination_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/NContamination/tln_n_contamination_filter.h
index 7084aabd5..557ac282c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/NContamination/tln_n_contamination_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/NContamination/tln_n_contamination_filter.h
@@ -28,6 +28,8 @@ public:
   QWidget *widget() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/NContamination/tln_n_contamination_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/NContamination/tln_n_contamination_item.h
index e45f587d6..117f23935 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/NContamination/tln_n_contamination_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/NContamination/tln_n_contamination_item.h
@@ -21,6 +21,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_event_factory.h
index 9a434db81..0c74de5e0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_event_factory.h
@@ -32,6 +32,8 @@ public:
   AbstractEventFilter *createFilter() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   RadioCnrFilter *m_filter{nullptr};
 };
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_filter.h
index 4ffb0521c..d6e1b26f2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_filter.h
@@ -35,6 +35,8 @@ public:
   QString stream(int id);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void updateFilterString() override;
 
 private slots:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_item.cpp
index 51f2cae26..732eef52d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_item.cpp
@@ -50,7 +50,7 @@ void RadioCnrItem::addItemInfoRows(QFormLayout *form)
   RadioCnrFilter *filter = static_cast<RadioCnrFilter *>(m_factory->filter());
   if (!filter)
   {
-    ERROR_LOG() << "RadioCnrFilter unavailable";
+    ERROR_LOG(m_logger) << "RadioCnrFilter unavailable";
     return;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_item.h
index 9657c6661..5360f6583 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioCnr/tln_radio_cnr_item.h
@@ -28,6 +28,8 @@ public:
   QString displayStreamName() const { return m_properties[QStringLiteral("streamName")].toString(); }
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_event_factory.h
index 06e352f5e..be6a2844b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_event_factory.h
@@ -32,6 +32,8 @@ public:
   AbstractEventFilter *createFilter() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   RadioTvcFilter *m_filter{nullptr};
 };
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_filter.h
index 1c19768ef..1b890c5c5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_filter.h
@@ -33,6 +33,8 @@ public:
   QString stream(int id) const { return m_streams.value(id); }
 
 private:
+
+NGL::INGLLogger &m_logger;
   void updateFilterString() override;
 
 private slots:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_item.cpp
index a266c454b..c2df62483 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_item.cpp
@@ -51,7 +51,7 @@ void RadioTvcItem::addItemInfoRows(QFormLayout *form)
   RadioTvcFilter *filter = static_cast<RadioTvcFilter *>(m_factory->filter());
   if (!filter)
   {
-    ERROR_LOG() << "RadioTvcFilter unavailable";
+    ERROR_LOG(m_logger) << "RadioTvcFilter unavailable";
     return;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_item.h
index 8fdc8092a..d57b04fbc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/RadioTvc/tln_radio_tvc_item.h
@@ -28,6 +28,8 @@ public:
   QString displayStreamName() const { return m_properties[QStringLiteral("streamName")].toString(); }
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Sanitation/tln_sanitation_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Sanitation/tln_sanitation_event_factory.h
index d8e1b4e82..fa9ec1149 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Sanitation/tln_sanitation_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Sanitation/tln_sanitation_event_factory.h
@@ -26,6 +26,8 @@ public:
   AbstractEventFilter *createFilter() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Sanitation/tln_sanitation_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Sanitation/tln_sanitation_filter.h
index 5c0999b3e..65a988f50 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Sanitation/tln_sanitation_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Sanitation/tln_sanitation_filter.h
@@ -28,6 +28,8 @@ public:
   QWidget *widget() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Sanitation/tln_sanitation_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Sanitation/tln_sanitation_item.h
index 8ad5aa8ec..477b18888 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Sanitation/tln_sanitation_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Sanitation/tln_sanitation_item.h
@@ -21,6 +21,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/TechnicalArea/tln_technical_area_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/TechnicalArea/tln_technical_area_event_factory.h
index 356cf9113..ace1745cf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/TechnicalArea/tln_technical_area_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/TechnicalArea/tln_technical_area_event_factory.h
@@ -26,6 +26,8 @@ public:
   AbstractEventFilter *createFilter() const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/TechnicalArea/tln_technical_area_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/TechnicalArea/tln_technical_area_filter.h
index 3e160044f..15e2daf4c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/TechnicalArea/tln_technical_area_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/TechnicalArea/tln_technical_area_filter.h
@@ -28,6 +28,8 @@ public:
   QWidget *widget() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/TechnicalArea/tln_technical_area_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/TechnicalArea/tln_technical_area_item.h
index 85d21b7b8..202e9a3e1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/TechnicalArea/tln_technical_area_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/TechnicalArea/tln_technical_area_item.h
@@ -21,6 +21,8 @@ public:
   void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_event_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_event_factory.h
index 3dc9714cb..90a2b3c9a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_event_factory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_event_factory.h
@@ -32,6 +32,8 @@ public:
   AbstractEventFilter *createFilter() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   WeaponAssignmentFilter *m_filter{nullptr};
 };
 
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 83ec521b5..de47b2c27 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
@@ -42,7 +42,7 @@ bool WeaponAssignmentFilter::init(std::shared_ptr<ProjectDataManagement::Interfa
 
   if (!m_pdmDtc)
   {
-    ERROR_LOG() << "PDM-DTC is not running";
+    ERROR_LOG(m_logger) << "PDM-DTC is not running";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_filter.h
index 7af875f67..f37788a45 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_filter.h
@@ -35,6 +35,8 @@ public:
   static const std::vector<int> s_filteredGearIds; 
 
 private:
+
+NGL::INGLLogger &m_logger;
   void updateFilterString() override;
 
 private slots:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_item.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_item.cpp
index 396e74037..537ca42b9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_item.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_item.cpp
@@ -62,7 +62,7 @@ void WeaponAssignmentItem::addItemInfoRows(QFormLayout *form)
   WeaponAssignmentFilter *filter = static_cast<WeaponAssignmentFilter *>(m_factory->filter());
   if (!filter)
   {
-    ERROR_LOG() << "WeaponAssignmentFilter unavailable";
+    ERROR_LOG(m_logger) << "WeaponAssignmentFilter unavailable";
     return;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_item.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_item.h
index b234f0dbf..2e98920a0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_item.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_item.h
@@ -26,6 +26,8 @@ public:
   void addItemInfoRows(QFormLayout *form) override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_dialog.cpp
index e73953c64..d4de4a524 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_dialog.cpp
@@ -191,7 +191,7 @@ void FilterDialog::onShowFilterItems()
 {
   if (!m_model->rootItem())
   {
-    DEBUG_LOG() << "invalid root item";
+    DEBUG_LOG(m_logger) << "invalid root item";
     return;
   }
 
@@ -201,7 +201,7 @@ void FilterDialog::onShowFilterItems()
   {
     if (!item)
     {
-      WARNING_LOG() << Q_FUNC_INFO << " nullptr item in filter model";
+      WARNING_LOG(m_logger) << Q_FUNC_INFO << " nullptr item in filter model";
       continue;
     }
     eventTypesOfFiltersToShow.append(item->eventType());
@@ -226,22 +226,22 @@ void FilterDialog::onLoad()
     else
     {
       bool bResult = m_model->jsonToTimelineFilter(content);
-      INFO_LOG() << "import file return: " << bResult;
+      INFO_LOG(m_logger) << "import file return: " << bResult;
     }
   }
   else
-    ERROR_LOG() << Q_FUNC_INFO << " failed";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed";
 }
 
 void FilterDialog::onSave()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   QByteArray byteArray = m_model->modelToJson();
   int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
   if (fileId > 0)
-    INFO_LOG() << "Saved file with id = " << fileId;
+    INFO_LOG(m_logger) << "Saved file with id = " << fileId;
   else
-    ERROR_LOG() << "Could not save file in library ";
+    ERROR_LOG(m_logger) << "Could not save file in library ";
 }
 
 void FilterDialog::onShowOnlyActiveFilters(bool show)
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 554fa9913..a604a7103 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,6 +33,8 @@ 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 };
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_edit_dialog.cpp
index 294801ffd..1d9ab242f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_edit_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_edit_dialog.cpp
@@ -62,18 +62,18 @@ bool FilterEditDialog::applyToFilter(AbstractEventFilter *filter)
     if (index >= count) 
       break;
     filter->clearAttributeValues(attributeName);
-    ERROR_LOG() << "count: " << m_ui->layout->count() << ", index: " << index;
+    ERROR_LOG(m_logger) << "count: " << m_ui->layout->count() << ", index: " << index;
     QGroupBox *attributeGroupBox = qobject_cast<QGroupBox *>(m_ui->layout->itemAt(index++)->widget());
     if (!attributeGroupBox)
     {
-      ERROR_LOG() << "Could not convert attribute '" << attributeName << "' to QGroupBox";
+      ERROR_LOG(m_logger) << "Could not convert attribute '" << attributeName << "' to QGroupBox";
       continue;
     }
 
     QVBoxLayout *vbox = qobject_cast<QVBoxLayout *>(attributeGroupBox->layout()->itemAt(0)->widget()->layout());
     if (!vbox)
     {
-      ERROR_LOG() << "Could not convert Group Box layout for attribute '" << attributeName << "' to QVBoxLayout";
+      ERROR_LOG(m_logger) << "Could not convert Group Box layout for attribute '" << attributeName << "' to QVBoxLayout";
       continue;
     }
 
@@ -91,11 +91,11 @@ bool FilterEditDialog::applyToFilter(AbstractEventFilter *filter)
           LtsWidgets::LtsSpinBox *spinBox = qobject_cast<LtsWidgets::LtsSpinBox *>(vbox->itemAt(row)->widget()->layout()->itemAt(0)->widget());
           if (!spinBox)
           {
-            WARNING_LOG() << "Could not convert widget to LtsSpinBox for attribute '" << attributeName << "'";
+            WARNING_LOG(m_logger) << "Could not convert widget to LtsSpinBox for attribute '" << attributeName << "'";
             continue;
           }
           if (!filter->insertAttributeValue(attributeName, spinBox->value()))
-            DEBUG_LOG() << "Inserting value for attribute '" << attributeName << "' failed";
+            DEBUG_LOG(m_logger) << "Inserting value for attribute '" << attributeName << "' failed";
           continue;
         }
 
@@ -104,11 +104,11 @@ bool FilterEditDialog::applyToFilter(AbstractEventFilter *filter)
           QComboBox *comboBox = qobject_cast<QComboBox *>(vbox->itemAt(row)->widget()->layout()->itemAt(0)->widget());
           if (!comboBox)
           {
-            WARNING_LOG() << "Could not convert widget to QComboBox for attribute '" << attributeName << "'";
+            WARNING_LOG(m_logger) << "Could not convert widget to QComboBox for attribute '" << attributeName << "'";
             continue;
           }
           if (!filter->insertAttributeValue(attributeName, comboBox->currentData().toInt()))
-            DEBUG_LOG() << "Inserting value for attribute '" << attributeName << "' failed";
+            DEBUG_LOG(m_logger) << "Inserting value for attribute '" << attributeName << "' failed";
           continue;
         }
 
@@ -117,11 +117,11 @@ bool FilterEditDialog::applyToFilter(AbstractEventFilter *filter)
           QCheckBox *checkBox = qobject_cast<QCheckBox *>(vbox->itemAt(row)->widget()->layout()->itemAt(0)->widget());
           if (!checkBox)
           {
-            WARNING_LOG() << "Could not convert widget to QCheckBox for attribute '" << attributeName << "'";
+            WARNING_LOG(m_logger) << "Could not convert widget to QCheckBox for attribute '" << attributeName << "'";
             continue;
           }
           if (!filter->insertAttributeValue(attributeName, checkBox->isChecked()))
-            DEBUG_LOG() << "Inserting value for attribute '" << attributeName << "' failed";
+            DEBUG_LOG(m_logger) << "Inserting value for attribute '" << attributeName << "' failed";
           continue;
         }
 
@@ -130,11 +130,11 @@ bool FilterEditDialog::applyToFilter(AbstractEventFilter *filter)
           QComboBox *comboBox = qobject_cast<QComboBox *>(vbox->itemAt(row)->widget()->layout()->itemAt(0)->widget());
           if (!comboBox)
           {
-            WARNING_LOG() << "Could not convert widget to QComboBox for attribute '" << attributeName << "', , type was " << vbox->itemAt(row)->widget()->layout()->itemAt(0)->widget()->metaObject()->className();
+            WARNING_LOG(m_logger) << "Could not convert widget to QComboBox for attribute '" << attributeName << "', , type was " << vbox->itemAt(row)->widget()->layout()->itemAt(0)->widget()->metaObject()->className();
             continue;
           }
           if (!filter->insertAttributeValue(attributeName, comboBox->currentText()))
-            DEBUG_LOG() << "Inserting value for attribute '" << attributeName << "' failed";
+            DEBUG_LOG(m_logger) << "Inserting value for attribute '" << attributeName << "' failed";
           continue;
         }
 
@@ -143,13 +143,13 @@ bool FilterEditDialog::applyToFilter(AbstractEventFilter *filter)
           LtsWidgets::LtsSpinBox *spinBoxMin = qobject_cast<LtsWidgets::LtsSpinBox *>(vbox->itemAt(row)->widget()->layout()->itemAt(1)->widget());
           if (!spinBoxMin)
           {
-            WARNING_LOG() << "Could not convert widget to LtsSpinBox for attribute '" << attributeName << "'";
+            WARNING_LOG(m_logger) << "Could not convert widget to LtsSpinBox for attribute '" << attributeName << "'";
             continue;
           }
           LtsWidgets::LtsSpinBox *spinBoxMax = qobject_cast<LtsWidgets::LtsSpinBox *>(vbox->itemAt(row)->widget()->layout()->itemAt(3)->widget());
           if (!spinBoxMax)
           {
-            WARNING_LOG() << "Could not convert widget to LtsSpinBox for attribute '" << attributeName << "'";
+            WARNING_LOG(m_logger) << "Could not convert widget to LtsSpinBox for attribute '" << attributeName << "'";
             continue;
           }
           int minValue = spinBoxMin->value();
@@ -160,7 +160,7 @@ bool FilterEditDialog::applyToFilter(AbstractEventFilter *filter)
             maxValue *= 1000;
           }
           if (!filter->insertAttributeValue(attributeName, QList<QVariant>({ minValue, maxValue })))
-            DEBUG_LOG() << "Inserting value for attribute '" << attributeName << "' failed";
+            DEBUG_LOG(m_logger) << "Inserting value for attribute '" << attributeName << "' failed";
           continue;
         }
 
@@ -174,19 +174,19 @@ bool FilterEditDialog::applyToFilter(AbstractEventFilter *filter)
           LtsWidgets::LtsDateTimeEdit *dateTimeEditMin = qobject_cast<LtsWidgets::LtsDateTimeEdit *>(vbox->itemAt(row)->widget()->layout()->itemAt(1)->widget());
           if (!dateTimeEditMin)
           {
-            WARNING_LOG() << "Could not convert widget to LtsDateTimeEdit for attribute '" << attributeName << "'";
+            WARNING_LOG(m_logger) << "Could not convert widget to LtsDateTimeEdit for attribute '" << attributeName << "'";
             continue;
           }
           LtsWidgets::LtsDateTimeEdit *dateTimeEditMax = qobject_cast<LtsWidgets::LtsDateTimeEdit *>(vbox->itemAt(row)->widget()->layout()->itemAt(3)->widget());
           if (!dateTimeEditMax)
           {
-            WARNING_LOG() << "Could not convert widget to LtsDateTimeEdit for attribute '" << attributeName << "'";
+            WARNING_LOG(m_logger) << "Could not convert widget to LtsDateTimeEdit for attribute '" << attributeName << "'";
             continue;
           }
           if (!filter->insertAttributeValue(
                 attributeName, QList<QVariant>({ dateTimeEditMin->msecsSinceEpoch(), dateTimeEditMax->msecsSinceEpoch() })
                 ))
-            WARNING_LOG() << "Inserting value for attribute '" << attributeName << "' failed";
+            WARNING_LOG(m_logger) << "Inserting value for attribute '" << attributeName << "' failed";
           continue;
         }
 
@@ -199,8 +199,8 @@ bool FilterEditDialog::applyToFilter(AbstractEventFilter *filter)
           continue;
         }
       }
-      catch (const QString &str) { ERROR_LOG() << Q_FUNC_INFO << " " << str; }
-      catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed for attribute: " << attributeName; }
+      catch (const QString &str) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " " << str; }
+      catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed for attribute: " << attributeName; }
     }
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_edit_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_edit_dialog.h
index f94b80005..1876934c4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_edit_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_edit_dialog.h
@@ -24,6 +24,8 @@ public:
   ~FilterEditDialog();
 
 private:
+
+NGL::INGLLogger &m_logger;
   bool applyToFilter(AbstractEventFilter *filter);
   void retranslate() override;
   bool apply() override;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_model.cpp
index 4ad392b6c..cdb20cea8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_filter_model.cpp
@@ -315,7 +315,7 @@ QVariant FilterModel::data(const QModelIndex &index, int role) const
         }
 
         default:
-          WARNING_LOG() << "eIntCompare for EventType " << eventTypeString(item->eventType()) << " not supported";
+          WARNING_LOG(m_logger) << "eIntCompare for EventType " << eventTypeString(item->eventType()) << " not supported";
           return {};
         }
 
@@ -414,7 +414,7 @@ bool FilterModel::applyFilterStates()
         if (filter->isActive() != active)
         {
 
-          DEBUG_LOG() <<"applyFilterStates: item()_name:"<<item->name()
+          DEBUG_LOG(m_logger) <<"applyFilterStates: item()_name:"<<item->name()
                                <<" , item_active:"<<item->isActive()
                                 <<" <|||> filter_name:"<<eventTypeString(filter->type())
                                 <<" , filter_active:"<<filter->isActive();
@@ -431,7 +431,7 @@ void FilterModel::toggleFilterState(EventType eventType, bool active)
 {
   if (!m_filter.contains(eventType))
   {
-    ERROR_LOG() << "unknown event type = " << eventTypeString(eventType) << " (" << static_cast<int>(eventType) << ")";
+    ERROR_LOG(m_logger) << "unknown event type = " << eventTypeString(eventType) << " (" << static_cast<int>(eventType) << ")";
     return;
   }
 
@@ -467,7 +467,7 @@ QByteArray FilterModel::modelToJson()
     AbstractEventFilter *filterPtr = it.value();
     if (!filterPtr)
     {
-      ERROR_LOG() << "Filter for event type " << eventTypeString(eventType) << " not available";
+      ERROR_LOG(m_logger) << "Filter for event type " << eventTypeString(eventType) << " not available";
       continue;
     }
 
@@ -523,7 +523,7 @@ QByteArray FilterModel::modelToJson()
   obj[QStringLiteral("id")] = 0;
   obj[QStringLiteral("XmlType")] = FileManagement::toString(FileManagement::XmlType::TLNTimelineFilter);
   obj[QStringLiteral("content")] = array;
-  DEBUG_LOG() << "Saving filter to JSON: " << QJsonDocument(obj).toJson();
+  DEBUG_LOG(m_logger) << "Saving filter to JSON: " << QJsonDocument(obj).toJson();
   return QJsonDocument(obj).toJson(QJsonDocument::Compact);
 }
 
@@ -535,7 +535,7 @@ bool FilterModel::jsonToTimelineFilter(const QByteArray &content)
 
   if (contentObject.isEmpty())
   {
-    ERROR_LOG() << " JSON file is empty ";
+    ERROR_LOG(m_logger) << " JSON file is empty ";
     return false;
   }
 
@@ -549,7 +549,7 @@ bool FilterModel::jsonToTimelineFilter(const QByteArray &content)
 
     if (!filterPtr)
     {
-      ERROR_LOG() << "Filter for event type " << eventTypeString(eventType) << " not available";
+      ERROR_LOG(m_logger) << "Filter for event type " << eventTypeString(eventType) << " not available";
       return false;
     }
 
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 56bd9ece7..b524d59ad 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,6 +58,8 @@ 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;
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 d96f9519d..40589d40c 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
@@ -42,11 +42,11 @@ ItemInfoDialog::ItemInfoDialog(QWidget *parent)
     if (this->m_replayAppSession == nullptr ||
         !m_replayAppSession->getForeignGuiInterface<SituationReplay::ForeignGuiInterface>(srpIfc))
     {
-      WARNING_LOG() << "missing Replay App. emitting start Situation replay app...";
+      WARNING_LOG(m_logger) << "missing Replay App. emitting start Situation replay app...";
       emit startSituationReplayApp();
     }
     else {
-      WARNING_LOG() << "Replay App exist; only start replay";
+      WARNING_LOG(m_logger) << "Replay App exist; only start replay";
       onStartReplay();
     }
   });
@@ -107,7 +107,7 @@ bool ItemInfoDialog::init(EventItemPtr &&itemPtr, int equipmentNumber,
   std::shared_ptr<SituationMap::ForeignGuiInterface> sitMapIfc;
 
   if (!m_session->getDtc<MarkerManagement::DataInterface>(m_mrkDtc))
-    WARNING_LOG() << "!m_session->getDtc<MarkerManagement::DataInterface>(m_mrkDtc)";
+    WARNING_LOG(m_logger) << "!m_session->getDtc<MarkerManagement::DataInterface>(m_mrkDtc)";
 
   m_mrkDtc->enableMarker();
 
@@ -123,15 +123,15 @@ bool ItemInfoDialog::init(EventItemPtr &&itemPtr, int equipmentNumber,
   m_fltAesIfc               = fltAesIfc;
   m_fltBuildingComponentIfc = fltBuildingComponentIfc;
   if (m_avmIfc == nullptr)
-    WARNING_LOG() << "missing AVM-IFC";
+    WARNING_LOG(m_logger) << "missing AVM-IFC";
   if (m_mrkIfc == nullptr)
-    WARNING_LOG() << "missing MRK-IFC";
+    WARNING_LOG(m_logger) << "missing MRK-IFC";
   if (m_fltParticipantIfc == nullptr)
-    WARNING_LOG() << "missing FLT-Part-IFC";
+    WARNING_LOG(m_logger) << "missing FLT-Part-IFC";
   if (m_fltAesIfc == nullptr)
-    WARNING_LOG() << "missing FLT-Aes-IFC";
+    WARNING_LOG(m_logger) << "missing FLT-Aes-IFC";
   if (m_fltBuildingComponentIfc == nullptr)
-    WARNING_LOG() << "missing FLT-BuildingComponent-IFC";
+    WARNING_LOG(m_logger) << "missing FLT-BuildingComponent-IFC";
 
   enableDisableButtons(srpIfc, sitMapIfc);
 
@@ -284,7 +284,7 @@ bool ItemInfoDialog::getStreamName(QString &streamName, bool silent) const
   if (_streamName.isEmpty())
   {
     if (!silent)
-      ERROR_LOG() << "stream name is empty: " << QJsonDocument(m_item->properties()).toJson();
+      ERROR_LOG(m_logger) << "stream name is empty: " << QJsonDocument(m_item->properties()).toJson();
     return false;
   }
   streamName = _streamName;
@@ -356,7 +356,7 @@ void ItemInfoDialog::onStartReplay()
 
   if (m_replayAppSession == nullptr)
   {
-    ERROR_LOG() << "missing Replay App, no replay in TimelineItemInfoDialog";
+    ERROR_LOG(m_logger) << "missing Replay App, no replay in TimelineItemInfoDialog";
     return;
   }
 
@@ -365,20 +365,20 @@ void ItemInfoDialog::onStartReplay()
   if (!m_replayAppSession->getForeignGuiInterface<SituationReplay::ForeignGuiInterface>(srpIfc))
   {
     m_ui->pbStartReplay->setToolTip(tr("Situation Replay App not started."));
-    ERROR_LOG() << ">>> missing SRP-IFC, no replay in TimelineItemInfoDialog";
+    ERROR_LOG(m_logger) << ">>> missing SRP-IFC, no replay in TimelineItemInfoDialog";
     return;
   }
   std::shared_ptr<SituationMap::ForeignGuiInterface> sitMapIfc;
   if (!m_replayAppSession->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(sitMapIfc))
   {
     m_ui->pbStartReplay->setToolTip(tr("This app has no map to focus this event on."));
-    ERROR_LOG() << ">>> missing SitMap-IFC, no focus on replay in TimelineItemInfoDialog 1";
+    ERROR_LOG(m_logger) << ">>> missing SitMap-IFC, no focus on replay in TimelineItemInfoDialog 1";
     return;
   }
   if (m_item->type() != EventType::Marker && !m_item->isPositionValid()) 
   {
     m_ui->pbStartReplay->setToolTip(tr("Event has an invalid position, cannot be focused and therefore has no replay capability."));
-    ERROR_LOG() << ">>> Event has an invalid position";
+    ERROR_LOG(m_logger) << ">>> Event has an invalid position";
     return;
   }
   
@@ -403,24 +403,24 @@ void ItemInfoDialog::onFocusOnMap()
 {
   if (m_replayAppSession == nullptr)
   {
-    WARNING_LOG() << "missing Replay App, no focus in TimelineItemInfoDialog";
+    WARNING_LOG(m_logger) << "missing Replay App, no focus in TimelineItemInfoDialog";
     return;
   }
 
   std::shared_ptr<SituationMap::ForeignGuiInterface> sitMapIfc;
   if (!m_replayAppSession->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(sitMapIfc))
   {
-    WARNING_LOG() << "missing SitMap-IFC, no focus on replay in TimelineItemInfoDialog 1";
+    WARNING_LOG(m_logger) << "missing SitMap-IFC, no focus on replay in TimelineItemInfoDialog 1";
     return;
   }
   if (!sitMapIfc)
   {
-    WARNING_LOG() << "missing SitMap-IFC, no focus on replay in TimelineItemInfoDialog 2";
+    WARNING_LOG(m_logger) << "missing SitMap-IFC, no focus on replay in TimelineItemInfoDialog 2";
     return;
   }
   if (!m_item->isPositionValid() && qFuzzyIsNull(static_cast<float>(m_item->position2D().x())) && qFuzzyIsNull(static_cast<float>(m_item->position2D().y())))
   {
-    WARNING_LOG() << "event has no valid position, skip onFocusOnMap";
+    WARNING_LOG(m_logger) << "event has no valid position, skip onFocusOnMap";
     return;
   }
   
@@ -438,11 +438,11 @@ void ItemInfoDialog::onFocusOnMap()
     MarkerManagement::MarkerManagementApplyFilter applyFilter(m_replayAppSession, m_fltParticipantIfc, m_fltAesIfc, m_fltBuildingComponentIfc);
 
     if(!applyFilter.applyMapSettings(mapSettings.toString().toUtf8()))
-      WARNING_LOG() << "map settings for #" << m_item->id() << " could not be applied";
+      WARNING_LOG(m_logger) << "map settings for #" << m_item->id() << " could not be applied";
 
     if (!applyFilter.applyFilter(filterSettings.toObject()))
     {
-      WARNING_LOG() << "filters from event #" << m_item->id() << " could not be applied";
+      WARNING_LOG(m_logger) << "filters from event #" << m_item->id() << " could not be applied";
       return;
     }
   }
@@ -458,14 +458,14 @@ void ItemInfoDialog::updateMarker(const MarkerManagement::Marker &data, DataModi
 
   QJsonObject obj =  m_item->properties();
   QJsonValue val;
-  DEBUG_LOG() << "ShowDetailsDialog::updateMarker"
+  DEBUG_LOG(m_logger) << "ShowDetailsDialog::updateMarker"
                       << " id=" << data.id()
                       << " id Marke=" << m_item->markerDbId()
                       << " note=" << data.note();
 
   for(int i=0 ; i < obj.keys().length() ; i++)
   {
-    DEBUG_LOG() << "i=" << i
+    DEBUG_LOG(m_logger) << "i=" << i
                         << " " << (obj.keys().at(i))
                         << " value=" << obj[obj.keys().at(i)].toString();
   }
@@ -475,20 +475,20 @@ void ItemInfoDialog::updateMarker(const MarkerManagement::Marker &data, DataModi
     val = QJsonValue(str);
     obj.insert (QStringLiteral("MarkerNote"), QJsonValue(val));
 
-    DEBUG_LOG() << "update MarkerNote:" << str ;
-    DEBUG_LOG() << " value=" << obj[QStringLiteral("MarkerNote")].toString();
+    DEBUG_LOG(m_logger) << "update MarkerNote:" << str ;
+    DEBUG_LOG(m_logger) << " value=" << obj[QStringLiteral("MarkerNote")].toString();
 
     m_item->setProperties(obj);
 
     QString result = QString::fromUtf8(QJsonDocument(m_item->properties()).toJson(QJsonDocument::Indented));
-    DEBUG_LOG() << "Result=" << result;
+    DEBUG_LOG(m_logger) << "Result=" << result;
     m_ui->pteDetailDataTest->setPlainText(QString::fromUtf8(QJsonDocument(m_item->properties()).toJson(QJsonDocument::Indented)));
     
     
     
     for (     int i = m_ui->formLayout->rowCount() -1 ; i >=m_formCount; i--)
     {
-      DEBUG_LOG() << "remove row i=" << i;
+      DEBUG_LOG(m_logger) << "remove row i=" << i;
       m_ui->formLayout->removeRow(i);
     }
     m_item->addItemInfoRows(m_ui->formLayout);
@@ -503,7 +503,7 @@ void ItemInfoDialog::startSituationPlayback(const QPointer<LtsSession::LtsSessio
   QTimer *timer = new QTimer(this);
   timer->singleShot(2000, this, [this, timer,replayAppSession]()
   {
-    WARNING_LOG() << ">>>>>>> initialization of the Replay session app.";
+    WARNING_LOG(m_logger) << ">>>>>>> initialization of the Replay session app.";
     std::shared_ptr<SituationReplay::ForeignGuiInterface> srpIfc;
     std::shared_ptr<SituationMap::ForeignGuiInterface> sitMapIfc;
     initReplayAppSession(replayAppSession, &srpIfc, &sitMapIfc);
@@ -526,7 +526,7 @@ void ItemInfoDialog::initReplayAppSession(const QPointer<LtsSession::LtsSession>
     {
       setButtonDisabled(m_ui->pbFocus, m_ui->tbFocus, tr("No map available."));
       m_replayAppSession = nullptr;
-      WARNING_LOG() << "Session replay app deleted!";
+      WARNING_LOG(m_logger) << "Session replay app deleted!";
 
 
       
@@ -534,10 +534,10 @@ void ItemInfoDialog::initReplayAppSession(const QPointer<LtsSession::LtsSession>
 
 
     if (!replayAppSession->getForeignGuiInterface<SituationReplay::ForeignGuiInterface>(*srpIfc))
-      WARNING_LOG() << "missing SRP-IFC, no replay in TimelineItemInfoDialog";
+      WARNING_LOG(m_logger) << "missing SRP-IFC, no replay in TimelineItemInfoDialog";
 
     if (!replayAppSession->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(*sitMapIfc))
-      WARNING_LOG() << "missing SitMap-IFC, no focusing on replay in TimelineItemInfoDialog";
+      WARNING_LOG(m_logger) << "missing SitMap-IFC, no focusing on replay in TimelineItemInfoDialog";
   }
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_info_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_info_dialog.h
index be87eb103..ee73e26a5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_info_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_info_dialog.h
@@ -51,6 +51,8 @@ public:
   void retranslate() override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   void enableDisableButtons(
     std::shared_ptr<SituationReplay::ForeignGuiInterface> srpIfc, std::shared_ptr<SituationMap::ForeignGuiInterface> sitMapIfc
   );
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 b2a8d0afb..71176f3b5 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
@@ -39,7 +39,7 @@ ItemListDialog::ItemListDialog(
 
   if (showMarkers)
   {
-    ERROR_LOG() << "Show markers";
+    ERROR_LOG(m_logger) << "Show markers";
     m_ui->ltsDataView->setModel(m_model);
   }
   else
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_dialog.h
index 515fb2e8f..716a69482 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_dialog.h
@@ -49,6 +49,8 @@ public:
   ItemListProxyModel *proxyModel() const { return m_proxyModel; }
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
 
 
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 97b3e9a25..094d20b5d 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
@@ -86,7 +86,7 @@ void ItemListModel::init(EventItemPtrs &&items)
     insertRow(itemPtr.get());
 
   if (!m_session->getDtc<MarkerManagement::DataInterface>(m_mrkDtc))
-      WARNING_LOG() << "!m_session->getDtc<MarkerManagement::DataInterface>(m_mrkDtc)";
+      WARNING_LOG(m_logger) << "!m_session->getDtc<MarkerManagement::DataInterface>(m_mrkDtc)";
 
     m_mrkDtc->enableMarker();
 
@@ -176,8 +176,8 @@ QVariant ItemListModel::data(const QModelIndex &index, int role) const
       int partyId = static_cast<const ParticipantTrack &>(m_model->track(item->parentTrackId())).partyId();
       return ParticipantManagement::trPartyName(m_ppmDtc->party(partyId).name());
     }
-    catch (const QString &str) { DEBUG_LOG() << Q_FUNC_INFO << " " << str; }
-    catch (...) { DEBUG_LOG() << Q_FUNC_INFO << " failed for item with id = " << item->id(); }
+    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(); }
     return {};
   }
   case Columns::EquipNo:
@@ -193,8 +193,8 @@ QVariant ItemListModel::data(const QModelIndex &index, int role) const
         return {};
       return equipmentNumber;
     }
-    catch (const QString &str) { DEBUG_LOG() << Q_FUNC_INFO << " " << str; }
-    catch (...) { DEBUG_LOG() << Q_FUNC_INFO << " failed for item with id = " << item->id(); }
+    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(); }
     return {};
   }
   case Columns::Hierarchy:
@@ -208,8 +208,8 @@ QVariant ItemListModel::data(const QModelIndex &index, int role) const
       int participantId = static_cast<const ParticipantTrack &>(m_model->track(item->parentTrackId())).participantId();
       return m_ppmDtc->hierarchyFromParticipant(participantId);
     }
-    catch (const QString &str) { DEBUG_LOG() << Q_FUNC_INFO << " " << str; }
-    catch (...) { DEBUG_LOG() << Q_FUNC_INFO << " failed for item with id = " << item->id(); }
+    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(); }
     return {};
   }
   case Columns::ParticipantId:
@@ -222,8 +222,8 @@ QVariant ItemListModel::data(const QModelIndex &index, int role) const
     {
       return static_cast<const ParticipantTrack &>(m_model->track(item->parentTrackId())).participantId();
     }
-    catch (const QString &str) { DEBUG_LOG() << Q_FUNC_INFO << " " << str; }
-    catch (...) { DEBUG_LOG() << Q_FUNC_INFO << " failed for item with id = " << item->id(); }
+    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(); }
     return {};
   }
   case Columns::AesType:
@@ -410,12 +410,12 @@ QVariant ItemListModel::data(const QModelIndex &index, int role) const
 
 void ItemListModel::updateMarker(const MarkerManagement::Marker &data, DataModification modType)
 {
-  DEBUG_LOG() << "ShowDetailsDialog::updateMarker"
+  DEBUG_LOG(m_logger) << "ShowDetailsDialog::updateMarker"
     << " id=" << data.id()
     << " note=" << data.note();
   for (EventItemPtr &itemPtr : m_items)
   {
-    DEBUG_LOG() << "id=" << itemPtr.get()->id()
+    DEBUG_LOG(m_logger) << "id=" << itemPtr.get()->id()
         << " dbId=" << itemPtr.get()->markerDbId();
     if ( itemPtr.get()->markerDbId() == data.id())
     {
@@ -426,7 +426,7 @@ void ItemListModel::updateMarker(const MarkerManagement::Marker &data, DataModif
           properties.insert (QStringLiteral("MarkerNote"), QJsonValue(val));
 
       itemPtr->setProperties(properties);
-      DEBUG_LOG() << "Update Marker";
+      DEBUG_LOG(m_logger) << "Update Marker";
       clear();
       for (EventItemPtr &itemPtr : m_items)
         insertRow(itemPtr.get());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_model.h
index 9a032406c..349f68e1c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_model.h
@@ -86,6 +86,8 @@ private slots:
   void updateMarker(const MarkerManagement::Marker &data, DataModification modType);
 
 private:
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
   std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_pdmDtc;
   std::shared_ptr<InfrastructureManagement::Interface::Dtc> m_ismDtc;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_legend.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_legend.h
index 64e0f95e3..3d7769383 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_legend.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_legend.h
@@ -29,6 +29,8 @@ public:
   ~TimelineLegend();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
 
 private:
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 56beb85df..a5aa21277 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
@@ -90,7 +90,7 @@ TimelineDialog::TimelineDialog(
   , m_liveTimer(new QTimer(this))
   , m_ui(new Ui::TimelineDialog)
 {
-  INFO_LOG() << Q_FUNC_INFO << " START";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   setOnlineHelpFilename(QStringLiteral("Timeline-Application"));
   m_ui->setupUi(this);
@@ -182,44 +182,44 @@ TimelineDialog::TimelineDialog(
 
 
   if (!static_cast<CameraVideoFilter *>(m_model->filter(EventType::CameraVideo))->init(m_avmDtc, m_ismDtc, m_avmDataIfc, m_avmIfc, exc.id()))
-    WARNING_LOG() << "initializing CameraVideoFilter failed";
+    WARNING_LOG(m_logger) << "initializing CameraVideoFilter failed";
   if (!static_cast<FireEventFilter *>(m_model->filter(EventType::FireEvent))->init(m_pdmDtc))
-    WARNING_LOG() << "initializing FireEventFilter failed";
+    WARNING_LOG(m_logger) << "initializing FireEventFilter failed";
   if (!static_cast<HitFilter *>(m_model->filter(EventType::Hit))->init(m_session, m_pdmDtc, m_ppmDtc))
-    WARNING_LOG() << "initializing HitFilter failed";
+    WARNING_LOG(m_logger) << "initializing HitFilter failed";
   if (!static_cast<HitBuildingFilter *>(m_model->filter(EventType::HitBuilding))->init(m_session, m_ismDtc, m_pdmDtc, m_ppmDtc))
-    WARNING_LOG() << "initializing HitBuildingFilter failed";
+    WARNING_LOG(m_logger) << "initializing HitBuildingFilter failed";
   if (!static_cast<HitEffectSimulationFilter *>(m_model->filter(EventType::HitEffectSimulation))->init(m_pdmDtc))
-    WARNING_LOG() <<"initializing HitEffectSimulationFilter failed";
+    WARNING_LOG(m_logger) <<"initializing HitEffectSimulationFilter failed";
   if (!static_cast<MarkerFilter *>(m_model->filter(EventType::Marker))->init(m_opmDtc))
-    WARNING_LOG() << "initializing MarkerFilter failed";
+    WARNING_LOG(m_logger) << "initializing MarkerFilter failed";
   if (!static_cast<RadioCnrFilter *>(m_model->filter(EventType::RadioCnr))->init(m_avmDtc, exc.id(), m_model))
-    WARNING_LOG() << "initializing RadioCnrFilter failed";
+    WARNING_LOG(m_logger) << "initializing RadioCnrFilter failed";
   if (!static_cast<RadioTvcFilter *>(m_model->filter(EventType::RadioTvc))->init(m_avmDtc, exc.id(), m_model))
-    WARNING_LOG() << "initializing RadioTvcFilter failed";
+    WARNING_LOG(m_logger) << "initializing RadioTvcFilter failed";
   if (!static_cast<WeaponAssignmentFilter *>(m_model->filter(EventType::WeaponAssignment))->init(m_pdmDtc))
-    WARNING_LOG() << "initializing WeaponAssignmentFilter failed";
+    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()))
-    WARNING_LOG() << "initializing CameraVideoFilter failed";
+    WARNING_LOG(m_logger) << "initializing CameraVideoFilter failed";
   if (!static_cast<FireEventFilter *>(m_model->tempFilter(EventType::FireEvent))->init(m_pdmDtc))
-    WARNING_LOG() << "initializing FireEventFilter failed";
+    WARNING_LOG(m_logger) << "initializing FireEventFilter failed";
   if (!static_cast<HitFilter *>(m_model->tempFilter(EventType::Hit))->init(m_session, m_pdmDtc, m_ppmDtc))
-    WARNING_LOG() << "initializing HitFilter failed";
+    WARNING_LOG(m_logger) << "initializing HitFilter failed";
   if (!static_cast<HitBuildingFilter *>(m_model->tempFilter(EventType::HitBuilding))->init(m_session, m_ismDtc, m_pdmDtc, m_ppmDtc))
-    WARNING_LOG() << "initializing HitBuildingFilter failed";
+    WARNING_LOG(m_logger) << "initializing HitBuildingFilter failed";
   if (!static_cast<HitEffectSimulationFilter *>(m_model->tempFilter(EventType::HitEffectSimulation))->init(m_pdmDtc))
-    WARNING_LOG() <<"initializing HitEffectSimulationFilter failed";
+    WARNING_LOG(m_logger) <<"initializing HitEffectSimulationFilter failed";
   if (!static_cast<MarkerFilter *>(m_model->tempFilter(EventType::Marker))->init(m_opmDtc))
-    WARNING_LOG() << "initializing MarkerFilter failed";
+    WARNING_LOG(m_logger) << "initializing MarkerFilter failed";
   if (!static_cast<RadioCnrFilter *>(m_model->tempFilter(EventType::RadioCnr))->init(m_avmDtc, exc.id(), m_model))
-    WARNING_LOG() << "initializing RadioCnrFilter failed";
+    WARNING_LOG(m_logger) << "initializing RadioCnrFilter failed";
   if (!static_cast<RadioTvcFilter *>(m_model->tempFilter(EventType::RadioTvc))->init(m_avmDtc, exc.id(), m_model))
-    WARNING_LOG() << "initializing RadioTvcFilter failed";
+    WARNING_LOG(m_logger) << "initializing RadioTvcFilter failed";
   if (!static_cast<WeaponAssignmentFilter *>(m_model->tempFilter(EventType::WeaponAssignment))->init(m_pdmDtc))
-    WARNING_LOG() << "initializing WeaponAssignmentFilter failed";
+    WARNING_LOG(m_logger) << "initializing WeaponAssignmentFilter failed";
 
 
   view->setItemDelegate(new TimelineDelegate(view));
@@ -361,7 +361,7 @@ TimelineDialog::TimelineDialog(
 
   hideProgress();
   setLive(false);
-  INFO_LOG() << Q_FUNC_INFO << " FINISH";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " FINISH";
 }
 
 
@@ -607,8 +607,8 @@ void TimelineDialog::openItemInfoDialog(AbstractEventItem &item, bool scrollToPo
         equipmentNumber = participantItem.isEquipmentNumberSet() ? participantItem.equipmentNumber()
                                                                  : dynamic_cast<const ParticipantTrack &>(m_model->track(item.parentTrackId())).equipmentNumber();
       }
-      catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " obtaining equipment number failed: " << errMsg; }
-      catch (...) { ERROR_LOG() << Q_FUNC_INFO << " obtaining equipment number failed"; }
+      catch (const QString &errMsg) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " obtaining equipment number failed: " << errMsg; }
+      catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " obtaining equipment number failed"; }
     }
 
     if (scrollToPosition)
@@ -634,11 +634,11 @@ void TimelineDialog::openItemInfoDialog(AbstractEventItem &item, bool scrollToPo
     else
       uIdString = QString::fromUtf8(QCryptographicHash::hash(QJsonDocument(item.properties()).toJson(), QCryptographicHash::Md5).toHex());
 
-    ERROR_LOG() << "uIdString = " << uIdString;
+    ERROR_LOG(m_logger) << "uIdString = " << uIdString;
     addDialog(dialog, m_menuGroup, QStringLiteral("ItemInfoDialog_%1").arg(uIdString), LtsWidgets::LayoutArea::eInfoTab);
 
   }
-  catch (const QString &str) { ERROR_LOG() << Q_FUNC_INFO << " failed for type "<<(int)eventType<<": " << str; }
+  catch (const QString &str) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed for type "<<(int)eventType<<": " << str; }
 }
 
 
@@ -654,12 +654,12 @@ void TimelineDialog::openItemListDialog(const QVector<int> &itemIds)
 
       if (item.type() == EventType::Block)
       {
-        WARNING_LOG() << "openItemListDialog does not handle block items";
+        WARNING_LOG(m_logger) << "openItemListDialog does not handle block items";
         continue;
       }
       items.push_back(m_model->eventFactory(item.type())->copyItem(item));
     }
-    catch (const QString &str) { ERROR_LOG() << Q_FUNC_INFO << " " << str; }
+    catch (const QString &str) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " " << str; }
   }
   if (!items.empty())
     openItemListDialog(std::move(items));
@@ -680,8 +680,8 @@ void TimelineDialog::openItemListDialog(EventItemPtrs &&items)
     });
     addDialog(dialog, m_menuGroup, {}, LtsWidgets::LayoutArea::eDialogTab);
   }
-  catch (const QString &str) { ERROR_LOG() << Q_FUNC_INFO << " " << str; }
-  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed"; }
+  catch (const QString &str) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " " << str; }
+  catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed"; }
 }
 
 void TimelineDialog::setZoomForDuration(const qint64 &durationInMSecs)
@@ -753,7 +753,7 @@ void TimelineDialog::onStartReplay()
     }
     catch (...)
     {
-      ERROR_LOG() << "[timeout] Failed to remove failed-to-start replay. domainId: " << m_session->domainId()
+      ERROR_LOG(m_logger) << "[timeout] Failed to remove failed-to-start replay. domainId: " << m_session->domainId()
                             << " - replay id: " << replayId
                             << " - url " << m_session->tcpConnectionUrl().toString();
     }
@@ -763,7 +763,7 @@ void TimelineDialog::onStartReplay()
   if (!found)
   {
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("Error trying to create a replay session"));
-    WARNING_LOG() << "[timeout] Error while trying to create a replay session: domainId: " << m_session->domainId()
+    WARNING_LOG(m_logger) << "[timeout] Error while trying to create a replay session: domainId: " << m_session->domainId()
                           << " - replay partition does not exist - replay id: " << replayId
                           << " - url " << m_session->tcpConnectionUrl().toString();
     rmPartFn();
@@ -776,7 +776,7 @@ void TimelineDialog::onStartReplay()
   if (m_replayApp == nullptr)
   {
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("Error trying to create a replay session"));
-    WARNING_LOG() << "Error while trying to create a replay session: domainId: " << m_session->domainId() <<
+    WARNING_LOG(m_logger) << "Error while trying to create a replay session: domainId: " << m_session->domainId() <<
                              " - partition create reply (failed) - replay id: " << replayId <<
                              " - url: " << m_session->tcpConnectionUrl().toString();
     rmPartFn();
@@ -798,7 +798,7 @@ void TimelineDialog::onStartReplay()
   auto fn = [this, replayAppSession]()
   {
     m_replayAppSession = replayAppSession;
-    WARNING_LOG() << "New Situation replay App started";
+    WARNING_LOG(m_logger) << "New Situation replay App started";
     emit situtionReplayAppStarted(m_replayAppSession);
   };
 
@@ -919,7 +919,7 @@ void TimelineDialog::onEditFilter(EventType eventType)
     LtsWidgets::LtsDateTimeEdit *dteEnd = qobject_cast<LtsWidgets::LtsDateTimeEdit *>(hbox->itemAt(3)->widget());
     if (!dteStart || !dteEnd)
     {
-      ERROR_LOG() << "could not convert widgets to LtsDateTimeEdit for range start and end";
+      ERROR_LOG(m_logger) << "could not convert widgets to LtsDateTimeEdit for range start and end";
       return;
     }
     dteStart->setMsecsSinceEpoch(m_ui->timeline->view()->startTime());
@@ -931,14 +931,14 @@ void TimelineDialog::onEditFilter(EventType eventType)
 
 void TimelineDialog::onShowItemsForAllFilters()
 {
-  DEBUG_LOG() << "onShowItemsForAllFilters";
+  DEBUG_LOG(m_logger) << "onShowItemsForAllFilters";
   EventTypes eventTypes;
   eventTypes.reserve(m_model->filters().size());
   for (auto it = m_model->filters().constBegin(); it != m_model->filters().constEnd(); ++it)
   {
     if (it.value()->isActive())
     {
-      DEBUG_LOG() << "onShowItemsForAllFilters: add active event type = " << it.key();
+      DEBUG_LOG(m_logger) << "onShowItemsForAllFilters: add active event type = " << it.key();
       eventTypes.append(it.key());
     }
   }
@@ -947,7 +947,7 @@ void TimelineDialog::onShowItemsForAllFilters()
 
 void TimelineDialog::onShowItemsForEventWithUnsavedFilters(EventType eventType)
 {
-  DEBUG_LOG() << __FUNCTION__;
+  DEBUG_LOG(m_logger) << __FUNCTION__;
   std::unique_ptr<AbstractEventFilter> filter(m_model->eventFactories().value(eventType)->filter()); 
   showItemListDialogByFilter(QVector<AbstractEventFilter *>() << filter.get());
 }
@@ -971,25 +971,25 @@ void TimelineDialog::showItemListDialogByFilter(const QVector<AbstractEventFilte
 
     showItemListDialog(std::move(items));
   }
-  catch (const QString &str) { ERROR_LOG() << str; }
-  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed"; }
+  catch (const QString &str) { ERROR_LOG(m_logger) << str; }
+  catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed"; }
 
   LtsWidgets::LtsGlobalWaitDialog::getInstance()->done();
 }
 
 void TimelineDialog::onShowItemsForEvents(EventTypes eventTypes)
 {
-  DEBUG_LOG() << "onShowItemsForFilters: " << eventTypes.size();
+  DEBUG_LOG(m_logger) << "onShowItemsForFilters: " << eventTypes.size();
 
   QVector<AbstractEventFilter *> filters;
   filters.reserve(eventTypes.size());
 
   for (EventType eventType : std::as_const(eventTypes))
   {
-    DEBUG_LOG() << "onShowItemsForFilters: EventType = " << QString::number(eventType);
+    DEBUG_LOG(m_logger) << "onShowItemsForFilters: EventType = " << QString::number(eventType);
     if (m_model->filters().contains(eventType))
     {
-      DEBUG_LOG() << "onShowItemsForFilters: Add EventType = " << QString::number(eventType);
+      DEBUG_LOG(m_logger) << "onShowItemsForFilters: Add EventType = " << QString::number(eventType);
       filters.append(m_model->filter(eventType));
     }
   }
@@ -1025,7 +1025,7 @@ void TimelineDialog::onOpenItemInfoDialog(int itemId)
   {
     openItemInfoDialog(static_cast<EventItem &>(m_model->item(itemId)), signalFromFilterEditDialog);
   }
-  catch (const QString &str) { ERROR_LOG() << str; }
+  catch (const QString &str) { ERROR_LOG(m_logger) << str; }
 }
 
 void TimelineDialog::onTrackActivated(int trackId)
@@ -1088,7 +1088,7 @@ void TimelineDialog::addItemToMap(int itemId, QMap<QString, int> &map) noexcept(
 
     map.insert(hashHex, itemId);
   }
-  catch (const QString &msg) { ERROR_LOG() << "cannot find item for item id" << itemId << ": " << msg; }
+  catch (const QString &msg) { ERROR_LOG(m_logger) << "cannot find item for item id" << itemId << ": " << msg; }
 }
 
 
@@ -1129,7 +1129,7 @@ void TimelineDialog::onItemsSelected(const QVector<int> &itemIds)
     {
       openItemInfoDialog(static_cast<AbstractEventItem &>(m_model->item(uniqueItems.first())));
     }
-    catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " failed: " << errMsg; }
+    catch (const QString &errMsg) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed: " << errMsg; }
 
     return;
 
@@ -1191,7 +1191,7 @@ void TimelineDialog::onItemsSelected(const QVector<int> &itemIds)
         catch (...) { return; }
       }
     }
-    catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " failed for item with id = " << itemId << ": " << errMsg; }
+    catch (const QString &errMsg) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed for item with id = " << itemId << ": " << errMsg; }
   }
 
 
@@ -1212,7 +1212,7 @@ void TimelineDialog::onItemsSelected(const QVector<int> &itemIds)
       const AbstractEventItem &item = static_cast<const AbstractEventItem &>(m_model->item(itemId));
       items.push_back(m_model->eventFactory(item.type())->copyItem(item));
     }
-    catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " failed for x item with id = " << itemId << ": " << errMsg; }
+    catch (const QString &errMsg) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed for x item with id = " << itemId << ": " << errMsg; }
   }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_dialog.h
index 6c4b67379..6c10004dc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_dialog.h
@@ -82,6 +82,8 @@ public:
   LtsTimeline::TimelineView *view();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void aboutToClose() override;
   void resizeEvent(QResizeEvent *event) override;
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 ff388722a..4c43213e4 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
@@ -190,13 +190,13 @@ TimelineModel::TimelineModel(LtsSession::LtsSession *session, TimelineDialog *di
   m_db = DBConnection::open(m_logger, dbUser, dbPasswd, driver, hostname, dbname);
   delete s;
 
-  DEBUG_LOG() << "s->databaseDriver() " << driver << ", s->databaseName() " << dbname;
+  DEBUG_LOG(m_logger) << "s->databaseDriver() " << driver << ", s->databaseName() " << dbname;
 
-  DEBUG_LOG() << "Trying to open database " << hostname << ":" << dbname;
+  DEBUG_LOG(m_logger) << "Trying to open database " << hostname << ":" << dbname;
 
   if (!m_db.isOpen())
   {
-    ERROR_LOG() << "Error opening database " << hostname << ":" << dbname << " - " << m_db.lastError().text();
+    ERROR_LOG(m_logger) << "Error opening database " << hostname << ":" << dbname << " - " << m_db.lastError().text();
     throw "cannot open connection to database";
   }
   else
@@ -372,10 +372,10 @@ void TimelineModel::clearUnusedTempTables()
         if (!tableName.startsWith(QStringLiteral("tln_temp_view_")))
           throw QStringLiteral("tried to drop a table that isn't a timeline temp view! '%1'").arg(tableName);
         executeQuery(QStringLiteral("DROP TABLE %1").arg(tableName));
-      } catch(const QString &msg) { ERROR_LOG() << "cannot remove stale temp table '" << tableName << "': " << msg; }
+      } catch(const QString &msg) { ERROR_LOG(m_logger) << "cannot remove stale temp table '" << tableName << "': " << msg; }
     }
   }
-  catch(const QString &msg) { ERROR_LOG() << "cannot remove stale temp tables: " << msg; }
+  catch(const QString &msg) { ERROR_LOG(m_logger) << "cannot remove stale temp tables: " << msg; }
 }
 
 
@@ -400,14 +400,14 @@ void TimelineModel::getParticipantTracks()
   
   for (ParticipantManagement::Party party : m_ppmDtc->partys())
   {
-    DEBUG_LOG() << "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()))));
     }
     catch (const QString &msg)
     {
-      ERROR_LOG() << "getParticipantTracks: cannot add party track: " << msg;
+      ERROR_LOG(m_logger) << "getParticipantTracks: cannot add party track: " << msg;
       continue;
     }
   }
@@ -425,7 +425,7 @@ void TimelineModel::getParticipantTracks()
     int equipmentNumber = participant.equipmentNumber().is_set() ? participant.equipmentNumber().get() : 0;
 
     if (QString::fromStdString(participant.designator()).contains(QStringLiteral("Ausb")))
-      DEBUG_LOG() << "FOUND Ausb! " << participant.id();
+      DEBUG_LOG(m_logger) << "FOUND Ausb! " << participant.id();
 
     QVector<int> inferiorIds;
     std::transform(participant.inferiorIds().cbegin(), participant.inferiorIds().cend(), std::back_inserter(inferiorIds),
@@ -442,7 +442,7 @@ void TimelineModel::getParticipantTracks()
       QStringList infs;
       std::transform(participant.inferiorIds().cbegin(), participant.inferiorIds().cend(), std::back_inserter(infs),
                      [](int32_t id) { return QString::number(id); });
-      DEBUG_LOG() << "sup " << participant.id() << " has infs: " << infs.join(QStringLiteral(", "));
+      DEBUG_LOG(m_logger) << "sup " << participant.id() << " has infs: " << infs.join(QStringLiteral(", "));
       superiorIds += participant.id();
     }
   };
@@ -456,7 +456,7 @@ void TimelineModel::getParticipantTracks()
 
     if (it == m_modelState.partys.constEnd())
     {
-      WARNING_LOG() << "participant with id " << superior.participantId << " has non-existant party id " << superior.partyId;
+      WARNING_LOG(m_logger) << "participant with id " << superior.participantId << " has non-existant party id " << superior.partyId;
       continue;
     }
 
@@ -550,7 +550,7 @@ void TimelineModel::onMarkerChanged(const MarkerManagement::Marker &marker, Data
       }
       catch (const QString &errMsg)
       {
-        ERROR_LOG() << "Marker " << marker.id() << " has invalid properties: " << errMsg;
+        ERROR_LOG(m_logger) << "Marker " << marker.id() << " has invalid properties: " << errMsg;
         
       }
 
@@ -579,7 +579,7 @@ void TimelineModel::onMarkerChanged(const MarkerManagement::Marker &marker, Data
   }
   catch (const QString &msg)
   {
-    ERROR_LOG() << "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;
   }
   
@@ -601,7 +601,7 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent)
   }
   catch (const QString &errMsg)
   {
-    ERROR_LOG() << "failed to parse properties of live event: " << errMsg << " - adding it anyways...";
+    ERROR_LOG(m_logger) << "failed to parse properties of live event: " << errMsg << " - adding it anyways...";
   }
 
 
@@ -614,7 +614,7 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent)
     {
       int duration = properties[QStringLiteral("duration")].toInt(0);
 
-      DEBUG_LOG() << "item is vid, tvc or cnr: updating duration to " << duration;
+      DEBUG_LOG(m_logger) << "item is vid, tvc or cnr: updating duration to " << duration;
       i.setDuration(duration);
       static_cast<EventItem &>(i).setProperties(properties);
 
@@ -633,21 +633,21 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent)
       try
       {
         Item &i = item(id);
-        DEBUG_LOG() << "item already exists";
+        DEBUG_LOG(m_logger) << "item already exists";
         updateItem(i, track(i.parentTrackId()));
       }
       catch (const QString &msg)
       {
-       DEBUG_LOG() << "update failed for item with id " << id << "!! " << msg; 
+       DEBUG_LOG(m_logger) << "update failed for item with id " << id << "!! " << msg; 
       }
     }
 
-    ERROR_LOG() << "done";
+    ERROR_LOG(m_logger) << "done";
     return; 
   }
   catch (const QString &msg)
   {
-    DEBUG_LOG() << "!!!!! " << msg;
+    DEBUG_LOG(m_logger) << "!!!!! " << msg;
     
     bool foundAtLeastOne = false;
     QVector<int> ids;
@@ -671,7 +671,7 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent)
           if (ei2.dbId() == eemEvent.id())
           {
             updateItem(ei2, track(bi.parentTrackId()));
-            DEBUG_LOG() << "done2";
+            DEBUG_LOG(m_logger) << "done2";
             found = true;
             foundAtLeastOne = true;
             break;
@@ -707,7 +707,7 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent)
       catch (...)
       {
         
-        DEBUG_LOG() << "not found anymore";
+        DEBUG_LOG(m_logger) << "not found anymore";
       }
     }
 
@@ -718,7 +718,7 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent)
 
 
   qint64 start = eemEvent.sampleTime();
-  DEBUG_LOG() << "start = " << start;
+  DEBUG_LOG(m_logger) << "start = " << start;
 
   
   EventType eventType = static_cast<EventType>(static_cast<int>(eemEvent.eventTypeId().underlying()));
@@ -738,13 +738,13 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent)
 
     if (!eventFilter->check(*eventItem.get()))
     {
-      ERROR_LOG() << "event does not comply with filter";
+      ERROR_LOG(m_logger) << "event does not comply with filter";
       return;
     }
   }
   catch (const QString &errMsg)
   {
-    ERROR_LOG() << "failed to add live event: " << errMsg;
+    ERROR_LOG(m_logger) << "failed to add live event: " << errMsg;
     return;
   }
 
@@ -773,8 +773,8 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent)
 
     }
   }
-  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " failed: " << errMsg; }
-  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed: "; }
+  catch (const QString &errMsg) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed: " << errMsg; }
+  catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed: "; }
 }
 
 void TimelineModel::onStreamListReceived(const QMap<QString, QString> &streamList)
@@ -834,11 +834,11 @@ bool TimelineModel::isBlockItem(int itemId) const
   }
   catch (const QString &str)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " " << str;
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " " << str;
   }
   catch (...)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " failed for item with id = " << itemId;
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed for item with id = " << itemId;
   }
   return false;
 }
@@ -863,7 +863,7 @@ std::vector<EventItemPtr> TimelineModel::getEventsByFilter(const QVector<Abstrac
 
   for (const AbstractEventFilter *filter : filters)
   {
-    DEBUG_LOG() << "getEventsByFilter: " << filter->type();
+    DEBUG_LOG(m_logger) << "getEventsByFilter: " << filter->type();
     eventTypes.append(QString::number(filter->type()));
 
     
@@ -883,7 +883,7 @@ std::vector<EventItemPtr> TimelineModel::getEventsByFilter(const QVector<Abstrac
     
   }
 
-  DEBUG_LOG() << "filterString = " << filterString;
+  DEBUG_LOG(m_logger) << "filterString = " << filterString;
 
   QString stmt(QStringLiteral("SELECT %1 FROM ex_%2.eem_event WHERE 1 = 1 %3 LIMIT ") + QString::number(s_maxRows + 1));
 
@@ -906,7 +906,7 @@ std::vector<EventItemPtr> TimelineModel::getEventsByFilter(const QVector<Abstrac
 
       items.push_back((createItemFromRow(row)));
     }
-    catch (const QString &errMsg) { ERROR_LOG() << "item creation failed: " << errMsg; }
+    catch (const QString &errMsg) { ERROR_LOG(m_logger) << "item creation failed: " << errMsg; }
     counter++;
   }
 
@@ -1003,8 +1003,8 @@ TrackType TimelineModel::trackType(int trackId) const
   {
     return trackType(track(trackId));
   }
-  catch (const QString &str) { ERROR_LOG() << Q_FUNC_INFO << " " << str; }
-  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed for item with id = " << trackId; }
+  catch (const QString &str) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " " << str; }
+  catch (...) { ERROR_LOG(m_logger) << Q_FUNC_INFO << " failed for item with id = " << trackId; }
   return TrackType::Unknown;
 }
 
@@ -1021,7 +1021,7 @@ QVector<QVariantMap>  TimelineModel::executeQuery(const QString &query, const QS
   QElapsedTimer t;
   t.start();
   bool res = q.exec(query);
-  DEBUG_LOG() << "executeQuery: " << t.elapsed() << "ms\n"
+  DEBUG_LOG(m_logger) << "executeQuery: " << t.elapsed() << "ms\n"
                       << ">> rows: " << q.size() << "\n"
                       << ">> query: " << query.toStdString().c_str() << "\n"
                       << "\n";
@@ -1030,7 +1030,7 @@ QVector<QVariantMap>  TimelineModel::executeQuery(const QString &query, const QS
 
   if (!res)
   {
-    ERROR_LOG() << (ignoreError ? "[ ]" : "[!]") << " query failed! query: '" << q.executedQuery() << "' - error: '" << q.lastError().text() << "'";
+    ERROR_LOG(m_logger) << (ignoreError ? "[ ]" : "[!]") << " query failed! query: '" << q.executedQuery() << "' - error: '" << q.lastError().text() << "'";
 
     if (!ignoreError)
       throw QStringLiteral("executeQuery: query failed: %1 - query was: '%2' ('%3')").arg(q.lastError().text(), q.executedQuery(), query);
@@ -1138,7 +1138,7 @@ void TimelineModel::backwardsChannelSumEvents(const Track &t)
   }
   catch (const QString &msg)
   {
-    ERROR_LOG() << "dataChanged failed: " << msg;
+    ERROR_LOG(m_logger) << "dataChanged failed: " << msg;
   }
 }
 
@@ -1168,7 +1168,7 @@ void TimelineModel::sumEvents(LtsTimeline::Track &track)
     auto it = m_itemCache.find(id);
     if (it == m_itemCache.end())
     {
-      ERROR_LOG() << "cannot erase item ("<<id<<") from track ("<<track.id()<<") - not found!!";
+      ERROR_LOG(m_logger) << "cannot erase item ("<<id<<") from track ("<<track.id()<<") - not found!!";
       continue;
     }
     m_itemCache.erase(it);
@@ -1196,7 +1196,7 @@ void TimelineModel::sumEvents(LtsTimeline::Track &track)
           }
           catch (const QString &msg)
           {
-            ERROR_LOG() << "cannot insert sub item: " << msg;
+            ERROR_LOG(m_logger) << "cannot insert sub item: " << msg;
           }
         }
         continue;
@@ -1208,7 +1208,7 @@ void TimelineModel::sumEvents(LtsTimeline::Track &track)
       }
       catch (const QString &msg)
       {
-        ERROR_LOG() << "cannot insert item: " << msg;
+        ERROR_LOG(m_logger) << "cannot insert item: " << msg;
       }
     }
   }
@@ -1263,7 +1263,7 @@ EventItemPtr TimelineModel::createItem(int id, qint64 sampleTime, QJsonObject pr
   auto eventFactoryIt = m_eventFactories.find(static_cast<EventType>(toEventType(eventTypeId)));
   if (eventFactoryIt == m_eventFactories.end())
   {
-    ERROR_LOG() << "event factory for event type id " << eventTypeId << " not found!";
+    ERROR_LOG(m_logger) << "event factory for event type id " << eventTypeId << " not found!";
     throw QStringLiteral("createItemFromRow: cannot create item because the event factory is missing for type id %1").arg(eventTypeId);
   }
   LtsUtils::QPoint3D position(posX, posY, posZ);
@@ -1297,7 +1297,7 @@ std::vector<EventItemPtr> TimelineModel::createItemsFromRows(const Rows &rows)
     }
     catch (const QString &msg)
     {
-      ERROR_LOG() << "cannot create item: " << msg;
+      ERROR_LOG(m_logger) << "cannot create item: " << msg;
     }
   }
   return ret; 
@@ -1364,7 +1364,7 @@ QJsonObject TimelineModel::eventPropertiesFromMarker(const MarkerManagement::Mar
       }
       default:
       {
-        WARNING_LOG() << "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().underlying();
         break;
       }
     }
@@ -1426,7 +1426,7 @@ std::vector<EventItemPtr> TimelineModel::getMarkerItems(const Filters &filters,
     }
     catch (const QString &errMsg)
     {
-      ERROR_LOG() << "Marker " << data.id() << " has invalid properties: " << errMsg;
+      ERROR_LOG(m_logger) << "Marker " << data.id() << " has invalid properties: " << errMsg;
       
     }
     
@@ -1515,7 +1515,7 @@ int TimelineModel::findTrack(const AbstractEventItem &_eventItem)
       }
       else
       {
-        DEBUG_LOG() << "finding track for camera video event wijth msei " << msei << " and stream name '" << streamName << "' ...";
+        DEBUG_LOG(m_logger) << "finding track for camera video event wijth msei " << msei << " and stream name '" << streamName << "' ...";
 
         
         
@@ -1544,7 +1544,7 @@ int TimelineModel::findTrack(const AbstractEventItem &_eventItem)
             beginInsertRows(idx, rowCount, rowCount);
             trackId = addTrack(m_outdoorCameraRootTrackId, OutdoorCameraTrack(streamName));
             m_outdoorCameraTracks.insert(streamName, trackId);
-            ERROR_LOG() << "outdoor camera stream track not found, created new track";
+            ERROR_LOG(m_logger) << "outdoor camera stream track not found, created new track";
           }
         }
         else
@@ -1554,7 +1554,7 @@ int TimelineModel::findTrack(const AbstractEventItem &_eventItem)
           try
           {
             trackId = constFinder<int>(m_buildingStreamsTracks, QPair<int, QString>(msei, streamName));
-            ERROR_LOG() << "track id for camera video event with msei " << msei << " and stream name '" << streamName << "' found by internal name!!";
+            ERROR_LOG(m_logger) << "track id for camera video event with msei " << msei << " and stream name '" << streamName << "' found by internal name!!";
           }
           catch (...)
           {
@@ -1563,7 +1563,7 @@ int TimelineModel::findTrack(const AbstractEventItem &_eventItem)
             try
             {
               trackId = constFinder<int>(m_videoTracks, streamName);
-              ERROR_LOG() << "track id for camera video event wijth msei " << msei << " and stream name '" << streamName << "' found by display name!!";
+              ERROR_LOG(m_logger) << "track id for camera video event wijth msei " << msei << " and stream name '" << streamName << "' found by display name!!";
             }
             catch (...)
             {
@@ -1582,13 +1582,13 @@ int TimelineModel::findTrack(const AbstractEventItem &_eventItem)
 
               trackId = addTrack(m_videosRootTrackId, VideoTrack(streamName));
               m_videoTracks.insert(streamName, trackId);
-              ERROR_LOG() << "track not found, created new track";
+              ERROR_LOG(m_logger) << "track not found, created new track";
             }
           }
         }
       }
 
-      ERROR_LOG() << "track id for camera video event with msei " << msei << " and stream name '" << streamName << "' ... is " << trackId;
+      ERROR_LOG(m_logger) << "track id for camera video event with msei " << msei << " and stream name '" << streamName << "' ... is " << trackId;
     }
     else if (eventType == EventType::RadioCnr)
     {
@@ -1608,7 +1608,7 @@ int TimelineModel::findTrack(const AbstractEventItem &_eventItem)
       }
       catch (const QString &msg)
       {
-        ERROR_LOG() << "cannot find cnr track for stream '"<<displayStreamName<<"': " << msg << " - creating the track....";
+        ERROR_LOG(m_logger) << "cannot find cnr track for stream '"<<displayStreamName<<"': " << msg << " - creating the track....";
 
         
 
@@ -1645,7 +1645,7 @@ int TimelineModel::findTrack(const AbstractEventItem &_eventItem)
       }
       catch (const QString &msg)
       {
-        ERROR_LOG() << "cannot find tvc track for stream '"<<displayStreamName<<"': "
+        ERROR_LOG(m_logger) << "cannot find tvc track for stream '"<<displayStreamName<<"': "
                             << msg << " - creating the track...."
                             << " id=" << _eventItem.id()
                             << " m_dbId=" << _eventItem.m_dbId;
@@ -1695,7 +1695,7 @@ int TimelineModel::findTrack(const AbstractEventItem &_eventItem)
   }
   catch (const QString &errMsg)
   {
-    ERROR_LOG() << "cannot find track: " << errMsg;
+    ERROR_LOG(m_logger) << "cannot find track: " << errMsg;
     return -1;
   }
 }
@@ -1872,7 +1872,7 @@ void TimelineModel::insertItem(Track &t, ItemPtr &&itemPtr) noexcept(false)
       auto it = m_itemCache.find(id);
       if (it == m_itemCache.end())
       {
-        ERROR_LOG() << "failed to remove id ("<<id<<") from item cache";
+        ERROR_LOG(m_logger) << "failed to remove id ("<<id<<") from item cache";
         continue;
       }
 
@@ -1940,7 +1940,7 @@ void TimelineModel::insertItem(ItemPtr &&itemPtr)
   }
   catch (const QString &errMsg)
   {
-    ERROR_LOG() << "cannot add new item: " << errMsg;
+    ERROR_LOG(m_logger) << "cannot add new item: " << errMsg;
   }
 }
 
@@ -1960,7 +1960,7 @@ void TimelineModel::getMarkers() noexcept(false)
   m_mrkDtc->waitForHistoricalDataMarker(5000);
 
   std::vector<EventItemPtr> markerItems = getMarkerItems(m_filter.values().toVector(), false, -1);
-  ERROR_LOG() << "markers: " << markerItems.size();
+  ERROR_LOG(m_logger) << "markers: " << markerItems.size();
 
   for (EventItemPtr &ptr : markerItems)
   {
@@ -1972,7 +1972,7 @@ void TimelineModel::getMarkers() noexcept(false)
     }
     catch (const QString &msg)
     {
-      ERROR_LOG() << "cannot add marker with db id "<<markerDbId<<": " << msg;
+      ERROR_LOG(m_logger) << "cannot add marker with db id "<<markerDbId<<": " << msg;
     }
   }
 }
@@ -2084,7 +2084,7 @@ void TimelineModel::getBuildings()
     }
     catch (const QString &msg)
     {
-      ERROR_LOG() << "getBuildings: failed to add building tracks: " << msg;
+      ERROR_LOG(m_logger) << "getBuildings: failed to add building tracks: " << msg;
       continue;
     }
 
@@ -2103,7 +2103,7 @@ void TimelineModel::getBuildings()
       mappingCounter++;
     }
 
-    DEBUG_LOG() << "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";
   }
 
   
@@ -2129,7 +2129,7 @@ void TimelineModel::getRadioTracks()
       {
         m_cnrChannelDisplayNames.insert(config.cnrChannelId(), QString::fromStdString(config.radioCircuit()));
         
-        DEBUG_LOG() << "!!!!!!!!!! config => id: " << config.id() << ", circuit: " << QString::fromStdString(config.radioCircuit())
+        DEBUG_LOG(m_logger) << "!!!!!!!!!! config => id: " << config.id() << ", circuit: " << QString::fromStdString(config.radioCircuit())
                             << ", channelId: " << config.cnrChannelId();
       }
     }
@@ -2149,11 +2149,11 @@ void TimelineModel::getRadioTracks()
       }
       catch (const QString &msg)
       {
-        ERROR_LOG() << "display name for cnr channel '"<<internalChannelName<<"' ("<<channelId<<") not found: " << msg;
+        ERROR_LOG(m_logger) << "display name for cnr channel '"<<internalChannelName<<"' ("<<channelId<<") not found: " << msg;
         displayName = internalChannelName;
       }
 
-      DEBUG_LOG() << "!!!!!!!!!! channel => id: " << channelId << ", name: " << internalChannelName << ", display name: " << displayName;
+      DEBUG_LOG(m_logger) << "!!!!!!!!!! channel => id: " << channelId << ", name: " << internalChannelName << ", display name: " << displayName;
       m_cnrStreams.insert(channelId, displayName);
 
       try
@@ -2162,7 +2162,7 @@ void TimelineModel::getRadioTracks()
       }
       catch (const QString &msg)
       {
-        ERROR_LOG() << "cannot add cnr channel '"<<msg<<"': " << msg;
+        ERROR_LOG(m_logger) << "cannot add cnr channel '"<<msg<<"': " << msg;
       }
     }
   }
@@ -2177,7 +2177,7 @@ void TimelineModel::getRadioTracks()
         m_tvcStreams.insert(config.tetraChannelId(), QString::fromStdString(config.radioCircuit()));
         m_tvcChannelDisplayNames.insert(config.tetraChannelId(), QString::fromStdString(config.radioCircuit()));
 
-        DEBUG_LOG() << "!!!!!!!!!! TETRA config => id: " << config.id() << ", circuit: " << QString::fromStdString(config.radioCircuit())
+        DEBUG_LOG(m_logger) << "!!!!!!!!!! TETRA config => id: " << config.id() << ", circuit: " << QString::fromStdString(config.radioCircuit())
                             << ", channelId: " << config.tetraChannelId();
       }
     }
@@ -2198,11 +2198,11 @@ void TimelineModel::getRadioTracks()
       }
       catch (const QString &msg)
       {
-        ERROR_LOG() << "display name for tvc channel '"<<internalChannelName<<"' ("<<channelId<<") not found: " << msg;
+        ERROR_LOG(m_logger) << "display name for tvc channel '"<<internalChannelName<<"' ("<<channelId<<") not found: " << msg;
         displayName = internalChannelName;
       }
 
-      DEBUG_LOG() << "!!!!!!!!!! channel => id: " << channelId << ", name: " << internalChannelName << ", display name: " << displayName;
+      DEBUG_LOG(m_logger) << "!!!!!!!!!! channel => id: " << channelId << ", name: " << internalChannelName << ", display name: " << displayName;
       m_tvcStreams.insert(channelId, displayName);
 
       try
@@ -2211,7 +2211,7 @@ void TimelineModel::getRadioTracks()
       }
       catch (const QString &msg)
       {
-        ERROR_LOG() << "cannot add tvc channel '"<<msg<<"': " << msg;
+        ERROR_LOG(m_logger) << "cannot add tvc channel '"<<msg<<"': " << msg;
       }
     }
   }
@@ -2266,7 +2266,7 @@ void TimelineModel::getBuildingVideoStreams()
 
     if (it2 == m_mountingPointsToMainStructureElementMapping.constEnd())
     {
-      ERROR_LOG() << "getStreams: cannot add stream '"<<streamDisplayName<<"' ('"<<internalStreamName<<"') because mounting point with id " << mountingPointId << " cannot be mapped to an msei";
+      ERROR_LOG(m_logger) << "getStreams: cannot add stream '"<<streamDisplayName<<"' ('"<<internalStreamName<<"') because mounting point with id " << mountingPointId << " cannot be mapped to an msei";
       continue;
     }
 
@@ -2285,7 +2285,7 @@ void TimelineModel::getBuildingVideoStreams()
       }
       catch (const QString &errMsg)
       {
-        ERROR_LOG() << "getStreams: failed to add track for stream '" << streamDisplayName << "' in building with id " << msei << ": " << errMsg;
+        ERROR_LOG(m_logger) << "getStreams: failed to add track for stream '" << streamDisplayName << "' in building with id " << msei << ": " << errMsg;
         return;
       }
       m_outdoorCameraTracks.insert(internalStreamName, trackId);
@@ -2299,7 +2299,7 @@ void TimelineModel::getBuildingVideoStreams()
 
       if (it3 == m_modelState.buildingTrackIds.constEnd())
       {
-        ERROR_LOG() << "getStreams: cannot add stream '"<<streamDisplayName<<"' ('"<<internalStreamName<<"') because msei " << msei << " is missing in building track map";
+        ERROR_LOG(m_logger) << "getStreams: cannot add stream '"<<streamDisplayName<<"' ('"<<internalStreamName<<"') because msei " << msei << " is missing in building track map";
         continue;
       }
 
@@ -2312,7 +2312,7 @@ void TimelineModel::getBuildingVideoStreams()
       }
       catch (const QString &msg)
       {
-        ERROR_LOG() << "getStreams: failed to add track for stream '"<<streamDisplayName<<"' in building with id " << msei << ": " << msg;
+        ERROR_LOG(m_logger) << "getStreams: failed to add track for stream '"<<streamDisplayName<<"' in building with id " << msei << ": " << msg;
         return;
       }
 
@@ -2346,7 +2346,7 @@ void TimelineModel::update(bool fake)
   m_updateMutex = true;
 
 
-  DEBUG_LOG() << ">>>>>>>>>> open sql connections: " << QSqlDatabase::connectionNames().count() << ": " << QSqlDatabase::connectionNames().join(QStringLiteral(", "));
+  DEBUG_LOG(m_logger) << ">>>>>>>>>> open sql connections: " << QSqlDatabase::connectionNames().count() << ": " << QSqlDatabase::connectionNames().join(QStringLiteral(", "));
 
 
   emit updateStatusChanged(true);
@@ -2357,7 +2357,7 @@ void TimelineModel::update(bool fake)
       + TimelineDelegate::s_zeroDurationItemWidth;
   m_zeroDurationItemWidthTime = m_view->toTime(x) - m_view->currentTime();
 
-  DEBUG_LOG() << "m_zeroDurationItemWidthTime = " << m_zeroDurationItemWidthTime;
+  DEBUG_LOG(m_logger) << "m_zeroDurationItemWidthTime = " << m_zeroDurationItemWidthTime;
 
 
   
@@ -2419,7 +2419,7 @@ void TimelineModel::update(bool fake)
     {
       executeQuery(QStringLiteral("DROP TABLE IF EXISTS temp_range_%1").arg(m_modelState.dbUuid), true);
     }
-    catch (const QString &errMsg) { ERROR_LOG() << "drop TempRangeTable failed: " << errMsg; return; }
+    catch (const QString &errMsg) { ERROR_LOG(m_logger) << "drop TempRangeTable failed: " << errMsg; return; }
 
     
     
@@ -2436,7 +2436,7 @@ void TimelineModel::update(bool fake)
             .arg(m_view->endTime())
             );
     }
-    catch (const QString &errMsg) { ERROR_LOG() << "create TempRangeTable failed: " << errMsg; return; }
+    catch (const QString &errMsg) { ERROR_LOG(m_logger) << "create TempRangeTable failed: " << errMsg; return; }
 
     m_modelState.tempRangeStart = m_view->startTime();
     m_modelState.tempRangeEnd = m_view->endTime();
@@ -2446,7 +2446,7 @@ void TimelineModel::update(bool fake)
     {
       executeQuery(QStringLiteral("DROP TABLE IF EXISTS %1").arg(m_modelState.publicTableName), true);
     }
-    catch (const QString &errMsg) { ERROR_LOG() << "drop TempViewTable failed: " << errMsg; return; }
+    catch (const QString &errMsg) { ERROR_LOG(m_logger) << "drop TempViewTable failed: " << errMsg; return; }
     
     try
     {
@@ -2462,7 +2462,7 @@ void TimelineModel::update(bool fake)
                    .arg(m_view->currentTime() + m_view->zoomFactor())
                    );
     }
-    catch (const QString &errMsg) { ERROR_LOG() << "create TempViewTable failed: " << errMsg; return; }
+    catch (const QString &errMsg) { ERROR_LOG(m_logger) << "create TempViewTable failed: " << errMsg; return; }
 
 
     try
@@ -2474,13 +2474,13 @@ void TimelineModel::update(bool fake)
 
       count = getInt(rows.first(), QStringLiteral("count"));
     }
-    catch (const QString &errMsg) { ERROR_LOG() << "countTempView" << errMsg; return; }
+    catch (const QString &errMsg) { ERROR_LOG(m_logger) << "countTempView" << errMsg; return; }
 
-    DEBUG_LOG() << "number of events in range = " << count;
+    DEBUG_LOG(m_logger) << "number of events in range = " << count;
 
     if (count == 0)
     {
-      WARNING_LOG() << "no events in selected range: " << QDateTime::fromMSecsSinceEpoch(m_modelState.tempRangeStart).toString() << " - " << QDateTime::fromMSecsSinceEpoch(m_modelState.tempRangeEnd).toString();
+      WARNING_LOG(m_logger) << "no events in selected range: " << QDateTime::fromMSecsSinceEpoch(m_modelState.tempRangeStart).toString() << " - " << QDateTime::fromMSecsSinceEpoch(m_modelState.tempRangeEnd).toString();
 
       m_modelState.knownStart = start;
       m_modelState.knownEnd   = end;
@@ -2490,7 +2490,7 @@ void TimelineModel::update(bool fake)
 
     if (count > 750000)
     {
-      ERROR_LOG() << "more than 750.000 events requested - aborted";
+      ERROR_LOG(m_logger) << "more than 750.000 events requested - aborted";
       emit errorCountExceeded();
       return;
     }
@@ -2530,7 +2530,7 @@ void TimelineModel::update(bool fake)
         
         EventItemPtrs eventItemPtrs = createItemsFromRows(*m_sharedThing[i]);
         
-        DEBUG_LOG() << "create took " << t.elapsed() << "ms";
+        DEBUG_LOG(m_logger) << "create took " << t.elapsed() << "ms";
 
         
         m_sharedThing[i]->clear();
@@ -2538,7 +2538,7 @@ void TimelineModel::update(bool fake)
 
         t.start();
         insertItems(eventItemPtrs);
-        DEBUG_LOG() << "insert took " << t.elapsed() << "ms";
+        DEBUG_LOG(m_logger) << "insert took " << t.elapsed() << "ms";
 
         m_isCurrentlyUpdating = false;
         emit dataChanged({}, {});
@@ -2595,7 +2595,7 @@ void TimelineModel::update(bool fake)
   (*m_lockyMcLockLock) = threads;
 
 
-  DEBUG_LOG() << "threads = " << threads << ", main thread id = " << QThread::currentThreadId();
+  DEBUG_LOG(m_logger) << "threads = " << threads << ", main thread id = " << QThread::currentThreadId();
   for (int i = 0; i < threads; ++i)
   {
     QString stmt(QStringLiteral("SELECT * FROM %1 LIMIT %2 OFFSET %3")
@@ -2618,7 +2618,7 @@ void TimelineModel::update(bool fake)
         QSqlDatabase db(QSqlDatabase::cloneDatabase(m_db, connectionName));
         if (!db.open())
         {
-          ERROR_LOG() << "thread " << (qintptr)QThread::currentThreadId() << " cannot connect to db: " << db.lastError().text()
+          ERROR_LOG(m_logger) << "thread " << (qintptr)QThread::currentThreadId() << " cannot connect to db: " << db.lastError().text()
                               << " connectionName=" << connectionName;
           return;
         }
@@ -2641,7 +2641,7 @@ void TimelineModel::update(bool fake)
         }
         catch (const QString &msg)
         {
-          ERROR_LOG() << "thread " << QThread::currentThreadId() << " failed: " << msg;
+          ERROR_LOG(m_logger) << "thread " << QThread::currentThreadId() << " failed: " << msg;
         }
 
         db.close();
@@ -2651,7 +2651,7 @@ void TimelineModel::update(bool fake)
 
       
 
-      DEBUG_LOG() << "Update took " << t.elapsed() << "ms in thread " << QThread::currentThreadId();
+      DEBUG_LOG(m_logger) << "Update took " << t.elapsed() << "ms in thread " << QThread::currentThreadId();
 
       return;
     });
@@ -2675,8 +2675,8 @@ void TimelineModel::updateFilterTable()
     
     
   }
-  catch (const QString &errMsg) { ERROR_LOG() << "updating filter table failed: " << errMsg; }
-  catch (...) { ERROR_LOG() << "updating filter table failed"; }
+  catch (const QString &errMsg) { ERROR_LOG(m_logger) << "updating filter table failed: " << errMsg; }
+  catch (...) { ERROR_LOG(m_logger) << "updating filter table failed"; }
 }
 
 
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 88180d879..4e5073905 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,6 +78,8 @@ 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 11ee85a04..63e4c36d8 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
@@ -15,10 +15,9 @@
 namespace Timeline
 {
 
-TimelineProgress::TimelineProgress( QWidget *parent )
-  : QWidget(parent)
-  , m_ui(new Ui::TimelineProgress)
-{
+TimelineProgress::TimelineProgress( QWidget *parent ) : QWidget(parent)
+  , m_ui(new Ui::TimelineProgress),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_ui->setupUi(this);
 
   setAttribute(Qt::WA_StyledBackground);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_progress.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_progress.h
index f5a11432f..1dee571cd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_progress.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_progress.h
@@ -36,6 +36,8 @@ public:
 private:
 
 
+
+NGL::INGLLogger &m_logger;
 protected slots:
 
 signals:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeEditingModeUI.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeEditingModeUI.cpp
index 8e2b930cd..94fb2fe5a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeEditingModeUI.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeEditingModeUI.cpp
@@ -59,7 +59,7 @@ AbstractAttributeWidget *EditingModeUI::createAttributeUIWidget(DetailData *deta
 
       if (!minb || !maxb) 
       {
-        WARNING_LOG() << "createAttributeUIWidget: !minb (" << minb << ") || !maxb (" << maxb << ")"; 
+        WARNING_LOG(m_logger) << "createAttributeUIWidget: !minb (" << minb << ") || !maxb (" << maxb << ")"; 
         break;
       }
 
@@ -90,7 +90,7 @@ AbstractAttributeWidget *EditingModeUI::createAttributeUIWidget(DetailData *deta
         break;
       }
 
-      WARNING_LOG() << "DetailData::ATTRIBUTE_UI_TYPE_RAD_RANGE_WIDGET: errorious values!";
+      WARNING_LOG(m_logger) << "DetailData::ATTRIBUTE_UI_TYPE_RAD_RANGE_WIDGET: errorious values!";
 
       break;
     }
@@ -115,7 +115,7 @@ AbstractAttributeWidget *EditingModeUI::createAttributeUIWidget(DetailData *deta
         break;
       }
 
-      WARNING_LOG() << "DetailData::ATTRIBUTE_UI_TYPE_AREA_RANGE_WIDGET: errorious values!";
+      WARNING_LOG(m_logger) << "DetailData::ATTRIBUTE_UI_TYPE_AREA_RANGE_WIDGET: errorious values!";
 
       break;
     }
@@ -137,7 +137,7 @@ AbstractAttributeWidget *EditingModeUI::createAttributeUIWidget(DetailData *deta
 
     default: 
     {
-      WARNING_LOG() << "createAttributeUIWidget: invalid attribute type #" << attributeUIType << "!";
+      WARNING_LOG(m_logger) << "createAttributeUIWidget: invalid attribute type #" << attributeUIType << "!";
       
       break;
     }
@@ -155,7 +155,7 @@ void EditingModeUI::addAttributeContainer(int eventType, const QString &initialV
 
   if (attributeUIWidget == nullptr)
   {
-    DEBUG_LOG() << "addAttributeContainer: !attributeUIWidget";
+    DEBUG_LOG(m_logger) << "addAttributeContainer: !attributeUIWidget";
     return;
   }
 
@@ -166,11 +166,10 @@ void EditingModeUI::addAttributeContainer(int eventType, const QString &initialV
   attributeUIWidget->setFocus(); 
 }
 
-EditingModeUI::EditingModeUI(DetailData *detailData, const QString &attributeType, QWidget *parent)
-  : QWidget(parent)
+EditingModeUI::EditingModeUI(DetailData *detailData, const QString &attributeType, QWidget *parent) : QWidget(parent)
   , attributeType(attributeType)
-  , m_detailData(detailData)
-{
+  , m_detailData(detailData),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   QVBoxLayout *editingModeLayout = new QVBoxLayout;
 
   QWidget *filterTextWidget = new QWidget; 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeEditingModeUI.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeEditingModeUI.h
index fc2546e6a..87db3b3f0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeEditingModeUI.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeEditingModeUI.h
@@ -30,6 +30,8 @@ public:
   QPushButton *pbAddAttributeContainer; 
 
 private:
+
+NGL::INGLLogger &m_logger;
   Timeline::AbstractAttributeWidget *createAttributeUIWidget(DetailData *detailData, const QString &attributeType,
                                                              int eventType, const QString &initialValue);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeSelectionModeUI.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeSelectionModeUI.cpp
index 35c022929..8dcb92112 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeSelectionModeUI.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeSelectionModeUI.cpp
@@ -30,7 +30,7 @@ QComboBox *SelectionModeUI::createAttributesComboBox(int eventType)
 
     if (cbAttribute.isEmpty())
     {
-      WARNING_LOG() << "SelectionModeUI::createAttributesComboBox: event type " << eventType << " has no attribute text for attribute " << attributeKey << " for attribute event lookup - not added";
+      WARNING_LOG(m_logger) << "SelectionModeUI::createAttributesComboBox: event type " << eventType << " has no attribute text for attribute " << attributeKey << " for attribute event lookup - not added";
     }
     else
     {
@@ -42,10 +42,9 @@ QComboBox *SelectionModeUI::createAttributesComboBox(int eventType)
 }
 
 
-SelectionModeUI::SelectionModeUI(DetailData *detailData, const int eventType)
-  : eventType(eventType)
-  , m_detailData(detailData)
-{
+SelectionModeUI::SelectionModeUI(DetailData *detailData, const int eventType) : eventType(eventType)
+  , m_detailData(detailData),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   selectionModeWidget = new QWidget();
   selectionModeLayout = new QHBoxLayout();
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeSelectionModeUI.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeSelectionModeUI.h
index 16f8ec413..72a21e860 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeSelectionModeUI.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/AttributeSelectionModeUI.h
@@ -21,6 +21,7 @@ class SelectionModeUI : public QObject
 {
   Q_OBJECT
 private:
+NGL::INGLLogger &m_logger;
   SelectionModeUI &operator=(const SelectionModeUI &); 
 
 public:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntry.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntry.cpp
index 97079a403..deaabf6d7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntry.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntry.cpp
@@ -18,8 +18,7 @@
 namespace Timeline
 {
 
-FilterTableEntry::FilterTableEntry(DetailData *detailData, const int &eventType, const bool &active, QWidget *parent) 
-  : QGroupBox(parent)
+FilterTableEntry::FilterTableEntry(DetailData *detailData, const int &eventType, const bool &active, QWidget *parent) : QGroupBox(parent)
   , m_eventType(eventType)
 
     
@@ -32,8 +31,8 @@ FilterTableEntry::FilterTableEntry(DetailData *detailData, const int &eventType,
   , m_pbFilterActive(new QPushButton(tr("Active")))
   , m_pbOK(new QPushButton(tr("OK")))
   , m_lbSelectText(new QLabel(tr("Select event type to filter:")))
-  , m_detailData(detailData)
-{
+  , m_detailData(detailData),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_cbEventSelector = getEventTypesComboBox();
 
   m_pbDelete->setPalette(QPalette(QColor("red")));
@@ -104,7 +103,7 @@ void FilterTableEntry::updateData()
 
     if (!ftec) 
     {
-      WARNING_LOG() << "FilterTableEntry::filterText(): !ftec";
+      WARNING_LOG(m_logger) << "FilterTableEntry::filterText(): !ftec";
       continue;
     }
 
@@ -130,7 +129,7 @@ const QJsonObject FilterTableEntry::filter(bool typeSafe) const
 
   if (m_eventType == -1)
   {
-    WARNING_LOG() << "FilterTableEntry has no event type.";
+    WARNING_LOG(m_logger) << "FilterTableEntry has no event type.";
     
     return {};
   }
@@ -165,7 +164,7 @@ const QJsonObject FilterTableEntry::filter(bool typeSafe) const
 
     if (!ftec) 
     {
-      WARNING_LOG() << "FilterTableEntry::filterText(): !ftec";
+      WARNING_LOG(m_logger) << "FilterTableEntry::filterText(): !ftec";
       continue;
     }
 
@@ -209,7 +208,7 @@ void FilterTableEntry::slotSelectEventType()
 
   if (m_eventType == -1)
   {
-    WARNING_LOG() << "slotSelectEventType: m_eventType == -1";
+    WARNING_LOG(m_logger) << "slotSelectEventType: m_eventType == -1";
     return;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntry.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntry.h
index 116a1c99c..3c5e3e5d4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntry.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntry.h
@@ -36,6 +36,7 @@ public:
 
 
 private:
+  NGL::INGLLogger &m_logger;
   QComboBox *getEventTypesComboBox();
 
   int m_eventType;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntryAttribute.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntryAttribute.cpp
index c8af9f60a..ccb7ce726 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntryAttribute.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntryAttribute.cpp
@@ -16,15 +16,14 @@
 namespace Timeline
 {
 
-FilterTableEntryAttribute::FilterTableEntryAttribute(DetailData *detailData, int eventType, const QString &attributeType, QWidget *parent)
-  : QGroupBox(parent)
+FilterTableEntryAttribute::FilterTableEntryAttribute(DetailData *detailData, int eventType, const QString &attributeType, QWidget *parent) : QGroupBox(parent)
   , m_eventType(eventType)
   , m_attributeType(attributeType) 
   , m_selectionModeUI(nullptr)
   , m_editionModeUI(nullptr)
   , m_attributesLayout(new QVBoxLayout())
-  , m_detailData(detailData)
-{
+  , m_detailData(detailData),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   
   this->setTitle(QString());
 
@@ -76,7 +75,7 @@ const QJsonObject FilterTableEntryAttribute::filter(bool typeSafe) const
 {
   if (m_attributeType.isEmpty())
   {
-    WARNING_LOG() << "filterText: m_attributeType == -1";
+    WARNING_LOG(m_logger) << "filterText: m_attributeType == -1";
     
     return QJsonObject();
   }
@@ -93,7 +92,7 @@ const QJsonObject FilterTableEntryAttribute::filter(bool typeSafe) const
 
   if (attributeTypeName.isEmpty())
   {
-    WARNING_LOG() << "filterText: !attributeTypeName.length()";
+    WARNING_LOG(m_logger) << "filterText: !attributeTypeName.length()";
     
     return QJsonObject();
   }
@@ -174,7 +173,7 @@ void FilterTableEntryAttribute::slotAddEditingMode(bool createBlankContainer)
 
   if (m_attributeType.isEmpty())
   {
-    WARNING_LOG() << "slotAddEditingMode: invalid attribute type string!";
+    WARNING_LOG(m_logger) << "slotAddEditingMode: invalid attribute type string!";
     return;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntryAttribute.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntryAttribute.h
index c19bffc0e..2a68ddd12 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntryAttribute.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterTableEntryAttribute.h
@@ -41,6 +41,7 @@ signals:
   void attributeChanged(const bool &hasAttribute);
 
 private:
+  NGL::INGLLogger &m_logger;
 private slots:
   void slotAddAttributeContainer();
   void slotDeleteAttributeContainer(); 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterWindow.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterWindow.cpp
index 8d44bc93d..255f0a077 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterWindow.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterWindow.cpp
@@ -30,14 +30,13 @@ namespace Timeline
 FilterWindow::FilterWindow(DetailData *detailData,
                            const std::shared_ptr<FileManagement::ForeignGuiInterface> &flmIfc,
                            LtsSession::LtsSession *session,
-                           QWidget *parent)
-  : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
+                           QWidget *parent) : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
   , m_flmIfc(flmIfc)
   , m_ui(new Ui::FilterWindow)
   , updateTimer(new QTimer(this))
   , m_detailData(detailData)
-  , m_session(session)
-{
+  , m_session(session),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_ui->setupUi(this);
   setMinimumSize(1500, 800);
 
@@ -100,11 +99,11 @@ void FilterWindow::slotSave()
                                 filterToDoc(exportFilter()));
   if (fileId > 0)
   {
-    DEBUG_LOG() << "Saved file with id = " << fileId;
+    DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
     __unchange__();
   }
   else
-    ERROR_LOG() << "Could not save file in library ";
+    ERROR_LOG(m_logger) << "Could not save file in library ";
 }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterWindow.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterWindow.h
index 4c05401f1..c5c4b8b7f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterWindow.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/FilterWindow.h
@@ -44,6 +44,7 @@ public:
   bool loadFilters(const QJsonArray &filter);
 
 private:
+  NGL::INGLLogger &m_logger;
   void retranslate() override;
   bool apply() override;
   void aboutToClose() override;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/ComboBox.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/ComboBox.cpp
index cb0d719df..ae725745c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/ComboBox.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/ComboBox.cpp
@@ -11,11 +11,10 @@ namespace Timeline
 {
 
 
-ComboBox::ComboBox(DetailData *detailData, const QString &attributeType, int eventType, const QString &initialValue, QWidget* parent)
-  : AbstractAttributeWidget(parent)
+ComboBox::ComboBox(DetailData *detailData, const QString &attributeType, int eventType, const QString &initialValue, QWidget* parent) : AbstractAttributeWidget(parent)
   , m_cbValues(new QComboBox())
-  , m_eventType(eventType)
-{
+  , m_eventType(eventType),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   connect(m_cbValues, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &ComboBox::signalChanges);
 
   addCustomWidget(m_cbValues);
@@ -32,7 +31,7 @@ ComboBox::ComboBox(DetailData *detailData, const QString &attributeType, int eve
 
   if (initialValueKey < 0 || !k) 
   {
-    WARNING_LOG() << "ComboBox::c_tor: initialValueKey < 0 (" << initialValueKey << ")" << "initialValue: " << initialValue;
+    WARNING_LOG(m_logger) << "ComboBox::c_tor: initialValueKey < 0 (" << initialValueKey << ")" << "initialValue: " << initialValue;
     return;
   }
 
@@ -73,7 +72,7 @@ void ComboBox::updateData(DetailData *detailData)
   
   m_cbValues->setCurrentIndex(m_cbValues->findData(lastSelectedKey, Qt::UserRole)); 
 
-  DEBUG_LOG() << "ComboBox: no initial item index found for value id" << lastSelectedKey;
+  DEBUG_LOG(m_logger) << "ComboBox: no initial item index found for value id" << lastSelectedKey;
 }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/ComboBox.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/ComboBox.h
index 4e38a9b50..9981718e3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/ComboBox.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/ComboBox.h
@@ -25,6 +25,7 @@ public:
   void updateData(DetailData *detailData) override;
 
 private:
+  NGL::INGLLogger &m_logger;
   QComboBox *m_cbValues;
   int m_eventType;
   QString m_concreteAttributeType;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/DefaultRangeWidget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/DefaultRangeWidget.cpp
index 4c653be78..3caec72b3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/DefaultRangeWidget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/DefaultRangeWidget.cpp
@@ -13,11 +13,10 @@
 namespace Timeline
 {
 
-DefaultRangeWidget::DefaultRangeWidget(unsigned int min, unsigned int max, const QString &prefix, const QString &suffix, const QString &initialValue, QWidget *parent)
-  : AbstractAttributeWidget(parent)
+DefaultRangeWidget::DefaultRangeWidget(unsigned int min, unsigned int max, const QString &prefix, const QString &suffix, const QString &initialValue, QWidget *parent) : AbstractAttributeWidget(parent)
   , box1(new QSpinBox())
-  , box2(new QSpinBox())
-{
+  , box2(new QSpinBox()),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   connect(box1, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &DefaultRangeWidget::signalChanges);
   connect(box2, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &DefaultRangeWidget::signalChanges);
 
@@ -56,7 +55,7 @@ DefaultRangeWidget::DefaultRangeWidget(unsigned int min, unsigned int max, const
 
     if (valueList.count() != 2) 
     {
-      WARNING_LOG() << "DefaultRangeWidget: invalid initial value '" << initialValue << "'";
+      WARNING_LOG(m_logger) << "DefaultRangeWidget: invalid initial value '" << initialValue << "'";
       return;
     }
 
@@ -68,7 +67,7 @@ DefaultRangeWidget::DefaultRangeWidget(unsigned int min, unsigned int max, const
 
     if (!k1 || !k2)
     {
-      WARNING_LOG() << "DefaultRangeWidget: initial value is not numeric '" << initialValue << "'";
+      WARNING_LOG(m_logger) << "DefaultRangeWidget: initial value is not numeric '" << initialValue << "'";
       return;
     }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/DefaultRangeWidget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/DefaultRangeWidget.h
index d2eb1a984..096096471 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/DefaultRangeWidget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/DefaultRangeWidget.h
@@ -30,6 +30,7 @@ public:
   void updateData(DetailData *detailData) override;
 
 private:
+  NGL::INGLLogger &m_logger;
   QSpinBox* box1;
   QSpinBox* box2;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/TimeRangeWidget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/TimeRangeWidget.cpp
index 556c4f46b..23f3f6bb2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/TimeRangeWidget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/TimeRangeWidget.cpp
@@ -16,11 +16,10 @@
 namespace Timeline
 {
 
-TimeRangeWidget::TimeRangeWidget(DetailData *detailData, const QString &initialValue, QWidget *parent)
-  : AbstractAttributeWidget(parent)
+TimeRangeWidget::TimeRangeWidget(DetailData *detailData, const QString &initialValue, QWidget *parent) : AbstractAttributeWidget(parent)
   , m_edit1(new LtsWidgets::LtsDateTimeEdit(this))
-  , m_edit2(new LtsWidgets::LtsDateTimeEdit(this))
-{
+  , m_edit2(new LtsWidgets::LtsDateTimeEdit(this)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   connect(m_edit1, &LtsWidgets::LtsDateTimeEdit::dateTimeChanged, this, &TimeRangeWidget::signalChanges);
   connect(m_edit2, &LtsWidgets::LtsDateTimeEdit::dateTimeChanged, this, &TimeRangeWidget::signalChanges);
 
@@ -55,7 +54,7 @@ TimeRangeWidget::TimeRangeWidget(DetailData *detailData, const QString &initialV
 
   if (initialTimeRange.count() != 2)
   {
-    WARNING_LOG() << "invalid initial time range value: " << initialValue;
+    WARNING_LOG(m_logger) << "invalid initial time range value: " << initialValue;
     return;
   }
 
@@ -64,7 +63,7 @@ TimeRangeWidget::TimeRangeWidget(DetailData *detailData, const QString &initialV
   time *= 1000;
 
   if (!k)
-    WARNING_LOG() << "invalid initial time range start value: " << initialTimeRange.at(0).toString();
+    WARNING_LOG(m_logger) << "invalid initial time range start value: " << initialTimeRange.at(0).toString();
   else
     m_edit1->setMsecsSinceEpoch(time);
 
@@ -73,7 +72,7 @@ TimeRangeWidget::TimeRangeWidget(DetailData *detailData, const QString &initialV
   time *= 1000;
 
   if (!k)
-    WARNING_LOG() << "invalid initial time range start value: " << initialTimeRange.at(1).toString();
+    WARNING_LOG(m_logger) << "invalid initial time range start value: " << initialTimeRange.at(1).toString();
   else
     m_edit2->setMsecsSinceEpoch(time);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/TimeRangeWidget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/TimeRangeWidget.h
index 6f7fac2e7..3d830587b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/TimeRangeWidget.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/EventFilter/widgets/TimeRangeWidget.h
@@ -26,6 +26,7 @@ public:
   void updateData(DetailData *detailData) override;
 
 private:
+  NGL::INGLLogger &m_logger;
 public:
   LtsWidgets::LtsDateTimeEdit *m_edit1;
   LtsWidgets::LtsDateTimeEdit *m_edit2;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/attribute_value_lookup.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/attribute_value_lookup.h
index 875b8a43a..189725695 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/attribute_value_lookup.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/attribute_value_lookup.h
@@ -63,6 +63,7 @@ public:
   AttributeValueMap getAttributeValueMap(int eventType) const override;
   QString getValueStringFromValueId(int attributeValueId) const override;
 private:
+NGL::INGLLogger &m_logger;
   std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_dtc;
 };
 
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 76b8cb2ac..fe7e85af3 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
@@ -396,7 +396,7 @@ DetailData::GetDetailDataResultList DetailData::getDetailData(const LtsTimelineC
   const QJsonObject &root = event->detailData();
   for (auto i = root.constBegin(); i != root.constEnd(); ++i)
   {
-    DEBUG_LOG() << "Adding Detail Data for: " << i.key();
+    DEBUG_LOG(m_logger) << "Adding Detail Data for: " << i.key();
     result.append(getDetailDataForAttribute(i.key(), *i));
   }
 
@@ -416,7 +416,7 @@ DetailData::GetDetailDataForAttributeResult DetailData::getDetailDataForAttribut
 
   if (attribute.isNull() || attribute.isUndefined())
   {
-    WARNING_LOG() << "DetailData::getDetailDataForAttribute: no attribute type " << attributeType
+    WARNING_LOG(m_logger) << "DetailData::getDetailDataForAttribute: no attribute type " << attributeType
                           << " in " << QJsonDocument(root).toJson();
 
     result.requestResult = DetailData::RequestResult::InvalidAttributeType;
@@ -461,7 +461,7 @@ DetailData::GetDetailDataForAttributeResult DetailData::getDetailDataForAttribut
     case QJsonValue::Null:
     case QJsonValue::Undefined:
     {
-      WARNING_LOG() << "Timeline: DetailData::getDetailDataForAttribute: attribute value is null or undefined! " << attributeValueJson.toString();
+      WARNING_LOG(m_logger) << "Timeline: DetailData::getDetailDataForAttribute: attribute value is null or undefined! " << attributeValueJson.toString();
       result.requestResult = DetailData::RequestResult::InvalidAttributeTypeJson;
       return result;
     }
@@ -497,7 +497,7 @@ DetailData::GetDetailDataForAttributeResult DetailData::getDetailDataForAttribut
 
     default:
     {
-      WARNING_LOG() << "Timeline: DetailData::getDetailDataForAttribute: attribute value cannot be handled. Type " << attributeValueJson.type() << attributeValueJson.toString();
+      WARNING_LOG(m_logger) << "Timeline: DetailData::getDetailDataForAttribute: attribute value cannot be handled. Type " << attributeValueJson.type() << attributeValueJson.toString();
       result.requestResult = DetailData::RequestResult::InvalidAttributeType;
       return result;
     }
@@ -547,7 +547,7 @@ DetailData::GetDetailDataForAttributeResult DetailData::getDetailDataForAttribut
 
       if (concreteAttributeType == attributeType) 
       {
-        ERROR_LOG() << "getDetailDataForAttribute: attribute type " << attributeType << " does not have an UiType !!!";
+        ERROR_LOG(m_logger) << "getDetailDataForAttribute: attribute type " << attributeType << " does not have an UiType !!!";
         result.requestResult = DetailData::RequestResult::NoUiTypeForAttribute;
       }
       else 
@@ -691,7 +691,7 @@ QString DetailData::AttributeTypeLookup::getAttributeType(const QString &attribu
       return i.key();
   }
 
-  WARNING_LOG() << "getAttributeType: attribute type not found by text '" << attributeText << "'";
+  WARNING_LOG(m_logger) << "getAttributeType: attribute type not found by text '" << attributeText << "'";
   return QString(); 
 }
 
@@ -721,7 +721,7 @@ void DetailData::AttributeParameterLookup::addParameter(const QString &attribute
 {
   if (!parameterMap.count())
   {
-    WARNING_LOG() << "addParameter: parameter map is empty!";
+    WARNING_LOG(m_logger) << "addParameter: parameter map is empty!";
     return;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/detail_data.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/detail_data.h
index 36d9c728b..02752f2fb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/detail_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/detail_data.h
@@ -144,6 +144,7 @@ public:
     explicit LookupBase(const QString &lookupClassName);
 
   protected:
+  NGL::INGLLogger &m_logger;
     QString m_lookupClassName;
   };
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog.cpp
index 4cf5a185f..3dc6c2504 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog.cpp
@@ -273,7 +273,7 @@ bool TimelineViewDialog::init(const std::shared_ptr<TimeLineManagement::ForeignD
 
   if (!m_model->init(eemForeign, mrkDtc, exmDtc, ppmDtc, pdmDtc, ismDtc, session, m_detailData, m_streamNameMapping))
   {
-    ERROR_LOG() << "model init failed";
+    ERROR_LOG(m_logger) << "model init failed";
     return false;
   }
 
@@ -402,7 +402,7 @@ bool TimelineViewDialog::init(const std::shared_ptr<TimeLineManagement::ForeignD
       {
 
         
-        WARNING_LOG() << "reimpl me!!";
+        WARNING_LOG(m_logger) << "reimpl me!!";
       });
 
       cacheDialog->setAttribute(Qt::WA_DeleteOnClose, true);
@@ -429,7 +429,7 @@ bool TimelineViewDialog::init(const std::shared_ptr<TimeLineManagement::ForeignD
 
     if (!m_model->hasActiveEventTypes())
     {
-      DEBUG_LOG() << "range changed, but no active event types! not arming timer..";
+      DEBUG_LOG(m_logger) << "range changed, but no active event types! not arming timer..";
       return;
     }
 
@@ -469,7 +469,7 @@ bool TimelineViewDialog::init(const std::shared_ptr<TimeLineManagement::ForeignD
   if (m_exerciseStart < 1)
   {
     LtsWidgets::LtsMessageDialog::showMessage(m_session->baseLayout(), tr("Exercise data not available or exercise not started yet."), tr("Cannot open timeline")); 
-    ERROR_LOG() << "exercise data not available - exercise start: " << m_exerciseStart;
+    ERROR_LOG(m_logger) << "exercise data not available - exercise start: " << m_exerciseStart;
     return false;
   }
 
@@ -623,7 +623,7 @@ void TimelineViewDialog::slotStartReplaySituation()
     if (rp.id() == 0)
     {
       LtsWidgets::LtsMessageDialog::showMessage(this, tr("Error trying to create a replay session in stage 1."));
-      WARNING_LOG() << "[timeout] Error while trying to create a replay session: domainId: " << m_session->domainId() <<
+      WARNING_LOG(m_logger) << "[timeout] Error while trying to create a replay session: domainId: " << m_session->domainId() <<
                     " - replay partition does not exist - replay id: " << m_requestHelper->getRepliedId() <<
                     " - url " << m_session->tcpConnectionUrl().toString();
       m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Import, true);
@@ -637,7 +637,7 @@ void TimelineViewDialog::slotStartReplaySituation()
       if (m_replayApp == nullptr)
       {
         LtsWidgets::LtsMessageDialog::showMessage(this, tr("Error trying to create a replay session in stage 2."));
-        WARNING_LOG() << "Error while trying to create a replay session: domainId: " << m_session->domainId() <<
+        WARNING_LOG(m_logger) << "Error while trying to create a replay session: domainId: " << m_session->domainId() <<
                       " - partition create reply (failed) - replay id: " << m_requestHelper->getRepliedId() <<
                       " - url: " << m_session->tcpConnectionUrl().toString();
         m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Import, true);
@@ -989,12 +989,12 @@ void TimelineViewDialog::slotWaitForReady()
     if (partitionTime < ex.beginTime())
     {
       LtsWidgets::LtsMessageDialog::showMessage(this, tr("The current time is outside of the Exercise's period.<br>Events are only recorded in Exercise period boundaries."), tr("No Events available"));
-      WARNING_LOG() << "Partition time was " << partitionTime << ", exercise begin time: " << ex.beginTime();
+      WARNING_LOG(m_logger) << "Partition time was " << partitionTime << ", exercise begin time: " << ex.beginTime();
     }
   }
   else
   {
-    WARNING_LOG() << "TimelineViewDialog::init: could not check exercise's boundaries!";
+    WARNING_LOG(m_logger) << "TimelineViewDialog::init: could not check exercise's boundaries!";
   }
 
   LtsWidgets::LtsGlobalWaitDialog::getInstance()->done();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog.h
index 4fc4c3d75..cea9ffc2f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog.h
@@ -110,6 +110,8 @@ signals:
   void signalInitEventList();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void onReplayPartitionCreateReply(const Core::FunctionReplyObject &reply) override { m_requestHelper->requestReply(reply); }
   qint64 currentSpanTime() const; 
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 4e54f2a78..2c78507b1 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
@@ -175,14 +175,14 @@ void DDSTimelineModel::slotAddLiveEvent(const ExerciseEventManagement::Event &ev
     QJsonObject root(getDetailData(event));
     ev->setEndT(root[QStringLiteral("endTime")].toDouble()); 
     ev->setDetailData(root);
-    DEBUG_LOG() << "live event not added - already exists - modified instead - end";
+    DEBUG_LOG(m_logger) << "live event not added - already exists - modified instead - end";
     
     return;
   }
 
   if (!isLive())
   {
-    DEBUG_LOG() << "not adding live event because we're not live";
+    DEBUG_LOG(m_logger) << "not adding live event because we're not live";
     return;
   }
 
@@ -191,7 +191,7 @@ void DDSTimelineModel::slotAddLiveEvent(const ExerciseEventManagement::Event &ev
   int eventType = static_cast<int>(event.eventTypeId().underlying());
   if (!m_activeEventTypeIds.contains(eventType))
   {
-    DEBUG_LOG() << "live event not added - event type ("<<eventType<<") inactive";
+    DEBUG_LOG(m_logger) << "live event not added - event type ("<<eventType<<") inactive";
     
     return;
   }
@@ -199,7 +199,7 @@ void DDSTimelineModel::slotAddLiveEvent(const ExerciseEventManagement::Event &ev
 
   if (m_liveCache.events.count() > m_cacheSize) 
   {
-    DEBUG_LOG() << "more than " << m_cacheSize << " live events - archiving and clearing";
+    DEBUG_LOG(m_logger) << "more than " << m_cacheSize << " live events - archiving and clearing";
     saveAndClearLiveCache();
   }
 
@@ -219,7 +219,7 @@ void DDSTimelineModel::slotAddLiveEvent(const ExerciseEventManagement::Event &ev
   rebuildTimelineKnownRanges(); 
 
 #ifdef LTS_DEBUG 
-  DEBUG_LOG() << "added live event at " << eventTime << " - cache: " << start << " " << end << ", " << m_liveCache.events.count() << " events";
+  DEBUG_LOG(m_logger) << "added live event at " << eventTime << " - cache: " << start << " " << end << ", " << m_liveCache.events.count() << " events";
 #endif
 
   addEventAndFilter(ltsEvent);
@@ -279,7 +279,7 @@ void DDSTimelineModel::addCacheRange(const LtsTimelineClassic::Range &range, con
     rebuildTimelineKnownRanges();
   }
 
-  DEBUG_LOG() << "added cache for " << range.start << " to " << range.end << " - event count now: " << m_eventCount;
+  DEBUG_LOG(m_logger) << "added cache for " << range.start << " to " << range.end << " - event count now: " << m_eventCount;
 }
 
 
@@ -302,7 +302,7 @@ void DDSTimelineModel::_uncache(const CacheRange &cr)
 void DDSTimelineModel::uncache(CacheRange &cr)
 {
   QString hash(QStringLiteral("<%1:%2:%3>").arg(cr.start).arg(cr.end).arg(cr.events.count()));
-  DEBUG_LOG() << "uncaching " << QString::number(qHash(hash), 16) << " " << cr.start << " "<< cr.end;
+  DEBUG_LOG(m_logger) << "uncaching " << QString::number(qHash(hash), 16) << " " << cr.start << " "<< cr.end;
 
   cr.visible = false;
   _uncache(cr);
@@ -343,7 +343,7 @@ void DDSTimelineModel::forceUncache()
       uncache(cr);
       m_eventCount -= cr.events.count();
       m_cachedEvents.erase(i);
-      DEBUG_LOG() << "removed an invisible & incomplete cache - event count now: " << m_eventCount;
+      DEBUG_LOG(m_logger) << "removed an invisible & incomplete cache - event count now: " << m_eventCount;
       return;
     }
   }
@@ -357,7 +357,7 @@ void DDSTimelineModel::forceUncache()
       uncache(cr);
       m_eventCount -= cr.events.count();
       m_cachedEvents.erase(i);
-      DEBUG_LOG() << "removed an invisible cache - event count now: " << m_eventCount;
+      DEBUG_LOG(m_logger) << "removed an invisible cache - event count now: " << m_eventCount;
       return;
     }
   }
@@ -396,7 +396,7 @@ void DDSTimelineModel::forceUncache()
     m_cachedEvents.erase(lowestEnd);
   }
 
-  WARNING_LOG() << "force-removing a visible cache ... - event count now: " << m_eventCount;
+  WARNING_LOG(m_logger) << "force-removing a visible cache ... - event count now: " << m_eventCount;
 }
 
 
@@ -434,7 +434,7 @@ void DDSTimelineModel::processEventList(qint64 &highest, bool &incomplete, QVect
     count++; 
     if (count > m_cacheSize)
     {
-      WARNING_LOG() << "max cache exceeded - not adding more than " << m_cacheSize << " events";
+      WARNING_LOG(m_logger) << "max cache exceeded - not adding more than " << m_cacheSize << " events";
       incomplete = true;
       emit signalTooMuchEvents();
       break; 
@@ -459,12 +459,12 @@ void DDSTimelineModel::receivedEvents(const LtsTimelineClassic::Range &range, QV
   
   if (isCacheFull())
   {
-    DEBUG_LOG() << "receivedEvents: cache full - force uncache";
+    DEBUG_LOG(m_logger) << "receivedEvents: cache full - force uncache";
     forceUncache();
   }
 
 #ifdef LTS_DEBUG 
-  DEBUG_LOG() << "received events count: " << receivedEventsList.count();
+  DEBUG_LOG(m_logger) << "received events count: " << receivedEventsList.count();
 #endif
 
   qint64 highest = 0;
@@ -474,7 +474,7 @@ void DDSTimelineModel::receivedEvents(const LtsTimelineClassic::Range &range, QV
   processEventList(highest, incomplete, cachedEvents, receivedEventsList);
   addCacheRange(range, cachedEvents, incomplete ? highest : 0);
 
-  DEBUG_LOG() << "receivedEvents: loading done";
+  DEBUG_LOG(m_logger) << "receivedEvents: loading done";
   emit signalLoadingDone();
 }
 
@@ -505,7 +505,7 @@ void DDSTimelineModel::slotRequestMessageReceived(const QString &message)
   EventRequest *er = qobject_cast<EventRequest *>(sender());
   if (er == nullptr)
   {
-    DEBUG_LOG() << "not an EventRequest: " << sender();
+    DEBUG_LOG(m_logger) << "not an EventRequest: " << sender();
     return;
   }
 
@@ -538,7 +538,7 @@ void DDSTimelineModel::slotRequestMessageReceived(const QString &message)
 
     if (err.error != QJsonParseError::NoError)
     {
-      ERROR_LOG() << "Event #" << id << " with event type id " << eventTypeId << " and start time " << startTime << " json detail data cannot be parsed: " << err.errorString() << " at offset " << err.offset;
+      ERROR_LOG(m_logger) << "Event #" << id << " with event type id " << eventTypeId << " and start time " << startTime << " json detail data cannot be parsed: " << err.errorString() << " at offset " << err.offset;
       continue;
     }
 
@@ -618,7 +618,7 @@ void DDSTimelineModel::slotRequestMessageReceived(const QString &message)
                                                                  path, paintFunc, color, root, -1, pos, m_session);
 
 #ifdef LTS_DEBUG 
-    DEBUG_LOG() << "Event #" << event->uniqueId() << " with event type id " << event->typeId() << " and start time " << event->startTime() << " created";
+    DEBUG_LOG(m_logger) << "Event #" << event->uniqueId() << " with event type id " << event->typeId() << " and start time " << event->startTime() << " created";
 #endif
 
     er->append(event);
@@ -628,13 +628,13 @@ void DDSTimelineModel::slotRequestMessageReceived(const QString &message)
 
 void DDSTimelineModel::requestEvents(const LtsTimelineClassic::Range &range)
 {
-  DEBUG_LOG() << "requesting events from " << QDateTime::fromMSecsSinceEpoch(range.start).toString()
+  DEBUG_LOG(m_logger) << "requesting events from " << QDateTime::fromMSecsSinceEpoch(range.start).toString()
                       << " to " << QDateTime::fromMSecsSinceEpoch(range.end).toString();
 
   if (m_createFakeEvents)
-    DEBUG_LOG() << "requesting fake events ..";
+    DEBUG_LOG(m_logger) << "requesting fake events ..";
   else
-    DEBUG_LOG() << "requesting real events ..";
+    DEBUG_LOG(m_logger) << "requesting real events ..";
 
   EventRequest *request = new EventRequest(m_createFakeEvents ? QUrl(QStringLiteral("ws://127.0.0.1:10090")) : m_eemForeign->eemUrl(),
                                            range.start, range.end, m_activeEventTypeIds, m_cacheSize);
@@ -643,7 +643,7 @@ void DDSTimelineModel::requestEvents(const LtsTimelineClassic::Range &range)
           this, [this, range, request]()
   {
     QVector<LtsTimelineClassic::Event *> eventList = request->eventList();
-    DEBUG_LOG() << ".. received real events! " << range.start << " - " << range.end;
+    DEBUG_LOG(m_logger) << ".. received real events! " << range.start << " - " << range.end;
 
     receivedEvents(range, eventList);
     request->deleteLater();
@@ -652,7 +652,7 @@ void DDSTimelineModel::requestEvents(const LtsTimelineClassic::Range &range)
   connect(request, &EventRequest::signalRequestFailed, 
           this, [this, request](const QString &errorString)
   {
-    ERROR_LOG() << ".. event request from " << request->start() << " to " << request->end() << " failed! '" << errorString << "'";
+    ERROR_LOG(m_logger) << ".. event request from " << request->start() << " to " << request->end() << " failed! '" << errorString << "'";
     emit signalLoadingDone(); 
   });
 
@@ -704,12 +704,12 @@ bool DDSTimelineModel::splitLowest(qint64 &rangeMin ,  qint64 rangeMax , qint64
     requestMin = rangeMin; 
     requestMax = lowestCache.start - 1; 
     
-    DEBUG_LOG() << "splitLowest: there is an uncached range before the lowest cache, adding this uncached range to the request " << requestMin << " - " << requestMax << " and set rangeMin now to " << rangeMin << " while rangeMax keeps being " << rangeMax;
+    DEBUG_LOG(m_logger) << "splitLowest: there is an uncached range before the lowest cache, adding this uncached range to the request " << requestMin << " - " << requestMax << " and set rangeMin now to " << rangeMin << " while rangeMax keeps being " << rangeMax;
   }
   else
   {
     
-    DEBUG_LOG() << "splitLowest: no uncached range at the start of the requested range, no need to request events here - skipping";
+    DEBUG_LOG(m_logger) << "splitLowest: no uncached range at the start of the requested range, no need to request events here - skipping";
   }
 
   
@@ -717,11 +717,11 @@ bool DDSTimelineModel::splitLowest(qint64 &rangeMin ,  qint64 rangeMax , qint64
 
   if (rangeMin > rangeMax) 
   {
-    DEBUG_LOG() << "splitLowest: rangeMin > rangeMax - lowestCache.end " << lowestCache.end;
+    DEBUG_LOG(m_logger) << "splitLowest: rangeMin > rangeMax - lowestCache.end " << lowestCache.end;
     rangeMin = rangeMax; 
   }
 
-  DEBUG_LOG() << "splitLowest: space? " << spaceBeforeCache << " | requestMin" << requestMin << " - requestMax " << requestMax << " | oldRangeMin " << oldRangeMin << " - rangeMin " << rangeMin;
+  DEBUG_LOG(m_logger) << "splitLowest: space? " << spaceBeforeCache << " | requestMin" << requestMin << " - requestMax " << requestMax << " | oldRangeMin " << oldRangeMin << " - rangeMin " << rangeMin;
 
   return spaceBeforeCache; 
 }
@@ -759,27 +759,27 @@ void DDSTimelineModel::getAllEventsOfType(const QSet<int> &eventTypeIds)
 
       if (icr == m_cachedEvents.end())
       {
-        WARNING_LOG() << "cr after request for crId " << crId << " not available anymore";
+        WARNING_LOG(m_logger) << "cr after request for crId " << crId << " not available anymore";
         return;
       }
 
       CacheRange &cr = icr->second;
 
       QVector<LtsTimelineClassic::Event *> eventList = request->eventList(); 
-      DEBUG_LOG() << "getAllEventsOfType: .. received real events! " << cr.start << " - " << cr.end;
+      DEBUG_LOG(m_logger) << "getAllEventsOfType: .. received real events! " << cr.start << " - " << cr.end;
 
 
       
       if (isCacheFull())
       {
-        DEBUG_LOG() << "getAllEventsOfType: receivedEvents: cache full - not adding new events";
+        DEBUG_LOG(m_logger) << "getAllEventsOfType: receivedEvents: cache full - not adding new events";
         cr.incomplete = true;
         return;
       }
 
 
 #ifdef LTS_DEBUG 
-      DEBUG_LOG() << "getAllEventsOfType: received events count: " << eventList.count();
+      DEBUG_LOG(m_logger) << "getAllEventsOfType: received events count: " << eventList.count();
 #endif
 
       qint64 highest = 0;
@@ -817,14 +817,14 @@ void DDSTimelineModel::getAllEventsOfType(const QSet<int> &eventTypeIds)
       rebuildTimelineKnownRanges();
 
 
-      DEBUG_LOG() << "getAllEventsOfType: receivedEvents: loading done";
+      DEBUG_LOG(m_logger) << "getAllEventsOfType: receivedEvents: loading done";
       request->deleteLater();
     });
 
     connect(request, &EventRequest::signalRequestFailed, 
             this, [this, request](const QString &errorString)
     {
-      ERROR_LOG() << "getAllEventsOfType: event request from " << request->start() << " to " << request->end() << " failed! '" << errorString << "'";
+      ERROR_LOG(m_logger) << "getAllEventsOfType: event request from " << request->start() << " to " << request->end() << " failed! '" << errorString << "'";
       emit signalLoadingDone();
     });
 
@@ -836,17 +836,17 @@ void DDSTimelineModel::getAllEventsOfType(const QSet<int> &eventTypeIds)
 
 void DDSTimelineModel::getEvents(qint64 rangeMin, qint64 rangeMax)
 {
-  DEBUG_LOG() << "getEvents: requesting events from " << QDateTime::fromMSecsSinceEpoch(rangeMin).toString() << rangeMin << " to " << QDateTime::fromMSecsSinceEpoch(rangeMax).toString() << rangeMax;
+  DEBUG_LOG(m_logger) << "getEvents: requesting events from " << QDateTime::fromMSecsSinceEpoch(rangeMin).toString() << rangeMin << " to " << QDateTime::fromMSecsSinceEpoch(rangeMax).toString() << rangeMax;
 
   if (!hasActiveEventTypes())
   {
-    DEBUG_LOG() << "no active event types selected";
+    DEBUG_LOG(m_logger) << "no active event types selected";
     return;
   }
 
   if (m_liveCache.start != 0 && rangeMax > m_liveCache.start) 
   {
-    DEBUG_LOG() << "live cache active & in range - limited range max from " << rangeMax << " to " << m_liveCache.start - 1;
+    DEBUG_LOG(m_logger) << "live cache active & in range - limited range max from " << rangeMax << " to " << m_liveCache.start - 1;
     rangeMax = m_liveCache.start - 1;
   }
 
@@ -855,17 +855,17 @@ void DDSTimelineModel::getEvents(qint64 rangeMin, qint64 rangeMax)
   for (auto &it : m_cachedEvents) 
   {
     CacheRange &cr = it.second;
-    DEBUG_LOG() << "> start " << cr.start << " end " << cr.end;
+    DEBUG_LOG(m_logger) << "> start " << cr.start << " end " << cr.end;
 
     bool inside = isInsideCachedRange(cr, rangeMin, rangeMax);
     if (!inside) 
       continue;
 
-    DEBUG_LOG() << "found range that was cached, using it instead of requesting new events";
+    DEBUG_LOG(m_logger) << "found range that was cached, using it instead of requesting new events";
 
     if (!cr.visible) 
     {
-      DEBUG_LOG() << "found range that was cached AND not visible, showing it again";
+      DEBUG_LOG(m_logger) << "found range that was cached AND not visible, showing it again";
       showCached(cr);
     }
 
@@ -900,18 +900,18 @@ void DDSTimelineModel::getEvents(qint64 rangeMin, qint64 rangeMax)
 
   if (rangeMin < rangeMax) 
   {
-    DEBUG_LOG() << "adding request for leftovers from " << rangeMin << " - " << rangeMax;
+    DEBUG_LOG(m_logger) << "adding request for leftovers from " << rangeMin << " - " << rangeMax;
     requestRanges.append(Range(rangeMin, rangeMax));
   }
 
   int requestRangesCount = requestRanges.count();
-  DEBUG_LOG() << "requestRanges: " << requestRangesCount;
+  DEBUG_LOG(m_logger) << "requestRanges: " << requestRangesCount;
 
   for (const auto &range : std::as_const(requestRanges))
     requestEvents(range);
 
   if (requestRangesCount < 1)
-    DEBUG_LOG() << "nothing requested (requestRangesCount empty)";
+    DEBUG_LOG(m_logger) << "nothing requested (requestRangesCount empty)";
 }
 
 
@@ -1090,7 +1090,7 @@ QJsonObject DDSTimelineModel::createMarkerDetailData(const MarkerManagement::Mar
       }
       default:
       {
-        WARNING_LOG() << "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().underlying();
         break;
       }
     }
@@ -1184,7 +1184,7 @@ void DDSTimelineModel::addMarkerManagementMarker(const MarkerManagement::Marker
                                                 m_session));
 
 #ifdef LTS_DEBUG 
-  DEBUG_LOG() << "marker added! uniqueId " << data.id() << ", startTime " << data.timeStamp();
+  DEBUG_LOG(m_logger) << "marker added! uniqueId " << data.id() << ", startTime " << data.timeStamp();
 #endif
 }
 
@@ -1218,7 +1218,7 @@ const QJsonObject DDSTimelineModel::getDetailData(const QByteArray &data, int id
   QJsonDocument doc(QJsonDocument::fromJson(data, &err));
   if (err.error != QJsonParseError::NoError)
   {
-    ERROR_LOG() << "getDetailData: Event #" << id << " with event type id " << type << " and start time " << startTime << " json detail data cannot be parsed: " << err.errorString() << " at offset " << err.offset;
+    ERROR_LOG(m_logger) << "getDetailData: Event #" << id << " with event type id " << type << " and start time " << startTime << " json detail data cannot be parsed: " << err.errorString() << " at offset " << err.offset;
     return QJsonObject();
   }
 
@@ -1317,7 +1317,7 @@ LtsTimelineClassic::Event *DDSTimelineModel::createEvent(const ExerciseEventMana
 
 
 #ifdef LTS_DEBUG 
-  DEBUG_LOG() << "Event #" << event->uniqueId() << " with event type id " << event->typeId() << " and start time " << event->startTime() << " created";
+  DEBUG_LOG(m_logger) << "Event #" << event->uniqueId() << " with event type id " << event->typeId() << " and start time " << event->startTime() << " created";
 #endif
 
   return event;
@@ -1370,7 +1370,7 @@ QStringList DDSTimelineModel::getPathForAvsEvents(const QString &type, const QJs
   QStringList result;
 
   int buildingId = obj[QStringLiteral("MainStructureElementId")].toInt();
-  DEBUG_LOG() << "Building Id = " << buildingId;
+  DEBUG_LOG(m_logger) << "Building Id = " << buildingId;
   if (buildingId > 0)
   {
     const QString buildingName = m_ismDtc->getBuildingDisplayName(buildingId);
@@ -1397,7 +1397,7 @@ QStringList DDSTimelineModel::getPathForBuildingEvents(const QString &type, cons
   QString buildingName;
 
   int buildingId = obj[QStringLiteral("MainStructureElementId")].toInt();
-  DEBUG_LOG() << "Building Id = " << buildingId;
+  DEBUG_LOG(m_logger) << "Building Id = " << buildingId;
   if (buildingId > 0)
   {
     buildingName = m_ismDtc->getBuildingDisplayName(buildingId);
@@ -1416,7 +1416,7 @@ QStringList DDSTimelineModel::getPathForAesEvents(const QString &type, const QJs
   result << type;
 
   QString aesName  = obj[QStringLiteral("AesName")].toString();
-  DEBUG_LOG() << "AesName = " << aesName;
+  DEBUG_LOG(m_logger) << "AesName = " << aesName;
   result << aesName;
 
   return result;
@@ -1436,7 +1436,7 @@ void DDSTimelineModel::removeEvent(int eventId)
     }
   }
 
-  WARNING_LOG() << "removeEvent: event "<<eventId<<" not found !!";
+  WARNING_LOG(m_logger) << "removeEvent: event "<<eventId<<" not found !!";
   
 }
 
@@ -1622,11 +1622,10 @@ QVector<LtsTimelineClassic::Event *> DDSTimelineModel::createTestEvents(qint64 t
 
 
 
-EventRequest::EventRequest(const QUrl &url, qint64 start, qint64 end, const QSet<int> &eventTypes, int limit)
-  : m_start(start)
+EventRequest::EventRequest(const QUrl &url, qint64 start, qint64 end, const QSet<int> &eventTypes, int limit) : m_start(start)
   , m_end(end)
-  , m_timeoutTimer(new QTimer(this))
-{
+  , m_timeoutTimer(new QTimer(this)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   QUrl realUrl(url);
   realUrl.setPath(QStringLiteral("/request"));
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog_model.h
index 5ecf7cb95..36968fa99 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_dialog_model.h
@@ -78,6 +78,9 @@ public:
 
 
 private:
+
+
+NGL::INGLLogger &m_logger;
   qint64 currentTime() const override;
   
   QStringList getPathForAvsEvents(const QString &type, const QJsonObject &obj) const;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list.cpp
index 3456c5d42..a3591557d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list.cpp
@@ -74,7 +74,7 @@ EventListDialog::EventListDialog(const QString &menuGroup,
 
 EventListDialog::~EventListDialog()
 {
-  DEBUG_LOG() << "~EventListDialog";
+  DEBUG_LOG(m_logger) << "~EventListDialog";
   if (m_proxyModel != nullptr)
     m_proxyModel->setInvalid(); 
   m_model->setInvalid(); 
@@ -139,10 +139,10 @@ void EventListDialog::initColumns()
     columnInfos.reserve(colCount);
     const auto header = m_ui->ltsDataView->searchView()->header();
 
-    DEBUG_LOG() << "concealed count: " << m_concealedColumns.length();
+    DEBUG_LOG(m_logger) << "concealed count: " << m_concealedColumns.length();
     for (int visualIndex = 0; visualIndex < colCount; ++visualIndex)
     {
-      DEBUG_LOG() << visualIndex << " concealed? " << m_concealedColumns.contains(visualIndex);
+      DEBUG_LOG(m_logger) << visualIndex << " concealed? " << m_concealedColumns.contains(visualIndex);
       if (m_concealedColumns.contains(visualIndex)) 
         continue;
 
@@ -153,7 +153,7 @@ void EventListDialog::initColumns()
       ci.visible = !header->isSectionHidden(ci.logicalIndex);
       ci.name = m_model->headerData(ci.logicalIndex, Qt::Orientation::Horizontal, Qt::DisplayRole).toString();
 
-      DEBUG_LOG() << "InitColumns:  Adding column " << ci.name <<
+      DEBUG_LOG(m_logger) << "InitColumns:  Adding column " << ci.name <<
                              " with visual index = " << ci.visualIndex <<
                              ", logical index = " << ci.logicalIndex;
 
@@ -237,7 +237,7 @@ void EventListDialog::showColumns()
   {
     int oldVisualIndex = header->visualIndex(ci.logicalIndex);
 
-    DEBUG_LOG() << "ShowColumns: Column " << ci.name
+    DEBUG_LOG(m_logger) << "ShowColumns: Column " << ci.name
                         << ", colVisible: " << ci.visible
                         << ", logical index: " << ci.logicalIndex
                         << ", old index: " << oldVisualIndex
@@ -264,8 +264,8 @@ void EventListDialog::reInitEventList(const LtsTimelineClassic::EventList &event
       newEventList += e;
   }
 
-  DEBUG_LOG() << "reInitEventList size = " << eventList.size();
-  DEBUG_LOG() << "reInitEventList new size = " << newEventList.size();
+  DEBUG_LOG(m_logger) << "reInitEventList size = " << eventList.size();
+  DEBUG_LOG(m_logger) << "reInitEventList new size = " << newEventList.size();
   m_model->clear();
   m_model->setData(newEventList);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list.h
index b51b1c528..fa595c523 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list.h
@@ -49,6 +49,8 @@ public:
   void reInitEventList(const LtsTimelineClassic::EventList &eventList, qint64 startTime, qint64 endTime);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void initColumns();
   void addConcealedColumns(const QVector<int> &concealedColumns);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list_columns.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list_columns.cpp
index f0b40784c..e0662912a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list_columns.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list_columns.cpp
@@ -146,14 +146,14 @@ void EventListColumns::loadColumns(const QJsonArray &cols)
     if (elc)
     {
       
-      ERROR_LOG() << "Modifed Column: " << ci.visualIndex
+      ERROR_LOG(m_logger) << "Modifed Column: " << ci.visualIndex
                           << ", " << ci.logicalIndex << ", " << ci.name
                           << ", " << ci.visible << ", " << objName;
       elc->setChecked(ci.visible);
     }    
     else
     {
-      ERROR_LOG() << "New Column: " << ci.visualIndex
+      ERROR_LOG(m_logger) << "New Column: " << ci.visualIndex
                           << ", " << ci.logicalIndex << ", " << ci.name
                           << ", " << ci.visible << ", " << objName;
       elc = new EventListColumn(ci);
@@ -167,9 +167,9 @@ bool EventListColumns::save()
 {
   int fileId = m_flmIfc->saveFileContent(this, FileManagement::FileType::Xml, 0, columnsToDoc(exportColumns()));
   if (fileId > 0)
-    DEBUG_LOG() << "Saved file with id = " << fileId;
+    DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
   else
-    ERROR_LOG() << "Could not save file in library ";
+    ERROR_LOG(m_logger) << "Could not save file in library ";
   return (fileId > 0);
 }
 
@@ -190,7 +190,7 @@ const QJsonArray EventListColumns::exportColumns() const
   for (const EventListColumn *elc : children)
   {
     const auto &ci = elc->columnInfo();
-    DEBUG_LOG() << "Saving column: " << ci.visualIndex << ", " << elc->text() << ", " << elc->isChecked();
+    DEBUG_LOG(m_logger) << "Saving column: " << ci.visualIndex << ", " << elc->text() << ", " << elc->isChecked();
     QJsonObject elcObj;
     elcObj[QStringLiteral("visualIndex")] = ci.visualIndex;
     elcObj[QStringLiteral("logicalIndex")] = ci.logicalIndex;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list_columns.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list_columns.h
index a24dcdb9b..7c5164ab7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list_columns.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list_columns.h
@@ -44,6 +44,8 @@ public:
   const ColumnInfo &columnInfo() const  { return m_ci; }
 
 private:
+
+NGL::INGLLogger &m_logger;
   ColumnInfo m_ci;
 };
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list_model.h
index 5f237c4b3..17f53be02 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_event_list_model.h
@@ -59,6 +59,8 @@ public slots:
   void appendEventList(const QVector<LtsTimelineClassic::Event *> &eventList);
 
 private:
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
   std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_pdmDtc;
   std::shared_ptr<InfrastructureManagement::Interface::Dtc> m_ismDtc;
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 fe1410d01..158288e0c 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
@@ -72,7 +72,7 @@ void TimelineLegendDialog::setActiveEventTypeIds(const QSet<int> &activeEventTyp
     if (cb != nullptr)
       cb->setChecked(true);
     else
-      WARNING_LOG() << "cb for event type " << activeEventType << " not found!";
+      WARNING_LOG(m_logger) << "cb for event type " << activeEventType << " not found!";
   }
 
   setUnchangeable(false);
@@ -255,7 +255,7 @@ bool TimelineLegendDialog::init(DDSTimelineModel *model, const QSet<int> &active
 
     if (paintFunc == nullptr)
     {
-      WARNING_LOG() << "No draw function for event " << eventType;
+      WARNING_LOG(m_logger) << "No draw function for event " << eventType;
       Q_ASSERT(false);
       continue;
     }
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 fad609e9c..9d1f7a876 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
@@ -35,6 +35,8 @@ signals:
   void signalEventTypesChanged(const QSet<int> &activeEventTypeIds);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
 
   static QString checkBoxName(int eventTypeId) { return QStringLiteral("CheckBoxEvent%1").arg(eventTypeId); }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_show_details.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_show_details.cpp
index 747a7d86c..c767f8a1a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_show_details.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_show_details.cpp
@@ -82,7 +82,7 @@ void ShowDetailsDialog::slotFocusOnMap()
 {
   if (m_replayAppSession == nullptr)
   {
-    WARNING_LOG() << "ShowDetailsDialog::init: no replay app, no focus";
+    WARNING_LOG(m_logger) << "ShowDetailsDialog::init: no replay app, no focus";
     return;
   }
 
@@ -90,13 +90,13 @@ void ShowDetailsDialog::slotFocusOnMap()
 
   if (!m_replayAppSession->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(sitMapIfc))
   {
-    WARNING_LOG() << "no sitMapIfc, no focusing on replay in Show Details Dialog 1";
+    WARNING_LOG(m_logger) << "no sitMapIfc, no focusing on replay in Show Details Dialog 1";
     return;
   }
 
   if (!sitMapIfc)
   {
-    WARNING_LOG() << "no sitMapIfc, no focusing on replay in Show Details Dialog 2";
+    WARNING_LOG(m_logger) << "no sitMapIfc, no focusing on replay in Show Details Dialog 2";
     return;
   }
 
@@ -104,7 +104,7 @@ void ShowDetailsDialog::slotFocusOnMap()
   {
     if (!m_event->positionValid())
     {
-      WARNING_LOG() << "event has no valid position, skip focusOnMap";
+      WARNING_LOG(m_logger) << "event has no valid position, skip focusOnMap";
       return;
     }
 
@@ -124,7 +124,7 @@ void ShowDetailsDialog::slotFocusOnMap()
     MarkerManagement::MarkerManagementApplyFilter applyFilter(m_replayAppSession, m_fltParticipantIfc, m_fltAesIfc, m_fltBuildingComponentIfc);
     if (!applyFilter.applyFilter(filterSettings.toObject()))
     {
-      WARNING_LOG() << "filters from event #"<<m_event->uniqueId()<<" could not be applied";
+      WARNING_LOG(m_logger) << "filters from event #"<<m_event->uniqueId()<<" could not be applied";
       return;
     }
   }
@@ -153,14 +153,14 @@ bool ShowDetailsDialog::getStreamNameAndEndTime(QString &streamName, qint64 &end
   if (_streamName.isEmpty())
   {
     if (!silent)
-      ERROR_LOG() << "ShowDetailsDialog::slotStartVideo(): stream name is empty " << QJsonDocument(m_event->detailData()).toJson();
+      ERROR_LOG(m_logger) << "ShowDetailsDialog::slotStartVideo(): stream name is empty " << QJsonDocument(m_event->detailData()).toJson();
     return false;
   }
 
   qint64 _endTime = root[QStringLiteral("endTime")].toDouble(0);
 
   if (_endTime == 0 && !silent)
-    WARNING_LOG() << "ShowDetailsDialog::slotStartPlayback: event " << m_event->uniqueId() << " has no end time!";
+    WARNING_LOG(m_logger) << "ShowDetailsDialog::slotStartPlayback: event " << m_event->uniqueId() << " has no end time!";
 
   streamName = _streamName;
   endTime = _endTime;
@@ -189,7 +189,7 @@ void ShowDetailsDialog::slotStartReplay()
 {
   if (m_replayAppSession == nullptr)
   {
-    ERROR_LOG() << "ShowDetailsDialog::slotStartReplay: no replay app, no replay";
+    ERROR_LOG(m_logger) << "ShowDetailsDialog::slotStartReplay: no replay app, no replay";
     return;
   }
 
@@ -197,7 +197,7 @@ void ShowDetailsDialog::slotStartReplay()
 
   if (!m_replayAppSession->getForeignGuiInterface<SituationReplay::ForeignGuiInterface>(srpIfc))
   {
-    ERROR_LOG() << "ShowDetailsDialog::slotStartReplay: no srp, no replay in Show Details Dialog";
+    ERROR_LOG(m_logger) << "ShowDetailsDialog::slotStartReplay: no srp, no replay in Show Details Dialog";
     return;
   }
 
@@ -287,7 +287,7 @@ bool ShowDetailsDialog::init(DetailData *detailData, const LtsTimelineClassic::E
   std::shared_ptr<SituationReplay::ForeignGuiInterface> srpIfc;
   std::shared_ptr<SituationMap::ForeignGuiInterface> sitMapIfc;
   if (!m_session->getDtc<MarkerManagement::DataInterface>(m_mrkDtc))
-    WARNING_LOG() << "!m_session->getDtc<MarkerManagement::DataInterface>(m_mrkDtc)";
+    WARNING_LOG(m_logger) << "!m_session->getDtc<MarkerManagement::DataInterface>(m_mrkDtc)";
 
   m_mrkDtc->enableMarker();
 
@@ -307,10 +307,10 @@ bool ShowDetailsDialog::init(DetailData *detailData, const LtsTimelineClassic::E
     });
 
     if (!replayAppSession->getForeignGuiInterface<SituationReplay::ForeignGuiInterface>(srpIfc))
-      WARNING_LOG() << "ShowDetailsDialog::init: no srp, no replay in Show Details Dialog";
+      WARNING_LOG(m_logger) << "ShowDetailsDialog::init: no srp, no replay in Show Details Dialog";
 
     if (!replayAppSession->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(sitMapIfc))
-      WARNING_LOG() << "ShowDetailsDialog::init: no sitMapIfc, no focusing on replay in Show Details Dialog";
+      WARNING_LOG(m_logger) << "ShowDetailsDialog::init: no sitMapIfc, no focusing on replay in Show Details Dialog";
   }
 
   m_avmIfc = avmIfc;
@@ -321,22 +321,22 @@ bool ShowDetailsDialog::init(DetailData *detailData, const LtsTimelineClassic::E
   m_streamNameMapping = streamNameMapping;
 
   if (m_avmIfc == nullptr)
-    WARNING_LOG() << "ShowDetailsDialog::init: no avm ifc given";
+    WARNING_LOG(m_logger) << "ShowDetailsDialog::init: no avm ifc given";
 
   if (m_mrkIfc == nullptr)
-    WARNING_LOG() << "ShowDetailsDialog::init: no mrk ifc given";
+    WARNING_LOG(m_logger) << "ShowDetailsDialog::init: no mrk ifc given";
 
   if (m_fltParticipantIfc == nullptr)
-    WARNING_LOG() << "ShowDetailsDialog::init: no flt Part ifc given";
+    WARNING_LOG(m_logger) << "ShowDetailsDialog::init: no flt Part ifc given";
 
   if (m_fltAesIfc == nullptr)
-    WARNING_LOG() << "ShowDetailsDialog::init: no flt Aes ifc given";
+    WARNING_LOG(m_logger) << "ShowDetailsDialog::init: no flt Aes ifc given";
 
   if (m_fltBuildingComponentIfc == nullptr)
-    WARNING_LOG() << "ShowDetailsDialog::init: no flt buildingComponent ifc given";
+    WARNING_LOG(m_logger) << "ShowDetailsDialog::init: no flt buildingComponent ifc given";
 
   if (m_streamNameMapping == nullptr)
-    WARNING_LOG() << "ShowDetailsDialog::init: no stream name mapping given";
+    WARNING_LOG(m_logger) << "ShowDetailsDialog::init: no stream name mapping given";
 
   m_event = event;
   int eventTypeId = event->typeId();
@@ -423,7 +423,7 @@ bool ShowDetailsDialog::init(DetailData *detailData, const LtsTimelineClassic::E
       else if (attributeDetail.requestResult == DetailData::RequestResult::InvalidAttributeType)
       {
         
-        DEBUG_LOG() << "Unhandled attribute " << attributeDetail.attributeTypeId << " - skipping";
+        DEBUG_LOG(m_logger) << "Unhandled attribute " << attributeDetail.attributeTypeId << " - skipping";
         continue;
       }
       else  
@@ -431,7 +431,7 @@ bool ShowDetailsDialog::init(DetailData *detailData, const LtsTimelineClassic::E
         attributeTypeText = QStringLiteral("%1 (%2)").arg(tr("<unknown>"), attributeDetail.attributeTypeId);
         attributeValueText = tr("<type unknown>");
 
-        WARNING_LOG() << "getDetailData failed with message id " << (int)attributeDetail.requestResult << " for attribute " << attributeDetail.attributeTypeId;
+        WARNING_LOG(m_logger) << "getDetailData failed with message id " << (int)attributeDetail.requestResult << " for attribute " << attributeDetail.attributeTypeId;
         continue; 
       }
     }
@@ -475,9 +475,9 @@ bool ShowDetailsDialog::init(DetailData *detailData, const LtsTimelineClassic::E
 
 
     QLabel *attributeValueTextLabel = new QLabel(attributeValueText);
-    DEBUG_LOG() << "attributeValueText=" << attributeValueText;
+    DEBUG_LOG(m_logger) << "attributeValueText=" << attributeValueText;
     attributeValueTextLabel->setTextInteractionFlags(attributeValueTextLabel->textInteractionFlags() | Qt::TextInteractionFlag::TextSelectableByMouse);
-    DEBUG_LOG() << "attributeTypeText="  << attributeTypeText
+    DEBUG_LOG(m_logger) << "attributeTypeText="  << attributeTypeText
                          << " attributeValueTextLabel=" << attributeValueTextLabel;
     m_ui->formLayout->addRow(new QLabel(attributeTypeText), attributeValueTextLabel);
   }
@@ -496,7 +496,7 @@ bool ShowDetailsDialog::init(DetailData *detailData, const LtsTimelineClassic::E
 
 void ShowDetailsDialog::updateMarker()
 {
-  DEBUG_LOG() << "ShowDetailsDialog::updateMarker";
+  DEBUG_LOG(m_logger) << "ShowDetailsDialog::updateMarker";
 }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_show_details.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_show_details.h
index b5792579a..ca424202a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_show_details.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimelineClassic/tln_show_details.h
@@ -60,6 +60,8 @@ private slots:
   void updateMarker();
 
 private:
+
+NGL::INGLLogger &m_logger;
   bool hasNameAndEndTime() const;
   bool getStreamNameAndEndTime(QString &streamName, qint64 &endTime, bool silent = false) const;
   void setButtonDisabled(QPushButton *button, QToolButton *warningButton, const QString &reasonMessage, bool hide = false);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_dialog.h
index 165d891a7..0f8f62674 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_dialog.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_dialog.h
@@ -28,6 +28,8 @@ public:
   bool init(const std::shared_ptr<TrainingAreaBaseOC::Interface::Dtc> &dtc, LtsNotification::LtsNotification *notiSfmMsg, qint64 lastClearTime);
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void onPrint();
   void onClear();
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 3e9bec0be..7bad17318 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
@@ -231,9 +231,9 @@ QVariant MessagingModel::data(const QModelIndex &index, int role) const
 
 void MessagingModel::clearModel()
 {
-  ERROR_LOG() << QDateTime::currentMSecsSinceEpoch();
+  ERROR_LOG(m_logger) << QDateTime::currentMSecsSinceEpoch();
   m_lastClearTime = QDateTime::currentMSecsSinceEpoch();
-  ERROR_LOG() << m_lastClearTime;
+  ERROR_LOG(m_logger) << m_lastClearTime;
 
   clear();
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_model.h
index a3c1aba48..1ea10126e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TrainingAreaBaseOC/Gui/SfmMessaging/taboc_sfm_messaging_model.h
@@ -57,6 +57,8 @@ public slots:
   void clearModel();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void insertData(const TrainingAreaBaseOC::FreeText &data, DataModification modType = DataModification::eAdded);
   void insertData(const TrainingAreaBaseOC::ShortMessage &data, DataModification modType = DataModification::eAdded);
   bool dontAdd(qint64 timeToCheck);
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 6a44f2745..5e89fc59b 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
@@ -50,7 +50,7 @@ bool EquipmentEditDialog::init()
       !m_session->getFtc<WarehouseManagement::DataInterface>(m_ftc) ||
       !m_ftc->enableAll())
   {
-    ERROR_LOG() << "whm equ WarehouseManagement dtc/ftc not found!";
+    ERROR_LOG(m_logger) << "whm equ WarehouseManagement dtc/ftc not found!";
     return false;
   }
 
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 fc36c4b9c..9e7c6ef29 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
@@ -42,6 +42,8 @@ signals:
   void sendData(const WarehouseGuez::EquipmentTypeWh &data);
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void onModifyEquipmentTypeWhReply(const Core::FunctionReplyObject &reply) override;
 
 private:
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 96b150432..00aa17ff6 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
@@ -36,6 +36,8 @@ public:
   bool init();
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void onRemoveEquipmentTypeWhReply(const Core::FunctionReplyObject &reply) override;
   void onModifyEquipmentTypeWhReply(const Core::FunctionReplyObject &reply) override;
 
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 6aa4437d8..73649ab4a 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
@@ -51,7 +51,7 @@ bool EquipmentModel::initModel(const std::shared_ptr<WarehouseGuez::Interface::D
       !m_dtc->enableEquipmentTypeWh() ||
       !m_dtc->enableInjuryModelAgdusWh())
   {
-    ERROR_LOG() << "dtc not okay";
+    ERROR_LOG(m_logger) << "dtc not okay";
     return false;
   }
   connect(m_dtc.get(), &WarehouseGuez::Interface::Dtc::equipmentTypeWhChanged,
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 8d6e4abe2..b3783f567 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
@@ -52,6 +52,7 @@ public:
 
   QMap<int, QString> equipmentTypeNames() const;
 protected:
+NGL::INGLLogger &m_logger;
   void onInjuryModelChanged(const WarehouseGuez::InjuryModelAgdusWh &im);
 private:
   std::shared_ptr<WarehouseGuez::Interface::Dtc> m_dtc;
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 de606c34a..7ee4c4564 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
@@ -40,6 +40,8 @@ signals:
   void sendData(const WarehouseGuez::InjuryModelAgdusWh &data);
 
 protected:
+
+NGL::INGLLogger &m_logger;
     void onModifyInjuryModelAgdusWhReply(const Core::FunctionReplyObject &reply) override;
 
 private:
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 d525f0e68..d8ab95cd7 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
@@ -36,6 +36,8 @@ public:
   bool init();
 
 protected:
+
+NGL::INGLLogger &m_logger;
     void onRemoveInjuryModelAgdusWhReply(const Core::FunctionReplyObject &reply) override;
     void onModifyInjuryModelAgdusWhReply(const Core::FunctionReplyObject &reply) override;
 
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 9c04c0bc5..aadef4a22 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
@@ -32,6 +32,8 @@ public:
   QSet<int> takenIds() const;
 
 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/BSM/bsm_api.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_api.cpp
index 75f20c611..7e3afde31 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_api.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_api.cpp
@@ -33,7 +33,7 @@ bool Api::init(const BuildingBsmConfig &bsmConfig)
 
 bool Api::triggerFlashlight(int bsmId, const QString &hostname, int numberOfFlashes, int pauseBetweenFlashesSec)
 {
-  DEBUG_LOG() << "triggerFlashlight bsmId=" << bsmId
+  DEBUG_LOG(m_logger) << "triggerFlashlight bsmId=" << bsmId
                        << " hostname=" << hostname
                        << " numberOfFlashes=" << numberOfFlashes
                       << " pauseBetweenFlashesSec=" << pauseBetweenFlashesSec;
@@ -46,7 +46,7 @@ bool Api::triggerFlashlightPulse(int bsmId, const QString &hostname,
                                  int choppedConfiguration,
                                  int flashDuration)
 {
-  DEBUG_LOG() << "triggerFlashlightPulse bsmId=" << bsmId
+  DEBUG_LOG(m_logger) << "triggerFlashlightPulse bsmId=" << bsmId
                        << " hostname=" << hostname
                        << " numberOfFlashes=" << numberOfFlashes
                       << " pauseDuration=" << pauseDuration
@@ -60,7 +60,7 @@ bool Api::triggerFlashlights( int numberOfFlashes,
                               int choppedConfiguration,
                               int flashDuration)
 {
-  DEBUG_LOG() << "triggerFlashlights numberOfFlashes=" << numberOfFlashes
+  DEBUG_LOG(m_logger) << "triggerFlashlights numberOfFlashes=" << numberOfFlashes
                       << " pauseDuration=" << pauseDuration
                       << " choppedConfiguration" << choppedConfiguration
                       << " flashDuration=" << flashDuration;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_api.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_api.h
index 621d06f91..4c9f92087 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_api.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_api.h
@@ -50,6 +50,7 @@ Q_SIGNALS:
                      DamageState damageState);
   void bsmStateChanged(const QVector<BsmState> &bsmStates);
 private:
+NGL::INGLLogger &m_logger;
   SocketHandler *m_socketHandler;
 };
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket.cpp
index 50015005b..0ba822b04 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket.cpp
@@ -45,10 +45,10 @@ bool Socket::sendData(const QByteArray &data)
 {
   if (!isConnected())
   {
-    WARNING_LOG() << "BSM " << m_config.id << ": Trying to send data but not connected!";
+    WARNING_LOG(m_logger) << "BSM " << m_config.id << ": Trying to send data but not connected!";
     return false;
   }
-  DEBUG_LOG() << "BSM " << m_config.id << ": sending data: 0x" << data.toHex();
+  DEBUG_LOG(m_logger) << "BSM " << m_config.id << ": sending data: 0x" << data.toHex();
   m_tcpSocket->write(data);
   m_tcpSocket->flush();
   return true;
@@ -57,7 +57,7 @@ bool Socket::sendData(const QByteArray &data)
 void Socket::setVersionInformation(int verMajor, int verMinor, int verRev, const QString &manufacturer)
 {
   m_versionInfo = QStringLiteral("%1.%2-%3 (%4)").arg(verMajor).arg(verMinor).arg(verRev).arg(manufacturer);
-  INFO_LOG() << "BSM " << m_config.id
+  INFO_LOG(m_logger) << "BSM " << m_config.id
                      << ": version = " << m_versionInfo;
 }
 
@@ -71,7 +71,7 @@ void Socket::gotAlive()
 
 void Socket::onConnected()
 {
-  INFO_LOG() << "BSM " << m_config.id << " is connected to "
+  INFO_LOG(m_logger) << "BSM " << m_config.id << " is connected to "
                      << m_tcpSocket->peerAddress().toString() << ":" << m_tcpSocket->peerPort();
   Telegrams::PanConfigurationSetup tele;
   tele.m_aliveMessage = s_aliveTimeout;
@@ -83,7 +83,7 @@ void Socket::onConnected()
 
 void Socket::onDisconnected()
 {
-  INFO_LOG() << "BSM " << m_config.id << " is disconnected";
+  INFO_LOG(m_logger) << "BSM " << m_config.id << " is disconnected";
   m_versionInfo.clear();
   startReconnectTimer();
   emit disconnected(m_config.id);
@@ -91,7 +91,7 @@ void Socket::onDisconnected()
 
 void Socket::onError(QAbstractSocket::SocketError error)
 {
-  DEBUG_LOG() << "BSM " << m_config.id
+  DEBUG_LOG(m_logger) << "BSM " << m_config.id
                         << " can not connect to " << m_config.hostname << ":" << m_config.port
                         << ": " << m_tcpSocket->errorString()
                         << " (" << error << ");";
@@ -100,7 +100,7 @@ void Socket::onError(QAbstractSocket::SocketError error)
 
 void Socket::onConnect()
 {
-  DEBUG_LOG() << "BSM " << m_config.id
+  DEBUG_LOG(m_logger) << "BSM " << m_config.id
                       << " trying to connect to " << m_config.hostname << ":" << m_config.port;
   m_tcpSocket->connectToHost(m_config.hostname, m_config.port);
 }
@@ -112,7 +112,7 @@ void Socket::onReadyRead()
 
 void Socket::onAliveTimeout()
 {
-  WARNING_LOG() << "BSM " << m_config.id
+  WARNING_LOG(m_logger) << "BSM " << m_config.id
                         << " alive timeout! Reconnecting";
   
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket.h
index d32bf3298..1a45ca91c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket.h
@@ -39,6 +39,7 @@ private Q_SLOTS:
   void onReadyRead();
   void onAliveTimeout();
 private:
+NGL::INGLLogger &m_logger;
   void startReconnectTimer();
 private:
   BuildingControlUnit::Bsm m_config;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket_handler.cpp
index b09ad56f0..bd29ba61d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket_handler.cpp
@@ -66,7 +66,7 @@ bool SocketHandler::triggerFlashlight(int bsmId, const QString &hostname, int nu
   Socket *s = hostname.isEmpty() ? getSocketForBsm(bsmId) : getSocketForBsm(hostname);
   if (!s)
     return false;
-  DEBUG_LOG() << "triggerFlashlight BSM Socket with socketId " << bsmId;  
+  DEBUG_LOG(m_logger) << "triggerFlashlight BSM Socket with socketId " << bsmId;  
   Telegrams::PanChoppedSignalFlashlight flash;
   flash.m_noOfFlashes = qBound(0, numberOfFlashes, 255);
   flash.m_pauseDuration = qBound(1, pauseBetweenFlashesSec, 10);
@@ -83,7 +83,7 @@ bool SocketHandler::triggerFlashlightPulse(int bsmId, const QString &hostname,
   Socket *s = hostname.isEmpty() ? getSocketForBsm(bsmId) : getSocketForBsm(hostname);
   if (!s)
     return false;
-  DEBUG_LOG() << "triggerFlashlightPulse BSM Socket with socketId " << bsmId
+  DEBUG_LOG(m_logger) << "triggerFlashlightPulse BSM Socket with socketId " << bsmId
                       << " hostname=" << hostname
                       << " numberOfFlashes=" << numberOfFlashes
                       << " pauseDuration=" << pauseDuration
@@ -118,12 +118,12 @@ bool SocketHandler::triggerFlashlights(int numberOfFlashes,
         ++cntSocketsActive;
     }
     else
-      WARNING_LOG() << "BSM " << s->bsmConfig().id
+      WARNING_LOG(m_logger) << "BSM " << s->bsmConfig().id
                             << " is not connected - can not activate flash light";
   }
   if (cntSocketsActive == 0)
   {
-    WARNING_LOG() << "No active bsm - can not trigger flash light for all bsm";
+    WARNING_LOG(m_logger) << "No active bsm - can not trigger flash light for all bsm";
     return false;
   }
   return true;
@@ -184,13 +184,13 @@ void SocketHandler::onDataAvailable(int id, const QByteArray &data)
 void SocketHandler::onSocketConnected(int id)
 {
   requestVersion(id); 
-  DEBUG_LOG() << "BSM Socket with id " << id << " connected";
+  DEBUG_LOG(m_logger) << "BSM Socket with id " << id << " connected";
   m_bsmStateTimer.start();
 }
 
 void SocketHandler::onSocketDisconnected(int id)
 {
-  DEBUG_LOG() << "BSM Socket with id " << id << " disconnected";
+  DEBUG_LOG(m_logger) << "BSM Socket with id " << id << " disconnected";
   m_socketData[id].clear();
   m_bsmStateTimer.start();
 }
@@ -216,12 +216,12 @@ Socket *SocketHandler::getSocketForBsm(int bsmId)
   Socket *s = m_sockets.value(bsmId);
   if (!s)
   {
-    WARNING_LOG() << "Got invalid bsm id (" << bsmId << ") to trigger flashlight";
+    WARNING_LOG(m_logger) << "Got invalid bsm id (" << bsmId << ") to trigger flashlight";
     return nullptr;
   }
   if (!s->isConnected())
   {
-    WARNING_LOG() << "Bsm with id " << bsmId
+    WARNING_LOG(m_logger) << "Bsm with id " << bsmId
                           << " is not connected - can not activate flash light";
     return nullptr;
   }
@@ -269,7 +269,7 @@ void SocketHandler::parseBsmTelegram(int id, const QByteArray &baTele)
   if (!tele)
     return;
   if (tele->telId() != Telegrams::PanTelegramId::ALIVE)
-    DEBUG_LOG() << "Got tele from bsm with id " << id << ": " << tele->print();
+    DEBUG_LOG(m_logger) << "Got tele from bsm with id " << id << ": " << tele->print();
   switch (tele->telId())
   {
   case Telegrams::PanTelegramId::ALIVE:
@@ -317,7 +317,7 @@ void SocketHandler::parseBsmTelegram(int id, const QByteArray &baTele)
 
 bool SocketHandler::requestVersion(int id)
 {
-  DEBUG_LOG() << "Requesting version for BSM " << id;
+  DEBUG_LOG(m_logger) << "Requesting version for BSM " << id;
   Socket *s = m_sockets.value(id);
   if (!s || !s->isConnected())
     return false;
@@ -333,7 +333,7 @@ void SocketHandler::handleDirectFire(int id, const Telegrams::PanDirectFire *tel
 
   if (tele->m_ammunitionId == 0)
   {
-    WARNING_LOG() << "Got direct fire without valid ammunition - ignoring: " << tele->print();
+    WARNING_LOG(m_logger) << "Got direct fire without valid ammunition - ignoring: " << tele->print();
     return;
   }
   OpticalShot osNew;
@@ -351,21 +351,21 @@ void SocketHandler::handleDirectFire(int id, const Telegrams::PanDirectFire *tel
 
 void SocketHandler::handleDirectFireSummray()
 {
-  DEBUG_LOG() << "handleDirectFireSummray m_lastShots.size=" << m_lastShots.size();
+  DEBUG_LOG(m_logger) << "handleDirectFireSummray m_lastShots.size=" << m_lastShots.size();
   OpticalShot osNew;
   if ( m_lastShots.size() == 0)
     return;
   int distance = 3000; 
-  DEBUG_LOG() << "distance=" << distance;
+  DEBUG_LOG(m_logger) << "distance=" << distance;
   for (const OpticalShot &os : std::as_const(m_lastShots))
   {
     int act_distance = os.deposition1 * os.deposition1 + os.deposition2 * os.deposition2;
-    DEBUG_LOG() << "act_distance=" << act_distance << " BSM-ID=" << os.id
+    DEBUG_LOG(m_logger) << "act_distance=" << act_distance << " BSM-ID=" << os.id
                          << " ammunitionId=" << os.ammunitionId;
     if ( act_distance < distance)
     {
       distance = act_distance;
-      DEBUG_LOG() << "distance=" << distance << " BSM-ID=" << os.id;
+      DEBUG_LOG(m_logger) << "distance=" << distance << " BSM-ID=" << os.id;
       osNew = os;
     }
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket_handler.h
index 9b5dfbdfc..aea9cb5f3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket_handler.h
@@ -69,6 +69,8 @@ private Q_SLOTS:
   void handleDirectFireSummray();
 
 private:
+
+NGL::INGLLogger &m_logger;
   Socket *getSocketForBsm(int bsmId);
   Socket *getSocketForBsm(const QString &hostname);
   QByteArray parseBuffer(int id, const QByteArray &buffer);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/handeleffect.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/handeleffect.cpp
index 1300ec777..1f329b71f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/handeleffect.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/handeleffect.cpp
@@ -61,22 +61,22 @@ void HandelEffect::handleEffect()
   switch (m_currentAction->aclass)
   {
   case AC_Unset:
-    DEBUG_LOG() << "---- This is unset ----";
+    DEBUG_LOG(m_logger) << "---- This is unset ----";
     break;
   case AC_Standard:
   {
-    DEBUG_LOG() << "---- This is a standard Action ----";
+    DEBUG_LOG(m_logger) << "---- This is a standard Action ----";
     if (!m_currentAction->url.isEmpty())
     {
       
-      DEBUG_LOG() << "---- emit newHttpRequest(a->url):" << m_currentAction->url.toString();
+      DEBUG_LOG(m_logger) << "---- emit newHttpRequest(a->url):" << m_currentAction->url.toString();
       emit newHttpRequest(m_currentAction->url);
     }
     break;
   }
   case AC_Repeat:
   {
-    DEBUG_LOG() << "---- This is a Repeat Action";
+    DEBUG_LOG(m_logger) << "---- This is a Repeat Action";
     const RepeatAction *ra = static_cast<const RepeatAction *>(m_currentAction);
 
     HandelEffect *he = new HandelEffect(this);
@@ -92,7 +92,7 @@ void HandelEffect::handleEffect()
   case AC_Pause:
   {
     const PauseAction *pa = static_cast<const PauseAction *>(m_currentAction);
-    DEBUG_LOG() << "---- This is a Pause Action Pause=" << pa->pause
+    DEBUG_LOG(m_logger) << "---- This is a Pause Action Pause=" << pa->pause
                         << " comment=" << pa->comment;
 
     QTimer::singleShot(pa->pause, this, &HandelEffect::handleEffect);
@@ -102,11 +102,11 @@ void HandelEffect::handleEffect()
   }
   case AC_Bsm:
   {
-    DEBUG_LOG() << "---- This is a Bsm Action ";
+    DEBUG_LOG(m_logger) << "---- This is a Bsm Action ";
     const BsmAction *ba = static_cast<const BsmAction*>(m_currentAction);
     if (!ba->isNull())
     {
-      DEBUG_LOG()  << "emit triggerAllFlashlights ------ atype=" << m_currentAction->atype
+      DEBUG_LOG(m_logger)  << "emit triggerAllFlashlights ------ atype=" << m_currentAction->atype
                            << " pause=" << ba->pause
                            << " choplength=" << ba->choplength
                            << " pulses=" << ba->pulses
@@ -120,7 +120,7 @@ void HandelEffect::handleEffect()
   default:
     break;
   }
-  DEBUG_LOG() << "--- End Action ";
+  DEBUG_LOG(m_logger) << "--- End Action ";
 
   
   QTimer::singleShot(0, this, &HandelEffect::handleEffect);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/handeleffects.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/handeleffects.cpp
index f9e522ba5..1ce6b5725 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/handeleffects.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/handeleffects.cpp
@@ -22,7 +22,7 @@ HandelEffects::HandelEffects(QObject *parent, const QString &loggerchannel)
   , m_getRelayStateTimer(new QTimer(this))
   , m_logger(getLogger(QStringLiteral("HandelEffects.") + loggerchannel))
 {
-  DEBUG_LOG() << "HandelEffects::init loggerchannel=" << loggerchannel;
+  DEBUG_LOG(m_logger) << "HandelEffects::init loggerchannel=" << loggerchannel;
   
 
   
@@ -40,7 +40,7 @@ void HandelEffects::init(const QString &controlEffectsCfg, const QString &hostna
 {
   m_xmlReader.init(controlEffectsCfg);
 
-  DEBUG_LOG() << "HandelEffects::init";
+  DEBUG_LOG(m_logger) << "HandelEffects::init";
   m_hostname = hostname;
   m_lastDamage = -1;
   m_effectType = et;
@@ -53,7 +53,7 @@ void HandelEffects::startEffects(int damagePercent)
 {
   if (m_lastDamage == damagePercent)
   {
-    DEBUG_LOG() << "damagePercent=" << damagePercent
+    DEBUG_LOG(m_logger) << "damagePercent=" << damagePercent
                         << " m_lastDamage=" << m_lastDamage
                         << " return";
     return;
@@ -73,7 +73,7 @@ void HandelEffects::startEffects(int damagePercent)
     if (e->effectType == ET_Relay && m_effectType == ET_BsmFlash)
       continue;
 
-    DEBUG_LOG() << "- HandelEffects::Starting Effect " << e << " of Type " << e->effectType << ". ----"
+    DEBUG_LOG(m_logger) << "- HandelEffects::Starting Effect " << e << " of Type " << e->effectType << ". ----"
                         << " name=" << e->name;
     for (const Range *range : e->constRanges())
     {
@@ -87,7 +87,7 @@ void HandelEffects::startEffects(int damagePercent)
       
       createEffectHandler(e, range);
     }
-    DEBUG_LOG() << "- End Effect ";
+    DEBUG_LOG(m_logger) << "- End Effect ";
   }
   m_lastDamage = damagePercent;
 }
@@ -103,7 +103,7 @@ void HandelEffects::createEffectHandler(Effect *e, const Range *range)
   {
     if (m_effectType == ET_BsmFlash)
     {
-      INFO_LOG() << "setOverrides connect Flashes" ;
+      INFO_LOG(m_logger) << "setOverrides connect Flashes" ;
       connect(handelEffect, &HandelEffect::triggerAllFlashlights, this, &HandelEffects::triggerAllFlashlights, Qt::UniqueConnection);
     }
     else
@@ -112,15 +112,15 @@ void HandelEffects::createEffectHandler(Effect *e, const Range *range)
 
   connect(handelEffect, &HandelEffect::effectReady, this, &HandelEffects::onEffectReady);
 
-  DEBUG_LOG() << "-- HandelEffects::Starting Range " << range->min << " - " << range->max
+  DEBUG_LOG(m_logger) << "-- HandelEffects::Starting Range " << range->min << " - " << range->max
                       << ". ----";
 
-  DEBUG_LOG() << "-- Range has " << range->actions.count() << " actions";
+  DEBUG_LOG(m_logger) << "-- Range has " << range->actions.count() << " actions";
 
   handelEffect->init(range->actions, 1);
 
   QTimer::singleShot(0, handelEffect, &HandelEffect::handleEffect);
-  DEBUG_LOG() << "-- End Range ";
+  DEBUG_LOG(m_logger) << "-- End Range ";
 }
 
 void HandelEffects::playHitSound(const int hitSoundId)
@@ -162,18 +162,18 @@ void HandelEffects::switchRelay(const SwitchRelayValues &switchRelayValues)
 void HandelEffects::setOverrides(const QVector<BcuEffectState> &effectStates)
 {
   m_effectStates = effectStates; 
-  DEBUG_LOG() << "In set overrides for " << m_hostname << ", effectStates.size: " << effectStates.size();
+  DEBUG_LOG(m_logger) << "In set overrides for " << m_hostname << ", effectStates.size: " << effectStates.size();
   for(const auto &es : std::as_const(m_effectStates))
   {
-    DEBUG_LOG() << "m_effectStates: es.id=" << es.id
+    DEBUG_LOG(m_logger) << "m_effectStates: es.id=" << es.id
                         << ", es.type=" << es.type
                         << ", es.override=" << es.effectOverride;
   }
   m_sounds = EffectOverride::EO_Auto;
-  DEBUG_LOG() << "Nun die Schleife:";
+  DEBUG_LOG(m_logger) << "Nun die Schleife:";
   for(const auto &es : std::as_const(effectStates))
   {
-    DEBUG_LOG() << "es.id=" << es.id
+    DEBUG_LOG(m_logger) << "es.id=" << es.id
                         << ", es.type=" << es.type
                         << ", es.override=" << es.effectOverride;
     switch (es.type) {
@@ -194,14 +194,14 @@ void HandelEffects::setOverrides(const QVector<BcuEffectState> &effectStates)
           if (e->effectHandler)
           {
             disconnect(e->effectHandler, &HandelEffect::newHttpRequest, this, &HandelEffects::sendHttpRequest);
-            INFO_LOG() << "setOverrides emit triggerAllFlashlights(0,0,0,0)" ;
+            INFO_LOG(m_logger) << "setOverrides emit triggerAllFlashlights(0,0,0,0)" ;
             emit triggerAllFlashlights(0,0,0,0);
           }
         }
       }
       if (es.effectOverride == BEO_Off )
       {
-        DEBUG_LOG() << "BEO_Off";
+        DEBUG_LOG(m_logger) << "BEO_Off";
         
         QUrl url = XmlReader::createPreparedUrl(contents(), m_hostname);
         QUrlQuery query;
@@ -260,7 +260,7 @@ void HandelEffects::setOverrides(const QVector<BcuEffectState> &effectStates)
         {
           if (e->effectHandler)
           {
-            INFO_LOG() << "setOverrides disconnect Flashes" ;
+            INFO_LOG(m_logger) << "setOverrides disconnect Flashes" ;
             disconnect (e->effectHandler, &HandelEffect::triggerAllFlashlights, this, &HandelEffects::triggerAllFlashlights);
           }
         }
@@ -309,7 +309,7 @@ QVector<BcuEffectState> HandelEffects::getOverrides()
       break;
 
     } 
-    DEBUG_LOG() << "getOverrides "
+    DEBUG_LOG(m_logger) << "getOverrides "
                          << " id=" << override.id
                          << " type=" << override.type
                          << " override" << override.effectOverride;
@@ -335,7 +335,7 @@ void HandelEffects::sendHttpRequest(const QUrl &url)
 {
   QUrl copy = url;
   copy.setHost(m_hostname);
-  DEBUG_LOG() << "sendHttpRequest" << copy.toString();
+  DEBUG_LOG(m_logger) << "sendHttpRequest" << copy.toString();
   emit newHttpRequest(copy, HandleHttpQueueMessageStatus::MS_Single);
 }
 
@@ -349,7 +349,7 @@ void HandelEffects::onRelayStateTimerTimeout()
     emit sendRelayState(m_relayState);
     m_overridesSend = false;
   }
-  DEBUG_LOG() << "send get relay-State contents()=" << contents().toString()
+  DEBUG_LOG(m_logger) << "send get relay-State contents()=" << contents().toString()
                       << " m_offlineCounter=" << m_offlineCounter;
   QUrl url = XmlReader::createPreparedUrl(contents(), m_hostname);
   url.setPath(QStringLiteral("/relay.php"));
@@ -364,12 +364,12 @@ void HandelEffects::onRelayStateTimerTimeout()
 void HandelEffects::handleEgcuReplyObject(const QString &host, const QByteArray &data)
 {
   bool relayStateChanged = false;
-  TRACE_LOG() << "handleEgcuReply Object:" << data
+  TRACE_LOG(m_logger) << "handleEgcuReply Object:" << data
                       << " m_offlineState=" << m_offlineState;
 
   if (m_offlineState)
   {
-    DEBUG_LOG() << "State wiederherstellen !!!!!!!!!!! m_offlineState=" << m_offlineState;
+    DEBUG_LOG(m_logger) << "State wiederherstellen !!!!!!!!!!! m_offlineState=" << m_offlineState;
     m_offlineState = false;
     setOverrides(m_effectStates);
   }
@@ -384,7 +384,7 @@ void HandelEffects::handleEgcuReplyObject(const QString &host, const QByteArray
     rsi.id = it.key().toInt();
     rsi.state  = it.value().isString() ? (it.value().toString().compare(QLatin1String("on"), Qt::CaseInsensitive) == 0) : it.value().toBool(false);
     m_relayState.relayStates.append(rsi);
-    TRACE_LOG() << "id=" << rsi.id
+    TRACE_LOG(m_logger) << "id=" << rsi.id
                         << " state=" << rsi.state;
   }
   if ( m_relayState.relayStates.size() == lastRelayState.relayStates.size())
@@ -393,19 +393,19 @@ void HandelEffects::handleEgcuReplyObject(const QString &host, const QByteArray
     {
       if (m_relayState.relayStates[i].state !=  lastRelayState.relayStates[i].state)
       {
-        TRACE_LOG() << "Values relayStateChanged = true";
+        TRACE_LOG(m_logger) << "Values relayStateChanged = true";
         relayStateChanged = true;
       }
     }
   }
   else
   {
-    TRACE_LOG() << "Size relayStateChanged = true";
+    TRACE_LOG(m_logger) << "Size relayStateChanged = true";
     relayStateChanged = true;
   }
   if ( m_offlineCounter > 1)
   {
-    TRACE_LOG() << "m_offlineCounter=" << m_offlineCounter;
+    TRACE_LOG(m_logger) << "m_offlineCounter=" << m_offlineCounter;
     relayStateChanged = true;
   }
 
@@ -413,7 +413,7 @@ void HandelEffects::handleEgcuReplyObject(const QString &host, const QByteArray
   m_relayState.stateTime =  QDateTime::currentMSecsSinceEpoch();
   m_relayState.offlineTime = 0;
   m_offlineCounter=0;
-  DEBUG_LOG() << "host=" << host.toLower()
+  DEBUG_LOG(m_logger) << "host=" << host.toLower()
                       << " relayStateChanged=" << relayStateChanged
                       << " m_overridesSend=" << m_overridesSend
                       << " m_offlineState=" << m_offlineState;
@@ -427,7 +427,7 @@ void HandelEffects::handleEgcuReplyObject(const QString &host, const QByteArray
 
     if ( m_relayState.hostname.toLower() == host.toLower() && relayStateChanged)
   {
-    DEBUG_LOG() << "emit sendRelayState(m_relayState) relayStateChanged";
+    DEBUG_LOG(m_logger) << "emit sendRelayState(m_relayState) relayStateChanged";
     emit sendRelayState(m_relayState);
   }
 }
@@ -435,7 +435,7 @@ void HandelEffects::handleEgcuReplyObject(const QString &host, const QByteArray
 void HandelEffects::handleEgcuReplyArray(const QString &host, const QByteArray &data)
 {
   Q_UNUSED (host);
-  TRACE_LOG() << "handleEgcuReply Array:" << data;
+  TRACE_LOG(m_logger) << "handleEgcuReply Array:" << data;
   m_relayState.relayStates.clear();
   
   const QJsonObject jsonObject = QJsonDocument::fromJson(data).object();
@@ -449,7 +449,7 @@ void HandelEffects::handleEgcuReplyArray(const QString &host, const QByteArray &
     rsi.id = i;
     rsi.state  = stateArray[i].isString() ? (stateArray[i].toString().compare(QLatin1String("on"), Qt::CaseInsensitive)== 0 ): stateArray[i].toBool(false);
     m_relayState.relayStates.append(rsi);
-    TRACE_LOG() << "id=" << rsi.id
+    TRACE_LOG(m_logger) << "id=" << rsi.id
                         << " state=" << rsi.state;
   }
 
@@ -466,7 +466,7 @@ void HandelEffects::handleEgcuReplyArray(const QString &host, const QByteArray &
 void HandelEffects::handleEgcuReply(const QString &host, const QByteArray &data)
 {
   
-  DEBUG_LOG() << "HandelEffects::handleEgcuReply host=" << host
+  DEBUG_LOG(m_logger) << "HandelEffects::handleEgcuReply host=" << host
                       << " m_hostname=" << m_hostname
                       << " m_overridesSend=" << m_overridesSend;
 
@@ -477,18 +477,18 @@ void HandelEffects::handleEgcuReply(const QString &host, const QByteArray &data)
   if (!jsonObject.contains(QStringLiteral("State")) )
   {
     m_overridesSend = true;
-    TRACE_LOG() << "No State return";
+    TRACE_LOG(m_logger) << "No State return";
     return;
   }
   const QJsonValue jsonValue = jsonObject[QStringLiteral("State")];
   if (jsonValue.isArray())
   {
-    TRACE_LOG() << "data isArray\n";
+    TRACE_LOG(m_logger) << "data isArray\n";
     handleEgcuReplyArray(host, data);
   }
   else
   {
-    TRACE_LOG() << "data isObject\n";
+    TRACE_LOG(m_logger) << "data isObject\n";
     handleEgcuReplyObject(host, data);
   }
 
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 10e103f63..e41caff0e 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
@@ -21,11 +21,11 @@ bool XmlReader::init(const QString &effectConfigFile)
   m_contents.effects.clear();
 
   QFile file(effectConfigFile);
-  DEBUG_LOG() << "open effectConfigFile: " << effectConfigFile;
+  DEBUG_LOG(m_logger) << "open effectConfigFile: " << effectConfigFile;
 
   if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
   {
-    WARNING_LOG() << "Couldn't open EffectConfigFile: " << effectConfigFile;
+    WARNING_LOG(m_logger) << "Couldn't open EffectConfigFile: " << effectConfigFile;
     return false;
   }
 
@@ -63,18 +63,18 @@ bool XmlReader::init(const QString &effectConfigFile)
 
   if (xml.hasError())
   {
-    ERROR_LOG() << "Effect Config File had XML Errors:\n" << xml.errorString();
+    ERROR_LOG(m_logger) << "Effect Config File had XML Errors:\n" << xml.errorString();
     return false;
   }
 
-  DEBUG_LOG() << "Effect Config File Contents: " << m_contents.toString();
+  DEBUG_LOG(m_logger) << "Effect Config File Contents: " << m_contents.toString();
   createHttpRequests();
   return true;
 }
 
 Effect *XmlReader::parseEffect(QXmlStreamReader &xml)
 {
-  DEBUG_LOG() << "- parseEffect Start";
+  DEBUG_LOG(m_logger) << "- parseEffect Start";
 
   if (xml.tokenType() != QXmlStreamReader::StartElement ||
       xml.name() != QStringLiteral("effect"))
@@ -125,12 +125,12 @@ Effect *XmlReader::parseEffect(QXmlStreamReader &xml)
     }
     xml.readNext();
   }
-  DEBUG_LOG() << "- parseEffect: Name: " << e->id
+  DEBUG_LOG(m_logger) << "- parseEffect: Name: " << e->id
                       << ", Type: " << e->effectType
                       << ", Category: " << e->category
                       << ", Name: " << e->name
                       << ", override: " << e->override;
-  DEBUG_LOG() << "- parseEffect End. It has " << e->ranges.size() << " ranges";
+  DEBUG_LOG(m_logger) << "- parseEffect End. It has " << e->ranges.size() << " ranges";
   return e;
 }
 
@@ -140,7 +140,7 @@ Range *XmlReader::parseRange(QXmlStreamReader &xml)
       xml.name() != QStringLiteral("range"))
     return {};
 
-  DEBUG_LOG() << "-- parseRange Start";
+  DEBUG_LOG(m_logger) << "-- parseRange Start";
   Range *r = new Range();
 
   QXmlStreamAttributes attributes = xml.attributes();
@@ -164,10 +164,10 @@ Range *XmlReader::parseRange(QXmlStreamReader &xml)
 
     xml.readNext();
   }
-  DEBUG_LOG() << "-- parseRange: [" << r->min << "-" << r->max << "]"
+  DEBUG_LOG(m_logger) << "-- parseRange: [" << r->min << "-" << r->max << "]"
                       << ", restartOnChange: " <<r->restartOnChange
                       << ", ActionCount: " << r->actions.count();
-  DEBUG_LOG() << "-- parseRange End";
+  DEBUG_LOG(m_logger) << "-- parseRange End";
   return r;
 }
 
@@ -188,7 +188,7 @@ Action *XmlReader::parseAction(QXmlStreamReader &xml)
   if (xml.name() == QStringLiteral("bsm"))
     return parseBsmAction(xml);
 
-  WARNING_LOG() << "--- parseUnknownAction with name '" << xml.name().string() << "'cannot be handled.";
+  WARNING_LOG(m_logger) << "--- parseUnknownAction with name '" << xml.name().string() << "'cannot be handled.";
   return {};
 }
 
@@ -198,18 +198,18 @@ PauseAction *XmlReader::parsePauseAction(QXmlStreamReader &xml)
       xml.name() != QLatin1String("pause"))
     return {};
 
-  DEBUG_LOG() << "--- parsePauseAction Start";
+  DEBUG_LOG(m_logger) << "--- parsePauseAction Start";
   QXmlStreamAttributes attributes = xml.attributes();
   PauseAction *p = new PauseAction();
   p->atype = static_cast<ActionType>(attributes.value(QStringLiteral("type")).toInt());
   if (attributes.hasAttribute(QStringLiteral("comment")))
     p->comment = attributes.value(QStringLiteral("comment")).toString();
   p->pause  = xml.readElementText().toInt();
-  DEBUG_LOG() << "--- parsePauseAction: "
+  DEBUG_LOG(m_logger) << "--- parsePauseAction: "
                       << " Pause: " << p->pause
                       << ", Comment: " << p->comment;
 
-  DEBUG_LOG() << "--- parsePauseAction End";
+  DEBUG_LOG(m_logger) << "--- parsePauseAction End";
   return p;
 }
 
@@ -218,7 +218,7 @@ RepeatAction *XmlReader::parseRepeatAction(QXmlStreamReader &xml)
   if (xml.tokenType() != QXmlStreamReader::StartElement ||
       xml.name() != QStringLiteral("repeat"))
     return {};
-  DEBUG_LOG() << "--- parseRepeatAction Start";
+  DEBUG_LOG(m_logger) << "--- parseRepeatAction Start";
   RepeatAction *ra = new RepeatAction();
   QXmlStreamAttributes attributes = xml.attributes();
 
@@ -244,8 +244,8 @@ RepeatAction *XmlReader::parseRepeatAction(QXmlStreamReader &xml)
   QString repetitions = QString::number(ra->count);
   if (ra->count < 0)
     repetitions = QLatin1String("Infinite");
-  DEBUG_LOG() << "--- parseRepeatAction: Repetitions: " << repetitions << ", Comment: " << ra->comment;
-  DEBUG_LOG() << "--- parseRepeatAction End";
+  DEBUG_LOG(m_logger) << "--- parseRepeatAction: Repetitions: " << repetitions << ", Comment: " << ra->comment;
+  DEBUG_LOG(m_logger) << "--- parseRepeatAction End";
   return ra;
 }
 
@@ -256,7 +256,7 @@ Action *XmlReader::parseStandardAction(QXmlStreamReader &xml)
       xml.name() != QStringLiteral("action"))
     return {};
 
-  DEBUG_LOG() << "--- parseStandardAction Start";
+  DEBUG_LOG(m_logger) << "--- parseStandardAction Start";
 
   QXmlStreamAttributes attributes = xml.attributes();
 
@@ -269,9 +269,9 @@ Action *XmlReader::parseStandardAction(QXmlStreamReader &xml)
   a->atype = static_cast<ActionType>(attributes.value(QStringLiteral("type")).toInt());
   if (attributes.hasAttribute(QStringLiteral("comment")))
     a->comment = attributes.value(QStringLiteral("comment")).toString();
-  DEBUG_LOG() << "--- parseStandardAction: Type: " << a->atype
+  DEBUG_LOG(m_logger) << "--- parseStandardAction: Type: " << a->atype
                       << ", Comment: " << a->comment;
-  DEBUG_LOG() << "--- parseStandardAction End";
+  DEBUG_LOG(m_logger) << "--- parseStandardAction End";
   return a;
 }
 
@@ -280,7 +280,7 @@ BsmAction *XmlReader::parseBsmAction(QXmlStreamReader &xml)
   QXmlStreamAttributes attributes = xml.attributes();
 
 
-  DEBUG_LOG()  << "--- parseBsmAction Start";
+  DEBUG_LOG(m_logger)  << "--- parseBsmAction Start";
   BsmAction *a = new BsmAction();
   a->atype = static_cast<ActionType>(attributes.value(QStringLiteral("type")).toInt());
   if (attributes.hasAttribute(QStringLiteral("comment")))
@@ -302,14 +302,14 @@ BsmAction *XmlReader::parseBsmAction(QXmlStreamReader &xml)
     xml.readNext();
   }
 
-  DEBUG_LOG() << "--- parseBsmAction: Type: " << a->atype
+  DEBUG_LOG(m_logger) << "--- parseBsmAction: Type: " << a->atype
                       << ", Pause: " << a->pause
                       << ", Choplength: " << a->choplength
                       << ", Count: " << a->count
                       << ", Pulses: " << a->pulses
                       << ", Pulseduration: " << a->pulseduration
                       << ", Comment: " << a->comment;
-  DEBUG_LOG()  << "--- parseBsmAction End";
+  DEBUG_LOG(m_logger)  << "--- parseBsmAction End";
   return a;
 }
 
@@ -384,7 +384,7 @@ void XmlReader::generateUrl(const Effect *e, Action *a)
     }
     url.setQuery(query);
     a->url = url;
-    DEBUG_LOG() << "Effect " << e->name << ", Action '" << a->comment << "' now has URL: " << url.toString();
+    DEBUG_LOG(m_logger) << "Effect " << e->name << ", Action '" << a->comment << "' now has URL: " << url.toString();
     break;
   }
   case AC_Repeat:
@@ -397,7 +397,7 @@ void XmlReader::generateUrl(const Effect *e, Action *a)
   case AC_Pause:
   case AC_Bsm:
   default:
-    DEBUG_LOG() << "Effect " << e->name << ", Action '" << a->comment << "' of Type " << a->aclass << " needs no URL";
+    DEBUG_LOG(m_logger) << "Effect " << e->name << ", Action '" << a->comment << "' of Type " << a->aclass << " needs no URL";
     break;
   }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/xmlreader.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/xmlreader.h
index 8a012b98f..1d2dd387f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/xmlreader.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/xmlreader.h
@@ -178,6 +178,7 @@ public:
   XmlContents contents() const { return m_contents; }
 
 private:
+  NGL::INGLLogger &m_logger;
   void createHttpRequests();
   static QString categoryName(Category c);
 
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 48612109d..1b9a54ce4 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
@@ -65,7 +65,7 @@ void Api::sendHitResult(const HitResult &hitResult, const QMap <int, Contaminati
     tele.hitResult.contaminations += csi;
   }
 
-  DEBUG_LOG() << Q_FUNC_INFO << ", tele = " << tele.toJson();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << ", tele = " << tele.toJson();
 
   m_webSocketHandler->sendTelegram(&tele, ws);
 }
@@ -141,7 +141,7 @@ void Api::sendEffectOverrides(const QString &segment,
 
 void Api::onTelegramReceived(const std::shared_ptr<Telegrams::BaseTelegram> &tele)
 {
-  DEBUG_LOG() << "tele->telegramId(): " << tele->telegramId();
+  DEBUG_LOG(m_logger) << "tele->telegramId(): " << tele->telegramId();
 
   if (tele->telegramId() == Telegrams::SetDamageState::telegramId())
   {
@@ -271,7 +271,7 @@ void Api::onTelegramReceived(const std::shared_ptr<Telegrams::BaseTelegram> &tel
     emit getBsmTechnicalStatus(tel->sensorId);
     return;
   }
-  WARNING_LOG() << "Received unhandled telegram " << tele->telegramId();
+  WARNING_LOG(m_logger) << "Received unhandled telegram " << tele->telegramId();
 }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/json_api.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/json_api.h
index 711ad649a..b27f71490 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/json_api.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/json_api.h
@@ -76,6 +76,7 @@ Q_SIGNALS:
 private Q_SLOTS:
   void onTelegramReceived(const std::shared_ptr<Telegrams::BaseTelegram> &tele);
 private:
+NGL::INGLLogger &m_logger;
   WebSocketHandler *m_webSocketHandler;
 };
 } 
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 60f3c9c46..d29af15a2 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
@@ -11,10 +11,9 @@ namespace BuildingControlUnit
 {
 namespace Json
 {
-WebSocketHandler::WebSocketHandler(QObject *parent)
-  : QObject(parent)
-  , m_webSocketServer(new QWebSocketServer(QStringLiteral("BCU"), QWebSocketServer::NonSecureMode, this))
-{}
+WebSocketHandler::WebSocketHandler(QObject *parent) : QObject(parent)
+  , m_webSocketServer(new QWebSocketServer(QStringLiteral("BCU"), QWebSocketServer::NonSecureMode, this)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 WebSocketHandler::~WebSocketHandler()
 {
@@ -30,7 +29,7 @@ bool WebSocketHandler::init(quint16 listenPort)
 {
   if (!m_webSocketServer->listen(QHostAddress::Any, listenPort))
   {
-    WARNING_LOG() << "Can not listen on port " << listenPort << " - aborting";
+    WARNING_LOG(m_logger) << "Can not listen on port " << listenPort << " - aborting";
     return false;
   }
   
@@ -48,7 +47,7 @@ bool WebSocketHandler::sendTelegram(const Telegrams::BaseTelegram *tele, QWebSoc
     return false;
 
   const QString jsonStr = QString::fromUtf8(tele->toJson());
-  DEBUG_LOG() << "jsonStr" << jsonStr;
+  DEBUG_LOG(m_logger) << "jsonStr" << jsonStr;
 
   bool bOk = false;
   for (QWebSocket *ws : std::as_const(m_webSockets))
@@ -68,7 +67,7 @@ void WebSocketHandler::onNewConnection()
   QWebSocket *ws = m_webSocketServer->nextPendingConnection();
   if (!ws)
     return;
-  DEBUG_LOG() << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
+  DEBUG_LOG(m_logger) << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
 
   connect(ws, &QWebSocket::textMessageReceived,
           this, &WebSocketHandler::onTextMessageReceived);
@@ -82,11 +81,11 @@ void WebSocketHandler::onNewConnection()
 
 void WebSocketHandler::onTextMessageReceived(const QString &msg)
 {
-  DEBUG_LOG() << "new text message: " << msg;
+  DEBUG_LOG(m_logger) << "new text message: " << msg;
   auto tele = std::shared_ptr<Telegrams::BaseTelegram>(Telegrams::BaseTelegram::telegramFromJson(msg.toUtf8()));
   if (!tele)
   {
-    WARNING_LOG() << "Error parsing incoming json data: '" << msg << "'";
+    WARNING_LOG(m_logger) << "Error parsing incoming json data: '" << msg << "'";
     return;
   }
   emit telegramReceived(tele);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/web_socket_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/web_socket_handler.h
index 87c14e7e8..7971e8ac5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/web_socket_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/web_socket_handler.h
@@ -41,6 +41,7 @@ private Q_SLOTS:
   void onWebSocketDisconnected();
   void onTextMessageReceived(const QString &msg);
 private:
+  NGL::INGLLogger &m_logger;
   QWebSocketServer *m_webSocketServer;
   QSet<QWebSocket *> m_webSockets;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/test_read_xml.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/test_read_xml.cpp
index 937876e48..6ce133f7f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/test_read_xml.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/test_read_xml.cpp
@@ -13,10 +13,9 @@
 #include <NGLLogger/NGLLoggerBootstrap.h>
 
 
-Test::Test()
-  : m_api(new BuildingControlUnit::VWM::Api(this))
-  .getNGLLogger("BCU.VWM.Test"))
-{
+Test::Test() : m_api(new BuildingControlUnit::VWM::Api(this))
+  .getNGLLogger("BCU.VWM.Test")),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   connect(m_api, &BuildingControlUnit::VWM::Api::hitResult,
           this, &Test::hitResult);
   QTimer::singleShot(0, this, &Test::test1);
@@ -29,7 +28,7 @@ Test::~Test()
 
 void Test::hitResult(const BuildingControlUnit::HitResult &result)
 {
-  INFO_LOG() << "Hit Result: sensorId = " << result.sensorId
+  INFO_LOG(m_logger) << "Hit Result: sensorId = " << result.sensorId
                      << ", originatorId = " << result.originatorId
                      << ", chargeTypeId = " << result.chargeTypeId
                      << ", dmgPercentOld = " << result.damagePercentOld
@@ -54,18 +53,18 @@ void Test::test1()
     const auto hitPos = BuildingControlUnit::VWM::Math::checkBsmPosition(bsm.position, bsm.direction, rooms);
     if (hitPos.state != BuildingControlUnit::VWM::HitPosition::State::OuterWall)
     {
-      WARNING_LOG() << "Effect on bsm " << bsm.id << " does not hit building ! - position: "
+      WARNING_LOG(m_logger) << "Effect on bsm " << bsm.id << " does not hit building ! - position: "
                             << bsm.position << ", direction: " << bsm.direction;
     }
     else if (hitPos.distance < 0)
     {
-      WARNING_LOG() << "Effect on bsm " << bsm.id << " results in hit pos behind a wall ("
+      WARNING_LOG(m_logger) << "Effect on bsm " << bsm.id << " results in hit pos behind a wall ("
                             << hitPos.distance << "m) instead in front - BSM is not modelled in the correct place: "
                             << bsm.position << ", direction: " << bsm.direction << ", roomId which was hit: " << hitPos.roomId;
     }
     else
     {
-      DEBUG_LOG() << "BSM with id " << bsm.id << " looks fine - room which will be hit: " << hitPos.roomId;
+      DEBUG_LOG(m_logger) << "BSM with id " << bsm.id << " looks fine - room which will be hit: " << hitPos.roomId;
     }
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/test_read_xml.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/test_read_xml.h
index f60085971..750860d2c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/test_read_xml.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/test_read_xml.h
@@ -24,4 +24,5 @@ private Q_SLOTS:
   void test5();
   void test6();
 private:
+NGL::INGLLogger &m_logger;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_api.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_api.cpp
index 3964d8173..09f8f612c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_api.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_api.cpp
@@ -38,7 +38,7 @@ bool Api::init(const QString &chargesConfig,
                const BuildingBsmConfig &bsmConfig,
                const bool initBuilding)
 {
-  DEBUG_LOG() << "chargesConfig=" << chargesConfig;
+  DEBUG_LOG(m_logger) << "chargesConfig=" << chargesConfig;
   if (!XmlReader::readCharges(chargesConfig, m_chargeMap))
     return false;
   if (!XmlReader::readBuilding(vulBuildingConfig, m_building))
@@ -48,21 +48,21 @@ bool Api::init(const QString &chargesConfig,
   QString fltXml = QString(QStringLiteral("/opt/BuildingModels/StaticMeshes/%1.flt.xml")).arg(m_building.name());
   if (!XmlReader::readBuildingGeometry(fltXml, m_buildingRoomGeometry ))
   {
-    ERROR_LOG() << "Error reading buildingRoomGeometry from file: " << fltXml << "'";
+    ERROR_LOG(m_logger) << "Error reading buildingRoomGeometry from file: " << fltXml << "'";
     
   }
 
-  DEBUG_LOG() << "Building buildingRoomGeometry read successfully from file: " << fltXml << "'";
+  DEBUG_LOG(m_logger) << "Building buildingRoomGeometry read successfully from file: " << fltXml << "'";
 
 
 
   int numberOfRemoved = m_building.cleanupPolygons();
   int numberOfDuplicates = m_building.checkPolygons();
-  DEBUG_LOG() << "Building cleanupPolygons: " << m_building.name() << "' -> " << numberOfRemoved << " points removed";
+  DEBUG_LOG(m_logger) << "Building cleanupPolygons: " << m_building.name() << "' -> " << numberOfRemoved << " points removed";
   if (numberOfDuplicates > 0)
-    ERROR_LOG() << "Building checkPolygons: " << m_building.name() << "' -> " << numberOfDuplicates << " duplicates";
+    ERROR_LOG(m_logger) << "Building checkPolygons: " << m_building.name() << "' -> " << numberOfDuplicates << " duplicates";
   else
-    DEBUG_LOG() << "Building checkPolygons: " << m_building.name() << "' -> " << numberOfDuplicates << " duplicates";
+    DEBUG_LOG(m_logger) << "Building checkPolygons: " << m_building.name() << "' -> " << numberOfDuplicates << " duplicates";
 
 
   m_bsmMap = bsmConfig.bsmMap;
@@ -85,7 +85,7 @@ void Api::onHitOptical(qint64 timeMSec, int sensorId, int originatorId, int char
   
   if (!bsm.isValid())
   {
-    WARNING_LOG() << "Given bsm id " << sensorId << " is not in our internal bsm list!";
+    WARNING_LOG(m_logger) << "Given bsm id " << sensorId << " is not in our internal bsm list!";
     return;
   }
   
@@ -105,7 +105,7 @@ void Api::onHitOptical(qint64 timeMSec, int sensorId, int originatorId, int char
 
 void Api::onSetEffectStatesRequest(const QString &hostname, const QVector<BcuEffectState> &effectStates)
 {
-  DEBUG_LOG() << "onSetEffectStatesRequest:"
+  DEBUG_LOG(m_logger) << "onSetEffectStatesRequest:"
                       << " hostname= " << hostname
                       << " effectStes.zize=" << effectStates.size();
 
@@ -120,7 +120,7 @@ void Api::onSetEffectStatesRequest(const QString &hostname, const QVector<BcuEff
         if (es.effectOverride == BcuEffectOverride::BEO_Off)
         {
           overridesObj.insert(QStringLiteral("flash"), 0);
-          DEBUG_LOG() << "flash = 0";
+          DEBUG_LOG(m_logger) << "flash = 0";
         }
       }
     }
@@ -137,14 +137,14 @@ void Api::onSetEffectStatesRequest(const QString &hostname, const QVector<BcuEff
       {
         QJsonObject relayStateObj;
         relayStateObj[QString::number(es.id)]=es.effectOverride;
-        DEBUG_LOG() << "relay = " << QString::number(es.id)
+        DEBUG_LOG(m_logger) << "relay = " << QString::number(es.id)
                             << " " << es.effectOverride;
         relayStateArray.append(relayStateObj);
       }
       else if (es.type == BcuEffectType::BET_BackgroundSound)
       {
         overridesObj.insert(QStringLiteral("sound"), es.effectOverride);
-        DEBUG_LOG() << "sound=" << es.effectOverride;
+        DEBUG_LOG(m_logger) << "sound=" << es.effectOverride;
       }
     }
     overridesObj.insert(QStringLiteral("relays"), relayStateArray);
@@ -154,7 +154,7 @@ void Api::onSetEffectStatesRequest(const QString &hostname, const QVector<BcuEff
   propertiesObj[QStringLiteral("Overrides")] = overridesObj;
 
   QString totalString = QString::fromLatin1(QJsonDocument(propertiesObj).toJson(QJsonDocument::Compact));
-  DEBUG_LOG() << "totalString=" <<  totalString;
+  DEBUG_LOG(m_logger) << "totalString=" <<  totalString;
   m_building.setSegmentProperties(hostname,totalString);
   StateStore::saveState(m_building, m_lastHitResult, m_contaminationStates);
 }
@@ -264,15 +264,15 @@ void Api::onHitEcc(int originatorId, DamageState damageState, const QVector<int>
 
 void Api::onSetContaminationState(const std::vector<ContaminationState> &contaminationStates)
 {
-  DEBUG_LOG() << "contaminationStates.size=" << contaminationStates.size();
+  DEBUG_LOG(m_logger) << "contaminationStates.size=" << contaminationStates.size();
 
   for (const auto &newcs : contaminationStates)
   {
-    DEBUG_LOG() << "newcs.damagePercentNew=" << newcs.damagePercentNew
+    DEBUG_LOG(m_logger) << "newcs.damagePercentNew=" << newcs.damagePercentNew
                          << " m_lastHitResult.damagePercentNew=" << m_lastHitResult.damagePercentNew;
     if ( newcs.damagePercentNew > m_lastHitResult.damagePercentNew)
     {
-      DEBUG_LOG() << "newcs.damagePercentNew=" << newcs.damagePercentNew;
+      DEBUG_LOG(m_logger) << "newcs.damagePercentNew=" << newcs.damagePercentNew;
       m_lastHitResult.damagePercentNew = newcs.damagePercentNew;
     }
     if (m_contaminationStates.contains(newcs.aesId))
@@ -302,7 +302,7 @@ void Api::onSetContaminationState(const std::vector<ContaminationState> &contami
     else
       m_contaminationStates.insert(newcs.aesId, newcs);
   }
-  DEBUG_LOG() << "onSetContaminationState emit hitResult "
+  DEBUG_LOG(m_logger) << "onSetContaminationState emit hitResult "
                       << " m_lastHitResult.damagePercentNew=" <<  m_lastHitResult.damagePercentNew;
   emit hitResult(m_lastHitResult, m_contaminationStates, false);
   StateStore::saveState(m_building, m_lastHitResult, m_contaminationStates);
@@ -311,7 +311,7 @@ void Api::onSetContaminationState(const std::vector<ContaminationState> &contami
 void Api::onResetContaminations()
 {
   m_contaminationStates.clear();
-  DEBUG_LOG() << "onResetContaminations emit hitResult";
+  DEBUG_LOG(m_logger) << "onResetContaminations emit hitResult";
   m_lastHitResult.chargeTypeId = 0;
   m_lastHitResult.originatorId = 0;
   m_lastHitResult.originatorType = BuildingControlUnit::OriginatorType::ECC;
@@ -338,7 +338,7 @@ void Api::onHitCes(const qint64 effectTimeMSec, const int chargeTypeId,
   
   hit.position.setZ(1);
 
-  INFO_LOG() << "XXXXX CES Hit = " << hit;
+  INFO_LOG(m_logger) << "XXXXX CES Hit = " << hit;
 
   
   
@@ -349,7 +349,7 @@ void Api::onHitCes(const qint64 effectTimeMSec, const int chargeTypeId,
   posTmp.setZ(10000);
   const LtsUtils::QPoint3D direction(0,0,1);  
   const auto hitPosTmp = BuildingControlUnit::VWM::Math::checkBsmPosition(posTmp, direction, m_building.rooms());
-  INFO_LOG() << "XXXXX hitPosTmp after checkBsmPosition = " << hitPosTmp;
+  INFO_LOG(m_logger) << "XXXXX hitPosTmp after checkBsmPosition = " << hitPosTmp;
   if (hitPosTmp.state != BuildingControlUnit::VWM::HitPosition::State::NoHit)
   {
     auto room = m_building.rooms().value(hitPosTmp.roomId);
@@ -382,7 +382,7 @@ void Api::onHitCes(const qint64 effectTimeMSec, const int chargeTypeId,
   NearestWall nearestWall;
   if (hitPos.state == BuildingControlUnit::VWM::HitPosition::State::NoHit)
   {
-    INFO_LOG() << "XXXXX CES Hit outside building - searching nearest wall ...";
+    INFO_LOG(m_logger) << "XXXXX CES Hit outside building - searching nearest wall ...";
 
     double distanceOut = 0;
     LtsUtils::QPoint3D directionWallElementPointToDetonationOut;
@@ -399,14 +399,14 @@ void Api::onHitCes(const qint64 effectTimeMSec, const int chargeTypeId,
 
   if (hitPos.state == BuildingControlUnit::VWM::HitPosition::State::NoHit)
   {
-    WARNING_LOG() << "Internal error - could not find impact position on building "
+    WARNING_LOG(m_logger) << "Internal error - could not find impact position on building "
                           << m_building.name() << " with impact pos " << posImpactOnGround;
   }
-  INFO_LOG() << "XXXXX Aes hit - hit pos: " << posImpactOnGround << " direction: " << hit.direction
+  INFO_LOG(m_logger) << "XXXXX Aes hit - hit pos: " << posImpactOnGround << " direction: " << hit.direction
                      << " (p=" << hit.direction+posImpactOnGround << ")"
                      << " ; nearestWall.roomId=" << nearestWall.roomId;
   for (auto item : std::as_const(nearestWall.wallElement))
-    DEBUG_LOG() << "Aes hit - hit pos: " << posImpactOnGround << " direction: " << hit.direction
+    DEBUG_LOG(m_logger) << "Aes hit - hit pos: " << posImpactOnGround << " direction: " << hit.direction
                         << " (p=" << hit.direction+posImpactOnGround
                         << " - " << item;
 
@@ -417,7 +417,7 @@ void Api::onHitCes(const qint64 effectTimeMSec, const int chargeTypeId,
 
     const LtsUtils::QPoint3D &center = centerOfWallElement3D(nearestWall.wallElement);
 
-    INFO_LOG() << "XXXXX Aes hit - hit pos: " << posImpactOnGround << " direction: " << hit.direction
+    INFO_LOG(m_logger) << "XXXXX Aes hit - hit pos: " << posImpactOnGround << " direction: " << hit.direction
                        << ", m_building.name=" << m_building.name()
                        << ", m_building.modelId=" << m_building.modelId()
                        << ", nearestWall.roomId=" << nearestWall.roomId
@@ -436,7 +436,7 @@ NearestWall Api::findNearestWall(const LtsUtils::QPoint3D &detonationLocation, d
   NearestWall nearestWall;
   distanceOut = std::numeric_limits<double>::max();
 
-  INFO_LOG() << "XXXXX searching nearest wall ...";
+  INFO_LOG(m_logger) << "XXXXX searching nearest wall ...";
   for (const Room &room : std::as_const(m_building.rooms()))
   {
     for (const OuterWall &wall : std::as_const(room.outerWalls()))
@@ -446,13 +446,13 @@ NearestWall Api::findNearestWall(const LtsUtils::QPoint3D &detonationLocation, d
         for (const LtsUtils::QPoint3D &p : std::as_const(we))
         {
           const double dist = (detonationLocation - p).length();
-          DEBUG_LOG() << "Room[" << room.id() << "]: " << p << ", dist = " << dist;
+          DEBUG_LOG(m_logger) << "Room[" << room.id() << "]: " << p << ", dist = " << dist;
           if (dist >= distanceOut)
             continue;
 
 
           distanceOut = dist;
-          INFO_LOG() << "New min distance " << dist << " Room[" << room.id() << "]: " << p;
+          INFO_LOG(m_logger) << "New min distance " << dist << " Room[" << room.id() << "]: " << p;
           directionWallElementPointToDetonationOut = p - detonationLocation;
 
           nearestWall.roomId = room.id();
@@ -486,7 +486,7 @@ void Api::onHitCes3D_Evaluation(const qint64 effectTimeMSec,
   
   
 
-  INFO_LOG() << "XXXXXXXXXX CES Hit 3D = " << hit
+  INFO_LOG(m_logger) << "XXXXXXXXXX CES Hit 3D = " << hit
                      << ", detonationLocation = " << detonationLocation
                      << ", detonationDistance = " << detonationDistance
                      << ", chargeTypeId = " << chargeTypeId
@@ -514,16 +514,16 @@ void Api::onHitCes3D_Evaluation(const qint64 effectTimeMSec,
     roomsWithDetonation = m_buildingRoomGeometry.pointIsInWhichRooms(detonationLocation);
     if (roomsWithDetonation.isEmpty())
     {
-      INFO_LOG() << "XXXX Building '" << m_building.name() << "'"
+      INFO_LOG(m_logger) << "XXXX Building '" << m_building.name() << "'"
                          << ", detonationLocation = " << detonationLocation
                          << " -> found no room";
     } else {
       if (roomsWithDetonation.size() == 1)
-        INFO_LOG() << "XXXX Building '" << m_building.name() << "'"
+        INFO_LOG(m_logger) << "XXXX Building '" << m_building.name() << "'"
                            << ", detonationLocation = " << detonationLocation
                            << " -> found just one room: " << roomsWithDetonation.first();
       else
-        INFO_LOG() << "XXXX Building '" << m_building.name() << "'"
+        INFO_LOG(m_logger) << "XXXX Building '" << m_building.name() << "'"
                            << ", detonationLocation = " << detonationLocation
                            << " -> found several rooms, choose first: " << roomsWithDetonation.first();
 
@@ -541,7 +541,7 @@ void Api::onHitCes3D_Evaluation(const qint64 effectTimeMSec,
     LtsUtils::QPoint3D directionWallElementPointToDetonationOut;
     NearestWall nearestWall = findNearestWall(detonationLocation, distanceOut, directionWallElementPointToDetonationOut);
 
-    INFO_LOG() << "XXXXX CES Hit outside building - searching nearest wall ..."
+    INFO_LOG(m_logger) << "XXXXX CES Hit outside building - searching nearest wall ..."
                        << ", detonationDistance = " << detonationDistance
                        << ", nearestWall.roomId = " << nearestWall.roomId;
 
@@ -588,7 +588,7 @@ void Api::onHitCes3D_Evaluation(const qint64 effectTimeMSec,
   bool hitSuccess = m_building.hit(LtsUtils::QPoint3D(), LtsUtils::QPoint3D(),  
                                    charge, &hitPosPreCalculated);
 
-  INFO_LOG() << "onHitCes3D_Evaluation hitSuccess=" << hitSuccess;
+  INFO_LOG(m_logger) << "onHitCes3D_Evaluation hitSuccess=" << hitSuccess;
 
   result.rooms            = m_building.roomStates();
   result.damageState      = m_building.damageState();
@@ -627,7 +627,7 @@ void Api::onFortifyFactorRequest(int originatorId, const QVector<FortifyInfo> &f
 
 void Api::onRelayStatesRequest(const QString &hostname, const QVector<RelayStateInfo> &relayStateInfos)
 {
-  DEBUG_LOG() << "onRelayStateRequest hostname=" << hostname
+  DEBUG_LOG(m_logger) << "onRelayStateRequest hostname=" << hostname
                       << " only hanlde in svcBuildings"
                       << " relayStateInfos.size()=" << relayStateInfos.size();
 }
@@ -649,14 +649,14 @@ void Api::sendOverrides()
 
     QJsonObject docObj = QJsonObject(doc.object());
 
-    DEBUG_LOG() << "sendOverrides hostname=" << hostname
+    DEBUG_LOG(m_logger) << "sendOverrides hostname=" << hostname
                          << " properties=" << properties;
 
     
     
     
     {
-      DEBUG_LOG() << "sendOverrides hostname=" << hostname
+      DEBUG_LOG(m_logger) << "sendOverrides hostname=" << hostname
                           << " properties=" << properties << "BCU-Flash";
       BcuEffectState bcuEffectState;
       bcuEffectState.id = 1; 
@@ -677,7 +677,7 @@ void Api::sendOverrides()
       }
       if (eo != BcuEffectOverride::BEO_Auto)
       {
-        DEBUG_LOG() << "bcuEffectState.effectOverride = eo" << eo;
+        DEBUG_LOG(m_logger) << "bcuEffectState.effectOverride = eo" << eo;
         bcuEffectState.effectOverride = eo;
         emit newOverrides({}, {bcuEffectState});
       }
@@ -726,7 +726,7 @@ void Api::sendHitToVwm(const Hit &hit)
 {
   m_hitsSinceLastInit += hit;
 
-  INFO_LOG() << " XXXXX sendHitToVwm, Incoming hit=" << hit
+  INFO_LOG(m_logger) << " XXXXX sendHitToVwm, Incoming hit=" << hit
                      << " hit.chargeTypeId=" << hit.chargeTypeId
                      << " originatorId=" << hit.originatorId
                      << " typeOfHit=" << hit.typeOfHit;
@@ -753,7 +753,7 @@ void Api::sendHitToVwm(const Hit &hit)
       charge.penetrationEffect = hit.penetrationFactor;
     }
 
-    DEBUG_LOG() << "charge=" << charge.chargeTypeId
+    DEBUG_LOG(m_logger) << "charge=" << charge.chargeTypeId
                         << " destructiveFactor" << charge.destructiveFactor
                         << " penetrationEffect" << charge.penetrationEffect;
     chargeOrg = charge;
@@ -770,23 +770,23 @@ void Api::sendHitToVwm(const Hit &hit)
 
       LtsUtils::QPoint3D dummyDist = hit.position - hit.direction;
 
-      INFO_LOG() << " XXXX CES outside bulding, reduce charge: " << charge
+      INFO_LOG(m_logger) << " XXXX CES outside bulding, reduce charge: " << charge
                          << ", hit.position " << hit.position
                          << ", hit.direction " << hit.direction
                          << ", dummyDist " << dummyDist.length();
       charge.destructiveFactor *= 0.5;
       charge.penetrationEffect *= 0.5;
-      INFO_LOG() << " XXXX CES outside bulding, reduce charge: " << charge;
+      INFO_LOG(m_logger) << " XXXX CES outside bulding, reduce charge: " << charge;
     }
 
     if (!charge.isValid())
     {
       if (hit.originatorType == OriginatorType::CesHit)
-        WARNING_LOG() << "Charge with id " << hit.chargeTypeId
+        WARNING_LOG(m_logger) << "Charge with id " << hit.chargeTypeId
                               << " not configured - can not caluclate impact effect for this charge";
       else
       {
-        WARNING_LOG() << "Direct charge with id " << hit.chargeTypeId
+        WARNING_LOG(m_logger) << "Direct charge with id " << hit.chargeTypeId
                               << " not configured - can not caluclate impact effect for this charge";
         emit unknownDirectHit(hit.sensorId);
       }
@@ -794,7 +794,7 @@ void Api::sendHitToVwm(const Hit &hit)
     }
     if (!m_building.hit(hit.position, hit.direction, charge))
     {
-      WARNING_LOG() << "Detected hit was outside of the building - ignored";
+      WARNING_LOG(m_logger) << "Detected hit was outside of the building - ignored";
       break;
     }
     result.rooms = m_building.roomStates();
@@ -832,7 +832,7 @@ void Api::sendHitToVwm(const Hit &hit)
     {
     case DamageState::NoDamage:
     {
-      DEBUG_LOG() << "Hit OC/ECC with NoDamage";
+      DEBUG_LOG(m_logger) << "Hit OC/ECC with NoDamage";
       m_building.init();
 
       result.effectSoundId = Settings::effectSoundIdEccActivate();
@@ -855,7 +855,7 @@ void Api::sendHitToVwm(const Hit &hit)
     }
     case DamageState::Destroyed:
     {
-      DEBUG_LOG() << "Hit OC/ECC with Destroyed";
+      DEBUG_LOG(m_logger) << "Hit OC/ECC with Destroyed";
       const DamageState dsOld = m_building.damageState();
 
       m_building.destroyAllRooms();
@@ -879,14 +879,14 @@ void Api::sendHitToVwm(const Hit &hit)
       break;
     }
     default:
-      WARNING_LOG() << "Invalid damage state override given: " << hit.damageStateOverride;
+      WARNING_LOG(m_logger) << "Invalid damage state override given: " << hit.damageStateOverride;
       result = HitResult();
       break;
     }
     break;
   }
   case OriginatorType::Unknown:
-    WARNING_LOG() << "Unknown originator type given: " << hit.originatorType;
+    WARNING_LOG(m_logger) << "Unknown originator type given: " << hit.originatorType;
     result = HitResult();
     break;
   }
@@ -905,7 +905,7 @@ const Charge Api::chargeFromChargeTypeId(int chargeTypeId) const
 
   for (auto i = m_chargeMap.cbegin(), end = m_chargeMap.cend(); i != end; ++i)
   {
-    TRACE_LOG() << "key=" << i.key() << " value=" << i.value();
+    TRACE_LOG(m_logger) << "key=" << i.key() << " value=" << i.value();
     if ( chargeTypeId == i.value().id)
       return m_chargeMap.value(i.key());
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_api.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_api.h
index 8d27466ef..1beb276a9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_api.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_api.h
@@ -77,6 +77,7 @@ Q_SIGNALS:
   void newOverrides( const QString &hostname, const QVector<BcuEffectState> &effectStates);
   void unknownDirectHit(int sensorId);
 private:
+NGL::INGLLogger &m_logger;
   void sendHitToVwm(const Hit &hit);
 private:
   QMap<int, Bsm>                  m_bsmMap;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building.cpp
index 66b27aef6..133a42448 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building.cpp
@@ -354,7 +354,7 @@ int Building::cleanupDublicatePointsInPolygon(int roomId, int idx, int subIdx, c
       auto p2 = points.at(j);
       if (qFuzzyCompare(p1, p2))
       {
-        DEBUG_LOG() << "Building '" << m_name << "' -> "
+        DEBUG_LOG(m_logger) << "Building '" << m_name << "' -> "
                             << "Polygon point " << i << " (" << p1 << ") and " << j << " (" << p2
                             << ") in room " << roomId << ", " << type << "[" << idx
                             << "], element[" << subIdx << "] are the same! -> REMOVE";
@@ -410,7 +410,7 @@ QVector<HitRoom> Building::roomStates() const
       hr.fortifyFactor = room.fortifyFactor();
       hr.directHit = room.isDirectHit();
       ret += hr;
-      DEBUG_LOG() << "HitRoom " << hr.roomId
+      DEBUG_LOG(m_logger) << "HitRoom " << hr.roomId
                           << " damage: " << hr.damagePercent
                           << "%, remainEffect: " << hr.remainingEffectPercent << "%"
                           << ", remainingEffectChargeTypeId: " << hr.remainingEffectChargeTypeId << "%"
@@ -448,7 +448,7 @@ void Building::setRoomState(DamageState damageState, const QVector<int> &afffect
     auto it = m_rooms.find(roomId);
     if (it == m_rooms.end())
     {
-      WARNING_LOG() << "Could not find room with id " << roomId;
+      WARNING_LOG(m_logger) << "Could not find room with id " << roomId;
       continue;
     }
     if (damageState == DamageState::Destroyed)
@@ -465,7 +465,7 @@ void Building::setFortifyInfo(const QVector<FortifyInfo> &foritfyInfos)
     auto it = m_rooms.find(info.roomId);
     if (it == m_rooms.end())
     {
-      WARNING_LOG() << "Could not find room with id " << info.roomId;
+      WARNING_LOG(m_logger) << "Could not find room with id " << info.roomId;
       continue;
     }
     Room &room = it.value();
@@ -538,14 +538,14 @@ bool Building::hit(const LtsUtils::QPoint3D &pos, const LtsUtils::QPoint3D &dir,
   const bool bBelowGround = isLastHitPositionBelowGroundHack();
   if (bBelowGround)
   {
-    INFO_LOG() << " XXXX CES belowGround, reduce charge: " << charge;
+    INFO_LOG(m_logger) << " XXXX CES belowGround, reduce charge: " << charge;
     charge.destructiveFactor *= 0.25;
     charge.penetrationEffect *= 0.25;
-    INFO_LOG() << " XXXX CES belowGround, reduce charge: " << charge;
+    INFO_LOG(m_logger) << " XXXX CES belowGround, reduce charge: " << charge;
   }
 
 
-  INFO_LOG() << "XXXXX HitPosition: state=" << m_lastHitPosition.state
+  INFO_LOG(m_logger) << "XXXXX HitPosition: state=" << m_lastHitPosition.state
                      << ", m_name=" << m_name
                      << ", m_modelId=" << m_modelId
                      << ", roomId=" << m_lastHitPosition.roomId
@@ -560,7 +560,7 @@ bool Building::hit(const LtsUtils::QPoint3D &pos, const LtsUtils::QPoint3D &dir,
   Room &hitRoom = m_rooms[m_lastHitPosition.roomId];
   if (!hitRoom.isValid())
   {
-    ERROR_LOG() << "Internal error in hit calculation - could not find room with id " << m_lastHitPosition.roomId;
+    ERROR_LOG(m_logger) << "Internal error in hit calculation - could not find room with id " << m_lastHitPosition.roomId;
     return false;
   }
 
@@ -651,7 +651,7 @@ QMap<int, Building::NeighboursToCheck> Building::checkHitNeighbours(const QMap<i
     auto itRoom = m_rooms.find(neighbourRoomId);
     if (itRoom == m_rooms.end())
     {
-      WARNING_LOG() << "Could not find room with id " << neighbourRoomId;
+      WARNING_LOG(m_logger) << "Could not find room with id " << neighbourRoomId;
       continue;
     }
 
@@ -670,7 +670,7 @@ QMap<int, Building::NeighboursToCheck> Building::checkHitNeighbours(const QMap<i
     
     const double oldRe = neighbour.remainingEffect();
     neighbour.setRemainingEffect(neighbourRoom.remainEffect * TF);
-    DEBUG_LOG() << "room " << neighbourRoomId << " remaining effect old: "
+    DEBUG_LOG(m_logger) << "room " << neighbourRoomId << " remaining effect old: "
                         << oldRe << " -> new: " << neighbour.remainingEffect();
     
 
@@ -740,7 +740,7 @@ int Building::checkDublicatePointsInPolygon(int roomId, int idx, int subIdx, con
       if (qFuzzyCompare(p1, p2))
       {
         ++numberOfDuplicates;
-        WARNING_LOG() << "Building '" << m_name << "' -> "
+        WARNING_LOG(m_logger) << "Building '" << m_name << "' -> "
                               << "Polygon point " << i << " (" << p1 << ") and " << j << " (" << p2
                               << ") in room " << roomId << ", " << type << "[" << idx
                               << "], element[" << subIdx << "] are the same! (size=" << points.size() << ")";
@@ -750,7 +750,7 @@ int Building::checkDublicatePointsInPolygon(int roomId, int idx, int subIdx, con
 
   if (numberOfDuplicates > 0)
     for (auto point : points)
-      WARNING_LOG() << "Building '" << m_name << "' -> " << "point =" << point << " (same points)";
+      WARNING_LOG(m_logger) << "Building '" << m_name << "' -> " << "point =" << point << " (same points)";
   return numberOfDuplicates;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building.h
index f6be135ec..fe502b617 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building.h
@@ -29,6 +29,8 @@ public:
 
 private:
   
+
+NGL::INGLLogger &m_logger;
   int m_id = 0;
   double m_transitionFactor = 0;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building_room_geometry.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building_room_geometry.cpp
index 28d00d52f..49fae2531 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building_room_geometry.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building_room_geometry.cpp
@@ -17,30 +17,30 @@ namespace VWM
 BuildingRoomGeometry::BuildingRoomGeometry()
   : m_logger(BuildingControlUnit::getLogger("VWM.BuildingRoomGeometry"))
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 BuildingRoomGeometry::~BuildingRoomGeometry()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool BuildingRoomGeometry::init(const QDomElement &domRoot)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   parse(domRoot);
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 
   return true;
 }
 
 QVector<int> BuildingRoomGeometry::pointIsInWhichRooms(const LtsUtils::QPoint3D &pointToFind)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, pointToFind" << pointToFind
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, pointToFind" << pointToFind
                       << ", m_roomOutlines.size() " << m_roomOutlines.size();
 
   QVector<int> roomtIds;
@@ -52,26 +52,26 @@ QVector<int> BuildingRoomGeometry::pointIsInWhichRooms(const LtsUtils::QPoint3D
     const int roomId = it.key();
     const RoomOutlineData &rod = it.value();
 
-    DEBUG_LOG() << Q_FUNC_INFO  << " check room " << roomId << " (check maxZ " << rod.maxZ << " ; minZ " << rod.minZ;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO  << " check room " << roomId << " (check maxZ " << rod.maxZ << " ; minZ " << rod.minZ;
     if (m_logger.isDebugEnabled())
       qCritical() << " check room " << roomId << ", outline: " << rod.outline;
 
 
     if (rod.outline.containsPoint( {pointToFind.x(), pointToFind.y()}, Qt::OddEvenFill))
     {
-      DEBUG_LOG() << Q_FUNC_INFO << "  within room " << roomId;
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << "  within room " << roomId;
 
       if ((rod.maxZ > pointToFind.z()) &&
           (pointToFind.z() > rod.minZ))
       {
-        DEBUG_LOG() << Q_FUNC_INFO << "     found roomId: " << roomId
+        DEBUG_LOG(m_logger) << Q_FUNC_INFO << "     found roomId: " << roomId
                             << "   pointToFind: " << pointToFind.x() << " , " << pointToFind.y();
         roomtIds.append(roomId);
       }
     }
   } 
 
-  TRACE_LOG() << Q_FUNC_INFO << " END, roomtIds.size() " << roomtIds.size();
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, roomtIds.size() " << roomtIds.size();
   return roomtIds;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building_room_geometry.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building_room_geometry.h
index 63b76ded8..fe5288902 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building_room_geometry.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_building_room_geometry.h
@@ -36,6 +36,8 @@ public:
   QVector<int> pointIsInWhichRooms(const LtsUtils::QPoint3D &pointToFind);
 
 private:
+
+NGL::INGLLogger &m_logger;
   bool parse(const QDomElement &domGroup);
 
 
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 a5c8a861f..fcef85a54 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
@@ -9,12 +9,11 @@
 
 namespace BuildingControlUnit
 {
-HandleHttpRequest::HandleHttpRequest(bool useQueue, QObject *parent)
-  : QObject(parent)
+HandleHttpRequest::HandleHttpRequest(bool useQueue, QObject *parent) : QObject(parent)
   , m_nam(new QNetworkAccessManager(this))
-  , m_bUseQueue(useQueue)
-{
-  INFO_LOG() << "Using Queue: " << m_bUseQueue;
+  , m_bUseQueue(useQueue),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  INFO_LOG(m_logger) << "Using Queue: " << m_bUseQueue;
   connect(m_nam, &QNetworkAccessManager::finished,
           this, &HandleHttpRequest::onReplyFinished);
   connect(m_nam, &QNetworkAccessManager::authenticationRequired,
@@ -41,7 +40,7 @@ void HandleHttpRequest::enqueue(const QUrl &url, HandleHttpQueueMessageStatus st
   if ((HandleHttpQueueMessageStatus::MS_Cyclic == status) &&
       m_queueMap[host].uniquenessChecker.contains(url.toString()))
   {
-    WARNING_LOG() << "Discarding duplicate url \"" << url.toString() << "\" due to slow message handling.";
+    WARNING_LOG(m_logger) << "Discarding duplicate url \"" << url.toString() << "\" due to slow message handling.";
   }
   else
   {
@@ -49,7 +48,7 @@ void HandleHttpRequest::enqueue(const QUrl &url, HandleHttpQueueMessageStatus st
     networkRequest.request = QNetworkRequest(url);
     m_queueMap[host].uniquenessChecker.insert(url.toString());
     m_queueMap[host].requests.enqueue(networkRequest);
-    DEBUG_LOG() << "Added '" << url.toString() << " to queue for host: " << host
+    DEBUG_LOG(m_logger) << "Added '" << url.toString() << " to queue for host: " << host
                         << " Queue has " << m_queueMap[host].requests.count() << " elements";
     trySendNextRequest();
   }
@@ -59,21 +58,21 @@ void HandleHttpRequest::onAuthenticationRequired(QNetworkReply *reply, QAuthenti
 {
   if (!reply || !authenticator)
   {
-    ERROR_LOG() << "Internal error - Nullptr exception!";
+    ERROR_LOG(m_logger) << "Internal error - Nullptr exception!";
   }
   else if (!m_queueMap.contains(reply->url().host()))
   {
-    WARNING_LOG() << "Internal error - got auth reply from unknown host!";
+    WARNING_LOG(m_logger) << "Internal error - got auth reply from unknown host!";
   }
   else
   {
     if (m_bUseQueue && reply != m_queueMap[reply->url().host()].activeReply)
-      WARNING_LOG() << "Internal error - got auth reply from unknown request!";
+      WARNING_LOG(m_logger) << "Internal error - got auth reply from unknown request!";
 
     
     if (m_queueMap[reply->url().host()].bAuthAlreadyRequested)
       return;
-    DEBUG_LOG() << "Authentication request";
+    DEBUG_LOG(m_logger) << "Authentication request";
     authenticator->setUser(m_username);
     authenticator->setPassword(m_passwd);
     m_queueMap[reply->url().host()].bAuthAlreadyRequested = true;
@@ -89,17 +88,17 @@ void HandleHttpRequest::onReplyFinished(QNetworkReply *reply)
   }
   if (!reply)
   {
-    ERROR_LOG() << "Internal error - Nullptr exception!";
+    ERROR_LOG(m_logger) << "Internal error - Nullptr exception!";
   }
   else if (!m_queueMap.contains(reply->url().host()))
   {
     reply->deleteLater();
-    WARNING_LOG() << "Internal error - got reply from unknown host!";
+    WARNING_LOG(m_logger) << "Internal error - got reply from unknown host!";
   }
   else if (m_bUseQueue && reply != m_queueMap[reply->url().host()].activeReply)
   {
     reply->deleteLater();
-    WARNING_LOG() << "Internal error - got reply from unknown request!";
+    WARNING_LOG(m_logger) << "Internal error - got reply from unknown request!";
   }
   else
   {
@@ -109,16 +108,16 @@ void HandleHttpRequest::onReplyFinished(QNetworkReply *reply)
       if ( m_newConnection)
       {
         m_newConnection = false;
-        DEBUG_LOG() << "emit newEgcuConnection host=" << reply->url().host();
+        DEBUG_LOG(m_logger) << "emit newEgcuConnection host=" << reply->url().host();
         emit newEgcuConnection(reply->url().host());
       }
-      DEBUG_LOG() << "Request successfull";
+      DEBUG_LOG(m_logger) << "Request successfull";
     }
     else
-      WARNING_LOG() << "Invalid request for host " << reply->url().host() << ", response code: " << responseCode << ", query: " << reply->url().toString();
+      WARNING_LOG(m_logger) << "Invalid request for host " << reply->url().host() << ", response code: " << responseCode << ", query: " << reply->url().toString();
 
     QByteArray replyData = reply->readAll();
-    DEBUG_LOG() << "Got reply (" << reply->url().toString() << "): " << replyData
+    DEBUG_LOG(m_logger) << "Got reply (" << reply->url().toString() << "): " << replyData
                         << " host=" << reply->url().host();
     emit egcuReply(reply->url().host(), replyData);
 
@@ -133,7 +132,7 @@ void HandleHttpRequest::sendNextRequest(HandleHttpQueue& queue)
 {
   if (m_bUseQueue && queue.activeReply != nullptr)
   {
-    WARNING_LOG() << "Internal error - active reply not yet finished!";
+    WARNING_LOG(m_logger) << "Internal error - active reply not yet finished!";
   }
   else if (!queue.requests.isEmpty())
   {
@@ -144,11 +143,11 @@ void HandleHttpRequest::sendNextRequest(HandleHttpQueue& queue)
     if ( networkRequest.time.secsTo(QTime::currentTime()) < 5)
     {
       queue.activeReply = m_nam->get(request);
-      DEBUG_LOG() << "Send request " << request.url().toString() << " and waiting for reply (" << queue.activeReply << ")";
+      DEBUG_LOG(m_logger) << "Send request " << request.url().toString() << " and waiting for reply (" << queue.activeReply << ")";
     }
     else
     {
-      DEBUG_LOG() << "remove request " << request.url().toString()
+      DEBUG_LOG(m_logger) << "remove request " << request.url().toString()
                           << " because it's too old" << networkRequest.time.secsTo(QTime::currentTime());
       sendNextRequest(queue);
       m_newConnection = true;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/handle_http_request.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/handle_http_request.h
index f4d785f1e..eeff72cdd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/handle_http_request.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/handle_http_request.h
@@ -68,6 +68,7 @@ private Q_SLOTS:
   void trySendNextRequest();
 
 private:
+  NGL::INGLLogger &m_logger;
   QNetworkAccessManager *m_nam;
   bool m_bUseQueue;
   QString m_username;
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 a87cc398a..948fc67b4 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
@@ -11,15 +11,14 @@
 
 namespace BuildingControlUnit
 {
-MainHandler::MainHandler()
-  : QObject()
+MainHandler::MainHandler() : QObject()
   , m_bsmApi(nullptr)
   , m_jsonApi(nullptr)
   , m_vwmApi(nullptr)
   , m_handelEffectsBsm(nullptr)
   , m_handleHttpRequest(nullptr)
-  , m_bsmFlash(BEO_Auto)
-{}
+  , m_bsmFlash(BEO_Auto),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 MainHandler::~MainHandler()
 {
@@ -59,17 +58,17 @@ bool MainHandler::init(const QString &ammuXml,
   }
   if (!m_vwmApi->init(ammuXml, vwmXml, bsmConfig, initBuilding))
   {
-    ERROR_LOG() << "Can not initialize VWM API - aborting";
+    ERROR_LOG(m_logger) << "Can not initialize VWM API - aborting";
     return false;
   }
   if (!m_jsonApi->init(listenPort))
   {
-    ERROR_LOG() << "Can not initialize Json API - aborting";
+    ERROR_LOG(m_logger) << "Can not initialize Json API - aborting";
     return false;
   }
   if (!m_bsmApi->init(bsmConfig))
   {
-    ERROR_LOG() << "Can not initialize BSM API - aborting";
+    ERROR_LOG(m_logger) << "Can not initialize BSM API - aborting";
     return false;
   }
 
@@ -135,16 +134,16 @@ bool MainHandler::init(const QString &ammuXml,
 
 void MainHandler::setInitialOverrides(const QString &hostname)
 {
-  DEBUG_LOG() << "setInitialOverrides m_handelEffectsVec.size()=" << m_handelEffectsVec.size();
+  DEBUG_LOG(m_logger) << "setInitialOverrides m_handelEffectsVec.size()=" << m_handelEffectsVec.size();
   
   for ( int i = 0; i < m_handelEffectsVec.size(); i++)
   {
     QString hostnameLocal = m_handelEffectsVec.at(i)->hostname();
     const QVector<BcuEffectState> effectStates = m_handelEffectsVec.at(i)->getOverrides();
-    DEBUG_LOG() << "setInitialOverrides host=" << hostnameLocal
+    DEBUG_LOG(m_logger) << "setInitialOverrides host=" << hostnameLocal
                         << " effectStates.size=" << effectStates.size();
     for (int j = 0; j < effectStates.size(); j++)
-      DEBUG_LOG() << "setInitialOverrides j="  << j
+      DEBUG_LOG(m_logger) << "setInitialOverrides j="  << j
                           << " id=" << effectStates[j].id
                           << " type=" << effectStates[j].type
                           << " override=" << effectStates[j].effectOverride;
@@ -171,7 +170,7 @@ void MainHandler::onHitResult(const HitResult &result, const QMap<int, Contamina
 {
   Q_UNUSED(contaminationStates)
   const VWM::Charge charge = m_vwmApi->chargeFromChargeTypeId(result.chargeTypeId);
-  DEBUG_LOG() << "onHitResult chargeTypeId=" << result.chargeTypeId
+  DEBUG_LOG(m_logger) << "onHitResult chargeTypeId=" << result.chargeTypeId
                        << " result.effectSoundId=" << result.effectSoundId
                        << " damagePercentNew=" << result.damagePercentNew
                        << " destructiveFactor=" << charge.destructiveFactor;
@@ -182,15 +181,15 @@ void MainHandler::onHitResult(const HitResult &result, const QMap<int, Contamina
   {
     for (HandelEffects *he : std::as_const(m_handelEffectsVec))
     {
-      DEBUG_LOG() << "playHitSound @EGCU " << he->hostname() << ", SoundId: " << result.effectSoundId;
+      DEBUG_LOG(m_logger) << "playHitSound @EGCU " << he->hostname() << ", SoundId: " << result.effectSoundId;
       he->playHitSound(result.effectSoundId);
     }
   }
 
-  DEBUG_LOG() << "HitResult: " << result;
+  DEBUG_LOG(m_logger) << "HitResult: " << result;
   if (result.sensorId != 0 && result.originatorId != 0 && m_bsmFlash != BEO_Off && charge.destructiveFactor > 1 )
   {
-    DEBUG_LOG() << "BSM Flash";
+    DEBUG_LOG(m_logger) << "BSM Flash";
     m_bsmApi->triggerFlashlight(result.sensorId);
     m_bsmApi->triggerFlashlightPulse(result.sensorId,  
                                      QString(),
@@ -200,7 +199,7 @@ void MainHandler::onHitResult(const HitResult &result, const QMap<int, Contamina
                                      Settings::flashDuration());
   }
   else
-    DEBUG_LOG() << "Kein BSM Flash";
+    DEBUG_LOG(m_logger) << "Kein BSM Flash";
 
   
   
@@ -210,14 +209,14 @@ void MainHandler::onHitResult(const HitResult &result, const QMap<int, Contamina
 
   for (int i = 0; i < m_egcuConfig.egcus.size(); i++)
   {
-    DEBUG_LOG() << "segmentDamage.size=" << segmentDamage.size();
+    DEBUG_LOG(m_logger) << "segmentDamage.size=" << segmentDamage.size();
     if ( i < segmentDamage.size() )
     {
-      DEBUG_LOG() << "segmentDamage[" << i <<"]=" << segmentDamage[i];
+      DEBUG_LOG(m_logger) << "segmentDamage[" << i <<"]=" << segmentDamage[i];
       m_handelEffectsVec[i]->startEffects(segmentDamage[i]);
     }
     else
-      DEBUG_LOG() << "No segment Damage for egcu:" << m_egcuConfig.egcus[i].hostname;
+      DEBUG_LOG(m_logger) << "No segment Damage for egcu:" << m_egcuConfig.egcus[i].hostname;
   }
   m_handelEffectsBsm->startEffects(result.damagePercentNew);
 }
@@ -231,22 +230,22 @@ void MainHandler::onUnknownDirectHit(int sensorId)
 
 void MainHandler::onSetEffectStatesRequest(const QString &hostname, const QVector<BcuEffectState> &effectStates)
 {
-  DEBUG_LOG() << "1 BSM flash  hostname='" << hostname
+  DEBUG_LOG(m_logger) << "1 BSM flash  hostname='" << hostname
                       << "' isEmpty:"<< hostname.isEmpty()
                       <<" isNull:" << hostname.isNull();
   m_effectStates.insert(hostname, effectStates);
   if (hostname.isEmpty())
   {
     m_bsmFlash = BEO_Auto;
-    DEBUG_LOG() << "2 BSM flash =" << m_bsmFlash;
+    DEBUG_LOG(m_logger) << "2 BSM flash =" << m_bsmFlash;
     m_handelEffectsBsm->setOverrides(effectStates);
     for ( int i = 0; i < effectStates.size(); i++)
     {
-      DEBUG_LOG() << "3 BSM flash =" << m_bsmFlash;
+      DEBUG_LOG(m_logger) << "3 BSM flash =" << m_bsmFlash;
       if ( effectStates.at(i).type == BET_BsmFlash)
       {
         m_bsmFlash = effectStates.at(i).effectOverride;
-        DEBUG_LOG() << "4 BSM flash =" << m_bsmFlash;
+        DEBUG_LOG(m_logger) << "4 BSM flash =" << m_bsmFlash;
         break;
       }
     }
@@ -266,7 +265,7 @@ void MainHandler::onSwitchRelayRequest(const QString &hostname, const SwitchRela
   {
     if (m_handelEffectsVec[i]->hostname() == hostname )
     {
-      DEBUG_LOG() << "switchRelay "
+      DEBUG_LOG(m_logger) << "switchRelay "
                             << " id=" << switchRelayValues.id
                             << " bcuRelayState=" << switchRelayValues.bcuRelayState;
       m_handelEffectsVec[i]->switchRelay(switchRelayValues);
@@ -328,7 +327,7 @@ QVector<int> MainHandler::getSegmentDamage(const QVector<HitRoom> &allHitRooms,
       if (egcu.roomIds.size() > 0 )
         averageDamage = damagePercentSegment / egcu.roomIds.size();
       result.append(averageDamage);
-      INFO_LOG() << "getSegmentDamage[" << egcu.hostname << "]=" << averageDamage;
+      INFO_LOG(m_logger) << "getSegmentDamage[" << egcu.hostname << "]=" << averageDamage;
     }
   }
   return result;
@@ -337,7 +336,7 @@ QVector<int> MainHandler::getSegmentDamage(const QVector<HitRoom> &allHitRooms,
 void MainHandler::flashBuildingDestructionIndicator(int egcu)
 {
   
-  ERROR_LOG() << "TODO flashBuildingDestructionIndicator egcu=" << egcu;
+  ERROR_LOG(m_logger) << "TODO flashBuildingDestructionIndicator egcu=" << egcu;
   
   
   
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/main_handler.h
index ca0ed0fcd..a7f7f333b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/main_handler.h
@@ -37,12 +37,14 @@ private Q_SLOTS:
   void onSwitchRelayRequest(const QString &hostname, const SwitchRelayValues &switchRelayValues);
   void webSocketSendInitialData(QWebSocket *ws);
 private:
+  NGL::INGLLogger &m_logger;
   QVector<int> getAffectedRoomIds(const QVector<HitRoom> &allHitRooms) const;
   QVector<int> getSegmentDamage(const QVector<HitRoom> &allHitRooms, const int damagePercentNew) const;
   int getHitRoomId(const QVector<HitRoom> &allHitRooms) const;
   void flashBuildingDestructionIndicator(int egcu);
   void cleanup();
 private:
+  NGL::INGLLogger &m_logger;
   BSM::Api *m_bsmApi;
   
   Json::Api *m_jsonApi;
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 592bc949c..5bcc55df1 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
@@ -40,13 +40,13 @@ BuildingControlHandler::~BuildingControlHandler()
 
 bool BuildingControlHandler::init()
 {
-  DEBUG_LOG()<<"BuildingControlHandler::init exerciseId="<<m_mainHandler->exerciseId();
+  DEBUG_LOG(m_logger)<<"BuildingControlHandler::init exerciseId="<<m_mainHandler->exerciseId();
 
   const QString bcuName = QStringLiteral("BuildingControlUnit");
   m_bcuExecutableName = QStandardPaths::findExecutable(bcuName, { QCoreApplication::applicationDirPath()});
   if (m_bcuExecutableName.isEmpty())
   {
-    WARNING_LOG() << "Executable " << bcuName << " not found - can not start building control unit processes!";
+    WARNING_LOG(m_logger) << "Executable " << bcuName << " not found - can not start building control unit processes!";
     return false;
   }
   if (m_mainHandler->exerciseId() > 0)
@@ -61,18 +61,18 @@ bool BuildingControlHandler::init()
     
     const QMultiMap<qint64, Buildings::HistoryState> latestStates = recordReplay.getHistoryStateMap();
 
-    DEBUG_LOG() << "Starting to read HistoryStatedata from record replay. Size: "
+    DEBUG_LOG(m_logger) << "Starting to read HistoryStatedata from record replay. Size: "
                         << latestStates.size();
     for (auto it = latestStates.begin(); it != latestStates.end(); ++it)
     {
       const Buildings::HistoryState &historyState = it.value();
       if (!m_mainHandler->ismHandler()->isElementAssignedToExercise(historyState.mseId(),m_mainHandler->exerciseId() ))
       {
-        DEBUG_LOG()<<"[INIT] [recordReplay]>>>>>>> mseId=" << historyState.mseId() << " not in execise";
+        DEBUG_LOG(m_logger)<<"[INIT] [recordReplay]>>>>>>> mseId=" << historyState.mseId() << " not in execise";
         continue;
       }
       m_historyStates.insert(historyState.mseId(), historyState);
-      DEBUG_LOG()<<"[INIT] [recordReplay]>>>>>>> "<<historyState;
+      DEBUG_LOG(m_logger)<<"[INIT] [recordReplay]>>>>>>> "<<historyState;
     }
   }
   return true;
@@ -92,7 +92,7 @@ void BuildingControlHandler::onBuildingRemoved(int buildingId)
 
 void BuildingControlHandler::onBuildingChanged(const BuildingInfo &buildingInfo, bool damageInit = false)
 {
-  DEBUG_LOG() << "onBuildingChanged damageInit=" << damageInit
+  DEBUG_LOG(m_logger) << "onBuildingChanged damageInit=" << damageInit
                       << " mseId=" << buildingInfo.mseId;
   auto it = m_buildings.find(buildingInfo.mseId);
   BuildingProcess *bldg = nullptr;
@@ -103,7 +103,7 @@ void BuildingControlHandler::onBuildingChanged(const BuildingInfo &buildingInfo,
                                buildingInfo,
                                damageInit,
                                this);
-    DEBUG_LOG() << "onBuildingChanged m_buildings.insert mseId="  << buildingInfo.mseId;
+    DEBUG_LOG(m_logger) << "onBuildingChanged m_buildings.insert mseId="  << buildingInfo.mseId;
     m_buildings.insert(buildingInfo.mseId, bldg);
     bldg->newRelayInfos(m_relayInfos);
     bldg->start();
@@ -118,17 +118,17 @@ void BuildingControlHandler::onBuildingChanged(const BuildingInfo &buildingInfo,
   if ( m_historyStates.contains(buildingInfo.mseId))
   {
     historyState = m_historyStates.value(buildingInfo.mseId);
-    DEBUG_LOG() << "onBuildingChanged setHistoryState contains historyState.mseId="  << historyState.mseId()
+    DEBUG_LOG(m_logger) << "onBuildingChanged setHistoryState contains historyState.mseId="  << historyState.mseId()
                         << " buildingInfo.mseId=" << buildingInfo.mseId;
   }
   else
   {
     historyState.mseId (buildingInfo.mseId);
-    DEBUG_LOG() << "onBuildingChanged setHistoryState insert historyState.mseId="  << historyState.mseId()
+    DEBUG_LOG(m_logger) << "onBuildingChanged setHistoryState insert historyState.mseId="  << historyState.mseId()
                         << " buildingInfo.mseId=" << buildingInfo.mseId;
     m_historyStates.insert(historyState.mseId(), historyState);
   }
-  DEBUG_LOG() << "onBuildingChanged setHistoryState historyState.mseId="  << historyState.mseId()
+  DEBUG_LOG(m_logger) << "onBuildingChanged setHistoryState historyState.mseId="  << historyState.mseId()
                       << " buildingInfo.mseId=" << buildingInfo.mseId;
   bldg->setHistoryState(m_historyStates.value(buildingInfo.mseId));
 }
@@ -136,59 +136,59 @@ void BuildingControlHandler::onBuildingChanged(const BuildingInfo &buildingInfo,
 void BuildingControlHandler::onSetBuildingContaminationStateRequest(const rti::core::SampleIdentity &cookie,
                                                                      const SetBuildingContaminationStateRequest &request)
 {
-  DEBUG_LOG() << "onSetBuildingContaminationStateRequest " << request;
+  DEBUG_LOG(m_logger) << "onSetBuildingContaminationStateRequest " << request;
   const Core::FunctionReplyObject fro = onSetBuildingContaminationStateRequestInternal(request);
   if (fro.error())
-    WARNING_LOG() << fro();
+    WARNING_LOG(m_logger) << fro();
   m_mainHandler->ddsHandler()->fts()->setBuildingContaminationStateReply(cookie, fro);
 }
 
 void BuildingControlHandler::onSetBuildingStatesRequest(const rti::core::SampleIdentity &cookie,
                                                         const SetBuildingStatesRequest &request)
 {
-  DEBUG_LOG() << "onSetBuildingStatesRequest " << request;
+  DEBUG_LOG(m_logger) << "onSetBuildingStatesRequest " << request;
   const Core::FunctionReplyObject fro = onSetBuildingStatesRequestInternal(request);
   if (fro.error())
-    WARNING_LOG() << fro();
+    WARNING_LOG(m_logger) << fro();
   m_mainHandler->ddsHandler()->fts()->setBuildingStatesReply(cookie, fro);
 }
 
 void BuildingControlHandler::onSetFortifyFactorRequest(const rti::core::SampleIdentity &cookie,
                                                        const SetFortifyFactorRequest &request)
 {
-  DEBUG_LOG() << "onSetFortifyFactorRequest " << request;
+  DEBUG_LOG(m_logger) << "onSetFortifyFactorRequest " << request;
   const Core::FunctionReplyObject fro = onSetFortifyFactorRequestInternal(request);
   if (fro.error())
-    WARNING_LOG() << fro();
+    WARNING_LOG(m_logger) << fro();
   m_mainHandler->ddsHandler()->fts()->setFortifyFactorReply(cookie, fro);
 }
 
 void BuildingControlHandler::onSendCesHitOnBuildingRequest(const rti::core::SampleIdentity &cookie,
                                                            const SendCesHitOnBuildingRequest &request)
 {
-  DEBUG_LOG() << "onSendCesHitOnBuildingRequest " << request;
+  DEBUG_LOG(m_logger) << "onSendCesHitOnBuildingRequest " << request;
   const Core::FunctionReplyObject fro = onSendCesHitOnBuildingRequestInternal(request);
   if (fro.error())
-    WARNING_LOG() << fro();
+    WARNING_LOG(m_logger) << fro();
   m_mainHandler->ddsHandler()->fts()->sendCesHitOnBuildingReply(cookie, fro);
 }
 
 void BuildingControlHandler::onSendCesHit3DonBuildingRequest(const rti::core::SampleIdentity &cookie, const SendCesHit3DonBuildingRequest &request)
 {
-  DEBUG_LOG() << "onSendCesHit3DonBuildingRequest " << request;
+  DEBUG_LOG(m_logger) << "onSendCesHit3DonBuildingRequest " << request;
   const Core::FunctionReplyObject fro = onSendCesHit3DonBuildingRequestInternal(request);
   if (fro.error())
-    WARNING_LOG() << fro();
+    WARNING_LOG(m_logger) << fro();
   m_mainHandler->ddsHandler()->fts()->sendCesHit3DonBuildingReply(cookie, fro);
 }
 
 void BuildingControlHandler::onTriggerBsmFlashRequest(const rti::core::SampleIdentity &cookie,
                                                       const TriggerBsmFlashRequest &request)
 {
-  DEBUG_LOG() << "onTriggerBsmFlashRequest " << request;
+  DEBUG_LOG(m_logger) << "onTriggerBsmFlashRequest " << request;
   const Core::FunctionReplyObject fro = onTriggerBsmFlashInternal(request);
   if (fro.error())
-    WARNING_LOG() << fro();
+    WARNING_LOG(m_logger) << fro();
   m_mainHandler->ddsHandler()->fts()->triggerBsmFlashReply(cookie, fro);
 }
 
@@ -255,7 +255,7 @@ Core::FunctionReplyObject BuildingControlHandler::onSetFortifyFactorRequestInter
 
 void BuildingControlHandler::setEffectStates(const int buildingId, const int assetId, const QByteArray &properties)
 {
-  DEBUG_LOG() << "BuildingControlHandler::setEffectStates"
+  DEBUG_LOG(m_logger) << "BuildingControlHandler::setEffectStates"
                       << " buildingId=" << buildingId
                       << " assetId=" << assetId
                       << " properties=" << properties;
@@ -282,11 +282,11 @@ void BuildingControlHandler::onRelayInfoChanged(const AssetManagement::RelayInfo
 
 Core::FunctionReplyObject BuildingControlHandler::onSendCesHitOnBuildingRequestInternal(const SendCesHitOnBuildingRequest &data)
 {
-  DEBUG_LOG() << "onSendCesHitOnBuildingRequestInternal";
+  DEBUG_LOG(m_logger) << "onSendCesHitOnBuildingRequestInternal";
   auto it = m_buildings.find(data.buildingId());
   if (it == m_buildings.end())
   {
-    DEBUG_LOG() << "onSendCesHitOnBuildingRequestInternal return";
+    DEBUG_LOG(m_logger) << "onSendCesHitOnBuildingRequestInternal return";
     return Core::FunctionReplyObject(data.buildingId(), tr_lts("dds", "Building with id %1 not found.")).arg(data.buildingId());
   }
 
@@ -295,21 +295,21 @@ Core::FunctionReplyObject BuildingControlHandler::onSendCesHitOnBuildingRequestI
                                   data.aesId(), data.impactPosition(),
                                   QString::fromStdString(data.properties())))
   {
-    DEBUG_LOG() << "onSendCesHitOnBuildingRequestInternal return Can not send ces hit to building control process";
+    DEBUG_LOG(m_logger) << "onSendCesHitOnBuildingRequestInternal return Can not send ces hit to building control process";
     return Core::FunctionReplyObject(data.buildingId(), tr_lts("dds", "Can not send ces hit to building control process."));
   }
-  DEBUG_LOG() << "FunctionReplyObject";
+  DEBUG_LOG(m_logger) << "FunctionReplyObject";
   return Core::FunctionReplyObject();
 }
 
 Core::FunctionReplyObject BuildingControlHandler::onSendCesHit3DonBuildingRequestInternal(const SendCesHit3DonBuildingRequest &data)
 {
 
-  DEBUG_LOG() << "onSendCesHit3DonBuildingRequestInternal";
+  DEBUG_LOG(m_logger) << "onSendCesHit3DonBuildingRequestInternal";
   auto it = m_buildings.find(data.buildingId());
   if (it == m_buildings.end())
   {
-    DEBUG_LOG() << "onSendCesHit3DonBuildingRequestInternal return";
+    DEBUG_LOG(m_logger) << "onSendCesHit3DonBuildingRequestInternal return";
     return Core::FunctionReplyObject(data.buildingId(), tr_lts("dds", "Building with id %1 not found.")).arg(data.buildingId());
   }
 
@@ -318,16 +318,16 @@ Core::FunctionReplyObject BuildingControlHandler::onSendCesHit3DonBuildingReques
                                     data.aesId(), data.impactPosition(), data.detonationLocation(), data.detonationDistance(),
                                     QString::fromStdString(data.properties())))
   {
-    DEBUG_LOG() << "onSendCesHit3DonBuildingRequestInternal return Can not send ces hit to building control process";
+    DEBUG_LOG(m_logger) << "onSendCesHit3DonBuildingRequestInternal return Can not send ces hit to building control process";
     return Core::FunctionReplyObject(data.buildingId(), tr_lts("dds", "Can not send ces hit to building control process."));
   }
-  DEBUG_LOG() << "FunctionReplyObject";
+  DEBUG_LOG(m_logger) << "FunctionReplyObject";
   return Core::FunctionReplyObject();
 }
 
 Core::FunctionReplyObject BuildingControlHandler::onTriggerBsmFlashInternal(const TriggerBsmFlashRequest &data)
 {
-  DEBUG_LOG() << "onTriggerBsmFlashInternal";
+  DEBUG_LOG(m_logger) << "onTriggerBsmFlashInternal";
 
 
   {
@@ -340,34 +340,34 @@ Core::FunctionReplyObject BuildingControlHandler::onTriggerBsmFlashInternal(cons
        BuildingInfo buildingInfo= bldg->buildingInfo();
        BsmInfo bsmInfo = buildingInfo.bsms.value(data.assetId());
 
-       DEBUG_LOG()  << " BuildingId=" << data.buildingId()
+       DEBUG_LOG(m_logger)  << " BuildingId=" << data.buildingId()
                             << " assetId=" << bsmInfo.assetId
                             << " hostname=" << bsmInfo.hostname;
 
        if (!bldg->triggerFlashlight(data))
        {
-         DEBUG_LOG() << "onTriggerBsmFlashInternal return Can not send trigger flashlight to building control process";
+         DEBUG_LOG(m_logger) << "onTriggerBsmFlashInternal return Can not send trigger flashlight to building control process";
          return Core::FunctionReplyObject(data.buildingId(), tr_lts("dds", "Can not send trigger flashlight to building control process"));
        }
   }
-  DEBUG_LOG() << "FunctionReplyObject";
+  DEBUG_LOG(m_logger) << "FunctionReplyObject";
   return Core::FunctionReplyObject();
 }
 
 void BuildingControlHandler::onSwitchRelayRequest(const rti::core::SampleIdentity &cookie,
                                              const SwitchRelayRequest &request)
 {
-  DEBUG_LOG() << "SwitchRelayRequest " << request;
+  DEBUG_LOG(m_logger) << "SwitchRelayRequest " << request;
   
   const Core::FunctionReplyObject fro = onSwitchRelayInternal(request);
   if (fro.error())
-    WARNING_LOG() << fro();
+    WARNING_LOG(m_logger) << fro();
   m_mainHandler->ddsHandler()->fts()->switchRelayReply(cookie, fro);
 }
 
 Core::FunctionReplyObject BuildingControlHandler::onSwitchRelayInternal(const SwitchRelayRequest &data)
 {
-  DEBUG_LOG() << "onSwitchRelayInternal " << data;
+  DEBUG_LOG(m_logger) << "onSwitchRelayInternal " << data;
   auto it = m_buildings.find(data.buildingId());
   if (it == m_buildings.end())
     return Core::FunctionReplyObject(data.buildingId(), tr_lts("dds", "Building with id %1 not found.")).arg(data.buildingId());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_control_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_control_handler.h
index 9dfa2fb3f..7156ece93 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_control_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_control_handler.h
@@ -39,6 +39,7 @@ public Q_SLOTS:
   void setEffectStates(const int buildingId, const int assetId, const QByteArray &properties);
   void onRelayInfoChanged(const AssetManagement::RelayInfo &info, const DataModification mod);
 private:
+  NGL::INGLLogger &m_logger;
   void onSetBuildingContaminationStateRequest(const rti::core::SampleIdentity &cookie,
                                  const SetBuildingContaminationStateRequest &request) override;
   void onSetBuildingStatesRequest(const rti::core::SampleIdentity &cookie,
@@ -63,6 +64,7 @@ private:
   Core::FunctionReplyObject onSwitchRelayInternal(const SwitchRelayRequest &data);
   
 private:
+  NGL::INGLLogger &m_logger;
   QMap<int, BuildingProcess *> m_buildings; 
   QMap<int, Buildings::HistoryState> m_historyStates; 
   QMap<int, AssetManagement::RelayInfo> m_relayInfos;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.cpp
index 924e94240..2f76d2218 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.cpp
@@ -80,22 +80,22 @@ void BuildingProcess::setBuildingInfo(const BuildingInfo &info)
 
 void BuildingProcess::onStructureElementUpdateEffectOverrideReply(const Core::FunctionReplyObject &replyObject)
 {
-  DEBUG_LOG() << "onSendCesHitReply for id " << replyObject.id() << " success= " << replyObject.error();
+  DEBUG_LOG(m_logger) << "onSendCesHitReply for id " << replyObject.id() << " success= " << replyObject.error();
 }
 
 bool BuildingProcess::start()
 {
-  DEBUG_LOG() << "BuildingProcess::start mseId = " << m_buildingInfo.mseId
+  DEBUG_LOG(m_logger) << "BuildingProcess::start mseId = " << m_buildingInfo.mseId
                       << " m_historyState.size() = " << m_historyState.stateHistory().size()
                       << " m_initBuilding=" << m_initBuilding;
   if (m_buildingInfo.mseId <= 0)
   {
-    WARNING_LOG() << "No valid building information set - can not start building process";
+    WARNING_LOG(m_logger) << "No valid building information set - can not start building process";
     return false;
   }
   if (m_proc.state() != QProcess::NotRunning)
   {
-    WARNING_LOG() << "Process for building " << m_buildingInfo.mseId << " is already running!";
+    WARNING_LOG(m_logger) << "Process for building " << m_buildingInfo.mseId << " is already running!";
     return false;
   }
   
@@ -120,13 +120,13 @@ bool BuildingProcess::start()
   const QByteArray bldCfgData = generateBuildingConfigData();
   
   const QString effectConfigFilename = NGL::findFile(NGL::FileType::ConfigFile, QStringLiteral("effect_config.xml"));
-  WARNING_LOG() << "(effectConfigFilename) = " << effectConfigFilename;
+  WARNING_LOG(m_logger) << "(effectConfigFilename) = " << effectConfigFilename;
 
   
   const QString bldDataFilename = tmpPath + QStringLiteral("bldg_%1_building_config.xml").arg(m_buildingInfo.mseId);
   if (!writeFile(bldDataFilename, bldCfgData))
   {
-    WARNING_LOG() << "(!writeFile(bldDataFilename, bldCfgData)";
+    WARNING_LOG(m_logger) << "(!writeFile(bldDataFilename, bldCfgData)";
     return false;
   }
 
@@ -134,7 +134,7 @@ bool BuildingProcess::start()
   const QString chargesDataFilename = tmpPath + QStringLiteral("bldg_%1_charges.xml").arg(m_buildingInfo.mseId);
   if (!writeFile(chargesDataFilename, chargesData))
   {
-    WARNING_LOG() << "(!writeFile(chargesDataFilename, chargesData)";
+    WARNING_LOG(m_logger) << "(!writeFile(chargesDataFilename, chargesData)";
     return false;
   }
 
@@ -148,7 +148,7 @@ bool BuildingProcess::start()
     if (!effectPtr)
       continue;
 
-    DEBUG_LOG() << "effect->id=" << effectPtr->id
+    DEBUG_LOG(m_logger) << "effect->id=" << effectPtr->id
                          << " effect->category=" << effectPtr->category
                          << " effect->effectType=" << effectPtr->effectType
                          << " effect->override=" <<  static_cast<int>(effectPtr->override);
@@ -201,9 +201,9 @@ void BuildingProcess::shutdown()
 
 void BuildingProcess::setHistoryState(const Buildings::HistoryState &historyState)
 {
-  DEBUG_LOG() << "BuildingProcess::setHistoryState size =" << historyState.stateHistory().size();
+  DEBUG_LOG(m_logger) << "BuildingProcess::setHistoryState size =" << historyState.stateHistory().size();
 
-  ERROR_LOG() << "[BuildingProcess::setHistoryState]>>> history =" << historyState;
+  ERROR_LOG(m_logger) << "[BuildingProcess::setHistoryState]>>> history =" << historyState;
   m_historyState = historyState;
   m_historyState.sampleTime(QDateTime::currentMSecsSinceEpoch());
   m_mainHandler->ddsHandler()->dts()->publish(m_historyState);
@@ -211,7 +211,7 @@ void BuildingProcess::setHistoryState(const Buildings::HistoryState &historyStat
 
 bool BuildingProcess::setVulnerabilityState(ProjectDataManagement::VulnerabilityState state, const std::vector<int> &roomIds)
 {
-  DEBUG_LOG() << "BuildingProcess::setVulnerabilityState:" << state;
+  DEBUG_LOG(m_logger) << "BuildingProcess::setVulnerabilityState:" << state;
   if (!m_wsSocket || !m_wsSocket->isValid())
     return false;
   BuildingControlUnit::Json::Telegrams::SetDamageState tele;
@@ -223,7 +223,7 @@ bool BuildingProcess::setVulnerabilityState(ProjectDataManagement::Vulnerability
     tele.roomIds += m_buildingInfo.roomId2SubId.value(id);
 
   tele.originatorId = 0; 
-  DEBUG_LOG() << "setVulnerabilityState  websocket send: " << QString::fromUtf8(tele.toJson());
+  DEBUG_LOG(m_logger) << "setVulnerabilityState  websocket send: " << QString::fromUtf8(tele.toJson());
   m_wsSocket->sendTextMessage(QString::fromUtf8(tele.toJson()));
 
   return true;
@@ -231,7 +231,7 @@ bool BuildingProcess::setVulnerabilityState(ProjectDataManagement::Vulnerability
 
 bool BuildingProcess::setContaminationState(const int &bldId, const ContaminationState &contaminationState)
 {
-  DEBUG_LOG() << "BuildingProcess::setContaminationState bldId: "<<bldId;
+  DEBUG_LOG(m_logger) << "BuildingProcess::setContaminationState bldId: "<<bldId;
   if (!m_wsSocket || !m_wsSocket->isValid())
     return false;
   BuildingControlUnit::Json::Telegrams::SetContaminationState tele;
@@ -244,18 +244,18 @@ bool BuildingProcess::setContaminationState(const int &bldId, const Contaminatio
     contState.rooms = contaminationState.rooms();
     tele.contaminationStates.push_back(contState);
 
-  DEBUG_LOG() << "SetContaminationState  websocket send: " << QString::fromUtf8(tele.toJson());
+  DEBUG_LOG(m_logger) << "SetContaminationState  websocket send: " << QString::fromUtf8(tele.toJson());
   m_wsSocket->sendTextMessage(QString::fromUtf8(tele.toJson()));
   return true;
 }
 
 bool BuildingProcess::resetContaminationState()
 {
-  DEBUG_LOG() << "BuildingProcess::resetContaminationState" ;
+  DEBUG_LOG(m_logger) << "BuildingProcess::resetContaminationState" ;
   if (!m_wsSocket || !m_wsSocket->isValid())
     return false;
   BuildingControlUnit::Json::Telegrams::ResetContaminationState tele;
-  DEBUG_LOG() << "ResetContaminationState  websocket send: " << QString::fromUtf8(tele.toJson());
+  DEBUG_LOG(m_logger) << "ResetContaminationState  websocket send: " << QString::fromUtf8(tele.toJson());
   m_wsSocket->sendTextMessage(QString::fromUtf8(tele.toJson()));
 
   return true;
@@ -276,7 +276,7 @@ bool BuildingProcess::setFortifyFactors(const std::vector<Buildings::FortifyFact
 
     tele.fortifyFactors.push_back(info);
   }
-  DEBUG_LOG() << "setFortifyFactors  websocket send: " << QString::fromUtf8(tele.toJson());
+  DEBUG_LOG(m_logger) << "setFortifyFactors  websocket send: " << QString::fromUtf8(tele.toJson());
   m_wsSocket->sendTextMessage(QString::fromUtf8(tele.toJson()));
   return true;
 }
@@ -293,7 +293,7 @@ bool BuildingProcess::setEffectStates( const int assetId, const QByteArray &prop
 
   if (!m_wsSocket || !m_wsSocket->isValid())
     return false;
-  DEBUG_LOG() << "setEffectStates"
+  DEBUG_LOG(m_logger) << "setEffectStates"
                       << " assetId=" << assetId
                       << " properties=" << properties;
 
@@ -301,24 +301,24 @@ bool BuildingProcess::setEffectStates( const int assetId, const QByteArray &prop
   {
     for (const EgcuInfo &egcu : std::as_const(m_buildingInfo.egcus))
     {
-      DEBUG_LOG() << "EGCU: " << egcu.assetName
+      DEBUG_LOG(m_logger) << "EGCU: " << egcu.assetName
                           << " assetId=" << egcu.assetId
                           << " egcu.assetId=" << egcu.assetId
                           << " hostname=" << egcu.hostname;
       if ( assetId == egcu.assetId)
       {
-        DEBUG_LOG() << "segment=" << egcu.hostname;
+        DEBUG_LOG(m_logger) << "segment=" << egcu.hostname;
         tele.segment = egcu.hostname;
       }
     }
     if (tele.segment.isEmpty())
     {
-      WARNING_LOG() << "Asset with id " << assetId << " not found in this building";
+      WARNING_LOG(m_logger) << "Asset with id " << assetId << " not found in this building";
       return false;
     }
     if (tele.segment == QString())
     {
-      ERROR_LOG() << "Asset with id=" << assetId << " has no Hostname!!!!";
+      ERROR_LOG(m_logger) << "Asset with id=" << assetId << " has no Hostname!!!!";
       return false;
     }
   }
@@ -385,9 +385,9 @@ bool BuildingProcess::setEffectStates( const int assetId, const QByteArray &prop
   }
 
   QString valueStr = QString::fromUtf8(tele.toJson());
-  DEBUG_LOG() << "setEffectStates  websocket send: " << valueStr;
+  DEBUG_LOG(m_logger) << "setEffectStates  websocket send: " << valueStr;
   qint64 sendBytesCount = m_wsSocket->sendTextMessage(valueStr);
-  DEBUG_LOG() << "sendBytesCount= " << sendBytesCount;
+  DEBUG_LOG(m_logger) << "sendBytesCount= " << sendBytesCount;
   m_effectStates.insert(assetId, valueStr);
 
   return true;
@@ -408,7 +408,7 @@ bool BuildingProcess::relayState(const std::vector<Buildings::RelayStateItem> &r
     tele.relayStates.push_back(info);
   }
 
-  DEBUG_LOG() << "relayState  websocket send: " << QString::fromUtf8(tele.toJson());
+  DEBUG_LOG(m_logger) << "relayState  websocket send: " << QString::fromUtf8(tele.toJson());
   m_wsSocket->sendTextMessage(QString::fromUtf8(tele.toJson()));
 
   return true;
@@ -455,7 +455,7 @@ bool BuildingProcess::sendCesHitOnBuilding(const qint64 effectTimeMSec,
   tele.relPosition.z      = relPos.offsetZ();
   tele.properties         = properties;
 
-  DEBUG_LOG() << "sendCesHitOnBuilding  websocket send: " << QString::fromUtf8(tele.toJson());
+  DEBUG_LOG(m_logger) << "sendCesHitOnBuilding  websocket send: " << QString::fromUtf8(tele.toJson());
   m_wsSocket->sendTextMessage(QString::fromUtf8(tele.toJson()));
   return true;
 }
@@ -525,7 +525,7 @@ bool BuildingProcess::sendCesHit3DonBuilding(const qint64 effectTimeMSec, const
   tele.detonationDistance = detonationDistance;
   tele.properties         = properties;
 
-  DEBUG_LOG() << "sendCesHit3DonBuilding  websocket send: " << QString::fromUtf8(tele.toJson());
+  DEBUG_LOG(m_logger) << "sendCesHit3DonBuilding  websocket send: " << QString::fromUtf8(tele.toJson());
   m_wsSocket->sendTextMessage(QString::fromUtf8(tele.toJson()));
   return true;
 }
@@ -536,7 +536,7 @@ bool BuildingProcess::switchRelay(const SwitchRelayRequest &data)
 
   if (!m_wsSocket || !m_wsSocket->isValid())
     return false;
-  DEBUG_LOG() << "switchRelay"
+  DEBUG_LOG(m_logger) << "switchRelay"
                       << " buildingId=" << data.buildingId()
                       << " assetId=" << data.assetId()
                       << data.state();
@@ -544,10 +544,10 @@ bool BuildingProcess::switchRelay(const SwitchRelayRequest &data)
 
   for (const EgcuInfo &egcu : std::as_const(m_buildingInfo.egcus))
   {
-    DEBUG_LOG() << "EGCU: " << egcu.assetName
+    DEBUG_LOG(m_logger) << "EGCU: " << egcu.assetName
                         << " assetId=" << egcu.assetId
                         << " hostname=" << egcu.hostname;
-    DEBUG_LOG() << "data.assetId()=" << data.assetId()
+    DEBUG_LOG(m_logger) << "data.assetId()=" << data.assetId()
                         << "egcu.assetId=" << egcu.assetId;
     if ( data.assetId() != egcu.assetId)
       continue;
@@ -561,7 +561,7 @@ bool BuildingProcess::switchRelay(const SwitchRelayRequest &data)
       tele.switchRelayValues.delay = data.pulseAttributes().get().delay();
       tele.switchRelayValues.pulse = data.pulseAttributes().get().pulse();
     }
-    DEBUG_LOG() << "switchRelay  websocket send: " << QString::fromUtf8(tele.toJson());
+    DEBUG_LOG(m_logger) << "switchRelay  websocket send: " << QString::fromUtf8(tele.toJson());
     m_wsSocket->sendTextMessage(QString::fromUtf8(tele.toJson()));
     return true;
   }
@@ -574,7 +574,7 @@ bool BuildingProcess::triggerFlashlight(const TriggerBsmFlashRequest data)
 
   if (!m_wsSocket || !m_wsSocket->isValid())
     return false;
-  DEBUG_LOG() << "triggerFlashlight"
+  DEBUG_LOG(m_logger) << "triggerFlashlight"
                       << " BuildingId=" << data.buildingId()
                       << " assetId=" << data.assetId()
                       << " m_buildingInfo.bsms.size()" << m_buildingInfo.bsms.size();
@@ -582,7 +582,7 @@ bool BuildingProcess::triggerFlashlight(const TriggerBsmFlashRequest data)
   QMapIterator<int, BsmInfo> i(m_buildingInfo.bsms);
   while (i.hasNext()) {
       i.next();
-      DEBUG_LOG() << "key=" << i.key()
+      DEBUG_LOG(m_logger) << "key=" << i.key()
                           << " assetId=" << i.value().assetId
                           << " bsmId=" << i.value().bsmId
                           << " hostname=" << i.value().hostname
@@ -592,7 +592,7 @@ bool BuildingProcess::triggerFlashlight(const TriggerBsmFlashRequest data)
   if ( m_buildingInfo.bsms.contains(data.assetId()))
   {
    BsmInfo bsmInfo = m_buildingInfo.bsms.value(data.assetId());
-   DEBUG_LOG() << " BuildingId=" << data.buildingId()
+   DEBUG_LOG(m_logger) << " BuildingId=" << data.buildingId()
                         << " assetId=" << bsmInfo.assetId
                         << " hostname=" << bsmInfo.hostname;
 
@@ -601,7 +601,7 @@ bool BuildingProcess::triggerFlashlight(const TriggerBsmFlashRequest data)
    tele.pauseBetweenFlashesSec = 0;
    tele.sensorId = 0; 
 
-    DEBUG_LOG() << "triggerFlashlight  websocket send: " << QString::fromUtf8(tele.toJson());
+    DEBUG_LOG(m_logger) << "triggerFlashlight  websocket send: " << QString::fromUtf8(tele.toJson());
     m_wsSocket->sendTextMessage(QString::fromUtf8(tele.toJson()));
     return true;
   }
@@ -615,7 +615,7 @@ void BuildingProcess::onReadyRead()
   if (data.contains(strToSearch))
   {
     m_wsUrl = data.split(strToSearch).at(1).split(QLatin1Char('\n')).at(0).trimmed();
-    INFO_LOG() << "Using web socket url '" << m_wsUrl << "' for building " << m_buildingInfo.mseId;
+    INFO_LOG(m_logger) << "Using web socket url '" << m_wsUrl << "' for building " << m_buildingInfo.mseId;
     openWebSocket();
   }
 }
@@ -626,12 +626,12 @@ void BuildingProcess::onProcessFinished(int exitCode, QProcess::ExitStatus exitS
   if (exitCode == 0 && exitStatus == QProcess::NormalExit)
     return;
   const char *what = exitStatus == QProcess::NormalExit ? "stopped" : "crashed";
-  WARNING_LOG() << "building control process for building " << m_buildingInfo.mseId
+  WARNING_LOG(m_logger) << "building control process for building " << m_buildingInfo.mseId
                         << " " << what << " with exit code " << exitCode << " - restarting in 1 second";
   if (exitCode != 0)
   {
-    WARNING_LOG() << "stdout: " << m_proc.readAllStandardOutput();
-    WARNING_LOG() << "stderr: " << m_proc.readAllStandardError();
+    WARNING_LOG(m_logger) << "stdout: " << m_proc.readAllStandardOutput();
+    WARNING_LOG(m_logger) << "stderr: " << m_proc.readAllStandardError();
   }
   closeWebSocket();
   QTimer::singleShot(1000, this, &BuildingProcess::start);
@@ -639,12 +639,12 @@ void BuildingProcess::onProcessFinished(int exitCode, QProcess::ExitStatus exitS
 
 void BuildingProcess::onTextMessageReceived(const QString &message)
 {
-  TRACE_LOG() << "Got message from building control process: " << message;
+  TRACE_LOG(m_logger) << "Got message from building control process: " << message;
   BuildingControlUnit::Json::Telegrams::BaseTelegram *tel =
       BuildingControlUnit::Json::Telegrams::BaseTelegram::telegramFromJson(message.toUtf8());
   if (!tel)
   {
-    WARNING_LOG() << "Can not convert '" << message << "' to a valid telegram!";
+    WARNING_LOG(m_logger) << "Can not convert '" << message << "' to a valid telegram!";
     return;
   }
   if (tel->telegramId() == BuildingControlUnit::Json::Telegrams::BsmState::telegramId())
@@ -656,7 +656,7 @@ void BuildingProcess::onTextMessageReceived(const QString &message)
   else if (tel->telegramId() == BuildingControlUnit::Json::Telegrams::EffectOverride::telegramId())
     handleEffectOverride(static_cast<BuildingControlUnit::Json::Telegrams::EffectOverride *>(tel));
   else
-    WARNING_LOG() << "Unhandled incoming telegram with id '" << tel->telegramId() << "'";
+    WARNING_LOG(m_logger) << "Unhandled incoming telegram with id '" << tel->telegramId() << "'";
 
   delete tel;
 }
@@ -692,7 +692,7 @@ void BuildingProcess::historyState(const BuildingState &state)
       && state.originatorParticipantId() == 0
       && state.contaminationStates().size() == 0) 
   {
-    DEBUG_LOG() << "setVulnerabilityState->removeHistoryStateByKey:" << state.id();
+    DEBUG_LOG(m_logger) << "setVulnerabilityState->removeHistoryStateByKey:" << state.id();
     m_historyState.stateHistory().resize(0);
   }
 
@@ -708,10 +708,10 @@ void BuildingProcess::historyState(const BuildingState &state)
   historyStateItem.contaminationStates() = state.contaminationStates();
 
   m_historyState.stateHistory().push_back(std::move(historyStateItem));
-  DEBUG_LOG() << "BuildingProcess::historyState contaminationStates:" << state;
+  DEBUG_LOG(m_logger) << "BuildingProcess::historyState contaminationStates:" << state;
 
   m_historyState.mseId(state.id());
-  DEBUG_LOG() << "setVulnerabilityState->removeHistoryStateByKey:" << m_historyState.mseId();
+  DEBUG_LOG(m_logger) << "setVulnerabilityState->removeHistoryStateByKey:" << m_historyState.mseId();
   m_historyState.sampleTime(QDateTime::currentMSecsSinceEpoch());
   m_mainHandler->ddsHandler()->dts()->publish(m_historyState);
 }
@@ -721,16 +721,16 @@ void BuildingProcess::handleHitResult(BuildingControlUnit::Json::Telegrams::HitR
   const BuildingControlUnit::Json::Telegrams::HitResult::HitResultInfo &data = tel->hitResult;
   BuildingState state;
 
-  DEBUG_LOG() << Q_FUNC_INFO << " data.hitOnRoomId=" << data.hitOnRoomId;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " data.hitOnRoomId=" << data.hitOnRoomId;
   state.id(m_buildingInfo.mseId);
 
   int assetId = m_mainHandler->ddsHandler()->dtcIsm()->getAssetIdFromMountingPointId(m_buildingInfo.mseId, data.sensorId);
-  DEBUG_LOG() << "handleHitResult assetId=" << assetId;
+  DEBUG_LOG(m_logger) << "handleHitResult assetId=" << assetId;
   state.assetId(assetId);
   
   InfrastructureManagement::StructureElement se;
   m_mainHandler->ddsHandler()->dtcIsm()->getStructureElementInMntPointAssetByAssetId(assetId, se);
-  DEBUG_LOG() << "handleHitResult structureElementId=" << se.id();
+  DEBUG_LOG(m_logger) << "handleHitResult structureElementId=" << se.id();
   state.structureElementId(se.id());
   state.sampleTime(QDateTime::currentMSecsSinceEpoch());
   if (data.originatorType == BuildingControlUnit::OriginatorType::DirectHit)
@@ -808,7 +808,7 @@ void BuildingProcess::handleReconnectEgcu(const QString &segment)
   
   
 
-  DEBUG_LOG() << "handleReconnectEgcu segment =" << segment;
+  DEBUG_LOG(m_logger) << "handleReconnectEgcu segment =" << segment;
 
   for (const EgcuInfo &egcu : std::as_const(m_buildingInfo.egcus))
   {
@@ -817,7 +817,7 @@ void BuildingProcess::handleReconnectEgcu(const QString &segment)
       const auto keys = m_effectOverridesReconnect.keys();
       for (const int &relayId : keys)
       {
-        DEBUG_LOG() << "RelayId=" << relayId
+        DEBUG_LOG(m_logger) << "RelayId=" << relayId
                             << " Override=" << m_effectOverridesReconnect.value(relayId);
 
         if (m_effectOverridesReconnect.value(relayId) >= 0)
@@ -827,7 +827,7 @@ void BuildingProcess::handleReconnectEgcu(const QString &segment)
 
           int structureElementIdMp = m_mainHandler->ddsHandler()->dtcIsm()->getStructueElementIdFromAssetId(egcu.assetId);
 
-          DEBUG_LOG() << "EGCU: " << egcu.assetName
+          DEBUG_LOG(m_logger) << "EGCU: " << egcu.assetName
                               << " assetId=" << egcu.assetId
                               << " hostname='" << egcu.hostname
                               << "' buildingName=" << egcu.buildingName
@@ -840,9 +840,9 @@ void BuildingProcess::handleReconnectEgcu(const QString &segment)
           request.structureElementId(structureElementIdMp);
           request.effectId(relayId);
           request.effectOverride(override);
-          DEBUG_LOG() << "Vor structureElementUpdateEffectOverrideRequest";
+          DEBUG_LOG(m_logger) << "Vor structureElementUpdateEffectOverrideRequest";
           int result = m_mainHandler->ismHandler()->ftcIsm()->structureElementUpdateEffectOverrideRequest(request, this);
-          DEBUG_LOG() << "Nach structureElementUpdateEffectOverrideRequest result=" << result;
+          DEBUG_LOG(m_logger) << "Nach structureElementUpdateEffectOverrideRequest result=" << result;
         }
       }
       break;
@@ -855,7 +855,7 @@ void BuildingProcess::handleRelayState(BuildingControlUnit::Json::Telegrams::Rel
 {
   RelayState state;
 
-  DEBUG_LOG() << "handleRelayState EGCU:" << tel->segment
+  DEBUG_LOG(m_logger) << "handleRelayState EGCU:" << tel->segment
                       << " m_buildingInfo.egcus.size()=" << m_buildingInfo.egcus.size()
                       << " stateTime=" << tel->stateTime
                       << " offlineTime=" << tel->offlineTime;
@@ -871,7 +871,7 @@ void BuildingProcess::handleRelayState(BuildingControlUnit::Json::Telegrams::Rel
   {
     if (QString::compare(egcu.hostname,tel->segment,  Qt::CaseInsensitive) == 0)
     {
-      DEBUG_LOG() << "EGCU: " << egcu.assetName
+      DEBUG_LOG(m_logger) << "EGCU: " << egcu.assetName
                           << " assetId=" << egcu.assetId
                           << " hostname='" << egcu.hostname
                           << "' buildingName=" << egcu.buildingName;
@@ -897,18 +897,18 @@ void BuildingProcess::handleRelayState(BuildingControlUnit::Json::Telegrams::Rel
 
 void BuildingProcess::handleEffectOverride(BuildingControlUnit::Json::Telegrams::EffectOverride *tel)
 {
-  DEBUG_LOG() << "BuildingProcess::handleEffectOverride"
+  DEBUG_LOG(m_logger) << "BuildingProcess::handleEffectOverride"
                        << " tel->overrides.size=" << tel->overrides.size();
 
     InfrastructureManagement::StructureElementUpdateEffectOverrideRequest request;
     for ( int i = 0; i < m_buildingInfo.egcus.size(); i++)
     {
-      DEBUG_LOG() << "BuildingProcess::handleEffectOverride i=" << i;
+      DEBUG_LOG(m_logger) << "BuildingProcess::handleEffectOverride i=" << i;
       if ( m_buildingInfo.egcus[i].hostname.toLower() == tel->segment)
       {
         int structureElementIdMp = m_mainHandler->ddsHandler()->dtcIsm()->getStructueElementIdFromAssetId( m_buildingInfo.egcus.at(i).assetId);
 
-        DEBUG_LOG() << "BuildingProcess::handleEffectOverride i=" << i
+        DEBUG_LOG(m_logger) << "BuildingProcess::handleEffectOverride i=" << i
                              << " mountPointId=" << m_buildingInfo.egcus.at(i).mountPointId
                              << " assetId=" <<  m_buildingInfo.egcus.at(i).assetId
                              << " structureElementId=" << m_buildingInfo.structureElementId
@@ -938,14 +938,14 @@ void BuildingProcess::handleEffectOverride(BuildingControlUnit::Json::Telegrams:
           break;
         }
         }
-        DEBUG_LOG() << "Send Override Request"
+        DEBUG_LOG(m_logger) << "Send Override Request"
                              << " structureElementId=" << request.structureElementId()
                              << " effectId=" << request.effectId()
                              << " effectOverride=" << request.effectOverride();
         if ( request.structureElementId() > 0)
           m_mainHandler->ddsHandler()->ftcIsm()->structureElementUpdateEffectOverrideRequest(request, this);
         else
-          ERROR_LOG() << "request.structureElementId() =" <<  request.structureElementId() << " NOT VALID!!!";
+          ERROR_LOG(m_logger) << "request.structureElementId() =" <<  request.structureElementId() << " NOT VALID!!!";
     }
   }
 }
@@ -1016,12 +1016,12 @@ bool BuildingProcess::writeFile(const QString &fn, const QByteArray &data)
   QFile f(fn);
   if (!f.open(QIODevice::WriteOnly | QIODevice::Truncate))
   {
-    WARNING_LOG() << "Can not open file '" << fn << "' - error: " << f.errorString();
+    WARNING_LOG(m_logger) << "Can not open file '" << fn << "' - error: " << f.errorString();
     return false;
   }
   if (f.write(data) != data.size())
   {
-    WARNING_LOG() << "Can not write data to file '" << fn << "' - error: " << f.errorString();
+    WARNING_LOG(m_logger) << "Can not write data to file '" << fn << "' - error: " << f.errorString();
     return false;
   }
   return true;
@@ -1112,7 +1112,7 @@ QByteArray BuildingProcess::generateChargesData() const
       auto it = chargeTypes.find(charge.chargeTypeId());
       if (it == chargeTypes.end())
       {
-        WARNING_LOG() << "Could not find charge type with id " << charge.chargeTypeId() << " - skipping";
+        WARNING_LOG(m_logger) << "Could not find charge type with id " << charge.chargeTypeId() << " - skipping";
         continue;
       }
       
@@ -1154,7 +1154,7 @@ void BuildingProcess::openWebSocket()
           this, &BuildingProcess::onWebSocketDisconnected);
   connect(m_wsSocket, &QWebSocket::textMessageReceived,
           this, &BuildingProcess::onTextMessageReceived);
-  WARNING_LOG() << "openWebSocket:" << m_wsUrl.toLocal8Bit()
+  WARNING_LOG(m_logger) << "openWebSocket:" << m_wsUrl.toLocal8Bit()
                         << " (buildingId: " << m_buildingInfo.mseId << ") - socket: " << m_wsSocket;
   m_wsSocket->open(QUrl::fromEncoded(m_wsUrl.toLocal8Bit()));
 }
@@ -1163,7 +1163,7 @@ void BuildingProcess::closeWebSocket()
 {
   if (m_wsSocket)
   {
-    WARNING_LOG() << "closeWebSocket (buildingId : " << m_buildingInfo.mseId << ") - socket: " << m_wsSocket
+    WARNING_LOG(m_logger) << "closeWebSocket (buildingId : " << m_buildingInfo.mseId << ") - socket: " << m_wsSocket
                           << " localPort=" << m_wsSocket->localPort() << ", error: " << ", " << m_wsSocket->errorString();
     m_wsSocket->disconnect(this);
     m_wsSocket->close();
@@ -1177,7 +1177,7 @@ void BuildingProcess::onWebSocketError(QAbstractSocket::SocketError error)
 {
   if (!m_wsSocket)
     return;
-  WARNING_LOG() << "Error connecting to " << m_wsSocket->peerAddress().toString() << ": " << error
+  WARNING_LOG(m_logger) << "Error connecting to " << m_wsSocket->peerAddress().toString() << ": " << error
                         << " (buildingId: " << m_buildingInfo.mseId << ") - socket: " << m_wsSocket;
   closeWebSocket();
   m_wsReconnectTimer->start(1000);
@@ -1185,22 +1185,22 @@ void BuildingProcess::onWebSocketError(QAbstractSocket::SocketError error)
 
 void BuildingProcess::onWebSocketConnected()
 {
-  INFO_LOG() << "connected to building control process " << m_buildingInfo.mseId << " via websockets localPort="<<m_wsSocket->localPort();
+  INFO_LOG(m_logger) << "connected to building control process " << m_buildingInfo.mseId << " via websockets localPort="<<m_wsSocket->localPort();
 
   QMapIterator<int, QString> i(m_effectStates);
   while (i.hasNext()) {
     i.next();
 
-    DEBUG_LOG() << "setEffectStates  websocket send: " << i.value();
+    DEBUG_LOG(m_logger) << "setEffectStates  websocket send: " << i.value();
     qint64 sendBytesCount = m_wsSocket->sendTextMessage(i.value());
-    DEBUG_LOG() << "sendBytesCount= " << sendBytesCount;
+    DEBUG_LOG(m_logger) << "sendBytesCount= " << sendBytesCount;
   }
   m_wsReconnectTimer->stop();
 }
 
 void BuildingProcess::onWebSocketDisconnected()
 {
-  WARNING_LOG() << "Websocket to " << m_wsUrl << " closed - trying to reconnect in 1 sec"
+  WARNING_LOG(m_logger) << "Websocket to " << m_wsUrl << " closed - trying to reconnect in 1 sec"
                         << " (buildingId : " << m_buildingInfo.mseId << ") - socket: " << m_wsSocket
                         << " localPort=" << m_wsSocket->localPort();
   closeWebSocket();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.h
index 1cc962eb0..062c0a24e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.h
@@ -36,6 +36,7 @@ public:
   quint16 getWebsocketPort() {return     QUrl::fromEncoded(m_wsUrl.toLocal8Bit()).port();}
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onStructureElementUpdateEffectOverrideReply(const Core::FunctionReplyObject &replyObject) override final;
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/dds_handler.cpp
index e7f52692b..2e1f597ad 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/dds_handler.cpp
@@ -11,7 +11,7 @@ namespace Buildings
 DdsHandler::DdsHandler(int domainId, int exerciseId)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise, exerciseId))
 {
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 DdsHandler::~DdsHandler()
@@ -27,7 +27,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -47,16 +47,16 @@ bool DdsHandler::init(const QStringList &qosFileList)
 
   bool bRet = m_ddsDts->enableAll();
 
-  DEBUG_LOG() << "Dts initialised";
+  DEBUG_LOG(m_logger) << "Dts initialised";
 
   bRet &= m_ddsFts->enableAll();
-  INFO_LOG() << "Fts initialised";
+  INFO_LOG(m_logger) << "Fts initialised";
 
   bRet &= m_ftcIsm->enableStructureElementUpdateEffectOverride();
-  INFO_LOG() << "ISM Ftc initialised";
+  INFO_LOG(m_logger) << "ISM Ftc initialised";
 
   bRet &= m_dtcPdm->enableChargeType();
-  INFO_LOG() << "ISM Ftc initialised";
+  INFO_LOG(m_logger) << "ISM Ftc initialised";
 
   return bRet;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/dds_handler.h
index df23a9cb3..b6a3fdcc7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/dds_handler.h
@@ -39,6 +39,7 @@ public:
   std::shared_ptr<ProjectDataManagement::Interface::Dtc> dtcPdm() const { return m_dtcPdm; }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<Core::Pacemaker>            m_pacemaker;
   std::shared_ptr<Buildings::Interface::Dts>  m_ddsDts;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.cpp
index 8ed178dc5..d0758f9db 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.cpp
@@ -16,13 +16,12 @@
 namespace Buildings
 {
 
-IsmHandler::IsmHandler(MainHandler *mainHandler)
-  : m_mainHandler(mainHandler)
+IsmHandler::IsmHandler(MainHandler *mainHandler) : m_mainHandler(mainHandler)
   , m_dtcIsm(nullptr)
   , m_ftcIsm(nullptr)
   , m_changeTimeoutTimer(new QTimer(this))
-  , m_changeTimeoutTimerInit(new QTimer(this))
-{
+  , m_changeTimeoutTimerInit(new QTimer(this)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   connect(m_changeTimeoutTimer, &QTimer::timeout,
           this, &IsmHandler::onBuildingsChanged);
   m_changeTimeoutTimer->setInterval(3 * 1000);
@@ -57,13 +56,13 @@ bool IsmHandler::init()
       !m_dtcIsm->enableMountingPointAsset() ||
       !m_dtcIsm->enableBridgeChangeStatus())
   {
-    ERROR_LOG() << "Can not read data from ISM";
+    ERROR_LOG(m_logger) << "Can not read data from ISM";
     return false;
   }
   m_ftcIsm = InfrastructureManagement::Interface::Ftc::create(m_mainHandler->ddsHandler()->ddsConnector());
   if (!m_ftcIsm->enableStructureElementUpdateEffectOverride())
   {
-      ERROR_LOG() << "Can not read data from ISM";
+      ERROR_LOG(m_logger) << "Can not read data from ISM";
       return false;
   }
   m_changeTimeoutTimerInit->start();
@@ -105,14 +104,14 @@ void IsmHandler::onInstrumentationAssetChanged(const InfrastructureManagement::I
     case DataModification::eModified:
     {
       const int exerciseId = data.availableInExercise().size() == 0 ? 0 : data.availableInExercise().at(0);
-      DEBUG_LOG() << "setting asset " << data.id() << " available in exercise " << exerciseId;
+      DEBUG_LOG(m_logger) << "setting asset " << data.id() << " available in exercise " << exerciseId;
       m_assetMainStructureElementInExercise.insert(data.id(), exerciseId);
       break;
     }
     case DataModification::eRemoved:
     {
       const int exerciseId = data.availableInExercise().size() == 0 ? 0 : data.availableInExercise().at(0);
-      DEBUG_LOG() << "removing asset " << data.id() << " from exercise " << exerciseId;
+      DEBUG_LOG(m_logger) << "removing asset " << data.id() << " from exercise " << exerciseId;
       m_assetMainStructureElementInExercise.remove(data.id());
       break;
     }
@@ -127,11 +126,11 @@ void IsmHandler::onMountingPointAssetChanged(const InfrastructureManagement::Mou
   {
   case DataModification::eAdded:
   case DataModification::eModified:
-    DEBUG_LOG() << "mounting asset " << data.assetId() << " on structure element id " << data.structureElementId();
+    DEBUG_LOG(m_logger) << "mounting asset " << data.assetId() << " on structure element id " << data.structureElementId();
     m_structureElementId2AssetId.insert(data.structureElementId(), data.assetId());
     break;
   case DataModification::eRemoved:
-    DEBUG_LOG() << "unmounting asset " << m_structureElementId2AssetId.value(data.structureElementId()) << " from structure element " << data.structureElementId();
+    DEBUG_LOG(m_logger) << "unmounting asset " << m_structureElementId2AssetId.value(data.structureElementId()) << " from structure element " << data.structureElementId();
     m_structureElementId2AssetId.remove(data.structureElementId());
     break;
   }
@@ -140,7 +139,7 @@ void IsmHandler::onMountingPointAssetChanged(const InfrastructureManagement::Mou
 
 void IsmHandler::onMainStructureElementChanged(const InfrastructureManagement::MainStructureElement &data, DataModification modType)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   switch (modType)
   {
   case DataModification::eAdded:
@@ -149,10 +148,10 @@ void IsmHandler::onMainStructureElementChanged(const InfrastructureManagement::M
     if (!isElementAssignedToExercise (data.id(),m_mainHandler->exerciseId() ) )
     {
       m_mainStructureElements.remove(data.id());
-      DEBUG_LOG() << "Building not in exercise id=" << data.id();
+      DEBUG_LOG(m_logger) << "Building not in exercise id=" << data.id();
       return;
     }
-    DEBUG_LOG()  << "Building=" << data.name()
+    DEBUG_LOG(m_logger)  << "Building=" << data.name()
                          << " properties=" << data.properties();
     QJsonParseError parserError;
     QByteArray content = QByteArray::fromStdString(data.properties());
@@ -160,24 +159,24 @@ void IsmHandler::onMainStructureElementChanged(const InfrastructureManagement::M
     const QJsonDocument doc(QJsonDocument::fromJson(content, &parserError));
     if (parserError.error != QJsonParseError::NoError)
     {
-      WARNING_LOG() << "Error parsing json document: " << parserError.errorString();
+      WARNING_LOG(m_logger) << "Error parsing json document: " << parserError.errorString();
       return;
     }
-    DEBUG_LOG() << "json to parse: " << doc.toJson();
+    DEBUG_LOG(m_logger) << "json to parse: " << doc.toJson();
     const QJsonObject objProperties(doc.object());
     if ( objProperties.contains(QStringLiteral("start_building_process")))
     {
-      DEBUG_LOG() << "properties contains start_building_process";
+      DEBUG_LOG(m_logger) << "properties contains start_building_process";
       bool startBuildingProcess = objProperties.value(QStringLiteral("start_building_process")).toBool();
       if (!startBuildingProcess)
       {
-        DEBUG_LOG() << "Building=" << data.name()
+        DEBUG_LOG(m_logger) << "Building=" << data.name()
                              << " start_building_process = false ";
         return;
       }
     }
 
-    DEBUG_LOG() << "#####   onMainStructureElementChanged - ID = " << data.id();
+    DEBUG_LOG(m_logger) << "#####   onMainStructureElementChanged - ID = " << data.id();
     checkOverride( m_mainStructureElements[data.id()], data);
     m_mainStructureElements[data.id()] = data;
     break;
@@ -192,13 +191,13 @@ void IsmHandler::onMainStructureElementChanged(const InfrastructureManagement::M
 void IsmHandler::onBridgeStatusChanged(const InfrastructureManagement::BridgeChangeStatus &data, DataModification modType)
 {
   static int s_id = 1;
-  DEBUG_LOG() << Q_FUNC_INFO << "s_id=" << s_id;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "s_id=" << s_id;
   switch (modType)
   {
   case DataModification::eAdded:
   case DataModification::eModified:
   {
-    DEBUG_LOG() << "#####   onBridgeStatusChanged - buildingId = " << data.buildingId();
+    DEBUG_LOG(m_logger) << "#####   onBridgeStatusChanged - buildingId = " << data.buildingId();
     BridgeStatus bs;
     bs.id(s_id++);    
     bs.buildingId(data.buildingId());
@@ -215,17 +214,17 @@ void IsmHandler::onBridgeStatusChanged(const InfrastructureManagement::BridgeCha
 
 void IsmHandler::getEgcuToRoom(const InfrastructureManagement::MainStructureElement &mse, QVector<EgcuInfo> &eis)
 {
-  INFO_LOG() << "properties=" << mse.properties();
+  INFO_LOG(m_logger) << "properties=" << mse.properties();
   QJsonParseError parserError;
   QByteArray content = QByteArray::fromStdString(mse.properties());
 
   const QJsonDocument doc(QJsonDocument::fromJson(content, &parserError));
   if (parserError.error != QJsonParseError::NoError)
   {
-    WARNING_LOG() << "Error parsing json document: " << parserError.errorString();
+    WARNING_LOG(m_logger) << "Error parsing json document: " << parserError.errorString();
     return;
   }
-  DEBUG_LOG() << "json to parse: " << doc.toJson();
+  DEBUG_LOG(m_logger) << "json to parse: " << doc.toJson();
   const QJsonObject objEgcus(doc.object());
   const QJsonArray arrEgcus(objEgcus.value(QStringLiteral("egcusToRooms")).toArray());
   for (int i = 0; i < arrEgcus.size(); ++i)
@@ -233,19 +232,19 @@ void IsmHandler::getEgcuToRoom(const InfrastructureManagement::MainStructureElem
     
     const QJsonObject objRooms(arrEgcus.at(i).toObject());
     const int mountpointEgcuId = objRooms[QStringLiteral("mountpointEgcu")].toInt();
-    INFO_LOG() << "mountpointEgcu=" << mountpointEgcuId;
-    INFO_LOG() << "i=" <<i;
+    INFO_LOG(m_logger) << "mountpointEgcu=" << mountpointEgcuId;
+    INFO_LOG(m_logger) << "i=" <<i;
     const QJsonArray arrRooms(objRooms.value(QStringLiteral("rooms")).toArray());
-    INFO_LOG() << "bi.egcus.size()=" << eis.size();
+    INFO_LOG(m_logger) << "bi.egcus.size()=" << eis.size();
 
     
     for (EgcuInfo &egcuInfo : eis)
     {
-      DEBUG_LOG() << "bi.egcus.at(k).mountPointId=" << egcuInfo.mountPointId
+      DEBUG_LOG(m_logger) << "bi.egcus.at(k).mountPointId=" << egcuInfo.mountPointId
                          << " mountpointEgcu=" << mountpointEgcuId;
       if (egcuInfo.mountPointId == mountpointEgcuId)
       {
-        DEBUG_LOG() << "mountpointEgcu=" << mountpointEgcuId;
+        DEBUG_LOG(m_logger) << "mountpointEgcu=" << mountpointEgcuId;
 
         egcuInfo.roomIds.clear();
         egcuInfo.roomIds.reserve(arrRooms.size());
@@ -273,10 +272,10 @@ void IsmHandler::buildingsChanged(bool init)
   QSet<int> availableBuildingIds;
   QMap<int, BuildingInfo> newBuildingConfiguration;
   availableBuildingIds.reserve(m_mainStructureElements.size());
-  INFO_LOG() << "Updating building config m_mainStructureElements.size=" << m_mainStructureElements.size();
+  INFO_LOG(m_logger) << "Updating building config m_mainStructureElements.size=" << m_mainStructureElements.size();
   for (const InfrastructureManagement::MainStructureElement &mse : std::as_const(m_mainStructureElements))
   {
-    DEBUG_LOG() << "Checking building " << mse.id() << " - " << mse.name();
+    DEBUG_LOG(m_logger) << "Checking building " << mse.id() << " - " << mse.name();
     BuildingInfo bi;
     bi.mseId = mse.id();
     bi.modelId = mse.modelId();
@@ -300,7 +299,7 @@ void IsmHandler::buildingsChanged(bool init)
         bi.subId2RoomId.insert(se.mountingPointId(), se.id());
         bi.roomId2SubId.insert(se.id(), se.mountingPointId());
         bi.roomName2RoomId.insert(QString::fromStdString(se.name()), se.mountingPointId());
-        INFO_LOG() << " Room: mountingPointId: " << se.mountingPointId()
+        INFO_LOG(m_logger) << " Room: mountingPointId: " << se.mountingPointId()
                            << ", roomId: " << se.id()
                            << ", Name: " << se.name();
         m_roomId2RoomName.insert(se.id(), QString::fromStdString(se.name()));
@@ -308,13 +307,13 @@ void IsmHandler::buildingsChanged(bool init)
     }
     if (m_mainHandler->exerciseId() != bi.currentExerciseId)
     {
-      DEBUG_LOG() << "Exercise id of building does not match current exercise: " << bi.currentExerciseId
+      DEBUG_LOG(m_logger) << "Exercise id of building does not match current exercise: " << bi.currentExerciseId
                           << " != " << m_mainHandler->exerciseId()
                           << " buildingId=" << bi.mseId
                           << " buildingName" << bi.name;
       continue;
     }
-    INFO_LOG() << "Adding building configuration for " << mse.id() << " - " << mse.name();
+    INFO_LOG(m_logger) << "Adding building configuration for " << mse.id() << " - " << mse.name();
     availableBuildingIds += mse.id();
     getEgcuToRoom(mse, bi.egcus);
     newBuildingConfiguration.insert(bi.mseId, bi);
@@ -325,7 +324,7 @@ void IsmHandler::buildingsChanged(bool init)
     if (!availableBuildingIds.contains(buildingId))
     {
       
-      INFO_LOG() << "Building " << buildingId << " no longer exists in this exercise - removing";
+      INFO_LOG(m_logger) << "Building " << buildingId << " no longer exists in this exercise - removing";
       emit buildingRemoved(buildingId);
       continue;
     }
@@ -333,11 +332,11 @@ void IsmHandler::buildingsChanged(bool init)
     const BuildingInfo &biNew = newBuildingConfiguration.value(buildingId);
     if (biOld == biNew)
     {
-      INFO_LOG() << "Building " << buildingId << " did not change - nothing to do";
+      INFO_LOG(m_logger) << "Building " << buildingId << " did not change - nothing to do";
     }
     else
     {
-      INFO_LOG() << "setHistoryState Building " << buildingId << " changed -> updating configuration"
+      INFO_LOG(m_logger) << "setHistoryState Building " << buildingId << " changed -> updating configuration"
                            << " biNew mseId=" << biNew.mseId
                            << " init=" << init;
       bool initBuildingChanged = true;
@@ -348,7 +347,7 @@ void IsmHandler::buildingsChanged(bool init)
   {
     if (m_currentBuildingConfiguration.contains(it.key()))
       continue;
-    INFO_LOG() << "setHistoryState New building added key= " << it.key()
+    INFO_LOG(m_logger) << "setHistoryState New building added key= " << it.key()
                        << " init=" << init;
     emit buildingChanged(it.value(), init);
   }
@@ -372,7 +371,7 @@ void IsmHandler::handleBuildingSensorModule(const InfrastructureManagement::Stru
   bsi.port = getBsmPortFromJSon(ia.properties());
   bsi.relPosition = se.relPosition();
   bsi.orientation = se.orientation();
-  DEBUG_LOG() << "adding bsm sensor module to building " << bi.mseId << ": " << bsi.assetId  << ", " << bsi.bsmId  << ", " << bsi.hostname;
+  DEBUG_LOG(m_logger) << "adding bsm sensor module to building " << bi.mseId << ": " << bsi.assetId  << ", " << bsi.bsmId  << ", " << bsi.hostname;
   bi.bsms.insert(bsi.assetId, bsi);
 }
 
@@ -387,7 +386,7 @@ void IsmHandler::handleBuildingControlUnit(const InfrastructureManagement::Struc
   auto itMpa = m_structureElementId2AssetId.find(se.id());
   if (itMpa == m_structureElementId2AssetId.end())
   {
-    INFO_LOG() << "structure element id " << se.id() << " not (yet)found"
+    INFO_LOG(m_logger) << "structure element id " << se.id() << " not (yet)found"
                        << " bi.mseId=" << bi.mseId
                        << " bi.assetId=" << bi.assetId
                        << " bi.egcus.size=" << bi.egcus.size()
@@ -398,31 +397,31 @@ void IsmHandler::handleBuildingControlUnit(const InfrastructureManagement::Struc
   const auto itAsset = m_assetMainStructureElementInExercise.find(assetId);
   if (itAsset == m_assetMainStructureElementInExercise.end())
   {
-    ERROR_LOG() << "asset id " << assetId << " not found";
+    ERROR_LOG(m_logger) << "asset id " << assetId << " not found";
     Q_ASSERT(false);
     return;
   }
   bi.currentExerciseId = itAsset.value();
   bi.assetId = itAsset.key();
 
-  DEBUG_LOG() << "adding bsm control unit (virtual) to building " << bi.mseId << ": " << bi.assetId  << ", " << bi.currentExerciseId;
+  DEBUG_LOG(m_logger) << "adding bsm control unit (virtual) to building " << bi.mseId << ": " << bi.assetId  << ", " << bi.currentExerciseId;
 }
 
 void IsmHandler::handleEffectGenerationControlUnit(const InfrastructureManagement::StructureElement &se, BuildingInfo &bi) const
 {
-  DEBUG_LOG() << "BuildingId=" << bi.mseId
+  DEBUG_LOG(m_logger) << "BuildingId=" << bi.mseId
                       << " se.id=" << se.id();
   auto itMpa = m_structureElementId2AssetId.find(se.id());
   if (itMpa == m_structureElementId2AssetId.end())
   {
-    INFO_LOG() << "Return m_structureElementId2AssetId.size()=" << m_structureElementId2AssetId.size();
+    INFO_LOG(m_logger) << "Return m_structureElementId2AssetId.size()=" << m_structureElementId2AssetId.size();
     return;
   }
   const int assetId = itMpa.value();
   const auto itAsset = m_instAssets.find(assetId);
   if (itAsset == m_instAssets.end())
   {
-    INFO_LOG() << "Return m_instAssets.size()=" << m_instAssets.size();
+    INFO_LOG(m_logger) << "Return m_instAssets.size()=" << m_instAssets.size();
     return;
   }
   const InfrastructureManagement::InstrumentationAsset &ia = itAsset.value();
@@ -433,12 +432,12 @@ void IsmHandler::handleEffectGenerationControlUnit(const InfrastructureManagemen
   egcu.mountPointId = se.mountingPointId();
   egcu.hostname = QString::fromStdString(ia.hostname());
   egcu.assetId = assetId;
-  DEBUG_LOG() << "Egcu.hostname=" << egcu.hostname;
-  INFO_LOG() << "properties=" << ia.properties();
+  DEBUG_LOG(m_logger) << "Egcu.hostname=" << egcu.hostname;
+  INFO_LOG(m_logger) << "properties=" << ia.properties();
 
   bi.egcus.push_back(egcu);
 
-  DEBUG_LOG() << "adding egcu to building " << bi.mseId << ": " << egcu.hostname
+  DEBUG_LOG(m_logger) << "adding egcu to building " << bi.mseId << ": " << egcu.hostname
                       << " name=" << egcu.buildingName
                       << " mountPointName=" << egcu.mountPointName
                       << " mountPointId=" << egcu.mountPointId
@@ -470,37 +469,37 @@ void IsmHandler::checkOverride(const InfrastructureManagement::MainStructureElem
                                const InfrastructureManagement::MainStructureElement &mseNew)
 
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
-  DEBUG_LOG() << "mseOld.elements().size()=" << mseOld.elements().size()
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "mseOld.elements().size()=" << mseOld.elements().size()
                       << " mseNew.elements().size()=" << mseNew.elements().size();
 
 
   for (const InfrastructureManagement::StructureElement &se : mseNew.elements())
   {
-    DEBUG_LOG() << "se=" << se.id()
+    DEBUG_LOG(m_logger) << "se=" << se.id()
                         << " name=" << se.name()
                         << " displayName=" << se.displayName()
                         << " properties=" << se.properties();
 
     for (const InfrastructureManagement::StructureElement &seOld : mseOld.elements())
     {
-      DEBUG_LOG() << "seOld.id=" << seOld.id()
+      DEBUG_LOG(m_logger) << "seOld.id=" << seOld.id()
                           << " se.id=" << se.id();
       if ( seOld.id() == se.id())
       {
-        DEBUG_LOG() << "Properties =" << se.properties()
+        DEBUG_LOG(m_logger) << "Properties =" << se.properties()
                             << " se.id=" << se.id()
                             << " se.name=" << se.name()
                             << " mountingPointId=" << se.mountingPointId();
-        DEBUG_LOG() << "se.properties()=" << se.properties()
+        DEBUG_LOG(m_logger) << "se.properties()=" << se.properties()
                             << " seOld.properties()=" << seOld.properties();
         if (se.properties() != seOld.properties() )
         {
-          DEBUG_LOG() << "HandleOverrides"
+          DEBUG_LOG(m_logger) << "HandleOverrides"
                                  "<< m_currentBuildingConfiguration.size=" << m_currentBuildingConfiguration.size();
           if ( se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Building) 
           {
-            DEBUG_LOG() << "BSM-Flash, no EGCU";
+            DEBUG_LOG(m_logger) << "BSM-Flash, no EGCU";
             QByteArray properties = QByteArray::fromStdString(se.properties());
             emit setEffectStates(mseNew.id(), 0, properties ); 
             continue;
@@ -508,13 +507,13 @@ void IsmHandler::checkOverride(const InfrastructureManagement::MainStructureElem
           for (auto it = m_currentBuildingConfiguration.begin(); it != m_currentBuildingConfiguration.end(); ++it)
           {
             BuildingInfo &bi = it.value();
-            DEBUG_LOG() << "key=" << it.key()
+            DEBUG_LOG(m_logger) << "key=" << it.key()
                                 << " id=" << bi.mseId
                                 << " assetId=" << bi.assetId
                                 << " egcus.size=" << bi.egcus.size();
             for (const auto &egcu : std::as_const(bi.egcus))
             {
-              DEBUG_LOG() << "AssetId=" << egcu.assetId
+              DEBUG_LOG(m_logger) << "AssetId=" << egcu.assetId
                                   << " assetName=" << egcu.assetName
                                   << " hostname=" << egcu.hostname
                                   << " egcu.mountPointId=" << egcu.mountPointId
@@ -522,7 +521,7 @@ void IsmHandler::checkOverride(const InfrastructureManagement::MainStructureElem
               if (egcu.mountPointId ==  se.mountingPointId())
               {
                 QByteArray properties = QByteArray::fromStdString(se.properties());
-                DEBUG_LOG() << "Send Json SetEffectStates to BuildingProcess"
+                DEBUG_LOG(m_logger) << "Send Json SetEffectStates to BuildingProcess"
                                     << " buildingId="
                                     << " assetId="<< egcu.assetId
                                     << " properties =" << properties;
@@ -535,7 +534,7 @@ void IsmHandler::checkOverride(const InfrastructureManagement::MainStructureElem
       }
       else
       {
-        TRACE_LOG() << "No changes do not HandleOverrides";
+        TRACE_LOG(m_logger) << "No changes do not HandleOverrides";
       }
     } 
 
@@ -549,7 +548,7 @@ void IsmHandler::checkOverride(const InfrastructureManagement::MainStructureElem
          
         int assetId;
          bool foundAssetId = m_dtcIsm->getAssetIdFromMountingPoint(se.id(), se.mountingPointId(), assetId);
-         DEBUG_LOG() << "Send Overrides to BuildingProcess (EGCU)"
+         DEBUG_LOG(m_logger) << "Send Overrides to BuildingProcess (EGCU)"
                              << " foundAssetId=" << foundAssetId
                              << " structureElementId=" << mseNew.id()
                              << " se.id=" << se.id()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.h
index 3560a9c1e..47daffab6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.h
@@ -170,6 +170,7 @@ private Q_SLOTS:
   void onBuildingsChangedInit();
 
 private:
+  NGL::INGLLogger &m_logger;
   void handleBuildingSensorModule(const InfrastructureManagement::StructureElement &se, BuildingInfo &bi) const;
   void handleBuildingControlUnit(const InfrastructureManagement::StructureElement &se, BuildingInfo &bi) const;
   void handleEffectGenerationControlUnit(const InfrastructureManagement::StructureElement &se, BuildingInfo &bi) const;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/main_handler.cpp
index 97655b4fe..912faf336 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/main_handler.cpp
@@ -9,9 +9,8 @@
 
 namespace Buildings
 {
-MainHandler::MainHandler(QObject *parent)
-  : QObject(parent)
-{}
+MainHandler::MainHandler(QObject *parent) : QObject(parent),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 MainHandler::~MainHandler()
 {
@@ -30,17 +29,17 @@ bool MainHandler::init(int domainId, int exerciseId)
   bool bRet = initInternal(domainId, exerciseId);
 
 
-  DEBUG_LOG() << "WebSocketInterfaceHandler initialized Port=" << m_webSocketHandler->listenPort();
+  DEBUG_LOG(m_logger) << "WebSocketInterfaceHandler initialized Port=" << m_webSocketHandler->listenPort();
   m_ddsHandler->pacemaker()->addPort(m_webSocketHandler->listenPort(), Core::PortType::WebSocketServer);
 
   if (bRet)
   {
-    DEBUG_LOG() << "svcBuildings successfully initialized";
+    DEBUG_LOG(m_logger) << "svcBuildings successfully initialized";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
   }
   else
   {
-    ERROR_LOG() << "Error initializing svcBuildings...";
+    ERROR_LOG(m_logger) << "Error initializing svcBuildings...";
     if (m_ddsHandler && m_ddsHandler->pacemaker())
       m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
   }
@@ -49,16 +48,16 @@ bool MainHandler::init(int domainId, int exerciseId)
 
 bool MainHandler::initInternal(int domainId, int exerciseId)
 {
-  INFO_LOG() << "MainHandler::init domainId = " << domainId
+  INFO_LOG(m_logger) << "MainHandler::init domainId = " << domainId
                       << " exerciseId = " << exerciseId;
 
   m_dbHandler = std::make_shared<DbHandler>();
   if (!m_dbHandler->init(exerciseId, Settings::settings()))
   {
-    ERROR_LOG() << "Could not init DbHandler";
+    ERROR_LOG(m_logger) << "Could not init DbHandler";
     return false;
   }
-  INFO_LOG() << "DbHandler initialized";
+  INFO_LOG(m_logger) << "DbHandler initialized";
 
   
   m_ddsHandler = std::make_shared<DdsHandler>(domainId, exerciseId);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/main_handler.h
index 002b87b5d..d4df8217d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/main_handler.h
@@ -54,6 +54,7 @@ public:
 private slots:
   
 private:
+  NGL::INGLLogger &m_logger;
   bool initInternal(int domainId, int exerciseId);
   std::shared_ptr<BuildingControlHandler> m_bcHandler;
   std::shared_ptr<DdsHandler> m_ddsHandler;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/pdm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/pdm_handler.cpp
index 3a31c3c6d..33618484f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/pdm_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/pdm_handler.cpp
@@ -7,10 +7,9 @@
 
 namespace Buildings
 {
-PdmHandler::PdmHandler(MainHandler *mainHandler)
-  : m_mainHandler(mainHandler)
-  , m_bPdmInitialized(false)
-{}
+PdmHandler::PdmHandler(MainHandler *mainHandler) : m_mainHandler(mainHandler)
+  , m_bPdmInitialized(false),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 PdmHandler::~PdmHandler()
 {}
@@ -26,7 +25,7 @@ void PdmHandler::initializePdm()
       !dtcPdm->waitForHistoricalDataChargeType(20000) ||
       !dtcPdm->waitForHistoricalDataBuildingChargeEffect(20000))  
   {
-    ERROR_LOG() << "Can not read charge/gear types from PDM";
+    ERROR_LOG(m_logger) << "Can not read charge/gear types from PDM";
     m_bPdmInitialized = false;
     return;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/pdm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/pdm_handler.h
index 1f0d2f4ff..393cd4011 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/pdm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/pdm_handler.h
@@ -18,8 +18,10 @@ public:
   QMap<int, ProjectDataManagement::BuildingChargeEffect> buildingChargeEffects();
   QMap<int, ProjectDataManagement::ChargeType> chargeTypes();
 private:
+  NGL::INGLLogger &m_logger;
   void initializePdm();
 private:
+  NGL::INGLLogger &m_logger;
   QMap<int, ProjectDataManagement::ChargeType> m_chargeTypes;
   QMap<int, ProjectDataManagement::BuildingChargeEffect> m_buildingChargeEffects;
   MainHandler *m_mainHandler;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ppm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ppm_handler.cpp
index b3f321ca6..a43c10839 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ppm_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ppm_handler.cpp
@@ -6,9 +6,8 @@
 
 namespace Buildings
 {
-PpmHandler::PpmHandler(MainHandler *mainHandler)
-  : m_mainHandler(mainHandler)
-{}
+PpmHandler::PpmHandler(MainHandler *mainHandler) : m_mainHandler(mainHandler),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 PpmHandler::~PpmHandler()
 {}
@@ -22,12 +21,12 @@ bool PpmHandler::init()
           this, &PpmHandler::onParticipantPositionChanged);
   if (!m_ppmDtc->enableEquipmentExerciseMapping())
   {
-    ERROR_LOG() << "Can not read equipment/exercise mappings from PPM";
+    ERROR_LOG(m_logger) << "Can not read equipment/exercise mappings from PPM";
     return false;
   }
   if (!m_ppmDtc->enableParticipantPosition())
   {
-    ERROR_LOG() << "Can not read ParticipantPositions from PPM";
+    ERROR_LOG(m_logger) << "Can not read ParticipantPositions from PPM";
     return false;
   }
   return true;
@@ -37,7 +36,7 @@ int PpmHandler::equipmentNumberToParticipantId(int equipmentNumber) const
 {
   const int ret = m_equipmentNumber2ParticipantId.value(equipmentNumber, -1);
   if (ret < 0)
-    WARNING_LOG() << "Can not map equipment number " << equipmentNumber << " to a valid participant id - using -1";
+    WARNING_LOG(m_logger) << "Can not map equipment number " << equipmentNumber << " to a valid participant id - using -1";
   return ret;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ppm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ppm_handler.h
index b47ee2c5f..b10ec5877 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ppm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ppm_handler.h
@@ -25,6 +25,7 @@ private Q_SLOTS:
   void onEquipmentExerciseMappingChanged(const ParticipantManagement::EquipmentExerciseMapping &data, DataModification modType);
   void onParticipantPositionChanged(const ParticipantManagement::ParticipantPosition &data, DataModification modType);
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
   QHash<int, int> m_equipmentNumber2ParticipantId;
   QHash<int, ParticipantManagement::ParticipantPosition> m_participantPositions;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/relay_info_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/relay_info_handler.cpp
index 054bed97e..283fc2280 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/relay_info_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/relay_info_handler.cpp
@@ -23,10 +23,10 @@ bool RelayInfoHandler::init()
 void RelayInfoHandler::onSetRelayInfoRequest(const rti::core::SampleIdentity &cookie,
                                              const SetRelayInfoRequest &request)
 {
-  DEBUG_LOG() << "onSetRelayInfoRequest " << request;
+  DEBUG_LOG(m_logger) << "onSetRelayInfoRequest " << request;
   const Core::FunctionReplyObject fro = onSetRelayInfoRequestInternal(request);
   if (fro.error())
-    WARNING_LOG() << fro();
+    WARNING_LOG(m_logger) << fro();
   m_mainHandler->ddsHandler()->fts()->setRelayInfoReply(cookie, fro);
 }
 
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 b81b6d755..5c25c9666 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
@@ -23,6 +23,7 @@ public:
 
 private Q_SLOTS:
 private:
+  NGL::INGLLogger &m_logger;
   void onSetRelayInfoRequest(const rti::core::SampleIdentity &cookie,
                                      const SetRelayInfoRequest &request) override;
   Core::FunctionReplyObject onSetRelayInfoRequestInternal(const SetRelayInfoRequest &data);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/web_socket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/web_socket_handler.cpp
index 45a24bd60..378056328 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/web_socket_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/web_socket_handler.cpp
@@ -33,10 +33,10 @@ WebSocketHandler::~WebSocketHandler()
 
 bool WebSocketHandler::init(quint16 listenPort)
 {
-  DEBUG_LOG() << "init";
+  DEBUG_LOG(m_logger) << "init";
   if (!m_webSocketServer->listen(QHostAddress::Any, listenPort))
   {
-    WARNING_LOG() << "Can not listen on port " << listenPort << " - aborting";
+    WARNING_LOG(m_logger) << "Can not listen on port " << listenPort << " - aborting";
     return false;
   }
 
@@ -44,7 +44,7 @@ bool WebSocketHandler::init(quint16 listenPort)
           this, &WebSocketHandler::onNewConnection);
 
 
-  INFO_LOG() << "Listening on port " << m_webSocketServer->serverPort();
+  INFO_LOG(m_logger) << "Listening on port " << m_webSocketServer->serverPort();
   return true;
 }
 
@@ -61,7 +61,7 @@ bool WebSocketHandler::init(const QPair<quint16, quint16> &portRange)
 
 bool WebSocketHandler::sendTelegramInternal() const
 {
-  DEBUG_LOG() << "sendTelegramInternal";
+  DEBUG_LOG(m_logger) << "sendTelegramInternal";
   QJsonObject obj;
   obj[QStringLiteral("participantId")]   = 1;
   obj[QStringLiteral("equipmentNumber")] = 2;
@@ -82,7 +82,7 @@ bool WebSocketHandler::sendTelegramInternal() const
 
 bool WebSocketHandler::sendbuildingInfos() const
 {
-  DEBUG_LOG() << "sendbuildingInfos";
+  DEBUG_LOG(m_logger) << "sendbuildingInfos";
   QJsonObject obj;
   QJsonArray arr;
 
@@ -93,7 +93,7 @@ bool WebSocketHandler::sendbuildingInfos() const
     BuildingProcess* buildingProcess = i.value();
     BuildingInfo buildingInfo = buildingProcess->buildingInfo();
     quint16 port = buildingProcess->getWebsocketPort();
-    DEBUG_LOG() << "key=" << i.key()
+    DEBUG_LOG(m_logger) << "key=" << i.key()
                          << " port= " << port
                          << " buildingInfo.name=" << buildingInfo.name;
     QJsonObject objIter;
@@ -119,8 +119,8 @@ bool WebSocketHandler::sendbuildingInfos() const
 
 void WebSocketHandler::onNewMessage(const QString &message)
 {
-  DEBUG_LOG() << "onNewMessage='" << message << "'";
-  DEBUG_LOG() << "m_buildingControlHandler->m_buildings.size()=" << m_buildingControlHandler->getBuildings().size();
+  DEBUG_LOG(m_logger) << "onNewMessage='" << message << "'";
+  DEBUG_LOG(m_logger) << "m_buildingControlHandler->m_buildings.size()=" << m_buildingControlHandler->getBuildings().size();
 
   if (message.indexOf(QStringLiteral("buildingRequest")) > 0)
   {
@@ -128,7 +128,7 @@ void WebSocketHandler::onNewMessage(const QString &message)
   }
   if (message.indexOf(QStringLiteral("triggerFlashlight")) > 0)
   {
-    DEBUG_LOG() << "triggerFlashlight" ;
+    DEBUG_LOG(m_logger) << "triggerFlashlight" ;
     triggerFlashlight(message);
   }
 }
@@ -148,12 +148,12 @@ QJsonObject WebSocketHandler::ObjectFromString(const QString& in)
         }
         else
         {
-            WARNING_LOG() << "Document is not an object";
+            WARNING_LOG(m_logger) << "Document is not an object";
         }
     }
     else
     {
-        WARNING_LOG() << "Invalid JSON...\n" << in ;
+        WARNING_LOG(m_logger) << "Invalid JSON...\n" << in ;
     }
 
     return obj;
@@ -162,20 +162,20 @@ QJsonObject WebSocketHandler::ObjectFromString(const QString& in)
 
 void WebSocketHandler::triggerFlashlight(const QString &message)
 {
-  DEBUG_LOG() << "triggerFlashlight message=" << message;
+  DEBUG_LOG(m_logger) << "triggerFlashlight message=" << message;
   QJsonObject obj = ObjectFromString(message);
   QJsonObject dataObj = obj.value(QStringLiteral("data")).toObject();
   int structureElementId = dataObj.value(QStringLiteral("structureElementId")).toInt();
   QString hostnameBsm = dataObj.value(QStringLiteral("hostnameBsm")).toString();
 
-  DEBUG_LOG() << "hostnameBsm=" << hostnameBsm
+  DEBUG_LOG(m_logger) << "hostnameBsm=" << hostnameBsm
                       << " structureElementId=" << structureElementId;
 
 }
 
 void WebSocketHandler::onNewConnection()
 {
-  DEBUG_LOG() << "onNewConnection";
+  DEBUG_LOG(m_logger) << "onNewConnection";
   QWebSocket *ws = m_webSocketServer->nextPendingConnection();
 
   if (!ws)
@@ -188,12 +188,12 @@ void WebSocketHandler::onNewConnection()
 
   m_webSockets += ws;
 
-  INFO_LOG() << "New websocket connected";
+  INFO_LOG(m_logger) << "New websocket connected";
 }
 
 void WebSocketHandler::onWebSocketDisconnected()
 {
-  DEBUG_LOG() << "onWebSocketDisconnected";
+  DEBUG_LOG(m_logger) << "onWebSocketDisconnected";
   QWebSocket *ws = qobject_cast<QWebSocket *>(sender());
   if (!ws)
     return;
@@ -201,7 +201,7 @@ void WebSocketHandler::onWebSocketDisconnected()
   m_webSockets.removeAll(ws);
   ws->deleteLater();
 
-  INFO_LOG() << "A websocket disconnected";
+  INFO_LOG(m_logger) << "A websocket disconnected";
 }
 
 bool WebSocketHandler::sendPosition()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/web_socket_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/web_socket_handler.h
index e8df3a5de..f9fec27be 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/web_socket_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/web_socket_handler.h
@@ -28,6 +28,7 @@ public:
   bool sendPosition();
 
 private:
+  NGL::INGLLogger &m_logger;
   bool sendTelegramInternal() const;
   bool sendbuildingInfos() const;
   QJsonObject ObjectFromString(const QString& in);
@@ -39,6 +40,7 @@ private Q_SLOTS:
   void onWebSocketDisconnected();
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<BuildingControlHandler>                             m_buildingControlHandler;  
   QWebSocketServer* m_webSocketServer = nullptr;
   QVector<QWebSocket*> m_webSockets;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Connection/client_connection.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Connection/client_connection.cpp
index 24de43ce7..41fe7571c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Connection/client_connection.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Connection/client_connection.cpp
@@ -30,7 +30,7 @@ bool ClientConnection::init()
 {
   if (m_socket == nullptr)
   {
-    ERROR_LOG() << "Initialisation failed due to an invalid socket";
+    ERROR_LOG(m_logger) << "Initialisation failed due to an invalid socket";
     return false;
   }
 
@@ -51,17 +51,17 @@ void ClientConnection::addMessage(const CombatNetRadio::WebSocketInterface::Mess
   if (!m_socket || m_socket->state() != QAbstractSocket::ConnectedState)
   {
     m_messageQueue.enqueue(message);
-    DEBUG_LOG() << "Adding message to queue, size: " << m_messageQueue.size();
+    DEBUG_LOG(m_logger) << "Adding message to queue, size: " << m_messageQueue.size();
     return;
   }
   const QString msg(message.toJsonString());
-  DEBUG_LOG() << "Send msg: " << msg;
+  DEBUG_LOG(m_logger) << "Send msg: " << msg;
   m_socket->sendTextMessage(msg);
 }
 
 void ClientConnection::onNewTextMessageFromSocket(const QString &message)
 {
-  DEBUG_LOG() << "Recv msg: " << message;
+  DEBUG_LOG(m_logger) << "Recv msg: " << message;
   emit newTextMessage(this, message);
 }
 
@@ -73,15 +73,15 @@ void ClientConnection::sendMessagesFromQueue()
   {
     Messages::ReplyMessage message = m_messageQueue.dequeue();
     const QString msg(message.toJsonString());
-    TRACE_LOG() << "Send msg: " << msg;
+    TRACE_LOG(m_logger) << "Send msg: " << msg;
     m_socket->sendTextMessage(msg);
-    DEBUG_LOG() << "Sent message from queue, new size: " << m_messageQueue.size();
+    DEBUG_LOG(m_logger) << "Sent message from queue, new size: " << m_messageQueue.size();
   }
 }
 
 void ClientConnection::onSocketDisconnect()
 {
-  DEBUG_LOG() << "Client with ip "
+  DEBUG_LOG(m_logger) << "Client with ip "
                       << m_ip.toString()
                       << " disconnected";
   emit disconnected(this);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Connection/client_connection.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Connection/client_connection.h
index eeba04c30..c00036c8f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Connection/client_connection.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Connection/client_connection.h
@@ -40,9 +40,11 @@ private Q_SLOTS:
   void onSocketDisconnect();
 
 private: 
+  NGL::INGLLogger &m_logger;
   void sendMessages();
 
 private: 
+  NGL::INGLLogger &m_logger;
   QWebSocket *m_socket;
   QQueue<Messages::ReplyMessage> m_messageQueue;
   QHostAddress m_ip;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Connection/connection_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Connection/connection_handler.cpp
index f35737fdd..6cdfb0359 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Connection/connection_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Connection/connection_handler.cpp
@@ -10,9 +10,8 @@
 
 using namespace CombatNetRadio::WebSocketInterface::Connection;
 
-ConnectionHandler::ConnectionHandler()
-  : m_server(nullptr)
-{
+ConnectionHandler::ConnectionHandler() : m_server(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 ConnectionHandler::~ConnectionHandler()
@@ -38,13 +37,13 @@ bool ConnectionHandler::init()
 
   
   quint16 port = 2081;
-  DEBUG_LOG() << "Trying to listen to port " << port;
+  DEBUG_LOG(m_logger) << "Trying to listen to port " << port;
   if (!m_server->listen(QHostAddress::Any, port))
   {
-    ERROR_LOG() << "Not possible to listen to port " << port;
+    ERROR_LOG(m_logger) << "Not possible to listen to port " << port;
     return false;
   }
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "... ok";
 
   return true;
 }
@@ -63,7 +62,7 @@ void ConnectionHandler::onNewMessage(CombatNetRadio::WebSocketInterface::Message
 
 void ConnectionHandler::onServerError(QWebSocketProtocol::CloseCode closeCode)
 {
-  ERROR_LOG() << "Got server error with close code " << closeCode;
+  ERROR_LOG(m_logger) << "Got server error with close code " << closeCode;
 }
 
 void ConnectionHandler::onNewConnection()
@@ -75,7 +74,7 @@ void ConnectionHandler::onNewConnection()
 
     if (!newConnection->init())
     {
-      ERROR_LOG() << "Failed to initialise new client";
+      ERROR_LOG(m_logger) << "Failed to initialise new client";
       delete newConnection;
       newConnection = nullptr;
       continue;
@@ -85,7 +84,7 @@ void ConnectionHandler::onNewConnection()
     connect(newConnection, &ClientConnection::disconnected, this, &ConnectionHandler::onDisconnected);
 
     m_connections.append(newConnection);
-    DEBUG_LOG() << "New client with ip " << newConnection->ip().toString() << " connected";
+    DEBUG_LOG(m_logger) << "New client with ip " << newConnection->ip().toString() << " connected";
     emit newClientConnection((qint64) static_cast<WebSocketInterface::Connection::ClientConnection::MessageTransmitter*>(newConnection));
   }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Connection/connection_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Connection/connection_handler.h
index 743069526..bf5e4e3d4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Connection/connection_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Connection/connection_handler.h
@@ -50,6 +50,7 @@ private Q_SLOTS:
   void onDisconnected(ClientConnection *conn);
 
 private: 
+  NGL::INGLLogger &m_logger;
   QWebSocketServer *m_server;
   QVector<ClientConnection *> m_connections;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Messages/message_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Messages/message_handler.cpp
index 9e73f71ab..35891e214 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Messages/message_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Messages/message_handler.cpp
@@ -12,9 +12,8 @@ namespace WebSocketInterface
 namespace Messages
 {
 
-MessageHandler::MessageHandler(ExerciseManager *exerciseManager)
-  : m_exerciseManager(exerciseManager)
-{
+MessageHandler::MessageHandler(ExerciseManager *exerciseManager) : m_exerciseManager(exerciseManager),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   Q_ASSERT(exerciseManager);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Messages/message_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Messages/message_handler.h
index 70ea52b9f..ed4a920a3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Messages/message_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/Messages/message_handler.h
@@ -28,6 +28,8 @@ public Q_SLOTS:
   void onNewTextMessage(MessageTransmitter *transmitter, const QString &message);
 
 private:
+
+NGL::INGLLogger &m_logger;
   ExerciseManager   *m_exerciseManager;
 };
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/websocket_interface_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/websocket_interface_handler.cpp
index bc8df02bb..4e4783e11 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/websocket_interface_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/WebSocketInterface/websocket_interface_handler.cpp
@@ -39,7 +39,7 @@ bool WebSocketInterfaceHandler::init()
 
   if (!m_connectionHandler->init())
   {
-    ERROR_LOG() << "Failed to initialise ConnectionHandler";
+    ERROR_LOG(m_logger) << "Failed to initialise ConnectionHandler";
     return false;
   }
 
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 3b13209a2..2cdbe4b16 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
@@ -16,12 +16,11 @@
 namespace CombatNetRadio
 {
 
-ConfigCnr::ConfigCnr(int exerciseId, AudioVideoManagement::Interface::Dtc *avmDtc, InfrastructureManagement::Interface::Dtc *ismDtc)
-  : m_exerciseId(exerciseId)
+ConfigCnr::ConfigCnr(int exerciseId, AudioVideoManagement::Interface::Dtc *avmDtc, InfrastructureManagement::Interface::Dtc *ismDtc) : m_exerciseId(exerciseId)
   , m_avmDtc(avmDtc)
   , m_ismDtc(ismDtc)
-  , m_loggerJson(getLogger("ConfigCnr.Json"))
-{
+  , m_loggerJson(getLogger("ConfigCnr.Json")),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   Q_ASSERT(avmDtc);
   Q_ASSERT(ismDtc);
 
@@ -199,7 +198,7 @@ boost::optional<AudioVideoManagement::FrequencyPlanning> ConfigCnr::activePlan()
 
 void ConfigCnr::onActiveFrequencyPlanningChanged(const AudioVideoManagement::ActiveFrequencyPlanning &data, DataModification modType)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << ": " << data;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << ": " << data;
 
   Q_UNUSED(modType);
   if (data.exerciseId() == m_exerciseId)
@@ -208,7 +207,7 @@ void ConfigCnr::onActiveFrequencyPlanningChanged(const AudioVideoManagement::Act
 
 void ConfigCnr::onFrequencyPlanningChanged(const AudioVideoManagement::FrequencyPlanning &data, DataModification modType)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << ": " << data;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << ": " << data;
 
   Q_UNUSED(modType);
 
@@ -223,7 +222,7 @@ void ConfigCnr::onFrequencyPlanningChanged(const AudioVideoManagement::Frequency
 
 void ConfigCnr::onCnrConfigChanged(const AudioVideoManagement::CnrConfig &data, DataModification modType)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << ": " << data;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << ": " << data;
 
   Q_UNUSED(modType);
   bool   isGlobal = !data.exerciseId().is_set();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/dds_handler.cpp
index 432e12a72..92b83c4b1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/dds_handler.cpp
@@ -15,16 +15,16 @@ namespace CombatNetRadio
 DdsHandler::DdsHandler(int domainId)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Global))
 {
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/dds_handler.h
index 484a77a12..f5b1dbdc0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/dds_handler.h
@@ -76,6 +76,7 @@ public:
   }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector>                 m_ddsConnector;
   std::unique_ptr<Core::Pacemaker>                            m_pacemaker;
   std::shared_ptr<AssetManagement::Interface::Dtc>            m_asmDtc;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/exercise_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/exercise_manager.cpp
index 1b72d2131..e5559693f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/exercise_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/exercise_manager.cpp
@@ -111,13 +111,13 @@ std::vector<WebSocketInterface::Messages::ReplyMessage> ExerciseManager::radioSt
 
 WebSocketInterface::Messages::ReplyMessage ExerciseManager::configCnr(const QString &uuid)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   const WebSocketInterface::Messages::ErrorMessage   noActivePlanning(1, uuid, QStringLiteral("No active frequency planning found"));
 
   if (m_parts.empty())
   {
-    DEBUG_LOG() << "No active frequency planning due to empty m_parts.";
+    DEBUG_LOG(m_logger) << "No active frequency planning due to empty m_parts.";
 
     return noActivePlanning;
   }
@@ -141,7 +141,7 @@ WebSocketInterface::Messages::ReplyMessage ExerciseManager::configCnr(const QStr
 
   if (configCnrData.radioCircuit.empty())
   {
-    DEBUG_LOG() << "No active frequency planning due to empty radio circuits.";
+    DEBUG_LOG(m_logger) << "No active frequency planning due to empty radio circuits.";
 
     return noActivePlanning;
   }
@@ -182,25 +182,25 @@ WebSocketInterface::Messages::ReplyMessage ExerciseManager::positionsCnr(const Q
 void ExerciseManager::onModifyFrequencyPlanningStatusReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    ERROR_LOG() << "Error while modifying FrequencyPlanningStatus: " << replyObject.str();
+    ERROR_LOG(m_logger) << "Error while modifying FrequencyPlanningStatus: " << replyObject.str();
   else
-    INFO_LOG() << "onModifyFrequencyPlanningStatusReply ok";
+    INFO_LOG(m_logger) << "onModifyFrequencyPlanningStatusReply ok";
 }
 
 void ExerciseManager::onClearFrequencyPlanningStatusReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    ERROR_LOG() << "Error while clearing FrequencyPlanningStatus: " << replyObject.str();
+    ERROR_LOG(m_logger) << "Error while clearing FrequencyPlanningStatus: " << replyObject.str();
   else
-    INFO_LOG() << "onClearFrequencyPlanningStatusReply ok";
+    INFO_LOG(m_logger) << "onClearFrequencyPlanningStatusReply ok";
 }
 
 void ExerciseManager::onRemoveFrequencyPlanningStatusByClientReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    ERROR_LOG() << "Error while removing FrequencyPlanningStatus: " << replyObject.str();
+    ERROR_LOG(m_logger) << "Error while removing FrequencyPlanningStatus: " << replyObject.str();
   else
-    INFO_LOG() << "onRemoveFrequencyPlanningStatusByClientReply ok";
+    INFO_LOG(m_logger) << "onRemoveFrequencyPlanningStatusByClientReply ok";
 }
 
 void ExerciseManager::setPositionsUpdateInterval(std::chrono::milliseconds interval)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/exercise_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/exercise_manager.h
index e6fe3ebb7..da1c5e92a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/exercise_manager.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/exercise_manager.h
@@ -68,6 +68,7 @@ signals:
   void positionsUpdate(const WebSocketInterface::Messages::ReplyMessage &positionsCnr);
 
 private:
+  NGL::INGLLogger &m_logger;
   void onExerciseActivated(int exerciseId);
   void onExerciseDeactivated(int exerciseId);
   void onPositionsUpdateTimeout();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/main_handler.cpp
index f0139c631..0457761a4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/main_handler.cpp
@@ -19,12 +19,12 @@ MainHandler::~MainHandler() = default;
 
 bool MainHandler::init(int domainId)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   m_ddsHandler.reset(new DdsHandler(domainId));
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation DdsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
   }
@@ -35,7 +35,7 @@ bool MainHandler::init(int domainId)
   m_webSocketInterfaceHandler.reset(new WebSocketInterface::WebSocketInterfaceHandler(m_exerciseManager.get()));
   if (!m_webSocketInterfaceHandler->init())
   {
-    ERROR_LOG() << "Initialisation WebSocketInterfaceHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler failed.";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/training_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/training_area.cpp
index f47aa5390..c37921ff4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/training_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/training_area.cpp
@@ -72,7 +72,7 @@ void TrainingArea::getRadioStations(InfrastructureManagement::Interface::Dtc *is
     data.id = stationId(mse);
     if (data.id == 0)
     {
-      WARNING_LOG() << "Got MainStructureElement of type 'RadioStation' but property 'stationId' was not set"
+      WARNING_LOG(m_logger) << "Got MainStructureElement of type 'RadioStation' but property 'stationId' was not set"
                             << " - database id: " << mse.id() << " - ignoring!";
       return;
     }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler.cpp
index 375d84866..ada0ee635 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler.cpp
@@ -14,27 +14,26 @@
 namespace ComponentMonitor
 {
 
-CheckmkHandler::CheckmkHandler()
-  : QObject()
-  , m_socket(new QTcpSocket(this))
-{
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+CheckmkHandler::CheckmkHandler() : QObject()
+  , m_socket(new QTcpSocket(this)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 CheckmkHandler::~CheckmkHandler()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (m_timer)
     m_timer->stop();
   delete m_socket;
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool CheckmkHandler::initialize(const QString &checkMkServerHostname, int checkMkServerPort,
                                 int checkIntervalSec)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START"
                        << " , hostname=" << checkMkServerHostname
                        << " , port=" << checkMkServerPort
                        << " , m_checkIntervalSec=" << checkIntervalSec;
@@ -58,22 +57,22 @@ bool CheckmkHandler::initialize(const QString &checkMkServerHostname, int checkM
           this, &CheckmkHandler::onConnected);
   connect(m_socket, &QTcpSocket::readyRead, this, &CheckmkHandler::readData);
 
-  INFO_LOG() << Q_FUNC_INFO << " END";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
 void CheckmkHandler::run()
 {
-  INFO_LOG() << Q_FUNC_INFO << " START";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_timer->start();
-  INFO_LOG() << Q_FUNC_INFO << " END";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void CheckmkHandler::stop()
 {
-  INFO_LOG() << Q_FUNC_INFO << " START";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_timer->stop();
-  INFO_LOG() << Q_FUNC_INFO << " END";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void CheckmkHandler::onTimeout()
@@ -86,7 +85,7 @@ void CheckmkHandler::onTimeout()
     m_timer->setInterval(m_checkIntervalSec*1000);
   }
 
-  INFO_LOG() << Q_FUNC_INFO << " Timeout, m_highFrequencyCheck=" << m_highFrequencyCheck
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " Timeout, m_highFrequencyCheck=" << m_highFrequencyCheck
                      << ", current Interval=" << m_timer->interval() << " [msec]";
 
   if (m_socket->state() == QAbstractSocket::SocketState::ConnectedState)
@@ -99,37 +98,37 @@ void CheckmkHandler::onTimeout()
 
 bool CheckmkHandler::doConnect()
 {
-  INFO_LOG() << Q_FUNC_INFO << " START, (int)m_socket->state()=" << (int)m_socket->state();
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " START, (int)m_socket->state()=" << (int)m_socket->state();
 
   
   m_socket->connectToHost(m_checkMkHost, m_checkMkPort);
   if (!m_socket->waitForConnected(5000))
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Could not (re)open tcp destination " << m_checkMkHost << ":" << m_checkMkPort << ", error: " << m_socket->errorString();
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Could not (re)open tcp destination " << m_checkMkHost << ":" << m_checkMkPort << ", error: " << m_socket->errorString();
     return false;
   }
-  INFO_LOG() << Q_FUNC_INFO << " (Re)openend tcp destination " << m_checkMkHost << ":" <<  m_checkMkPort;
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " (Re)openend tcp destination " << m_checkMkHost << ":" <<  m_checkMkPort;
 
-  INFO_LOG() << Q_FUNC_INFO << " END";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
 void CheckmkHandler::onImmediateGetStateRequested()
 {
-  INFO_LOG() << Q_FUNC_INFO << " START";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   
   m_highFrequencyCheck = 3;
   onTimeout();
 
-  INFO_LOG() << Q_FUNC_INFO << " END";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool CheckmkHandler::writeGetStateRequest()
 {
   if (!m_socket->isOpen())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " socket not open";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " socket not open";
     return false;
   }
 
@@ -160,16 +159,16 @@ bool CheckmkHandler::writeGetStateRequest()
   
   const char* cmdCheck = "GET hosts\nResponseHeader: fixed16\nColumns: name state last_check \nKeepAlive: on\n\n";
   int bWritten = m_socket->write(cmdCheck);
-  INFO_LOG() << Q_FUNC_INFO << " cmdCheck= '" << cmdCheck << "'";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " cmdCheck= '" << cmdCheck << "'";
 
 
-  INFO_LOG() << Q_FUNC_INFO << " bWritten= " << bWritten;
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " bWritten= " << bWritten;
   return true;
 }
 
 void CheckmkHandler::readData()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX";
 
   while (m_socket->canReadLine())
     processLine(m_socket->readLine().trimmed());
@@ -204,10 +203,10 @@ bool CheckmkHandler::processLine(const QByteArray &line)
   if (sl.size() < 2)
   {
     if (str.startsWith(QStringLiteral("200")))
-      DEBUG_LOG() << Q_FUNC_INFO << " size to small " << sl.size()
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " size to small " << sl.size()
                          << ", line='" << str << "'";
     else
-      WARNING_LOG() << Q_FUNC_INFO << " size to small " << sl.size()
+      WARNING_LOG(m_logger) << Q_FUNC_INFO << " size to small " << sl.size()
                             << ", line='" << str << "'";
     return false;
   }
@@ -238,7 +237,7 @@ bool CheckmkHandler::processLine(const QByteArray &line)
     lastCheck = lastCheckStr.toLongLong();
   }
 
-  DEBUG_LOG() << Q_FUNC_INFO
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO
                      << " name: '" << name << "'"
                      << ", stateInt: '" << stateInt << "'"
                      << ", reachable: '" << reachable << "'"
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler.h
index ba7eefd09..4130e6c4e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler.h
@@ -56,6 +56,7 @@ private Q_SLOTS:
 
 
 protected:
+  NGL::INGLLogger &m_logger;
   bool processLine(const QByteArray &line);
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler_schedule_check.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler_schedule_check.cpp
index d30501ad6..3d26b5e6b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler_schedule_check.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler_schedule_check.cpp
@@ -17,17 +17,17 @@ CheckmkHandlerScheduleCheck::CheckmkHandlerScheduleCheck(const std::shared_ptr<D
   , m_socket(new QTcpSocket(this))
   , m_ddsHandler(ddsHandler)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 CheckmkHandlerScheduleCheck::~CheckmkHandlerScheduleCheck()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (m_timer)
     m_timer->stop();
   delete m_socket;
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool CheckmkHandlerScheduleCheck::initialize(const QString &checkMkServerHostname, int checkMkServerPort)
@@ -36,7 +36,7 @@ bool CheckmkHandlerScheduleCheck::initialize(const QString &checkMkServerHostnam
                        << " , hostname=" << checkMkServerHostname
                        << " , port=" << checkMkServerPort;
 
-  DEBUG_LOG() << Q_FUNC_INFO << " ddsHandler referenced";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " ddsHandler referenced";
 
   m_checkMkHost  = checkMkServerHostname;
   m_checkMkPort  = checkMkServerPort;
@@ -55,22 +55,22 @@ bool CheckmkHandlerScheduleCheck::initialize(const QString &checkMkServerHostnam
   connect(m_socket, &QTcpSocket::connected,
           this, &CheckmkHandlerScheduleCheck::onConnected);
 
-  INFO_LOG() << Q_FUNC_INFO << " END";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
 void CheckmkHandlerScheduleCheck::run(int timoutMsec)
 {
-  INFO_LOG() << Q_FUNC_INFO << " START, timoutMsec=" << timoutMsec;
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " START, timoutMsec=" << timoutMsec;
   m_timer->start(timoutMsec);
-  INFO_LOG() << Q_FUNC_INFO << " END";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void CheckmkHandlerScheduleCheck::stop()
 {
-  INFO_LOG() << Q_FUNC_INFO << " START";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_timer->stop();
-  INFO_LOG() << Q_FUNC_INFO << " END";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void CheckmkHandlerScheduleCheck::onTimeout()
@@ -85,7 +85,7 @@ void CheckmkHandlerScheduleCheck::onTimeout()
 
 bool CheckmkHandlerScheduleCheck::doConnect()
 {
-  INFO_LOG() << Q_FUNC_INFO << " START, (int)m_socket->state()=" << (int)m_socket->state();
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " START, (int)m_socket->state()=" << (int)m_socket->state();
 
   
   
@@ -93,30 +93,30 @@ bool CheckmkHandlerScheduleCheck::doConnect()
   m_socket->connectToHost(m_checkMkHost, m_checkMkPort);
   if (!m_socket->waitForConnected(5000))
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Could not (re)open tcp destination " << m_checkMkHost << ":" << m_checkMkPort << ", error: " << m_socket->errorString();
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Could not (re)open tcp destination " << m_checkMkHost << ":" << m_checkMkPort << ", error: " << m_socket->errorString();
     return false;
   }
-  INFO_LOG() << Q_FUNC_INFO << " (Re)openend tcp destination " << m_checkMkHost << ":" <<  m_checkMkPort;
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " (Re)openend tcp destination " << m_checkMkHost << ":" <<  m_checkMkPort;
 
-  INFO_LOG() << Q_FUNC_INFO << " END";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
 void CheckmkHandlerScheduleCheck::addScheduleCheckHostnames(const QStringList &hostnames)
 {
-  INFO_LOG() << Q_FUNC_INFO << " hostnames: " << hostnames.join(QStringLiteral(";"));
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " hostnames: " << hostnames.join(QStringLiteral(";"));
   m_scheduleCheckHostnames += hostnames;
 }
 
 bool CheckmkHandlerScheduleCheck::writeScheduleUpdateRequest()
 {
-  DEBUG_LOG() << Q_FUNC_INFO
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO
                       << " state " << (int)m_socket->state()
                       << ", isOpen " << m_socket->isOpen();
 
   if (!m_socket->isOpen() || (m_socket->state() != QAbstractSocket::SocketState::ConnectedState))
   {
-    ERROR_LOG() << Q_FUNC_INFO << " socket not open or connected "
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " socket not open or connected "
                         << " host/port: " << m_checkMkHost << ":" <<  m_checkMkPort;
     return false;
   }
@@ -137,13 +137,13 @@ bool CheckmkHandlerScheduleCheck::writeScheduleUpdateRequest()
     qint64 now = QDateTime::currentSecsSinceEpoch();
     
     const QString cmd = QString(QStringLiteral("COMMAND [%1] SCHEDULE_FORCED_HOST_CHECK;%2;%3")).arg(now).arg(hostname.toUpper()).arg(now);
-    DEBUG_LOG() << Q_FUNC_INFO << " cmd= '" << cmd << "'";
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " cmd= '" << cmd << "'";
     int bWritten = m_socket->write(cmd.toUtf8()) + m_socket->write("\n\n");
-    DEBUG_LOG() << Q_FUNC_INFO << " bWritten= " << bWritten;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " bWritten= " << bWritten;
     bWrittenAll += bWritten;
   } 
 
-  INFO_LOG() << Q_FUNC_INFO << " bWrittenAll= " << bWrittenAll;
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " bWrittenAll= " << bWrittenAll;
 
   
   m_scheduleCheckHostnames.clear();
@@ -165,7 +165,7 @@ void CheckmkHandlerScheduleCheck::onConnected()
 
 void CheckmkHandlerScheduleCheck::onStateChanged(const QAbstractSocket::SocketState &newState)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " SocketState changed to: " << newState;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " SocketState changed to: " << newState;
   qInfo() << " CheckmkHandlerScheduleCheck:  SocketState changed to: " << newState;
 }
 
@@ -177,8 +177,8 @@ void CheckmkHandlerScheduleCheck::onSocketError(const QAbstractSocket::SocketErr
 
 void CheckmkHandlerScheduleCheck::onTriggerUpdateRequest(const rti::core::SampleIdentity &cookie, const TriggerUpdate &request)
 {
-  INFO_LOG() << Q_FUNC_INFO << " request=" << request;
-  DEBUG_LOG() << Q_FUNC_INFO << " m_socket->state=" << (int)m_socket->state();
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " request=" << request;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " m_socket->state=" << (int)m_socket->state();
 
 
 
@@ -230,7 +230,7 @@ void CheckmkHandlerScheduleCheck::onTriggerUpdateRequest(const rti::core::Sample
     }
   } else {
     
-    WARNING_LOG() << Q_FUNC_INFO << " socket not connected"
+    WARNING_LOG(m_logger) << Q_FUNC_INFO << " socket not connected"
                           << ", (int)m_socket->state()=" << (int)m_socket->state()
                           << ", destination " << m_checkMkHost << ":" << m_checkMkPort
                           << ",  -> queued cmd/request: " << request;
@@ -238,13 +238,13 @@ void CheckmkHandlerScheduleCheck::onTriggerUpdateRequest(const rti::core::Sample
     
   }
 
-  INFO_LOG() << Q_FUNC_INFO << " m_ddsHandler = " << m_ddsHandler;
-  INFO_LOG() << Q_FUNC_INFO << " m_ddsHandler->fts() = " << m_ddsHandler->fts();
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " m_ddsHandler = " << m_ddsHandler;
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " m_ddsHandler->fts() = " << m_ddsHandler->fts();
 
   if (m_ddsHandler && m_ddsHandler->fts())
     m_ddsHandler->fts()->triggerUpdateReply(cookie, ret);
   else
-    ERROR_LOG() << Q_FUNC_INFO << " no m_ddsHandler or m_ddsHandler->fts()";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no m_ddsHandler or m_ddsHandler->fts()";
 
 
   if (!connected)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler_schedule_check.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler_schedule_check.h
index c472141bc..b7a94c88e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler_schedule_check.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler_schedule_check.h
@@ -60,6 +60,7 @@ private:
 
 
 protected:
+  NGL::INGLLogger &m_logger;
   bool processLine(const QByteArray &line);
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/component_status_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/component_status_handler.cpp
index 9f2c75268..10da69fcf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/component_status_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/component_status_handler.cpp
@@ -12,35 +12,34 @@
 namespace ComponentMonitor
 {
 
-ComponentStatusHandler::ComponentStatusHandler()
-  : QObject()
-{
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+ComponentStatusHandler::ComponentStatusHandler() : QObject(),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 ComponentStatusHandler::~ComponentStatusHandler()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_ddsHandler = nullptr;
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool ComponentStatusHandler::initialize(const std::shared_ptr<DdsHandler> &ddsHandler)
 {
-  INFO_LOG() << Q_FUNC_INFO << " START initialize ComponentStatusHandler";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " START initialize ComponentStatusHandler";
 
   
   
 
   
   m_ddsHandler = ddsHandler;
-  DEBUG_LOG() << Q_FUNC_INFO << " ddsHandler referenced";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " ddsHandler referenced";
 
   m_ismDtc = m_ddsHandler->ismDtc();
   if (!m_ismDtc)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Failure: no ismDtc";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Failure: no ismDtc";
     return false;
   }
 
@@ -48,7 +47,7 @@ bool ComponentStatusHandler::initialize(const std::shared_ptr<DdsHandler> &ddsHa
   m_ismDtc->enableInstrumentationAsset();
   m_ismDtc->waitForHistoricalDataInstrumentationAsset(2000);
 
-  DEBUG_LOG() << Q_FUNC_INFO << " instrumentationAssets-size = " << m_ismDtc->instrumentationAssets().size();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " instrumentationAssets-size = " << m_ismDtc->instrumentationAssets().size();
 
   
   
@@ -65,8 +64,8 @@ bool ComponentStatusHandler::initialize(const std::shared_ptr<DdsHandler> &ddsHa
   QTimer::singleShot(35000, this, &ComponentStatusHandler::dump);
 
 
-  DEBUG_LOG() << Q_FUNC_INFO << "initialize succesful, statusMapSize=" << statusMapSize();
-  INFO_LOG() << Q_FUNC_INFO << " END initialize ComponentStatusHandler, statusMapSize=" << statusMapSize();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "initialize succesful, statusMapSize=" << statusMapSize();
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " END initialize ComponentStatusHandler, statusMapSize=" << statusMapSize();
   return true;
 }
 
@@ -95,7 +94,7 @@ void ComponentStatusHandler::onInstrumentationAssetChanged(const InfrastructureM
   static int assetChangedCounter = 0;
 
   const int iAssetId = iAsset.id();
-  DEBUG_LOG() << Q_FUNC_INFO
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO
                       << ", iAssetId=" << iAssetId
                       << " (assetChangedCounter=" << ++assetChangedCounter << ")";
 
@@ -139,62 +138,62 @@ void ComponentStatusHandler::onInstrumentationAssetChanged(const InfrastructureM
 
 void ComponentStatusHandler::dump()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " +++++++++++++++++++++++++++++++++++++++++++++";
-  DEBUG_LOG() << Q_FUNC_INFO << " +++++++++++++++++++++++++++++++++++++++++++++";
-  DEBUG_LOG() << Q_FUNC_INFO << " DUMP START";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " +++++++++++++++++++++++++++++++++++++++++++++";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " +++++++++++++++++++++++++++++++++++++++++++++";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " DUMP START";
 
   int counter = 0;
 
   
   counter = 0;
-  DEBUG_LOG() << " +++++++++++++++++++++++++++++++++++++++++++++";
-  DEBUG_LOG() << " REACHABLE:";
+  DEBUG_LOG(m_logger) << " +++++++++++++++++++++++++++++++++++++++++++++";
+  DEBUG_LOG(m_logger) << " REACHABLE:";
   for (const ComponentStatus &status : std::as_const(m_statusMap))
   {
     if (status.state().underlying() == ComponentState_def::Reachable)
     {
-      DEBUG_LOG() << " id=" << status.id() << ", host '" << status.hostname().c_str() << " -> Reachable";
+      DEBUG_LOG(m_logger) << " id=" << status.id() << ", host '" << status.hostname().c_str() << " -> Reachable";
       ++counter;
     }
   } 
-  DEBUG_LOG() << " REACHABLE hostCounter = " << counter;
+  DEBUG_LOG(m_logger) << " REACHABLE hostCounter = " << counter;
 
   
   counter = 0;
-  DEBUG_LOG() << " +++++++++++++++++++++++++++++++++++++++++++++";
-  DEBUG_LOG() << " UNREACHABLE:";
+  DEBUG_LOG(m_logger) << " +++++++++++++++++++++++++++++++++++++++++++++";
+  DEBUG_LOG(m_logger) << " UNREACHABLE:";
   for (const ComponentStatus &status : std::as_const(m_statusMap))
   {
     if (status.state().underlying() == ComponentState_def::Unreachable)
     {
-      DEBUG_LOG() << " id=" << status.id() << ", host '" << status.hostname().c_str() << " -> Unreachable";
+      DEBUG_LOG(m_logger) << " id=" << status.id() << ", host '" << status.hostname().c_str() << " -> Unreachable";
       ++counter;
     }
   } 
-  DEBUG_LOG() << " UNREACHABLE hostCounter = " << counter;
+  DEBUG_LOG(m_logger) << " UNREACHABLE hostCounter = " << counter;
 
   
   counter = 0;
-  DEBUG_LOG() << " +++++++++++++++++++++++++++++++++++++++++++++";
-  DEBUG_LOG() << " UNDEFINED:";
+  DEBUG_LOG(m_logger) << " +++++++++++++++++++++++++++++++++++++++++++++";
+  DEBUG_LOG(m_logger) << " UNDEFINED:";
   for (const ComponentStatus &status : std::as_const(m_statusMap))
   {
     if (status.state().underlying() == ComponentState_def::Undefined)
     {
-      DEBUG_LOG() << " id=" << status.id() << ", host '" << status.hostname().c_str() << " -> Undefined";
+      DEBUG_LOG(m_logger) << " id=" << status.id() << ", host '" << status.hostname().c_str() << " -> Undefined";
       ++counter;
     }
   } 
-  DEBUG_LOG() << " UNDEFINED hostCounter = " << counter;
+  DEBUG_LOG(m_logger) << " UNDEFINED hostCounter = " << counter;
 
-  DEBUG_LOG() << Q_FUNC_INFO << " DUMP END";
-  DEBUG_LOG() << Q_FUNC_INFO << " +++++++++++++++++++++++++++++++++++++++++++++";
-  DEBUG_LOG() << Q_FUNC_INFO << " +++++++++++++++++++++++++++++++++++++++++++++";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " DUMP END";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " +++++++++++++++++++++++++++++++++++++++++++++";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " +++++++++++++++++++++++++++++++++++++++++++++";
 }
 
 void ComponentStatusHandler::onNewState(const QString &hostname, bool reachable, long long lastCheckSec)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " hostname=" << hostname
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " hostname=" << hostname
                       << ", reachable=" << reachable
                       << ", lastCheckSec=" << lastCheckSec;
 
@@ -219,7 +218,7 @@ void ComponentStatusHandler::onNewState(const QString &hostname, bool reachable,
 
 void ComponentStatusHandler::onUpdateLastCheckTimeDirect(const QStringList &hostnamesForUpdateLastCheckTime, qint64 lastCheckSec)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START hostnamesForLastCheckTime=" << hostnamesForUpdateLastCheckTime.join(QStringLiteral(";"));
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START hostnamesForLastCheckTime=" << hostnamesForUpdateLastCheckTime.join(QStringLiteral(";"));
 
   for (ITERATOR_T it = m_statusMap.begin(); it != m_statusMap.end(); ++it)
   {
@@ -236,12 +235,12 @@ void ComponentStatusHandler::onUpdateLastCheckTimeDirect(const QStringList &host
     if ((curState == ComponentState_def::Reachable) ||
         (curState == ComponentState_def::Unreachable))
     {
-      DEBUG_LOG() << Q_FUNC_INFO << " updateLastCheckTimeDirect"
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " updateLastCheckTimeDirect"
                           << " host: '" << curHostname << "'"
                           << " newLastCheck= " << lastCheckSec;
-      INFO_LOG() << Q_FUNC_INFO << " DIFF_2a (*it) " << (*it);
+      INFO_LOG(m_logger) << Q_FUNC_INFO << " DIFF_2a (*it) " << (*it);
       cs.last_check(lastCheckSec);
-      INFO_LOG() << Q_FUNC_INFO << " DIFF_2b (*it) " << (*it);
+      INFO_LOG(m_logger) << Q_FUNC_INFO << " DIFF_2b (*it) " << (*it);
       m_ddsHandler->dts()->publish(cs);
     }
   } 
@@ -250,7 +249,7 @@ void ComponentStatusHandler::onUpdateLastCheckTimeDirect(const QStringList &host
 bool ComponentStatusHandler::addUpdateInstrumentationAsset(ComponentStatusHandler::ITERATOR_T it,
                                                            const ComponentStatus &cs)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START add/Update: cs=" << cs
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START add/Update: cs=" << cs
                       << ", curSize=" << m_statusMap.size() << ")";
   const int id = cs.id();
 
@@ -260,8 +259,8 @@ bool ComponentStatusHandler::addUpdateInstrumentationAsset(ComponentStatusHandle
     
     if ((*it) != cs)
     {
-      INFO_LOG() << Q_FUNC_INFO << " DIFF (*it) " << (*it);
-      INFO_LOG() << Q_FUNC_INFO << " DIFF cs    " << cs;
+      INFO_LOG(m_logger) << Q_FUNC_INFO << " DIFF (*it) " << (*it);
+      INFO_LOG(m_logger) << Q_FUNC_INFO << " DIFF cs    " << cs;
 
       (*it) = cs; 
       m_ddsHandler->dts()->publish(cs);
@@ -274,7 +273,7 @@ bool ComponentStatusHandler::addUpdateInstrumentationAsset(ComponentStatusHandle
     m_statusMap.insert(id, cs);
     m_ddsHandler->dts()->publish(cs);
   }
-  DEBUG_LOG() << Q_FUNC_INFO << " END add/Update: cs=" << cs
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END add/Update: cs=" << cs
                       << ", curSize=" << m_statusMap.size() << ")";
   return true;
 }
@@ -282,7 +281,7 @@ bool ComponentStatusHandler::addUpdateInstrumentationAsset(ComponentStatusHandle
 bool ComponentStatusHandler::removeInstrumentationAsset(ComponentStatusHandler::ITERATOR_T it)
 {
   const int id = it.value().id();
-  DEBUG_LOG() << Q_FUNC_INFO << " remove: id=" << id;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " remove: id=" << id;
   m_statusMap.remove(id);
   m_ddsHandler->dts()->removeComponentStatusByKey(id);
   return true;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/component_status_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/component_status_handler.h
index 6d4750348..ed45692ae 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/component_status_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/component_status_handler.h
@@ -49,6 +49,7 @@ private Q_SLOTS:
   void dump();
 
 protected:
+  NGL::INGLLogger &m_logger;
   bool addUpdateInstrumentationAsset(ITERATOR_T it, const ComponentStatus &cs);
   bool removeInstrumentationAsset(ITERATOR_T it);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/dds_handler.cpp
index b997c01db..22f718746 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/dds_handler.cpp
@@ -17,7 +17,7 @@ namespace ComponentMonitor
 DdsHandler::DdsHandler(int domainId, int exerciseId)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Global, exerciseId))
 {
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 DdsHandler::~DdsHandler()
@@ -27,7 +27,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -45,10 +45,10 @@ bool DdsHandler::init(const QStringList &qosFileList)
   m_ddsFts = ComponentMonitor::Interface::Fts::create(m_ddsConnector);
 
   bool bRet = m_ddsDts->enableAll();
-  INFO_LOG() << "Dts initialised";
+  INFO_LOG(m_logger) << "Dts initialised";
 
   bRet &= m_ddsFts->enableAll();
-  INFO_LOG() << "Fts initialised";
+  INFO_LOG(m_logger) << "Fts initialised";
 
   m_ismDtc = InfrastructureManagement::Interface::Dtc::create(m_ddsConnector);
 
@@ -60,9 +60,9 @@ bool DdsHandler::init(const QStringList &qosFileList)
 
 void DdsHandler::enableDtcs()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START Enable DTCs(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START Enable DTCs(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
   m_ismDtc->enableInstrumentationAsset();
-  DEBUG_LOG() << Q_FUNC_INFO << " END Enable DTCs(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END Enable DTCs(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 std::shared_ptr<InfrastructureManagement::Interface::Dtc> DdsHandler::ismDtc() const
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/dds_handler.h
index ee33ee180..89cea33db 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/dds_handler.h
@@ -53,6 +53,7 @@ public:
   std::shared_ptr<InfrastructureManagement::Interface::Dtc> ismDtc() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<DTS::CurrentRunningState>   m_dtsCurrentRunningState;
   std::shared_ptr<Core::Pacemaker>            m_pacemaker;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/initialization.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/initialization.cpp
index 5c401897a..c847041a7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/initialization.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/initialization.cpp
@@ -14,29 +14,29 @@ namespace ComponentMonitor
 Initialization::Initialization()
   : m_logger(getLogger("Initialization"))
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 Initialization::~Initialization()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_checkmkHandler = nullptr;
   m_componentStatusHandler = nullptr;
   m_ddsHandler = nullptr;
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool Initialization::initialize(const std::shared_ptr<DdsHandler> &ddsHandler)
 {
-  INFO_LOG() << Q_FUNC_INFO << " START";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   
   
 
   
   m_ddsHandler = ddsHandler;
-  DEBUG_LOG() << Q_FUNC_INFO << "ddsHandler referenced";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "ddsHandler referenced";
 
   
   
@@ -73,10 +73,10 @@ bool Initialization::initialize(const std::shared_ptr<DdsHandler> &ddsHandler)
   
   if (!m_checkmkHandler->initialize(host, port, intervalSec))
   {
-    ERROR_LOG() << Q_FUNC_INFO << " CheckmkHandler::initialize failed";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " CheckmkHandler::initialize failed";
     return false;
   }
-  INFO_LOG() << Q_FUNC_INFO << " CheckmkHandler:initialize succesful";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " CheckmkHandler:initialize succesful";
 
   QObject::connect(m_checkmkHandler.get(), &CheckmkHandler::newState,
                    m_componentStatusHandler.get(), &ComponentStatusHandler::onNewState, Qt::UniqueConnection);
@@ -88,10 +88,10 @@ bool Initialization::initialize(const std::shared_ptr<DdsHandler> &ddsHandler)
   m_checkmkHandlerScheduleCheck = std::make_shared<CheckmkHandlerScheduleCheck>(m_ddsHandler);
   if (!m_checkmkHandlerScheduleCheck->initialize(host, port))
   {
-    ERROR_LOG() << Q_FUNC_INFO << " CheckmkHandlerScheduleCheck::initialize failed";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " CheckmkHandlerScheduleCheck::initialize failed";
     return false;
   }
-  INFO_LOG() << Q_FUNC_INFO << " CheckmkHandlerScheduleCheck:initialize succesful";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " CheckmkHandlerScheduleCheck:initialize succesful";
 
 
 #ifdef LTS_DEBUG
@@ -110,21 +110,21 @@ bool Initialization::initialize(const std::shared_ptr<DdsHandler> &ddsHandler)
 #endif 
 
 
-  INFO_LOG() << Q_FUNC_INFO << " END";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
 bool Initialization::delayedInit()
 {
-  INFO_LOG() << Q_FUNC_INFO << " START";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " START";
   bool success = true;
   if (!m_componentStatusHandler->initialize(m_ddsHandler))
   {
-    ERROR_LOG() << Q_FUNC_INFO << " initialize failed for ComponentStatusHandler";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " initialize failed for ComponentStatusHandler";
     success = false;
   }
 
-  INFO_LOG() << Q_FUNC_INFO << " ComponentStatusHandler, statusMapSize=" << m_componentStatusHandler->getHostnames().size();
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " ComponentStatusHandler, statusMapSize=" << m_componentStatusHandler->getHostnames().size();
 
   m_checkmkHandler->run();
 
@@ -144,7 +144,7 @@ bool Initialization::delayedInit()
   
 
 
-  INFO_LOG() << Q_FUNC_INFO << " END";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " END";
   return success;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/initialization.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/initialization.h
index 6f7c7ca32..9c813e6e8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/initialization.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/initialization.h
@@ -38,6 +38,7 @@ public:
 
 protected:
 
+  NGL::INGLLogger &m_logger;
 private:
   std::shared_ptr<DdsHandler>                                 m_ddsHandler;
   std::shared_ptr<ComponentStatusHandler>                     m_componentStatusHandler;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/main_handler.cpp
index 6230637aa..bde0efe57 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/main_handler.cpp
@@ -11,19 +11,18 @@
 namespace ComponentMonitor
 {
 
-MainHandler::MainHandler(QObject *parent)
-  : QObject(parent)
-{
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+MainHandler::MainHandler(QObject *parent) : QObject(parent),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 MainHandler::~MainHandler()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_cmoService = nullptr;
   m_ddsHandler = nullptr;
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool MainHandler::init(int domainId)
@@ -33,11 +32,11 @@ bool MainHandler::init(int domainId)
   m_ddsHandler = std::make_shared<DdsHandler>(domainId, excerciseId);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation ddsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
   }
-  DEBUG_LOG() << "Initialisation ddsHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation ddsHandler succesful.";
 
   
   
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/main_handler.h
index 171edd5bf..97d425fd5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/main_handler.h
@@ -25,6 +25,7 @@ public:
   std::shared_ptr<DdsHandler> dds() const { return m_ddsHandler; }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>                       m_ddsHandler;
   std::shared_ptr<ComponentMonitor::Initialization> m_cmoService;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/dds_handler.cpp
index f7843b674..93e5d0149 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/dds_handler.cpp
@@ -10,18 +10,18 @@ namespace DifferentialGPS
 DdsHandler::DdsHandler(int domainId)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Global))
 {
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 } 
 
 
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
-  INFO_LOG() << "--- Start DifferentialGPS DDSHandler.";
+  INFO_LOG(m_logger) << "--- Start DifferentialGPS DDSHandler.";
 
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/dds_handler.h
index a6f8824d0..ea6af8335 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/dds_handler.h
@@ -30,6 +30,7 @@ public:
   }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<Core::Pacemaker>            m_pacemaker;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/mainthread.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/mainthread.cpp
index e5fb1c767..1837d7df0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/mainthread.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/mainthread.cpp
@@ -59,7 +59,7 @@ bool MainThread::init(int domainId)
   m_ddsHandler.reset(new DdsHandler(domainId));
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation DdsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/mainthread.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/mainthread.h
index 6c1cdbae5..050c27846 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/mainthread.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/mainthread.h
@@ -30,6 +30,7 @@ public:
 Q_SIGNALS:
   void newDataAvailable();
 protected:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler> m_ddsHandler;
   QByteArray m_dgpsData;
   QTimer *m_dgpsTimer;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/tcpsocket.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/tcpsocket.cpp
index f172e7b65..67c1ebb9c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/tcpsocket.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/tcpsocket.cpp
@@ -33,7 +33,7 @@ void TcpSocket::startThreadInternal(const QString &hostName, quint16 port)
 
 void TcpSocket::run()
 {
-  DEBUG_LOG() << "Starting thread";
+  DEBUG_LOG(m_logger) << "Starting thread";
   m_reconnectTimer = new QTimer(this);
   doConnect();
   exec();
@@ -54,14 +54,14 @@ void TcpSocket::doConnect()
   connect(m_socket, &QTcpSocket::readyRead,
           this, &TcpSocket::onReadyRead);
 
-  INFO_LOG() << "Connecting to tcp server at "
+  INFO_LOG(m_logger) << "Connecting to tcp server at "
                      << m_hostName << ":" << m_hostPort;
   m_socket->connectToHost(m_hostName, m_hostPort);
 }
 
 void TcpSocket::onConnected()
 {
-  INFO_LOG() << "Connected to "
+  INFO_LOG(m_logger) << "Connected to "
                      << m_socket->peerAddress().toString()
                      << ":" << m_socket->peerPort();
   m_waitTime = 1;
@@ -69,13 +69,13 @@ void TcpSocket::onConnected()
 
 void TcpSocket::onDisconnected()
 {
-  INFO_LOG() << "Disconnected from " << m_socket->peerAddress().toString()
+  INFO_LOG(m_logger) << "Disconnected from " << m_socket->peerAddress().toString()
                      << ":" << m_socket->peerPort();
 }
 
 void TcpSocket::onError(QAbstractSocket::SocketError err)
 {
-  ERROR_LOG() << "Socket error: " << err
+  ERROR_LOG(m_logger) << "Socket error: " << err
                       << " " << m_socket->errorString()
                       << ":" << m_socket->peerPort()
                       << " - trying to reconnect in " << m_waitTime << " seconds";
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/tcpsocket.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/tcpsocket.h
index c8804e18f..4bc59689b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/tcpsocket.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/tcpsocket.h
@@ -19,6 +19,7 @@ public:
   ~TcpSocket();
 
 protected:
+  NGL::INGLLogger &m_logger;
   void startThreadInternal(const QString &hostName, quint16 port);
 
   void run() override;
@@ -33,6 +34,7 @@ protected Q_SLOTS:
   virtual void onError(QAbstractSocket::SocketError);
   virtual void onReadyRead() = 0;
 protected:
+  NGL::INGLLogger &m_logger;
   QString m_hostName;
   quint16 m_hostPort;
   QTcpSocket *m_socket;
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 17e4528d6..4cce81f48 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/feedGeoJson.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/feedGeoJson.cpp
@@ -17,11 +17,10 @@
 namespace FeedGeoJson
 {
 
-FeedGeoJson::FeedGeoJson(QObject *parent)
-  : QObject(parent)
+FeedGeoJson::FeedGeoJson(QObject *parent) : QObject(parent)
   , m_bTestsSuccessful(true)
-  , m_refPos(LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UMD8000090000")))
-{}
+  , m_refPos(LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UMD8000090000"))),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 FeedGeoJson::~FeedGeoJson()
 {}
@@ -30,7 +29,7 @@ bool FeedGeoJson::init(const int domainId, const int exerciseId,  WebSocketServe
 {
   m_websocketServer = &webSocketServer;
   bool bRet = true;
-  INFO_LOG() << "init begin";
+  INFO_LOG(m_logger) << "init begin";
 
   m_ddsConnector42 = std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise, exerciseId);
   m_ddsConnector42->init();
@@ -104,15 +103,15 @@ return message;
 void FeedGeoJson::onParticipantPositionChanged(const ParticipantManagement::ParticipantPosition &data, DataModification modType)
 {
   NOTICE_LOG(m_logger) << "onParticipantPositionChanged: " << data;
-  DEBUG_LOG() << "onParticipantPositionChanged: " << data;
+  DEBUG_LOG(m_logger) << "onParticipantPositionChanged: " << data;
   if (modType == DataModification::eRemoved)
   {
-    DEBUG_LOG() << "m_participantsOutsideMap.remove participantId: " << data.participantId();
+    DEBUG_LOG(m_logger) << "m_participantsOutsideMap.remove participantId: " << data.participantId();
     
   }
   else
   {
-    DEBUG_LOG() << "Handle ParticipantPosition";
+    DEBUG_LOG(m_logger) << "Handle ParticipantPosition";
     QString posGeoJson = getGeoJsonPosition(data);
     m_websocketServer->sendMessage(posGeoJson);
   }
@@ -120,7 +119,7 @@ void FeedGeoJson::onParticipantPositionChanged(const ParticipantManagement::Part
 
 void FeedGeoJson::onDynamicParticipantDataChanged(const ParticipantManagement::DynamicParticipantData &data, DataModification modType)
 {
-  DEBUG_LOG() << "onDynamicParticipantDataChanged";
+  DEBUG_LOG(m_logger) << "onDynamicParticipantDataChanged";
   if (modType == DataModification::eRemoved)
     return;
 
@@ -129,14 +128,14 @@ void FeedGeoJson::onDynamicParticipantDataChanged(const ParticipantManagement::D
 
 void FeedGeoJson::failExit()
 {
-  DEBUG_LOG() << "FailExit";
+  DEBUG_LOG(m_logger) << "FailExit";
   m_bTestsSuccessful = false;
   QTimer::singleShot(50, qApp, QCoreApplication::quit);
 }
 
 void FeedGeoJson::ExitSuccess()
 {
-  DEBUG_LOG() << "ExitSuccess";
+  DEBUG_LOG(m_logger) << "ExitSuccess";
   m_bTestsSuccessful = true;
   QTimer::singleShot(200, qApp, &QCoreApplication::quit);
 }
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 656ccb9bc..30d88d258 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/feedGeoJson.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/FeedGeoJson/feedGeoJson.h
@@ -46,6 +46,7 @@ protected Q_SLOTS:
 
 protected:
 
+  NGL::INGLLogger &m_logger;
 private: 
   QString getGeoJsonPosition(const ParticipantManagement::ParticipantPosition &data);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/abstract_socket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/abstract_socket_handler.cpp
index 8c6567d47..d1b8e03b2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/abstract_socket_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/abstract_socket_handler.cpp
@@ -41,16 +41,16 @@ void AbstractSocketHandler::textMessageReceived(const QByteArray &msg)
 {
   if (msg.isEmpty())
   {
-    ERROR_LOG() << "Empty message received";
+    ERROR_LOG(m_logger) << "Empty message received";
     return;
   }
   const QJsonObject obj = QJsonDocument::fromJson(msg).object();
-  DEBUG_LOG() << "incoming telegram: " << msg;
+  DEBUG_LOG(m_logger) << "incoming telegram: " << msg;
 
   const QJsonValue type = obj.value(QStringLiteral("type"));
   if (!type.isString())
   {
-    ERROR_LOG() << "Can not read type id: " << msg;
+    ERROR_LOG(m_logger) << "Can not read type id: " << msg;
     return;
   }
   const QString typeStr = type.toString();
@@ -66,11 +66,11 @@ void AbstractSocketHandler::textMessageReceived(const QByteArray &msg)
     else if (typeStr.compare(Constraints<NasatSimulationStatus>::type(), Qt::CaseInsensitive) == 0)
       emit simulationStatusReceived(NasatSimulationStatus::fromJson(data));
     else
-      ERROR_LOG() << "Got unknown json telegram: " << msg;
+      ERROR_LOG(m_logger) << "Got unknown json telegram: " << msg;
   }
   catch (const JsonException &ex)
   {
-    ERROR_LOG() << "Could not parse json telegram: " << msg
+    ERROR_LOG(m_logger) << "Could not parse json telegram: " << msg
                         << ", error: " << ex.what();
   }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/abstract_socket_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/abstract_socket_handler.h
index 083e66960..a0b7ec53f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/abstract_socket_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/abstract_socket_handler.h
@@ -30,11 +30,13 @@ Q_SIGNALS:
   void simulationStatusReceived(const NasatSimulationStatus &data);
 
 protected:
+  NGL::INGLLogger &m_logger;
   void textMessageReceived(const QByteArray &msg);
   bool sendTelegram(const NasatBase *tele);
   virtual bool sendTelegramInternal(const QByteArray &tele) = 0;
 
 protected:
+  NGL::INGLLogger &m_logger;
 };
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/dds_handler.cpp
index ae5b14fff..bdec746eb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/dds_handler.cpp
@@ -26,22 +26,22 @@ Participant2Dds::Participant2Dds(const dds::domain::DomainParticipant &domainPar
   
 
   
-  DEBUG_LOG() << Q_FUNC_INFO << " create FTC..." << " exerciseId=" << exerciseId;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " create FTC..." << " exerciseId=" << exerciseId;
 
   m_aesFtc = AreaEffectSimulation::Interface::Ftc::create(m_ddsConnector);
   if (!m_aesFtc->enableAirSupportImpactModify())
   {
-    ERROR_LOG() << "Could not enable AES AirSupportImpactModify FTC for"
+    ERROR_LOG(m_logger) << "Could not enable AES AirSupportImpactModify FTC for"
                         << " exerciseId=" << exerciseId;
     m_aesFtc = nullptr;
   }
   if (!m_aesFtc->enableExplosionClusterModify())
   {
-    ERROR_LOG() << "Could not enable AES enableExplosionClusterModify FTC for"
+    ERROR_LOG(m_logger) << "Could not enable AES enableExplosionClusterModify FTC for"
                         << " exerciseId=" << exerciseId;
     m_aesFtc = nullptr;
   }
-  DEBUG_LOG() << Q_FUNC_INFO << " create FTC..." << " exerciseId=" << exerciseId << " Done: " << m_aesFtc.get();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " create FTC..." << " exerciseId=" << exerciseId << " Done: " << m_aesFtc.get();
 }
 
 bool Participant2Dds::publish(const TrainingAreaBase::EquipmentPosition &pos)
@@ -51,7 +51,7 @@ bool Participant2Dds::publish(const TrainingAreaBase::EquipmentPosition &pos)
     m_tabDts = TrainingAreaBase::Interface::Dts::create(m_ddsConnector);
     if (!m_tabDts->enableEquipmentPosition())
     {
-      ERROR_LOG() << "Could not enable TAB equipment position DTS for "
+      ERROR_LOG(m_logger) << "Could not enable TAB equipment position DTS for "
                           << m_ddsConnector->getDefaultPartition();
       m_tabDts = nullptr;
       return false;
@@ -80,7 +80,7 @@ bool Participant2Dds::publish(const GuezNasat::Nasat9Liner &nl)
     m_gnaDts = GuezNasat::Interface::Dts::create(m_ddsConnector);
     if (!m_gnaDts->enableNasat9Liner())
     {
-      ERROR_LOG() << "Could not enable GNA Nasat9Liner DTS for "
+      ERROR_LOG(m_logger) << "Could not enable GNA Nasat9Liner DTS for "
                           << m_ddsConnector->getDefaultPartition();
       m_gnaDts = nullptr;
       return false;
@@ -92,13 +92,13 @@ bool Participant2Dds::publish(const GuezNasat::Nasat9Liner &nl)
 
 void Participant2Dds::addParticipantToWatch(int participantId)
 {
-  DEBUG_LOG() << "addParticipantToWatch: " << participantId;
+  DEBUG_LOG(m_logger) << "addParticipantToWatch: " << participantId;
   m_participantsToWatch += participantId;
 }
 
 void Participant2Dds::removeParticipantToWatch(int participantId)
 {
-  DEBUG_LOG() << "removeParticipantToWatch: " << participantId;
+  DEBUG_LOG(m_logger) << "removeParticipantToWatch: " << participantId;
   m_participantsToWatch -= participantId;
 }
 
@@ -120,7 +120,7 @@ void Participant2Dds::onParticipantChanged(const ParticipantManagement::Particip
 {
   if (modType == DataModification::eRemoved)
     return;
-  DEBUG_LOG() << "onParticipantChanged: " << data.id()
+  DEBUG_LOG(m_logger) << "onParticipantChanged: " << data.id()
                       << ", " << m_participantsToWatch.contains(data.id())
                       << ", " << m_participantsToWatch.size()
                       << ", " << m_participantsToWatch.contains(data.id())
@@ -138,16 +138,16 @@ void Participant2Dds::onParticipantChanged(const ParticipantManagement::Particip
 DdsHandler::DdsHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(ddsConnector->getDomainParticipant(), IDL::PartitionType::AllExercises))
 {
-  DEBUG_LOG() << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
-  INFO_LOG() << "--- Start GuezNasat DDSHandler.";
+  INFO_LOG(m_logger) << "--- Start GuezNasat DDSHandler.";
 
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -158,22 +158,22 @@ bool DdsHandler::init(const QStringList &qosFileList)
   m_ddsDts = GuezNasat::Interface::Dts::create(m_ddsConnector);
   bool bRet = m_ddsDts->enableNasatAircraft() &&
       m_ddsDts->enableNasatAircraftParticipant();
-  INFO_LOG() << "Dts initialised: " << bRet;
+  INFO_LOG(m_logger) << "Dts initialised: " << bRet;
 
   
   m_ddsFts = GuezNasat::Interface::Fts::create(m_ddsConnector);
   bRet &= m_ddsFts->enableAll();
-  INFO_LOG() << "Fts initialised: " << bRet;
+  INFO_LOG(m_logger) << "Fts initialised: " << bRet;
 
   
   m_exmDtc = ExerciseManagement::Interface::Dtc::create(m_ddsConnector);
   bRet &= m_exmDtc->enableExercise();
-  INFO_LOG() << "EXM Dtc initialised: " << bRet;
+  INFO_LOG(m_logger) << "EXM Dtc initialised: " << bRet;
 
   
   m_pdmDtc = ProjectDataManagement::Interface::Dtc::create(m_ddsConnector);
   bRet &= m_pdmDtc->enableChargeType();
-  INFO_LOG() << "PDM Dtc initialised: " << bRet;
+  INFO_LOG(m_logger) << "PDM Dtc initialised: " << bRet;
 
   return bRet;
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/dds_handler.h
index 012767fba..ecab7f0a0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/dds_handler.h
@@ -38,6 +38,7 @@ public:
 Q_SIGNALS:
   void participantRemoved(int exerciseId, int participantId);
 private:
+NGL::INGLLogger &m_logger;
   void onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType);
 private:
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft.cpp
index 55bd70ae1..27ba08e8b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft.cpp
@@ -84,16 +84,16 @@ void HandlerNasatAircraft::flaFluSimulationChanged(int nasatId, bool bSimulation
     m_dts->publish(na);
     return;
   }
-  WARNING_LOG() << "Got a flaFluSimulationChanged information but aircraft with id " << nasatId << " is not available";
+  WARNING_LOG(m_logger) << "Got a flaFluSimulationChanged information but aircraft with id " << nasatId << " is not available";
 }
 
 void HandlerNasatAircraft::onModifyNasatAircraftRequest(const rti::core::SampleIdentity &cookie,
                                                         const NasatAircraft &request)
 {
-  DEBUG_LOG() << "onModifyNasatAircraftRequest: " << request;
+  DEBUG_LOG(m_logger) << "onModifyNasatAircraftRequest: " << request;
   auto ret = request.id() > 0 ? modifyNasatAircraftRequest(request) : createNasatAircraftRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_fts->modifyNasatAircraftReply(cookie, ret);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft.h
index 643f7c58e..05db4d45d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft.h
@@ -34,6 +34,7 @@ Q_SIGNALS:
   void activateNasatAircraftSimulation(int nasatId, bool bActivateSimulation);
   void nasatIdChanged(int oldNasatId, int newNasatId);
 protected:
+  NGL::INGLLogger &m_logger;
   void onModifyNasatAircraftRequest(const rti::core::SampleIdentity &cookie,
                                     const NasatAircraft &request) override;
   Core::FunctionReplyObject createNasatAircraftRequest(const NasatAircraft &request);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft_participant.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft_participant.cpp
index e2a052cfe..e8b34c88d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft_participant.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft_participant.cpp
@@ -40,26 +40,26 @@ HandlerNasatAircraftParticipant::HandlerNasatAircraftParticipant(Initialization
   , m_fts(mainHandler->dds()->fts())
   , m_db(mainHandler->db())
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START";
-  DEBUG_LOG() << Q_FUNC_INFO << " END";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 HandlerNasatAircraftParticipant::~HandlerNasatAircraftParticipant()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
   for (const auto &data : std::as_const(m_nasatAircraftParticipants))
     m_dts->removeNasatAircraftByKey(data.id());
-  DEBUG_LOG() << Q_FUNC_INFO << " END";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool HandlerNasatAircraftParticipant::init()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   auto cb = [this](const Database::NasatAircraftParticipant & data)
   {
     const auto dds(fromDb(data));
-    DEBUG_LOG() << "m_nasatAircraftParticipants.insert(" << dds.id() << ")";
+    DEBUG_LOG(m_logger) << "m_nasatAircraftParticipants.insert(" << dds.id() << ")";
     m_nasatAircraftParticipants.insert(dds.id(), dds);
     m_dts->publish(dds);
     m_mainHandler->handlerParticipant()->onNasatAircraftParticipantCreated(dds);
@@ -85,16 +85,16 @@ bool HandlerNasatAircraftParticipant::init()
     dumpExercises();
   });
 
-  DEBUG_LOG() << "HandlerNasatAircraftParticipant init done";
+  DEBUG_LOG(m_logger) << "HandlerNasatAircraftParticipant init done";
 
-  DEBUG_LOG() << Q_FUNC_INFO << " START";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
   return true;
 }
 
 void HandlerNasatAircraftParticipant::dumpNasatAircraftParticipants()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START, size=" << m_nasatAircraftParticipants.size();
-  DEBUG_LOG() << Q_FUNC_INFO << " --------------------------------------";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, size=" << m_nasatAircraftParticipants.size();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " --------------------------------------";
 
   auto it = m_nasatAircraftParticipants.begin();
   while (it != m_nasatAircraftParticipants.end())
@@ -102,17 +102,17 @@ void HandlerNasatAircraftParticipant::dumpNasatAircraftParticipants()
     const auto &id = it.key();
     const auto &nap = it.value();
 
-    DEBUG_LOG() << Q_FUNC_INFO << " id=" << id << " - nap=" << nap;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id=" << id << " - nap=" << nap;
     ++it;
   }
-  DEBUG_LOG() << Q_FUNC_INFO << " --------------------------------------";
-  DEBUG_LOG() << Q_FUNC_INFO << " END, size=" << m_nasatAircraftParticipants.size();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " --------------------------------------";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END, size=" << m_nasatAircraftParticipants.size();
 }
 
 void HandlerNasatAircraftParticipant::dumpExercises()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START, size=" << m_exercises.size();
-  DEBUG_LOG() << Q_FUNC_INFO << " --------------------------------------";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, size=" << m_exercises.size();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " --------------------------------------";
 
   auto it = m_exercises.begin();
   while (it != m_exercises.end())
@@ -120,11 +120,11 @@ void HandlerNasatAircraftParticipant::dumpExercises()
     const auto &id = it.key();
     const auto &nasatAircraftParticipant = it.value();
 
-    DEBUG_LOG() << Q_FUNC_INFO << " id=" << id << " - nasatAircraftParticipant=" << nasatAircraftParticipant;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id=" << id << " - nasatAircraftParticipant=" << nasatAircraftParticipant;
     ++it;
   }
-  DEBUG_LOG() << Q_FUNC_INFO << " --------------------------------------";
-  DEBUG_LOG() << Q_FUNC_INFO << " END, size=" << m_exercises.size();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " --------------------------------------";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END, size=" << m_exercises.size();
 }
 
 void HandlerNasatAircraftParticipant::aircraftRemoved(int nasatAircraftId)
@@ -145,7 +145,7 @@ void HandlerNasatAircraftParticipant::aircraftRemoved(int nasatAircraftId)
 
 void HandlerNasatAircraftParticipant::participantRemoved(int exerciseId, int participantId)
 {
-  DEBUG_LOG() << "participantRemoved: " << exerciseId << ", " << participantId;
+  DEBUG_LOG(m_logger) << "participantRemoved: " << exerciseId << ", " << participantId;
   auto it = m_nasatAircraftParticipants.begin();
   while (it != m_nasatAircraftParticipants.end())
   {
@@ -179,7 +179,7 @@ bool isExerciseStateValid(ExerciseManagement::ExerciseState_def::type state)
 
 void HandlerNasatAircraftParticipant::onExerciseChanged(const ExerciseManagement::Exercise &exercise, DataModification modType)
 {
-  INFO_LOG() << Q_FUNC_INFO << " START" << " , exercise" << exercise << " , modType" << modType;
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " START" << " , exercise" << exercise << " , modType" << modType;
 
   const int exId = exercise.id();
   switch (modType)
@@ -190,10 +190,10 @@ void HandlerNasatAircraftParticipant::onExerciseChanged(const ExerciseManagement
     const bool valid = isExerciseStateValid(exercise.state().underlying());
     if (!valid)
     {
-      INFO_LOG() << Q_FUNC_INFO << " STATE of exId=" << exId
+      INFO_LOG(m_logger) << Q_FUNC_INFO << " STATE of exId=" << exId
                          << " , state=" << exercise.state();
       int cnt = removeNapsOfExercise(exId);
-      INFO_LOG() << Q_FUNC_INFO << " STATE of exId=" << exId << " not valid : counter of removed naps=" << cnt;
+      INFO_LOG(m_logger) << Q_FUNC_INFO << " STATE of exId=" << exId << " not valid : counter of removed naps=" << cnt;
     }
   }
     break;
@@ -205,11 +205,11 @@ void HandlerNasatAircraftParticipant::onExerciseChanged(const ExerciseManagement
       const bool valid = isExerciseStateValid(exercise.state().underlying());
       if (!valid)
       {
-        INFO_LOG() << Q_FUNC_INFO << " STATE change of exId=" << exId
+        INFO_LOG(m_logger) << Q_FUNC_INFO << " STATE change of exId=" << exId
                            << " , old state=" << exerciseRef.state()
                            << " , new state=" << exercise.state();
         int cnt = removeNapsOfExercise(exId);
-        INFO_LOG() << Q_FUNC_INFO << " STATE change of exId=" << exId << " : counter of removed naps=" << cnt;
+        INFO_LOG(m_logger) << Q_FUNC_INFO << " STATE change of exId=" << exId << " : counter of removed naps=" << cnt;
       }
     }
     m_exercises[exId] = exercise;
@@ -218,13 +218,13 @@ void HandlerNasatAircraftParticipant::onExerciseChanged(const ExerciseManagement
   case DataModification::eRemoved:
   {
     int cnt = removeNapsOfExercise(exId);
-    INFO_LOG() << Q_FUNC_INFO << " STATE change of Exercise, counter of removed naps=" << cnt;
+    INFO_LOG(m_logger) << Q_FUNC_INFO << " STATE change of Exercise, counter of removed naps=" << cnt;
 
     m_exercises.remove(exId);
   }
     break;
   }
-  INFO_LOG() << Q_FUNC_INFO << " END" << " , exercise" << exercise << " , modType" << modType;
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " END" << " , exercise" << exercise << " , modType" << modType;
 }
 
 void HandlerNasatAircraftParticipant::removeNasatAircraftParticipant(const NasatAircraftParticipant &val)
@@ -238,10 +238,10 @@ void HandlerNasatAircraftParticipant::removeNasatAircraftParticipant(const Nasat
 void HandlerNasatAircraftParticipant::onModifyNasatAircraftParticipantRequest(const rti::core::SampleIdentity &cookie,
                                                                               const NasatAircraftParticipant &request)
 {
-  DEBUG_LOG() << "onModifyNasatAircraftParticipantRequest: " << request;
+  DEBUG_LOG(m_logger) << "onModifyNasatAircraftParticipantRequest: " << request;
   auto ret = request.id() <= 0 ? createNasatAircraftParticipantRequest(request) : modifyNasatAircraftParticipantRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_fts->modifyNasatAircraftParticipantReply(cookie, ret);
 }
 
@@ -299,7 +299,7 @@ Core::FunctionReplyObject HandlerNasatAircraftParticipant::modifyNasatAircraftPa
 
 int HandlerNasatAircraftParticipant::removeNapsOfExercise(int exerciseId)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START, exerciseId=" << exerciseId
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, exerciseId=" << exerciseId
                       << ", m_nasatAircraftParticipants.size()" << m_nasatAircraftParticipants.size();
   int count = 0;
   QHash<int, NasatAircraftParticipant> napsCopy = m_nasatAircraftParticipants;
@@ -308,7 +308,7 @@ int HandlerNasatAircraftParticipant::removeNapsOfExercise(int exerciseId)
   {
     if (nap.exerciseId() == exerciseId)
     {
-      DEBUG_LOG() << Q_FUNC_INFO << " nap has to be removed: nap=" << nap;
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " nap has to be removed: nap=" << nap;
 
       NasatAircraftParticipant napToTriggerRemoving;
       napToTriggerRemoving.id(nap.id());        
@@ -319,7 +319,7 @@ int HandlerNasatAircraftParticipant::removeNapsOfExercise(int exerciseId)
       ++count;
     }
   }
-  DEBUG_LOG() << Q_FUNC_INFO << " END, exerciseId=" << exerciseId
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END, exerciseId=" << exerciseId
                       << ", m_nasatAircraftParticipants.size()" << m_nasatAircraftParticipants.size()
                       << ", counter=" << count;
   return count;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft_participant.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft_participant.h
index a6ae66200..376505233 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft_participant.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft_participant.h
@@ -38,6 +38,7 @@ public Q_SLOTS:
   void dumpExercises();
 
 protected:
+  NGL::INGLLogger &m_logger;
   void removeNasatAircraftParticipant(const NasatAircraftParticipant &val);
   void onModifyNasatAircraftParticipantRequest(const rti::core::SampleIdentity &cookie,
                                                const NasatAircraftParticipant &request) override;
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 2d6442cb5..62198002b 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
@@ -23,7 +23,7 @@ HandlerNasatImpact::HandlerNasatImpact(Initialization *mainHandler)
   : AreaEffectSimulation::Interface::Ftc::AirSupportImpactModifyReplyHandler()
   , m_mainHandler(mainHandler)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   auto pdmDtc = m_mainHandler->dds()->pdmDtc();
   connect(pdmDtc.get(), &ProjectDataManagement::Interface::Dtc::chargeTypeChanged,
           this, &HandlerNasatImpact::onChargeTypeChanged);
@@ -59,32 +59,32 @@ HandlerNasatImpact::HandlerNasatImpact(Initialization *mainHandler)
 
 #endif 
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void HandlerNasatImpact::onAirSupportImpactModifyReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    WARNING_LOG() << "Could not create single explosion for nasat impact: " << reply();
+    WARNING_LOG(m_logger) << "Could not create single explosion for nasat impact: " << reply();
 
 #ifdef NLDEVCTRL_844
   testing.replyCounter++;
-  INFO_LOG() << "Got create reply: " << reply() << "(id=" << reply.id() << ")"
+  INFO_LOG(m_logger) << "Got create reply: " << reply() << "(id=" << reply.id() << ")"
                      << ", this=" << this
                      << " - replyCounter=" << testing.replyCounter;
 #else
-  INFO_LOG() << "Got create reply: " << reply() << "(id=" << reply.id() << ")"
+  INFO_LOG(m_logger) << "Got create reply: " << reply() << "(id=" << reply.id() << ")"
                      << ", this=" << this;
 #endif 
 }
 
 void HandlerNasatImpact::onExplosionClusterModifyReply(const Core::FunctionReplyObject &reply)
 {
-  INFO_LOG() << "Got create reply: " << reply() << "(id=" << reply.id() << ")"
+  INFO_LOG(m_logger) << "Got create reply: " << reply() << "(id=" << reply.id() << ")"
                      << ", this=" << this
                      << ", reply.error()=" << reply.error();
   if (reply.error())
-    ERROR_LOG() << "onExplosionClusterModifyReply:  Got reply: " << reply() << "(id=" << reply.id() << ")"
+    ERROR_LOG(m_logger) << "onExplosionClusterModifyReply:  Got reply: " << reply() << "(id=" << reply.id() << ")"
                         << " '" << reply.translated() << "'";
 }
 
@@ -113,7 +113,7 @@ void HandlerNasatImpact::nasatImpact(int nasatId, const Core::GeoPosition &pos,
     return;
 #endif 
 
-  DEBUG_LOG() << Q_FUNC_INFO << " START, nasatId=" << nasatId
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, nasatId=" << nasatId
                       << ", pos=" << pos
                       << ", flightTimeMsec = " << flightTimeMsec
                       << ", impactTimeMsec = " << impactTimeMsec;
@@ -121,7 +121,7 @@ void HandlerNasatImpact::nasatImpact(int nasatId, const Core::GeoPosition &pos,
   const auto participants = m_mainHandler->handlerParticipant()->participantsForNasatId(nasatId);
   if (participants.isEmpty())
   {
-    WARNING_LOG() << "Can not find a valid participant for nasat aircraft with id " << nasatId;
+    WARNING_LOG(m_logger) << "Can not find a valid participant for nasat aircraft with id " << nasatId;
     return;
   }
 
@@ -145,7 +145,7 @@ void HandlerNasatImpact::nasatImpact(int nasatId, const Core::GeoPosition &pos,
   if (m_logger.isDebugEnabled())
   {
     const Core::GeoPosition &nasatPos = m_mainHandler->handlerParticipant()->nasatPosition(nasatId);
-    DEBUG_LOG() << Q_FUNC_INFO << " START, nasatId=" << nasatId
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, nasatId=" << nasatId
                         << ", pos=" << nasatPos
                         << ", flightTimeMsec = " << flightTimeMsec
                         << ", impactTimeMsec=" << impactTimeMsec;
@@ -191,7 +191,7 @@ void HandlerNasatImpact::nasatImpact(int nasatId, const Core::GeoPosition &pos,
 
 
 
-  DEBUG_LOG() << " Sending air support impact: number of participant= " << participants.size();
+  DEBUG_LOG(m_logger) << " Sending air support impact: number of participant= " << participants.size();
   for (const NasatAircraftParticipantEx *nap : participants)
   {
     
@@ -205,17 +205,17 @@ void HandlerNasatImpact::nasatImpact(int nasatId, const Core::GeoPosition &pos,
 
     int success = nap->publisher()->publish(ecCommonModifyRequest, this);
     if (success)
-      DEBUG_LOG() << "Sending air support impact create request: " << ecReq << " to exercise " << nap->exerciseId()
+      DEBUG_LOG(m_logger) << "Sending air support impact create request: " << ecReq << " to exercise " << nap->exerciseId()
                           << ", nap=" << nap->participant()
                           << " -> success = " << success;
     else
-      ERROR_LOG() << "Error on Sending air support impact create request: " << ecReq << " to exercise " << nap->exerciseId()
+      ERROR_LOG(m_logger) << "Error on Sending air support impact create request: " << ecReq << " to exercise " << nap->exerciseId()
                           << ", nap=" << nap->participant()
                           << " -> success = " << success;
 
 #ifdef NLDEVCTRL_844
     testing.requestCounter++;
-    INFO_LOG() << " requestCounter =  " << testing.requestCounter;
+    INFO_LOG(m_logger) << " requestCounter =  " << testing.requestCounter;
 #endif 
   }
 
@@ -254,7 +254,7 @@ void HandlerNasatImpact::onChargeTypeChanged(const ProjectDataManagement::Charge
   int nasatId = obj.value(QLatin1String("nasatId")).toInt();
   if (nasatId == 0)
   {
-    WARNING_LOG() << "Found charge with an invalid property 'nasatId', id: " << ct.id();
+    WARNING_LOG(m_logger) << "Found charge with an invalid property 'nasatId', id: " << ct.id();
     return;
   }
   m_chargeMapping.insert(nasatId, ct.id());
@@ -266,7 +266,7 @@ int HandlerNasatImpact::chargeTypeFromMunitionCode(int nasatChargeCode) const
   auto it = m_chargeMapping.find(nasatChargeCode);
   if (it != m_chargeMapping.end())
     return it.value();
-  WARNING_LOG() << "Got unmapped nasat charge code " << nasatChargeCode;
+  WARNING_LOG(m_logger) << "Got unmapped nasat charge code " << nasatChargeCode;
   Q_ASSERT(false);
   return -1;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_impact.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_impact.h
index f34772441..30c9a8758 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_impact.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_impact.h
@@ -30,9 +30,11 @@ public Q_SLOTS:
   void nasatImpact(int nasatId, const Core::GeoPosition &pos, qint64 flightTimeMsec, qint64 impactTimeMsec, int munitionCode, FuseType fuseType = FuseType::Instant);
   void onChargeTypeChanged(const ProjectDataManagement::ChargeType &ct);
 private:
+  NGL::INGLLogger &m_logger;
   int chargeTypeFromMunitionCode(int nasatChargeCode) const;
   int fuseTypeToPdmIgniterType(FuseType fusetype) const;
 private:
+  NGL::INGLLogger &m_logger;
   Initialization *m_mainHandler;
   QHash<int, int> m_chargeMapping;
 #ifdef NLDEVCTRL_844
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_nine_liner.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_nine_liner.cpp
index c689b16ce..6a0b2e0a2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_nine_liner.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_nine_liner.cpp
@@ -25,7 +25,7 @@ bool HandlerNasatNineLiner::init() const
   connect(m_mainHandler->handlerParticipant().get(), &HandlerParticipant::nasatAircraftParticipantRemoved,
           this, &HandlerNasatNineLiner::onNasatAircraftParticipantRemoved, Qt::DirectConnection);
 
-  DEBUG_LOG() << "HandlerNasatNineLiner init done";
+  DEBUG_LOG(m_logger) << "HandlerNasatNineLiner init done";
   
   
   return true;
@@ -108,18 +108,18 @@ static Nasat9Liner createDds9Liner(const NasatNineLiner &nasatNineLiner)
 void HandlerNasatNineLiner::nineLinerReceived(const NasatNineLiner &nasatNineLiner)
 {
   
-  DEBUG_LOG() << "nineLinerReceived, aircraftId=" << nasatNineLiner.aircraftId
+  DEBUG_LOG(m_logger) << "nineLinerReceived, aircraftId=" << nasatNineLiner.aircraftId
                       << "  -  nasatNineLiner.aircraftId is aka nasatId";
 
   const auto participants = m_mainHandler->handlerParticipant()->participantsForNasatId(nasatNineLiner.aircraftId);
   if (participants.isEmpty())
   {
-    INFO_LOG() << "No exercise participants found to publish 9-liner for nasat aircraft with id "
+    INFO_LOG(m_logger) << "No exercise participants found to publish 9-liner for nasat aircraft with id "
                        << nasatNineLiner.aircraftId;
     return;
   }
 
-  DEBUG_LOG() << "nineLinerReceived, publishing to exercises";
+  DEBUG_LOG(m_logger) << "nineLinerReceived, publishing to exercises";
 
   static int s_id = 1;
   Nasat9Liner nl = createDds9Liner(nasatNineLiner);
@@ -129,7 +129,7 @@ void HandlerNasatNineLiner::nineLinerReceived(const NasatNineLiner &nasatNineLin
     const auto &exerciseParticipantId = it.key();
     auto nape = it.value();
 
-    DEBUG_LOG() << "nineLinerReceived, publishing to exercises, s_id=" << s_id
+    DEBUG_LOG(m_logger) << "nineLinerReceived, publishing to exercises, s_id=" << s_id
                         << ", exerciseParticipantId.exerciseId=" << exerciseParticipantId.exerciseId
                         << ", exerciseParticipantId.participantId=" << exerciseParticipantId.participantId;
 
@@ -171,17 +171,17 @@ void HandlerNasatNineLiner::onNasatAircraftParticipantRemoved(const NasatAircraf
   
 
   const int nasatId = m_mainHandler->nasatAircraft()->nasatIdFromNasatAircraftId(nap.nasatAircraftId());
-  INFO_LOG() << " onNasatAircraftParticipantRemoved,  nap = " << nap << ", nasatId = " << nasatId;
+  INFO_LOG(m_logger) << " onNasatAircraftParticipantRemoved,  nap = " << nap << ", nasatId = " << nasatId;
   if (nasatId < 0)
   {
-    WARNING_LOG() << " nasatIdFromNasatAircraftId failed, nap=" << nap;
+    WARNING_LOG(m_logger) << " nasatIdFromNasatAircraftId failed, nap=" << nap;
     return;
   }
 
   const auto participants = m_mainHandler->handlerParticipant()->participantsForNasatId(nasatId);
   if (participants.isEmpty())
   {
-    INFO_LOG() << "No exercise participants found to publish 9-liner for nasat aircraft with id "
+    INFO_LOG(m_logger) << "No exercise participants found to publish 9-liner for nasat aircraft with id "
                        << nap.nasatAircraftId();
     return;
   }
@@ -192,7 +192,7 @@ void HandlerNasatNineLiner::onNasatAircraftParticipantRemoved(const NasatAircraf
     auto nape = it.value();
     auto &nineLinerParticipant = m_nineLiner[exerciseParticipantId];
 
-    DEBUG_LOG() << Q_FUNC_INFO << " updating for removing "
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " updating for removing "
                         << ", exerciseParticipantId.exerciseId=" << exerciseParticipantId.exerciseId
                         << ", exerciseParticipantId.participantId=" << exerciseParticipantId.participantId
                         << ", nineLinerParticipant.isEmpty()=" << nineLinerParticipant.isEmpty();
@@ -202,7 +202,7 @@ void HandlerNasatNineLiner::onNasatAircraftParticipantRemoved(const NasatAircraf
       auto &oldLast = nineLinerParticipant.last();
       if (oldLast.isCurrent())
       {
-        DEBUG_LOG() << Q_FUNC_INFO << " updating for removing "
+        DEBUG_LOG(m_logger) << Q_FUNC_INFO << " updating for removing "
                             << ", exerciseParticipantId.exerciseId=" << exerciseParticipantId.exerciseId
                             << ", exerciseParticipantId.participantId=" << exerciseParticipantId.participantId;
         oldLast.sampleTime(QDateTime::currentMSecsSinceEpoch()); 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_nine_liner.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_nine_liner.h
index 80cc7b263..f39292404 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_nine_liner.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_nine_liner.h
@@ -26,6 +26,7 @@ public Q_SLOTS:
   void onNasatAircraftParticipantRemoved(const NasatAircraftParticipant &nap);
 
 private:
+  NGL::INGLLogger &m_logger;
   QHash<ExerciseParticipantKey, QVector<Nasat9Liner>> m_nineLiner;
   Initialization *m_mainHandler;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_participant.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_participant.cpp
index 2ce677274..4940dd060 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_participant.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_participant.cpp
@@ -20,24 +20,24 @@ namespace GuezNasat
 NasatAircraftParticipantEx::NasatAircraftParticipantEx()
   : m_logger(getLogger("NasatAircraftParticipantEx"))
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START";
-  DEBUG_LOG() << Q_FUNC_INFO << " END";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 NasatAircraftParticipantEx::NasatAircraftParticipantEx(const NasatAircraftParticipant &nap, const std::shared_ptr<Participant2Dds> &publisher)
   : m_nap(nap)
   , m_publisher(publisher)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_publisher->addParticipantToWatch(m_nap.participantId());
-  DEBUG_LOG() << Q_FUNC_INFO << " END";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 NasatAircraftParticipantEx::~NasatAircraftParticipantEx()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_publisher->removeParticipantToWatch(m_nap.participantId());
-  DEBUG_LOG() << Q_FUNC_INFO << " END";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 int NasatAircraftParticipantEx::partyId() const
@@ -82,23 +82,23 @@ void HandlerParticipant::onNasatAircraftParticipantRemoved(const NasatAircraftPa
   auto it = m_activePublisher.find(nasatId);
   if (it == m_activePublisher.end())
   {
-    WARNING_LOG() << "No publisher for NasatAircraftParticipant " << nasatId << "(" << nap.nasatAircraftId() << ") found !?";
+    WARNING_LOG(m_logger) << "No publisher for NasatAircraftParticipant " << nasatId << "(" << nap.nasatAircraftId() << ") found !?";
     return;
   }
   auto itParticipants = it.value().find(ExerciseParticipantKey(nap.exerciseId(), nap.participantId()));
   if (itParticipants == it.value().end())
   {
-    WARNING_LOG() << "No participant entry for NasatAircraftParticipant " << nasatId << "("
+    WARNING_LOG(m_logger) << "No participant entry for NasatAircraftParticipant " << nasatId << "("
                           << nap.exerciseId() << "," << nap.participantId() << ") found !?";
     return;
   }
 
   
-  DEBUG_LOG() << " emit nasatAircraftParticipantRemoved, nap = " << nap;
+  DEBUG_LOG(m_logger) << " emit nasatAircraftParticipantRemoved, nap = " << nap;
   emit nasatAircraftParticipantRemoved(nap);
 
 
-  DEBUG_LOG() << "Remove position publisher for " << nap;
+  DEBUG_LOG(m_logger) << "Remove position publisher for " << nap;
 
   
   NasatAircraftParticipantEx* napeCopy= itParticipants.value();
@@ -119,11 +119,11 @@ void HandlerParticipant::onNasatAircraftParticipantRemoved(const NasatAircraftPa
 
 Core::GeoPosition HandlerParticipant::nasatPosition(int nasatId) const
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START, nasatId=" << nasatId;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, nasatId=" << nasatId;
   auto it = m_lastNasatPositionsAsCoreGeoposition.find(nasatId);
   if (it == m_lastNasatPositionsAsCoreGeoposition.end())
   {
-    INFO_LOG() << "No NasatPosition for nasat id " << nasatId << " found";
+    INFO_LOG(m_logger) << "No NasatPosition for nasat id " << nasatId << " found";
     return {};
   }
   return *it;
@@ -131,7 +131,7 @@ Core::GeoPosition HandlerParticipant::nasatPosition(int nasatId) const
 
 void HandlerParticipant::onNasatPosition(const NasatPosition &position)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START, position.aircraftId=" << position.aircraftId;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, position.aircraftId=" << position.aircraftId;
   const Core::GeoPosition geoPos(position.position.lon * LtsCoordTrans::deg2rad(),
                                  position.position.lat * LtsCoordTrans::deg2rad(),
                                  position.position.height);  
@@ -144,11 +144,11 @@ void HandlerParticipant::onNasatPosition(const NasatPosition &position)
 
 void HandlerParticipant::onNasatAircraftPosition(int nasatId, const Core::GeoPosition &pos, qint64 ts)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START, nasatId=" << nasatId;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, nasatId=" << nasatId;
   auto it = m_activePublisher.find(nasatId);
   if (it == m_activePublisher.end())
   {
-    INFO_LOG() << "No position publisher for nasat id " << nasatId << " found - ignoring " << m_activePublisher.size();
+    INFO_LOG(m_logger) << "No position publisher for nasat id " << nasatId << " found - ignoring " << m_activePublisher.size();
     return;
   }
 
@@ -161,11 +161,11 @@ void HandlerParticipant::onNasatAircraftPosition(int nasatId, const Core::GeoPos
     tabPos.equipmentNumber(-napEx->participantId());
     int success = napEx->publisher()->publish(tabPos);
     if (success)
-      DEBUG_LOG() << "Publishing positon: " << tabPos << " to exercise " << napEx->exerciseId()
+      DEBUG_LOG(m_logger) << "Publishing positon: " << tabPos << " to exercise " << napEx->exerciseId()
                           << ", napEx: " << napEx->participant()
                           << " -> success = " << success;
     else
-      ERROR_LOG() << "Error on Publishing positon: " << tabPos << " to exercise " << napEx->exerciseId()
+      ERROR_LOG(m_logger) << "Error on Publishing positon: " << tabPos << " to exercise " << napEx->exerciseId()
                           << ", napEx: " << napEx->participant()
                           << " -> success = " << success;
 
@@ -180,7 +180,7 @@ void HandlerParticipant::onNasatIdChanged(int oldNasatId, int newNasatId)
 
 void HandlerParticipant::createNasatAircraftParticipant(const NasatAircraftParticipant &nap, int nasatId)
 {
-  DEBUG_LOG() << "Creating position publisher for " << nap
+  DEBUG_LOG(m_logger) << "Creating position publisher for " << nap
                       << ", nasatId=" << nasatId;
   auto *napEx = new NasatAircraftParticipantEx(nap,
                                                m_mainHandler->dds()->ddsParticipant(nap.exerciseId()));
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_participant.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_participant.h
index 8d09a3a59..7f7663f26 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_participant.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_participant.h
@@ -31,6 +31,7 @@ struct NasatAircraftParticipantEx final
 
   Q_DISABLE_COPY(NasatAircraftParticipantEx)
 private:
+NGL::INGLLogger &m_logger;
   NasatAircraftParticipant m_nap;
   std::shared_ptr<Participant2Dds> m_publisher;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/initialization.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/initialization.cpp
index 15934dd02..cc58f00ba 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/initialization.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/initialization.cpp
@@ -43,13 +43,13 @@ Initialization::~Initialization()
 bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector,
                                 const QSqlDatabase &)
 {
-  INFO_LOG() << "Start GuezNasat Initialization.";
+  INFO_LOG(m_logger) << "Start GuezNasat Initialization.";
 
   
   m_ddsHandler = std::make_shared<DdsHandler>(ddsConnector);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation DdsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
     return false;
   }
 
@@ -58,7 +58,7 @@ bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector
   if (!m_dbHandler->init(ddsConnector->getPartitionId(), Settings::settings()))
 
   {
-    ERROR_LOG() << "Initialisation DbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation DbHandler failed.";
     return false;
   }
 
@@ -80,16 +80,16 @@ bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector
   
   if (Settings::useWebSocket())
   {
-    INFO_LOG() << "Using WebSocket";
+    INFO_LOG(m_logger) << "Using WebSocket";
     m_jsonSocketHandler.reset(new WebSocketHandler);
   }
   else
   {
-    INFO_LOG() << "Using TcpSocket";
+    INFO_LOG(m_logger) << "Using TcpSocket";
     m_jsonSocketHandler.reset(new TcpSocketHandler);
   }
 
-  INFO_LOG() << "GuezNasat Initialization initialized";
+  INFO_LOG(m_logger) << "GuezNasat Initialization initialized";
 
   return true;
 } 
@@ -97,7 +97,7 @@ bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector
 
 bool Initialization::loadFromDatabase()
 {
-  TRACE_LOG() << Q_FUNC_INFO << "START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "START";
 
   if (!m_ddsHandler ||
       !m_dbHandler ||
@@ -111,27 +111,27 @@ bool Initialization::loadFromDatabase()
 
   if (!m_handlerNasatAircraft->init())
   {
-    ERROR_LOG() << "Initialisation HandlerNasatAircraft failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerNasatAircraft failed.";
     return false;
   }
   if (!m_handlerNasatAircraftParticipant->init())
   {
-    ERROR_LOG() << "Initialisation HandlerNasatAircraftParticipant failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerNasatAircraftParticipant failed.";
     return false;
   }
   if (!m_handlerNasatImpact->init())
   {
-    ERROR_LOG() << "Initialisation HandlerNasatImpact failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerNasatImpact failed.";
     return false;
   }
   if (!m_handlerNasatNineLiner->init())
   {
-    ERROR_LOG() << "Initialisation HandlerNasatNineLiner failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerNasatNineLiner failed.";
     return false;
   }
   if (!m_handlerParticipant->init())
   {
-    ERROR_LOG() << "Initialisation ParticipantPositionPublisher failed.";
+    ERROR_LOG(m_logger) << "Initialisation ParticipantPositionPublisher failed.";
     return false;
   }
 
@@ -147,13 +147,13 @@ bool Initialization::loadFromDatabase()
     NOTICE_LOG(m_logger) << "Initialisation SocketHandler ....";
     if (!m_jsonSocketHandler->init(Settings::socketListenPort()))
     {
-      ERROR_LOG() << "Initialisation WebSocketHandler failed.";
+      ERROR_LOG(m_logger) << "Initialisation WebSocketHandler failed.";
     }
   });
 #else
   if (!m_jsonSocketHandler->init(Settings::socketListenPort()))
   {
-    ERROR_LOG() << "Initialisation WebSocketHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation WebSocketHandler failed.";
     return false;
   }
 #endif 
@@ -171,7 +171,7 @@ bool Initialization::loadFromDatabase()
   QObject::connect(m_jsonSocketHandler.get(), &AbstractSocketHandler::nineLinerReceived,
                    m_handlerNasatNineLiner.get(), &HandlerNasatNineLiner::nineLinerReceived);
 
-  TRACE_LOG() << Q_FUNC_INFO << "END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
   return true;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/initialization.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/initialization.h
index 9e07c169a..8d74bae77 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/initialization.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/initialization.h
@@ -38,6 +38,7 @@ public:
   std::shared_ptr<HandlerParticipant> handlerParticipant() const { return m_handlerParticipant; }
 
 private: 
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>                m_ddsHandler;                
   std::shared_ptr<DbHandler>                 m_dbHandler;                 
   std::shared_ptr<HandlerNasatAircraft>            m_handlerNasatAircraft;
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 6dca0f4e7..813b57236 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
@@ -36,6 +36,8 @@ private Q_SLOTS:
   void onAirSupportImpact(AreaEffectSimulation::AirSupportImpactModifyRequest asi, int equipmentNumber);
 
 private:
+
+NGL::INGLLogger &m_logger;
   NgsHandler *m_ngsHandler;
   std::shared_ptr<AreaEffectSimulation::Interface::Dtc>  m_dtcAes;
   std::shared_ptr<AreaEffectSimulation::Interface::Ftc>  m_ftcAes;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/dds_handler.cpp
index 4d1263d31..b0a955bba 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/dds_handler.cpp
@@ -9,11 +9,10 @@
 namespace HighLevelArchitecture
 {
 
-DdsHandler::DdsHandler(int domainId, int exerciseId)
-  : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId))
-  , m_exerciseHasHlaConnection(false)
-{
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+DdsHandler::DdsHandler(int domainId, int exerciseId) : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId))
+  , m_exerciseHasHlaConnection(false),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 DdsHandler::~DdsHandler()
@@ -27,7 +26,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/dds_handler.h
index 0aed56eda..bf5a0dedb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/dds_handler.h
@@ -32,8 +32,10 @@ public:
 Q_SIGNALS:
   void exerciseHlaStateChanged(bool bHlaEnabled);
 private:
+  NGL::INGLLogger &m_logger;
   void onExerciseChanged(const ExerciseManagement::Exercise &ex, DataModification modType);
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector>            m_ddsConnector;
   std::shared_ptr<Core::Pacemaker>                       m_pacemaker;
   std::shared_ptr<ExerciseManagement::Interface::Dtc>    m_dtcExm;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/main_handler.cpp
index 292aa1a37..a28ba841f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/main_handler.cpp
@@ -13,10 +13,9 @@
 namespace HighLevelArchitecture
 {
 
-MainHandler::MainHandler(QObject *parent)
-  : QObject(parent)
-  , m_exerciseId(0)
-{}
+MainHandler::MainHandler(QObject *parent) : QObject(parent)
+  , m_exerciseId(0),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 MainHandler::~MainHandler()
 {
@@ -31,7 +30,7 @@ bool MainHandler::init(int domainId, int exerciseId)
   m_ddsHandler = std::make_shared<DdsHandler>(domainId, exerciseId);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Could not init DDS handler";
+    ERROR_LOG(m_logger) << "Could not init DDS handler";
     return false;
   }
   connect(m_ddsHandler.get(), &DdsHandler::exerciseHlaStateChanged,
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/main_handler.h
index dfcb93b55..d8e7fbae0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/main_handler.h
@@ -26,6 +26,7 @@ public:
 private Q_SLOTS:
   void onExerciseHlaStateChanged(bool bHlaEnabled);
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler> m_ddsHandler;
   std::shared_ptr<NgsHandler> m_ngsHandler;
   std::shared_ptr<WebSocketHandler> m_wsHandler;
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 8808209ee..66af94e11 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
@@ -127,8 +127,7 @@ static inline rpr2::SpatialStruct spatialStructFromWorldLocation(const rpr2::Wor
 
 
 
-NgsConnector::NgsConnector(const QString &fedName, NgsHandler *ngsHandler)
-  : m_ngsHandler(ngsHandler)
+NgsConnector::NgsConnector(const QString &fedName, NgsHandler *ngsHandler) : m_ngsHandler(ngsHandler)
   , m_fedName(fedName)
   , m_swadmin(&ngs::SimulatedWorldAPI::getSimulatedWorldAdmin())
   , m_master(nullptr)
@@ -144,8 +143,8 @@ NgsConnector::NgsConnector(const QString &fedName, NgsHandler *ngsHandler)
   , m_iaWeaponFireCallback(new ObserverWeaponFireCBNotifier())
   , m_bInitialized(false)
   , m_bCanPublishData(false)
-  , m_timer(new QTimer(this))
-{
+  , m_timer(new QTimer(this)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   connect(m_timer, &QTimer::timeout,
           this, &NgsConnector::go);
   connect(m_playerCallback, &PlayerCallback::firstTick,
@@ -212,7 +211,7 @@ bool NgsConnector::initialize(ngs::IObserver::ProtocolType protocol, const QStri
   }
   catch (const ngs::NGSSimWorldException &e)
   {
-    ERROR_LOG() << "caught exception during init (getIFederationMaster): " << e.print();
+    ERROR_LOG(m_logger) << "caught exception during init (getIFederationMaster): " << e.print();
     return false;
   }
 
@@ -227,7 +226,7 @@ bool NgsConnector::initialize(ngs::IObserver::ProtocolType protocol, const QStri
     }
     catch (const NGSException &e)
     {
-      ERROR_LOG() << "caught exception during init (createFederation): " << e.print();
+      ERROR_LOG(m_logger) << "caught exception during init (createFederation): " << e.print();
       return false;
     }
     player = &m_swadmin->getIPlayer(m_fedName.toStdString(), playerName.toStdString(), *m_playerCallback, Settings::swConfFileName().toLatin1().data(), Settings::fomIdentifier().toStdString(), Settings::rtiIdentifier().toStdString());
@@ -277,22 +276,22 @@ void NgsConnector::subscribeAtNgs()
   m_enitityNumberCounter = 1; 
   m_eventCount = 1;
 
-  INFO_LOG() << "Subscribe at NGS - Human Objects";
+  INFO_LOG(m_logger) << "Subscribe at NGS - Human Objects";
   rpr2::IObserverHumanObjClass &humanObjClass = m_somPlayer->getObserverHumanObjClass(*m_humanCallback);
   humanObjClass.subscribeAllAttributes();
   humanObjClass.subscribe();
 
-  INFO_LOG() << "Subscribe at NGS - GroundVehicle Objects";
+  INFO_LOG(m_logger) << "Subscribe at NGS - GroundVehicle Objects";
   rpr2::IObserverGroundVehicleObjClass &groundVehicleObjClass = m_somPlayer->getObserverGroundVehicleObjClass(*m_groundVehicleCallback);
   groundVehicleObjClass.subscribeAllAttributes();
   groundVehicleObjClass.subscribe();
 
-  INFO_LOG() << "Subscribe at NGS - LongBowApache Objects";
+  INFO_LOG(m_logger) << "Subscribe at NGS - LongBowApache Objects";
   rpr2::IObserverLongBowApacheObjClass &longBowApacheObjClass = m_somPlayer->getObserverLongBowApacheObjClass(*m_longBowApacheCallback);
   longBowApacheObjClass.subscribeAllAttributes();
   longBowApacheObjClass.subscribe();
 
-  INFO_LOG() << "Subscribe at NGS - Designator Objects";
+  INFO_LOG(m_logger) << "Subscribe at NGS - Designator Objects";
   rpr2::IObserverDesignatorObjClass &designatorObjClass = m_somPlayer->getObserverDesignatorObjClass(*m_designatorCallback);
   designatorObjClass.subscribeAllAttributes();
   designatorObjClass.subscribe();
@@ -321,35 +320,35 @@ void NgsConnector::unsubscribeFromNgs()
 
   if (m_somPlayer)
   {
-    INFO_LOG() << "Unsubscribe at NGS - Human Objects";
+    INFO_LOG(m_logger) << "Unsubscribe at NGS - Human Objects";
     rpr2::IObserverHumanObjClass &humanObjClass = m_somPlayer->getObserverHumanObjClass(*m_humanCallback);
     humanObjClass.unsubscribe();
 
-    INFO_LOG() << "Unsubscribe at NGS - GroundVehicle Objects";
+    INFO_LOG(m_logger) << "Unsubscribe at NGS - GroundVehicle Objects";
     rpr2::IObserverGroundVehicleObjClass &groundVehicleObjClass = m_somPlayer->getObserverGroundVehicleObjClass(*m_groundVehicleCallback);
     groundVehicleObjClass.unsubscribe();
 
-    INFO_LOG() << "Unsubscribe at NGS - LongBowApache Objects";
+    INFO_LOG(m_logger) << "Unsubscribe at NGS - LongBowApache Objects";
     rpr2::IObserverLongBowApacheObjClass &longBowApacheObjClass = m_somPlayer->getObserverLongBowApacheObjClass(*m_longBowApacheCallback);
     longBowApacheObjClass.unsubscribe();
 
-    INFO_LOG() << "Unsubscribe at NGS - Designator Objects";
+    INFO_LOG(m_logger) << "Unsubscribe at NGS - Designator Objects";
     rpr2::IObserverDesignatorObjClass &designatorObjectClass = m_somPlayer->getObserverDesignatorObjClass(*m_designatorCallback);
     designatorObjectClass.unsubscribe();
 
-    INFO_LOG() << "Unsubscribe at NGS - Engagement Reply Interaction";
+    INFO_LOG(m_logger) << "Unsubscribe at NGS - Engagement Reply Interaction";
     rpr2::IObserverEngagementReplyIntClass &enr = m_somPlayer->getObserverEngagementReplyIntClass(*m_iaEngagementReplyCallback);
     enr.unsubscribe();
 
-    INFO_LOG() << "Unsubscribe at NGS - Event Report Interaction";
+    INFO_LOG(m_logger) << "Unsubscribe at NGS - Event Report Interaction";
     rpr2::IObserverEventReportIntClass &evr = m_somPlayer->getObserverEventReportIntClass(*m_iaEventReportCallback);
     evr.unsubscribe();
 
-    INFO_LOG() << "Unsubscribe at NGS - Munition Detonation Interaction";
+    INFO_LOG(m_logger) << "Unsubscribe at NGS - Munition Detonation Interaction";
     rpr2::IObserverMunitionDetonationIntClass &md = m_somPlayer->getObserverMunitionDetonationIntClass(*m_iaMunitionDetonationCallback);
     md.unsubscribe();
 
-    INFO_LOG() << "Unsubscribe at NGS - Weapon Fire Interaction";
+    INFO_LOG(m_logger) << "Unsubscribe at NGS - Weapon Fire Interaction";
     rpr2::IObserverWeaponFireIntClass &wf = m_somPlayer->getObserverWeaponFireIntClass(*m_iaWeaponFireCallback);
     wf.unsubscribe();
   }
@@ -515,7 +514,7 @@ bool NgsConnector::sendData(int eqNo, const QByteArray& data, int requestIdentif
   vds.NumberOfLongLongs__A__Padding__A__DatumValue.resize(data.size() / 8 + 1);
   vds.DatumLengthInBits = 8 * data.size();
 
-  TRACE_LOG() << "--> Data. Receiver: " << eqNo << ", ReqID: " << requestIdentifier << ", Data: " << data;
+  TRACE_LOG(m_logger) << "--> Data. Receiver: " << eqNo << ", ReqID: " << requestIdentifier << ", Data: " << data;
 
   for (unsigned int i=0; i< vds.NumberOfLongLongs__A__Padding__A__DatumValue.size(); ++i)
   {
@@ -682,11 +681,11 @@ void NgsConnector::go()
   }
   catch (const NGSException &ex)
   {
-    ERROR_LOG() << "NGS Exception caught in Event Loop" << ex.print();
+    ERROR_LOG(m_logger) << "NGS Exception caught in Event Loop" << ex.print();
   }
   catch (const std::exception &e)
   {
-    ERROR_LOG() << "Standard Exception caught in Event Loop: " << e.what();
+    ERROR_LOG(m_logger) << "Standard Exception caught in Event Loop: " << e.what();
   }
   catch (...)
   {
@@ -1499,7 +1498,7 @@ void NgsConnector::onNewMunitionDetonation(const rpr2::IObserverMunitionDetonati
   
   const auto &objectIdentifier = interaction.getEventIdentifier().IssuingObjectIdentifier;
   int eqId = getEquipmentNoByRTIObjectId(objectIdentifier.ID);
-  DEBUG_LOG() << "Engagement Reply, Issuer: " << eqId;
+  DEBUG_LOG(m_logger) << "Engagement Reply, Issuer: " << eqId;
   if (m_playerMap.contains(eqId) || objectIdentifier.ID == std::to_string(IdentifierStruct(0).toInt64())) 
     return;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.h
index 0a1fec516..68ef40c41 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.h
@@ -232,6 +232,7 @@ signals:
   void laserDesignation(const TrainingAreaBase::LaserDesignation &event);
 
 protected:
+  NGL::INGLLogger &m_logger;
   void subscribeAtNgs();
   void unsubscribeFromNgs();
 
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 53a4f1814..dee732eb0 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
@@ -14,10 +14,9 @@
 namespace HighLevelArchitecture
 {
 
-NgsHandler::NgsHandler(QObject *parent)
-  : QObject(parent)
-  , m_ddsHandler(nullptr)
-{}
+NgsHandler::NgsHandler(QObject *parent) : QObject(parent)
+  , m_ddsHandler(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 NgsHandler::~NgsHandler()
 {
@@ -39,7 +38,7 @@ bool NgsHandler::init(const std::shared_ptr<DdsHandler> &ddsHandler)
 
   ngs::IObserver::ProtocolType protocol = Settings::hlaProtocol();
 
-  INFO_LOG() << "Protocol = " << protToStr.value(protocol, QStringLiteral("UNKNOWN"));
+  INFO_LOG(m_logger) << "Protocol = " << protToStr.value(protocol, QStringLiteral("UNKNOWN"));
 
   m_ngsConnector = 
 
@@ -61,9 +60,9 @@ void NgsHandler::onFirstTickFinished()
   m_ppmHandler = std::make_shared<PpmHandler>(this);
   m_aesHandler = std::make_shared<AesHandler>(this);
   if (!m_ppmHandler->init())
-    ERROR_LOG() << "Could not init ppm handler - not able to publish participants to HLA";
+    ERROR_LOG(m_logger) << "Could not init ppm handler - not able to publish participants to HLA";
   if (!m_aesHandler->init())
-    ERROR_LOG() << "Could not init ppm handler - not able to publish area effect simulations to HLA";
+    ERROR_LOG(m_logger) << "Could not init ppm handler - not able to publish area effect simulations to HLA";
 
   connect(m_ppmHandler.get(), &PpmHandler::externalEquipmentNumberAdded,
           this, &NgsHandler::externalEquipmentNumberAdded);
@@ -89,11 +88,11 @@ void NgsHandler::initSocketReaders()
       sr->start();
       connect(sr, &SocketReader::newData, this, &NgsHandler::onNewSocketReaderData);
       m_socketReaders.append(sr);
-      INFO_LOG() << "SocketReader with ID " << sd.hlaRequestIdentifier << " connected";
+      INFO_LOG(m_logger) << "SocketReader with ID " << sd.hlaRequestIdentifier << " connected";
     }
     else
     {
-      ERROR_LOG() << "Could not initialize SocketReader " << sd.hlaRequestIdentifier;
+      ERROR_LOG(m_logger) << "Could not initialize SocketReader " << sd.hlaRequestIdentifier;
     }
   }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_handler.h
index 06efff02d..d8322c8ca 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_handler.h
@@ -49,6 +49,7 @@ private slots:
 
 private:
 
+  NGL::INGLLogger &m_logger;
   void initSocketReaders();
   void deInitSocketReaders();
 
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 594cf3750..b318d7303 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
@@ -82,7 +82,7 @@ bool PpmHandler::init()
         m_dtsTab->enableEquipmentGearAssignment())
       )
   {
-    ERROR_LOG() << "Enabling TAB DTS Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling TAB DTS Data-Topics failed.";
     return false;
   }
 
@@ -172,7 +172,7 @@ void PpmHandler::onDynamicParticipantDataChanged(const ParticipantManagement::Dy
   int equipmentNo = getEquipmentNo(data.participantId());
   if (equipmentNo == 0)
   {
-    ERROR_LOG() << "Could not find EquipmentNo for Participant " << data.participantId() << ". Cannot send Dynamic Participant Data Modification to HLA.";
+    ERROR_LOG(m_logger) << "Could not find EquipmentNo for Participant " << data.participantId() << ". Cannot send Dynamic Participant Data Modification to HLA.";
     return;
   }
 
@@ -235,7 +235,7 @@ void PpmHandler::onDynamicParticipantDataChanged(const ParticipantManagement::Dy
 
 void PpmHandler::onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType)
 {
-  DEBUG_LOG() << "onParticipantChanged: " << data;
+  DEBUG_LOG(m_logger) << "onParticipantChanged: " << data;
   switch (modType)
   {
   case DataModification::eAdded:
@@ -314,7 +314,7 @@ void PpmHandler::onParticipantChanged(const ParticipantManagement::Participant &
 
 void PpmHandler::onParticipantPositionChanged(const ParticipantManagement::ParticipantPosition &data, DataModification modType)
 {
-  DEBUG_LOG() << "onParticipantPositionChanged: " << data;
+  DEBUG_LOG(m_logger) << "onParticipantPositionChanged: " << data;
   switch (modType)
   {
   case DataModification::eAdded:
@@ -404,7 +404,7 @@ void PpmHandler::onChargeTypeChanged(const ProjectDataManagement::ChargeType &da
 
 void PpmHandler::startPublishToNgs()
 {
-  INFO_LOG() << "Recreating all players from scratch due to structure / exercise change";
+  INFO_LOG(m_logger) << "Recreating all players from scratch due to structure / exercise change";
 
   
   m_createdParticipantIds.clear();
@@ -413,7 +413,7 @@ void PpmHandler::startPublishToNgs()
   
 
   
-  INFO_LOG() << "(Re)Adding all players, size: " << m_partData.size();
+  INFO_LOG(m_logger) << "(Re)Adding all players, size: " << m_partData.size();
 
   for (const ParticipantManagement::Participant &participant : std::as_const(m_partData))
     createParticipant(participant);
@@ -474,7 +474,7 @@ rpr2::DetonationResultCodeEnum8::ET PpmHandler::rpr2DetonationResultFromPercenta
 
 void PpmHandler::participantVulnerabilityStateRequest(const TrainingAreaBase::TetraIcd::DemandVulnerabilityStateChange &request)
 {
-  DEBUG_LOG() << "Participant Vulnerability State Request";
+  DEBUG_LOG(m_logger) << "Participant Vulnerability State Request";
 
   rpr2::DetonationResultCodeEnum8::ET resCode = rpr2DetonationResultFromVulnerabilityState(request.reqestedState);
   m_ngsHandler->ngsConnector()->sendMunitionDetonation(request.header.equipmentNumber,
@@ -503,7 +503,7 @@ void PpmHandler::createParticipant(const ParticipantManagement::Participant &par
 
   if (!m_ngsHandler->ngsConnector()->canPublishData())
   {
-    WARNING_LOG() << "Can not publish data ... :(";
+    WARNING_LOG(m_logger) << "Can not publish data ... :(";
     return;
   }
 
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 860ff7b89..cea8131b0 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
@@ -90,6 +90,7 @@ public slots:
   void participantCesHitInformationRequest(const TrainingAreaBase::TetraIcd::CesHitInformation &request);
 
 private:
+  NGL::INGLLogger &m_logger;
   void createParticipant(const ParticipantManagement::Participant &participant);
   bool createHuman(const ParticipantManagement::Participant &participant);
   bool createGroundVehicle(const ParticipantManagement::Participant &participant);
@@ -113,6 +114,7 @@ private:
   static rpr2::DetonationResultCodeEnum8::ET rpr2DetonationResultFromPercentage(int percentage);
 
 private:
+  NGL::INGLLogger &m_logger;
   NgsHandler *m_ngsHandler;
   std::shared_ptr<ParticipantManagement::Interface::Dtc> m_dtcPpm;
   std::shared_ptr<ParticipantManagement::Interface::Ftc> m_ftcPpm;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_actionrequest.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_actionrequest.cpp
index d56fd7931..5afeb9254 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_actionrequest.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_actionrequest.cpp
@@ -22,6 +22,6 @@ void ObserverActionRequestCBNotifier::newActionRequestIntInstance(const rpr2::IO
 
 void ObserverActionRequestCBNotifier::deleteInterface()
 {
-  DEBUG_LOG() << "Delete Interface";
+  DEBUG_LOG(m_logger) << "Delete Interface";
   
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_actionrequest.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_actionrequest.h
index c6d96bbf3..3b7d020a0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_actionrequest.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_actionrequest.h
@@ -25,6 +25,8 @@ public:
   void deleteInterface() override;
 
 protected:
+
+NGL::INGLLogger &m_logger;
 signals:
   
   void newActionRequest(const rpr2::IObserverActionRequestIntInstance &interaction);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_data.cpp
index d8f423aaf..bc877ad73 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_data.cpp
@@ -22,6 +22,6 @@ void ObserverDataCBNotifier::newDataIntInstance(const rpr2::IObserverDataIntInst
 
 void ObserverDataCBNotifier::deleteInterface()
 {
-  DEBUG_LOG() << "Delete Interface";
+  DEBUG_LOG(m_logger) << "Delete Interface";
   
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_data.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_data.h
index c1236648e..86535bf37 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_data.h
@@ -25,6 +25,8 @@ public:
   void deleteInterface() override;
 
 protected:
+
+NGL::INGLLogger &m_logger;
 signals:
   
   void newData(const rpr2::IObserverDataIntInstance &interaction);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_engagementreply.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_engagementreply.cpp
index 2264c96f6..fbefa3d88 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_engagementreply.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_engagementreply.cpp
@@ -23,6 +23,6 @@ void ObserverEngagementReplyCBNotifier::newEngagementReplyIntInstance(const rpr2
 
 void ObserverEngagementReplyCBNotifier::deleteInterface()
 {
-  DEBUG_LOG() << "Delete Interface";
+  DEBUG_LOG(m_logger) << "Delete Interface";
   
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_engagementreply.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_engagementreply.h
index c8d08ab7b..910abc2e1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_engagementreply.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_engagementreply.h
@@ -25,6 +25,8 @@ public:
   void deleteInterface() override;
 
 protected:
+
+NGL::INGLLogger &m_logger;
 signals:
   void newEngagementReply(const rpr2::IObserverEngagementReplyIntInstance &interaction);
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_eventreport.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_eventreport.cpp
index f5f7de69d..e68ba2bb3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_eventreport.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_eventreport.cpp
@@ -22,6 +22,6 @@ void ObserverEventReportCBNotifier::newEventReportIntInstance(const rpr2::IObser
 
 void ObserverEventReportCBNotifier::deleteInterface()
 {
-  DEBUG_LOG() << "Delete Interface";
+  DEBUG_LOG(m_logger) << "Delete Interface";
   
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_eventreport.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_eventreport.h
index 6b238c9f9..91971e55f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_eventreport.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_eventreport.h
@@ -25,6 +25,8 @@ public:
   void deleteInterface() override;
 
 protected:
+
+NGL::INGLLogger &m_logger;
 signals:
   void newEventReport(const rpr2::IObserverEventReportIntInstance &interaction);
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_munitiondetonation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_munitiondetonation.cpp
index ba944fb85..34c0849a3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_munitiondetonation.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_munitiondetonation.cpp
@@ -17,6 +17,6 @@ void ObserverMunitionDetonationCBNotifier::newMunitionDetonationIntInstance(cons
 
 void ObserverMunitionDetonationCBNotifier::deleteInterface()
 {
-  DEBUG_LOG() << "Delete Interface";
+  DEBUG_LOG(m_logger) << "Delete Interface";
   
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_munitiondetonation.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_munitiondetonation.h
index 0528e2e22..d7170ca95 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_munitiondetonation.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_munitiondetonation.h
@@ -24,6 +24,8 @@ public:
   void deleteInterface() override;
 
 protected:
+
+NGL::INGLLogger &m_logger;
 signals:
   void newMunitionDetonation(const rpr2::IObserverMunitionDetonationIntInstance &interaction);
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_weaponfire.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_weaponfire.cpp
index 03c2aa975..2f4dce195 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_weaponfire.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_weaponfire.cpp
@@ -23,6 +23,6 @@ void ObserverWeaponFireCBNotifier::newWeaponFireIntInstance(const rpr2::IObserve
 
 void ObserverWeaponFireCBNotifier::deleteInterface()
 {
-  DEBUG_LOG() << "Delete Interface";
+  DEBUG_LOG(m_logger) << "Delete Interface";
   
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_weaponfire.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_weaponfire.h
index be317f4f7..b26d4d149 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_weaponfire.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_ia_weaponfire.h
@@ -25,6 +25,8 @@ public:
   void deleteInterface() override;
 
 protected:
+
+NGL::INGLLogger &m_logger;
 signals:
   void newWeaponFire(const rpr2::IObserverWeaponFireIntInstance &interaction);
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_observer_object_instance_cb.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_observer_object_instance_cb.h
index 6f62ab32e..a650dbade 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_observer_object_instance_cb.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/rpr/rpr_observer_object_instance_cb.h
@@ -25,7 +25,7 @@ public:
   
   void deleteObjectInstance() override
   {
-    DEBUG_LOG() << "deleteObjectInstance";
+    DEBUG_LOG(m_logger) << "deleteObjectInstance";
     if (m_pCB && m_pIObject)
       m_pCB->deleteObjectInstance(*m_pIObject);
     delete this;
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 acb332fdf..1251da1a2 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
@@ -12,17 +12,16 @@
 
 namespace HighLevelArchitecture {
 
-SocketReader::SocketReader(QObject *parent)
-  : QThread(parent)
+SocketReader::SocketReader(QObject *parent) : QThread(parent)
   , m_socket(new QTcpSocket(this))
   , m_hlaRequestIdentifier(0)
-  .getNGLLogger("SocketReader"))
-{
+  .getNGLLogger("SocketReader")),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 bool SocketReader::init(const QString &host, quint16 port, int hlaRequestIdentifier)
 {
-  DEBUG_LOG() << "SR " << hlaRequestIdentifier << ": Trying to establish connection to " << host << ":" << port;
+  DEBUG_LOG(m_logger) << "SR " << hlaRequestIdentifier << ": Trying to establish connection to " << host << ":" << port;
 
   m_hlaRequestIdentifier = hlaRequestIdentifier;
   connect(m_socket, SIGNAL(readyRead()), this, SLOT(onReadyRead()));
@@ -49,9 +48,9 @@ void SocketReader::onReadyRead()
   
   
   
-  DEBUG_LOG() << "SR "<< m_hlaRequestIdentifier << ": Data received, transmitting";
+  DEBUG_LOG(m_logger) << "SR "<< m_hlaRequestIdentifier << ": Data received, transmitting";
   QByteArray ba(m_socket->readAll());
-  TRACE_LOG() << "SR "<< m_hlaRequestIdentifier << ": Data contents: " << ba.constData();
+  TRACE_LOG(m_logger) << "SR "<< m_hlaRequestIdentifier << ": Data contents: " << ba.constData();
   emit newData(ba, m_hlaRequestIdentifier);
 }
 
@@ -75,7 +74,7 @@ void SocketReader::onSocketError(const QAbstractSocket::SocketError &error)
     }
   }
 
-  ERROR_LOG() << "SR "<< m_hlaRequestIdentifier << ": Socket Error: " << errorValue;
+  ERROR_LOG(m_logger) << "SR "<< m_hlaRequestIdentifier << ": Socket Error: " << errorValue;
 }
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/socketreader.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/socketreader.h
index 6b860c110..c3e7f4dd0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/socketreader.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/socketreader.h
@@ -26,6 +26,7 @@ signals:
   void newData(const QByteArray &content, int id);
 
 protected:
+  NGL::INGLLogger &m_logger;
   QTcpSocket      *m_socket;
   int              m_hlaRequestIdentifier;
 private slots:
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 1a9988376..0770b94ad 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
@@ -15,12 +15,11 @@
 namespace HighLevelArchitecture
 {
 
-WebSocketHandler::WebSocketHandler(int exerciseId, MainHandler *mainHandler, QObject *parent)
-  : QObject(parent)
+WebSocketHandler::WebSocketHandler(int exerciseId, MainHandler *mainHandler, QObject *parent) : QObject(parent)
   , m_webSocketServer(new QWebSocketServer(QStringLiteral("WLS"), QWebSocketServer::NonSecureMode, this))
   , m_mainHandler(mainHandler)
-  , m_exerciseId(exerciseId)
-{}
+  , m_exerciseId(exerciseId),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 WebSocketHandler::~WebSocketHandler()
 {
@@ -32,7 +31,7 @@ bool WebSocketHandler::init(quint16 listenPort)
 {
   if (!m_webSocketServer->listen(QHostAddress::Any, listenPort))
   {
-    WARNING_LOG() << "Can not listen on port " << listenPort << " - aborting";
+    WARNING_LOG(m_logger) << "Can not listen on port " << listenPort << " - aborting";
     return false;
   }
   connect(m_webSocketServer, &QWebSocketServer::newConnection,
@@ -51,7 +50,7 @@ bool WebSocketHandler::sendTelegramInternal(const TrainingAreaBase::TetraIcd::Tr
 
 
   const QString jsonStr = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact));
-  DEBUG_LOG() << "jsonStr: " << jsonStr;
+  DEBUG_LOG(m_logger) << "jsonStr: " << jsonStr;
 
   bool bOk = false;
   for (auto wsw : std::as_const(m_webSockets))
@@ -68,12 +67,12 @@ void WebSocketHandler::sendHlaConnectionState()
   TrainingAreaBase::TetraIcd::ProxyConnectionState connState;
   connState.connectedToSystem = m_mainHandler->isConnectedToHla();
   sendTelegram(&connState, m_exerciseId);
-  DEBUG_LOG() << "sendHlaConnectionState, isConnected: " << connState.connectedToSystem;
+  DEBUG_LOG(m_logger) << "sendHlaConnectionState, isConnected: " << connState.connectedToSystem;
 }
 
 void WebSocketHandler::sendParticipantConnectionStates()
 {
-  DEBUG_LOG() << "sendParticipantConnectionStates";
+  DEBUG_LOG(m_logger) << "sendParticipantConnectionStates";
   TrainingAreaBase::TetraIcd::WlsParticipantsConnectionState partConnState;
   partConnState.equipmentNumber = -1;
   partConnState.dataCommunicationPossible = false;
@@ -81,7 +80,7 @@ void WebSocketHandler::sendParticipantConnectionStates()
 
   if (!m_mainHandler->isConnectedToHla())
   {
-    INFO_LOG() << "We are (not) yet connected to HLA - don't send participant connection states";
+    INFO_LOG(m_logger) << "We are (not) yet connected to HLA - don't send participant connection states";
     return;
   }
   const auto externalEquipmentNumbers = m_mainHandler->ngsHandler()->ppmHandler()->externalEquipmentNumbers();
@@ -117,7 +116,7 @@ void WebSocketHandler::onNewConnection()
   QWebSocket *ws = m_webSocketServer->nextPendingConnection();
   if (!ws)
     return;
-  DEBUG_LOG() << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
+  DEBUG_LOG(m_logger) << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
   auto wsw = std::make_shared<WebSocketWrapper>(ws);
 
   connect(wsw.get(), &WebSocketWrapper::textMessageReceived,
@@ -132,11 +131,11 @@ void WebSocketHandler::onTextMessageReceived(const QByteArray &baJson)
 {
   using namespace TrainingAreaBase::TetraIcd;
 
-  TRACE_LOG() << "WebSocketHandler::onTextMessageReceived: " << baJson;
+  TRACE_LOG(m_logger) << "WebSocketHandler::onTextMessageReceived: " << baJson;
   WebSocketWrapper *wsw = qobject_cast<WebSocketWrapper *>(sender());
   if (!wsw)
   {
-    ERROR_LOG() << "Internal error - sender is no WebSocketWrapper";
+    ERROR_LOG(m_logger) << "Internal error - sender is no WebSocketWrapper";
     return;
   }
 
@@ -156,7 +155,7 @@ void WebSocketHandler::onTextMessageReceived(const QByteArray &baJson)
   const QJsonValue typeId = obj.value(QStringLiteral("typeId"));
   if (!typeId.isDouble())
   {
-    ERROR_LOG() << "Can not read type id: " << baJson;
+    ERROR_LOG(m_logger) << "Can not read type id: " << baJson;
     return;
   }
   const QJsonObject data = obj.value(QStringLiteral("data")).toObject();
@@ -185,14 +184,14 @@ void WebSocketHandler::onTextMessageReceived(const QByteArray &baJson)
       emit vulnerabilityStateRequest(DemandVulnerabilityStateChange::fromJson(data));
       break;
     default:
-      WARNING_LOG() << "Handler for telegram Id " << typeId.toInt()
+      WARNING_LOG(m_logger) << "Handler for telegram Id " << typeId.toInt()
                             << " not yet implemented (" << baJson << ")";
       return;
     }
   }
   catch (const std::exception &e)
   {
-    WARNING_LOG() << "Could not parse json: " << e.what() << " (" << baJson << ")";
+    WARNING_LOG(m_logger) << "Could not parse json: " << e.what() << " (" << baJson << ")";
     return;
   }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/web_socket_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/web_socket_handler.h
index 843dccaf9..8c84dc493 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/web_socket_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/web_socket_handler.h
@@ -54,6 +54,7 @@ public Q_SLOTS:
   void onExternalEquipmentNumberRemoved(int equipNo);
 
 private:
+  NGL::INGLLogger &m_logger;
   void sendDataCommunicationState(int equipNo, bool bIsAvailable);
   bool sendTelegramInternal(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data,
                             const QString &type, int exerciseId);
@@ -62,6 +63,7 @@ private Q_SLOTS:
   void onWebSocketDisconnected();
   void onTextMessageReceived(const QByteArray &baJson);
 private:
+  NGL::INGLLogger &m_logger;
   QWebSocketServer *m_webSocketServer;
   QVector<std::shared_ptr<WebSocketWrapper>> m_webSockets;
   MainHandler *m_mainHandler;
@@ -85,6 +87,7 @@ Q_SIGNALS:
 private Q_SLOTS:
   void onTextMessageReceived(const QString &data);
 private:
+  NGL::INGLLogger &m_logger;
   QWebSocket *m_webSocket;
   int m_exerciseId;
 };
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 8f9591da2..044dc3b85 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
@@ -79,9 +79,9 @@ AesHandler::AesHandler(NgsHandler *ngsHandler)
 void AesHandler::onMineAreaModifyReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    WARNING_LOG() << "ModifyReply: " << replyObject();
+    WARNING_LOG(m_logger) << "ModifyReply: " << replyObject();
   else
-    DEBUG_LOG() << "ModifyReply: " << replyObject();
+    DEBUG_LOG(m_logger) << "ModifyReply: " << replyObject();
   m_requestHelper->requestReply(replyObject);
 }
 
@@ -176,7 +176,7 @@ void AesHandler::onAesItemViewChanged(const AesItemView &data, DataModification
     for (const auto &pos : data.form())
       formString << ParticipantPosition(pos).toString();
 
-    DEBUG_LOG() << "\n##############################"
+    DEBUG_LOG(m_logger) << "\n##############################"
                         << "\n##### AesItemViewChanged #####"
                         << "\n##############################"
                         << "\nid: " << data.id()
@@ -196,7 +196,7 @@ void AesHandler::onAesItemViewChanged(const AesItemView &data, DataModification
       data.effectStateId() == AesEffectState::EsExpired ||
       data.effectStateId() == AesEffectState::EsRemoved)
   {
-    DEBUG_LOG() << "Item view with id " << data.aesItemId() << " removed";
+    DEBUG_LOG(m_logger) << "Item view with id " << data.aesItemId() << " removed";
     m_aesItemViews.remove(data.aesItemId());
     m_takenIndicesForAesItem.remove(data.aesItemId());
     m_ngsHandler->ngsConnector()->setItemForm(data.aesItemId());
@@ -205,7 +205,7 @@ void AesHandler::onAesItemViewChanged(const AesItemView &data, DataModification
   else if (data.effectStateId() == AesEffectState::EsPrepared &&
            data.aesTypeId() == AesType_def::AtExplosionAreaSingleExplosions)
   {
-    DEBUG_LOG() << "Item view with id " << data.aesItemId() << " added";
+    DEBUG_LOG(m_logger) << "Item view with id " << data.aesItemId() << " added";
     m_aesItemViews.insert(data.aesItemId(), data);
     m_takenIndicesForAesItem.insert(data.aesItemId(), QVector<int32_t>());
   }
@@ -213,7 +213,7 @@ void AesHandler::onAesItemViewChanged(const AesItemView &data, DataModification
   else if (data.aesTypeId() == AesType_def::AtBCContamination)
   {
     m_ngsHandler->ngsConnector()->setItemForm(data.aesItemId(), data.aesTypeId().underlying(), data.form());
-    DEBUG_LOG() << "Item view with id " << data.aesItemId() << " directly updated in ngsConnector";
+    DEBUG_LOG(m_logger) << "Item view with id " << data.aesItemId() << " directly updated in ngsConnector";
   }
 }
 
@@ -229,7 +229,7 @@ void AesHandler::onTriggeredImpactsChanged(const TriggeredImpacts &data, DataMod
     }
     bitfield.append(QStringLiteral("]"));
 
-    DEBUG_LOG() << "\n#####################################"
+    DEBUG_LOG(m_logger) << "\n#####################################"
                         << "\n##### triggered impacts changed #####"
                         << "\n#####################################"
                         << "\nid: " << data.id()
@@ -349,7 +349,7 @@ void AesHandler::onAesExplosionSingleChanged(const ExplosionSingle &data, DataMo
 
 
 
-  DEBUG_LOG() << "\n####################################"
+  DEBUG_LOG(m_logger) << "\n####################################"
                       << "\n##### single explosion changed #####"
                       << "\n####################################"
                       << "\nid: " << data.id()
@@ -387,7 +387,7 @@ void AesHandler::onAesMineAreaChanged(const MineArea &data, DataModification mod
 {
   Q_UNUSED(modType);
 
-  DEBUG_LOG() << "\n#############################"
+  DEBUG_LOG(m_logger) << "\n#############################"
                       << "\n##### mine area changed #####"
                       << "\n#############################"
                       << "\nid: " << data.id()
@@ -410,7 +410,7 @@ void AesHandler::onAesMineCorridorChanged(const MineCorridor &data, DataModifica
 {
   Q_UNUSED(modType);
 
-  DEBUG_LOG() << "\n#################################"
+  DEBUG_LOG(m_logger) << "\n#################################"
                       << "\n##### mine corridor changed #####"
                       << "\n#################################"
                       << "\nid: " << data.id()
@@ -435,7 +435,7 @@ void AesHandler::onAesNContaminationChanged(const NContamination &data, DataModi
   Q_UNUSED(modType);
   m_ngsHandler->ngsConnector()->guezNuclearAgent(data);
 
-  DEBUG_LOG() << "\n####################################"
+  DEBUG_LOG(m_logger) << "\n####################################"
                       << "\n##### n contamination changed #####"
                       << "\n####################################"
                       << "\nid: " << data.id()
@@ -458,7 +458,7 @@ void AesHandler::onAesBCContaminationChanged(const BCContamination &data, DataMo
   Q_UNUSED(modType);
   m_ngsHandler->ngsConnector()->guezChemicalAgent(data);
 
-  DEBUG_LOG() << "\n####################################"
+  DEBUG_LOG(m_logger) << "\n####################################"
                       << "\n##### bc contamination changed #####"
                       << "\n####################################"
                       << "\nid: " << data.id()
@@ -563,7 +563,7 @@ void AesHandler::onAesRemoveItem(qint64 identifierInt)
   AesType type = m_dtcAes->aesItemIdFromExternalId(identifierInt, aesItemId);
   Core::RemoveElementRequest req(aesItemId);
 
-  DEBUG_LOG() << "Remove Item for " << aesItemId << " requested. Type: " << type;
+  DEBUG_LOG(m_logger) << "Remove Item for " << aesItemId << " requested. Type: " << type;
 
   switch (type.underlying())
   {
@@ -647,11 +647,11 @@ void AesHandler::onAesActivationTimeChanged(qint64 identifierInt, qint64 msecsSi
   }
   case AreaEffectSimulation::AesType_def::AtMineArea:
   {
-    DEBUG_LOG() << "onAesActivationTimeChanged / MineArea";
+    DEBUG_LOG(m_logger) << "onAesActivationTimeChanged / MineArea";
     MineAreaModifyRequest *req = static_cast<MineAreaModifyRequest*>(m_pendingRequests.value(aesItemId));
     if (!req)
     {
-      DEBUG_LOG() << "onAesActivationTimeChanged / MineArea - Request NOT found";
+      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))
         return;
@@ -958,7 +958,7 @@ void AesHandler::onAesPointsDataChanged(qint64 identifierInt, const std::vector<
   int aesItemId = 0;
   AesType type = m_dtcAes->aesItemIdFromExternalId(identifierInt, aesItemId);
 
-  DEBUG_LOG() << "Points Data changed for Aes Item ID: " << aesItemId << ". Type: " << type;
+  DEBUG_LOG(m_logger) << "Points Data changed for Aes Item ID: " << aesItemId << ". Type: " << type;
 
   switch (type.underlying())
   {
@@ -980,7 +980,7 @@ void AesHandler::onAesPointsDataChanged(qint64 identifierInt, const std::vector<
     std::vector<Core::GeoPosition2D> segments;
     if (!getCorridorSegment(pos, segments, width))
     {
-      ERROR_LOG() << "Could not calculate Mine Area from given Points Data!";
+      ERROR_LOG(m_logger) << "Could not calculate Mine Area from given Points Data!";
       return;
     }
     req->segments(segments);
@@ -1003,7 +1003,7 @@ void AesHandler::onAesPointsDataChanged(qint64 identifierInt, const std::vector<
     std::vector<Core::GeoPosition2D> segments;
     if (!getCorridorSegment(pos, segments, width))
     {
-      ERROR_LOG() << "Could not calculate Mine Area from given Points Data!";
+      ERROR_LOG(m_logger) << "Could not calculate Mine Area from given Points Data!";
       return;
     }
     req->segments(segments);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/aes_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/aes_handler.h
index a056503eb..f806d1f48 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/aes_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/aes_handler.h
@@ -87,6 +87,7 @@ private Q_SLOTS:
 #endif 
 
 private:
+  NGL::INGLLogger &m_logger;
   template <typename T>
   void onSendRequest(const T &item);
   template <typename T>
@@ -94,6 +95,7 @@ private:
 
   static bool isModifiable(const AreaEffectSimulation::AesItem &item);
 private:
+  NGL::INGLLogger &m_logger;
   NgsHandler *m_ngsHandler;
   std::shared_ptr<AreaEffectSimulation::Interface::Dtc>  m_dtcAes;
   std::shared_ptr<AreaEffectSimulation::Interface::Ftc>  m_ftcAes;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/dds_handler.cpp
index cffb46124..4434de37b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/dds_handler.cpp
@@ -9,11 +9,10 @@
 namespace HighLevelArchitecture
 {
 
-DdsHandler::DdsHandler(int domainId, int exerciseId)
-  : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId))
-  , m_hlaIsActive(false)
-{
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+DdsHandler::DdsHandler(int domainId, int exerciseId) : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId))
+  , m_hlaIsActive(false),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 DdsHandler::~DdsHandler()
@@ -27,7 +26,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/dds_handler.h
index bc629ddf8..b8424120d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/dds_handler.h
@@ -33,8 +33,10 @@ public:
 Q_SIGNALS:
   void exerciseHlaStateChanged(bool bHlaEnabled);
 private:
+  NGL::INGLLogger &m_logger;
   void onExerciseChanged(const ExerciseManagement::Exercise &ex, DataModification modType);
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector>            m_ddsConnector;
   std::shared_ptr<Core::Pacemaker>                       m_pacemaker;
   std::shared_ptr<ExerciseManagement::Interface::Dtc>    m_dtcExm;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/main_handler.cpp
index 7c6539f4d..23ee905b8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/main_handler.cpp
@@ -15,10 +15,9 @@
 namespace HighLevelArchitecture
 {
 
-MainHandler::MainHandler(QObject *parent)
-  : QObject(parent)
-  , m_exerciseId(0)
-{}
+MainHandler::MainHandler(QObject *parent) : QObject(parent)
+  , m_exerciseId(0),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 MainHandler::~MainHandler()
 {
@@ -34,7 +33,7 @@ bool MainHandler::init(int domainId, int exerciseId)
   m_ddsHandler = std::make_shared<DdsHandler>(domainId, exerciseId);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Could not init DDS handler";
+    ERROR_LOG(m_logger) << "Could not init DDS handler";
     return false;
   }
   connect(m_ddsHandler.get(), &DdsHandler::exerciseHlaStateChanged,
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/main_handler.h
index dfcb93b55..d8e7fbae0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/main_handler.h
@@ -26,6 +26,7 @@ public:
 private Q_SLOTS:
   void onExerciseHlaStateChanged(bool bHlaEnabled);
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler> m_ddsHandler;
   std::shared_ptr<NgsHandler> m_ngsHandler;
   std::shared_ptr<WebSocketHandler> m_wsHandler;
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 2f3aafe7d..dbf4763ce 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
@@ -134,8 +134,7 @@ static inline rpr2::EnvironmentObjectTypeStruct dummyEOS()
 
 
 
-NgsConnector::NgsConnector(const QString &fedName, NgsHandler *ngsHandler)
-  : m_ngsHandler(ngsHandler)
+NgsConnector::NgsConnector(const QString &fedName, NgsHandler *ngsHandler) : m_ngsHandler(ngsHandler)
   , m_fedName(fedName)
   , m_swadmin(&ngs::SimulatedWorldAPI::getSimulatedWorldAdmin())
   , m_master(nullptr)
@@ -154,8 +153,8 @@ NgsConnector::NgsConnector(const QString &fedName, NgsHandler *ngsHandler)
   , m_requestBiteReportCallback(new ObserverGuezRequestBiteReportCBNotifier())
   , m_bInitialized(false)
   , m_bCanPublishData(false)
-  , m_timer(new QTimer(this))
-{
+  , m_timer(new QTimer(this)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   connect(m_timer, &QTimer::timeout,
           this, &NgsConnector::go);
   connect(m_playerCallback, &PlayerCallback::firstTick,
@@ -234,7 +233,7 @@ bool NgsConnector::initialize(ngs::IObserver::ProtocolType protocol, const QStri
   }
   catch (const ngs::NGSSimWorldException &e)
   {
-    ERROR_LOG() << "caught exception during init (getIFederationMaster): " << e.print();
+    ERROR_LOG(m_logger) << "caught exception during init (getIFederationMaster): " << e.print();
     return false;
   }
 
@@ -249,7 +248,7 @@ bool NgsConnector::initialize(ngs::IObserver::ProtocolType protocol, const QStri
     }
     catch (const NGSException &e)
     {
-      ERROR_LOG() << "caught exception during init (createFederation): " << e.print();
+      ERROR_LOG(m_logger) << "caught exception during init (createFederation): " << e.print();
       return false;
     }
     player = &m_swadmin->getIPlayer(m_fedName.toStdString(), playerName.toStdString(), *m_playerCallback, Settings::swConfFileName().toLatin1().data(), Settings::fomIdentifier().toStdString(), Settings::rtiIdentifier().toStdString());
@@ -299,27 +298,27 @@ void NgsConnector::subscribeAtNgs()
   m_enitityNumberCounter = 1; 
   m_eventCount = 1;
 
-  INFO_LOG() << "Subscribe at NGS - Guez Human Objects";
+  INFO_LOG(m_logger) << "Subscribe at NGS - Guez Human Objects";
   rpr2::IObserverGuezHumanObjClass &humanObjClass = m_somPlayer->getObserverGuezHumanObjClass(*m_humanCallback);
   humanObjClass.subscribeAllAttributes();
   humanObjClass.subscribe();
 
-  INFO_LOG() << "Subscribe at NGS - Guez ObserverController Objects";
+  INFO_LOG(m_logger) << "Subscribe at NGS - Guez ObserverController Objects";
   rpr2::IObserverGuezObserverControllerObjClass &observerControllerObjClass = m_somPlayer->getObserverGuezObserverControllerObjClass(*m_observerControllerCallback);
   observerControllerObjClass.subscribeAllAttributes();
   observerControllerObjClass.subscribe();
 
-  INFO_LOG() << "Subscribe at NGS - Guez GroundVehicle Objects";
+  INFO_LOG(m_logger) << "Subscribe at NGS - Guez GroundVehicle Objects";
   rpr2::IObserverGuezGroundVehicleObjClass &groundVehicleObjClass = m_somPlayer->getObserverGuezGroundVehicleObjClass(*m_groundVehicleCallback);
   groundVehicleObjClass.subscribeAllAttributes();
   groundVehicleObjClass.subscribe();
 
-  INFO_LOG() << "Subscribe at NGS - Guez MineField Objects";
+  INFO_LOG(m_logger) << "Subscribe at NGS - Guez MineField Objects";
   rpr2::IObserverGuezMineFieldObjClass &minefieldObjClass = m_somPlayer->getObserverGuezMineFieldObjClass(*m_minefieldCallback);
   minefieldObjClass.subscribeAllAttributes();
   minefieldObjClass.subscribe();
 
-  INFO_LOG() << "Subscribe at NGS - Guez MineField Breach Objects";
+  INFO_LOG(m_logger) << "Subscribe at NGS - Guez MineField Breach Objects";
   rpr2::IObserverGuezMineFieldBreachObjClass &minefieldBreachObjClass = m_somPlayer->getObserverGuezMineFieldBreachObjClass(*m_minefieldBreachCallback);
   minefieldBreachObjClass.subscribeAllAttributes();
   minefieldBreachObjClass.subscribe();
@@ -355,23 +354,23 @@ void NgsConnector::unsubscribeFromNgs()
 
   if (m_somPlayer)
   {
-    INFO_LOG() << "Unsubscribe at NGS - Guez Human Objects";
+    INFO_LOG(m_logger) << "Unsubscribe at NGS - Guez Human Objects";
     rpr2::IObserverGuezHumanObjClass &humanObjClass = m_somPlayer->getObserverGuezHumanObjClass(*m_humanCallback);
     humanObjClass.unsubscribe();
 
-    INFO_LOG() << "Unsubscribe at NGS - Guez ObserverController Objects";
+    INFO_LOG(m_logger) << "Unsubscribe at NGS - Guez ObserverController Objects";
     rpr2::IObserverGuezObserverControllerObjClass &observerControllerObjClass = m_somPlayer->getObserverGuezObserverControllerObjClass(*m_observerControllerCallback);
     observerControllerObjClass.unsubscribe();
 
-    INFO_LOG() << "Unsubscribe at NGS - Guez GroundVehicle Objects";
+    INFO_LOG(m_logger) << "Unsubscribe at NGS - Guez GroundVehicle Objects";
     rpr2::IObserverGuezGroundVehicleObjClass &groundVehicleObjClass = m_somPlayer->getObserverGuezGroundVehicleObjClass(*m_groundVehicleCallback);
     groundVehicleObjClass.unsubscribe();
 
-    INFO_LOG() << "Unsubscribe at NGS - Guez MineField Objects";
+    INFO_LOG(m_logger) << "Unsubscribe at NGS - Guez MineField Objects";
     rpr2::IObserverGuezMineFieldObjClass &minefieldObjClass = m_somPlayer->getObserverGuezMineFieldObjClass(*m_minefieldCallback);
     minefieldObjClass.unsubscribe();
 
-    INFO_LOG() << "Unsubscribe at NGS - Guez MineField Breach Objects";
+    INFO_LOG(m_logger) << "Unsubscribe at NGS - Guez MineField Breach Objects";
     rpr2::IObserverGuezMineFieldBreachObjClass &minefieldBreachObjClass = m_somPlayer->getObserverGuezMineFieldBreachObjClass(*m_minefieldBreachCallback);
     minefieldBreachObjClass.unsubscribe();
   }
@@ -1097,11 +1096,11 @@ void NgsConnector::go()
   }
   catch (const NGSException &ex)
   {
-    ERROR_LOG() << "NGS Exception caught in Event Loop" << ex.print();
+    ERROR_LOG(m_logger) << "NGS Exception caught in Event Loop" << ex.print();
   }
   catch (const std::exception &e)
   {
-    ERROR_LOG() << "Standard Exception caught in Event Loop: " << e.what();
+    ERROR_LOG(m_logger) << "Standard Exception caught in Event Loop: " << e.what();
   }
   catch (...)
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_connector.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_connector.h
index b273b43f9..915315ab9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_connector.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_connector.h
@@ -284,6 +284,7 @@ signals:
   void newMinefieldBreach(AreaEffectSimulation::MineCorridorModifyRequest &mc);
 
 protected:
+  NGL::INGLLogger &m_logger;
   void subscribeAtNgs();
   void unsubscribeFromNgs();
 
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 3a15d1a81..634edc64e 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
@@ -12,10 +12,9 @@
 namespace HighLevelArchitecture
 {
 
-NgsHandler::NgsHandler(QObject *parent)
-  : QObject(parent)
-  , m_ddsHandler(nullptr)
-{}
+NgsHandler::NgsHandler(QObject *parent) : QObject(parent)
+  , m_ddsHandler(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 NgsHandler::~NgsHandler()
 {
@@ -37,7 +36,7 @@ bool NgsHandler::init(const std::shared_ptr<DdsHandler> &ddsHandler)
 
   ngs::IObserver::ProtocolType protocol = Settings::hlaProtocol();
 
-  INFO_LOG() << "Protocol = " << protToStr.value(protocol, QStringLiteral("UNKNOWN"));
+  INFO_LOG(m_logger) << "Protocol = " << protToStr.value(protocol, QStringLiteral("UNKNOWN"));
 
   m_ngsConnector = 
 
@@ -59,9 +58,9 @@ void NgsHandler::onFirstTickFinished()
   m_ppmHandler = std::make_shared<PpmHandler>(this);
   m_aesHandler = std::make_shared<AesHandler>(this);
   if (!m_ppmHandler->init())
-    ERROR_LOG() << "Could not init ppm handler - not able to publish participants to HLA";
+    ERROR_LOG(m_logger) << "Could not init ppm handler - not able to publish participants to HLA";
   if (!m_aesHandler->init())
-    ERROR_LOG() << "Could not init ppm handler - not able to publish area effect simulations to HLA";
+    ERROR_LOG(m_logger) << "Could not init ppm handler - not able to publish area effect simulations to HLA";
 
   emit firstTickFinished();
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_handler.h
index 7234bd47d..65d9b40ac 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_handler.h
@@ -42,6 +42,7 @@ Q_SIGNALS:
 private slots:
   void onFirstTickFinished();
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler> m_ddsHandler;
   std::shared_ptr<PpmHandler> m_ppmHandler;
   std::shared_ptr<AesHandler> m_aesHandler;
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 46fae0dc6..61bc54536 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
@@ -81,7 +81,7 @@ bool PpmHandler::init()
         m_dtsTab->enableEquipmentBite())
       )
   {
-    ERROR_LOG() << "Enabling TAB DTS Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling TAB DTS Data-Topics failed.";
     return false;
   }
 
@@ -176,7 +176,7 @@ void PpmHandler::onDynamicParticipantDataChanged(const ParticipantManagement::Dy
   int equipmentNo = getEquipmentNo(data.participantId());
   if (equipmentNo == 0)
   {
-    ERROR_LOG() << "Could not find EquipmentNo for Participant " << data.participantId() << ". Cannot send Dynamic Participant Data Modification to HLA.";
+    ERROR_LOG(m_logger) << "Could not find EquipmentNo for Participant " << data.participantId() << ". Cannot send Dynamic Participant Data Modification to HLA.";
     return;
   }
 
@@ -255,7 +255,7 @@ void PpmHandler::onDynamicParticipantDataChanged(const ParticipantManagement::Dy
 
 void PpmHandler::onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType)
 {
-  DEBUG_LOG() << "onParticipantChanged: " << data;
+  DEBUG_LOG(m_logger) << "onParticipantChanged: " << data;
   switch (modType)
   {
   case DataModification::eAdded:
@@ -337,7 +337,7 @@ void PpmHandler::onParticipantChanged(const ParticipantManagement::Participant &
 
 void PpmHandler::onParticipantPositionChanged(const ParticipantManagement::ParticipantPosition &data, DataModification modType)
 {
-  DEBUG_LOG() << "onParticipantPositionChanged: " << data;
+  DEBUG_LOG(m_logger) << "onParticipantPositionChanged: " << data;
   switch (modType)
   {
   case DataModification::eAdded:
@@ -446,7 +446,7 @@ void PpmHandler::onEquipmentBiteChanged(const TrainingAreaBase::EquipmentBite &d
 
 void PpmHandler::startPublishToNgs()
 {
-  INFO_LOG() << "Recreating all players from scratch due to structure / exercise change";
+  INFO_LOG(m_logger) << "Recreating all players from scratch due to structure / exercise change";
 
   
   m_createdParticipantIds.clear();
@@ -455,7 +455,7 @@ void PpmHandler::startPublishToNgs()
   
 
   
-  INFO_LOG() << "(Re)Adding all players, size: " << m_partData.size();
+  INFO_LOG(m_logger) << "(Re)Adding all players, size: " << m_partData.size();
 
   for (const ParticipantManagement::Participant &participant : std::as_const(m_partData))
     createParticipant(participant);
@@ -479,7 +479,7 @@ void PpmHandler::createParticipant(const ParticipantManagement::Participant &par
 
   if (!m_ngsHandler->ngsConnector()->canPublishData())
   {
-    WARNING_LOG() << "Can not publish data ... :(";
+    WARNING_LOG(m_logger) << "Can not publish data ... :(";
     return;
   }
 
@@ -1002,7 +1002,7 @@ bool PpmHandler::onExconInit(int eqNo, rpr2::ResetPlayerEnum8::ET rp, rpr2::Acti
 
 bool PpmHandler::onBiteReport(const TrainingAreaBase::EquipmentBite &report)
 {
-  DEBUG_LOG() << "Attempting to Forward Bite Report to DDS. dtsTab: " << m_dtsTab << ", report for EqId: " << report.equipmentNumber();
+  DEBUG_LOG(m_logger) << "Attempting to Forward Bite Report to DDS. dtsTab: " << m_dtsTab << ", report for EqId: " << report.equipmentNumber();
   if (!m_dtsTab)
     return false;
   return m_dtsTab->publish(report);
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 092caa164..d9d14207c 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
@@ -89,6 +89,7 @@ public slots:
   void participantBiteRequest(const TrainingAreaBase::TetraIcd::DemandBite &request);
 
 private:
+  NGL::INGLLogger &m_logger;
   void createParticipant(const ParticipantManagement::Participant &participant);
   bool createHuman(const ParticipantManagement::Participant &participant);
   bool createGroundVehicle(const ParticipantManagement::Participant &participant);
@@ -110,6 +111,7 @@ private:
   TypeStruct getTypestruct(int typeId);
 
 private:
+  NGL::INGLLogger &m_logger;
   NgsHandler *m_ngsHandler;
   std::shared_ptr<ParticipantManagement::Interface::Dtc> m_dtcPpm;
   std::shared_ptr<ParticipantManagement::Interface::Ftc> m_ftcPpm;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_bitereport.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_bitereport.cpp
index d6830d4e9..145894ec7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_bitereport.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_bitereport.cpp
@@ -17,6 +17,6 @@ void ObserverGuezBiteReportCBNotifier::newGuezBiteReportIntInstance(const rpr2::
 
 void ObserverGuezBiteReportCBNotifier::deleteInterface()
 {
-  DEBUG_LOG() << "Delete Interface";
+  DEBUG_LOG(m_logger) << "Delete Interface";
   
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_bitereport.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_bitereport.h
index 97ea7951c..8d87de697 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_bitereport.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_bitereport.h
@@ -23,6 +23,8 @@ public:
   void deleteInterface() override;
 
 protected:
+
+NGL::INGLLogger &m_logger;
 signals:
   void newGuezBiteReport(const rpr2::IObserverGuezBiteReportIntInstance &action);
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_exconengagement.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_exconengagement.cpp
index 9df89b90d..3c4602aa5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_exconengagement.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_exconengagement.cpp
@@ -17,6 +17,6 @@ void ObserverGuezExconEngagementCBNotifier::newGuezExconEngagementIntInstance(co
 
 void ObserverGuezExconEngagementCBNotifier::deleteInterface()
 {
-  DEBUG_LOG() << "Delete Interface";
+  DEBUG_LOG(m_logger) << "Delete Interface";
   
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_exconengagement.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_exconengagement.h
index 0179a2511..f380c08f9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_exconengagement.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_exconengagement.h
@@ -23,6 +23,8 @@ public:
   void deleteInterface() override;
 
 protected:
+
+NGL::INGLLogger &m_logger;
 signals:
   void newGuezExconEngagement(const rpr2::IObserverGuezExconEngagementIntInstance &action);
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_hit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_hit.cpp
index 4661b25be..c336069e7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_hit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_hit.cpp
@@ -18,6 +18,6 @@ void ObserverGuezHitCBNotifier::newGuezHitIntInstance(const rpr2::IObserverGuezH
 
 void ObserverGuezHitCBNotifier::deleteInterface()
 {
-  DEBUG_LOG() << "Delete Interface";
+  DEBUG_LOG(m_logger) << "Delete Interface";
   
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_hit.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_hit.h
index fc26dfa2f..8b51bc2a6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_hit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_hit.h
@@ -23,6 +23,8 @@ public:
   void deleteInterface() override;
 
 protected:
+
+NGL::INGLLogger &m_logger;
 signals:
   void newGuezHit(const rpr2::IObserverGuezHitIntInstance &interaction);
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_init.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_init.cpp
index eb88dc143..bf97aaac7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_init.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_init.cpp
@@ -17,6 +17,6 @@ void ObserverGuezInitCBNotifier::newGuezInitIntInstance(const rpr2::IObserverGue
 
 void ObserverGuezInitCBNotifier::deleteInterface()
 {
-  DEBUG_LOG() << "Delete Interface";
+  DEBUG_LOG(m_logger) << "Delete Interface";
   
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_init.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_init.h
index 396ea963f..04a07f14f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_init.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_init.h
@@ -23,6 +23,8 @@ public:
   void deleteInterface() override;
 
 protected:
+
+NGL::INGLLogger &m_logger;
 signals:
   void newGuezInit(const rpr2::IObserverGuezInitIntInstance &action);
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_requestbitereport.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_requestbitereport.cpp
index 4110428b8..fb0759e88 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_requestbitereport.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_requestbitereport.cpp
@@ -17,6 +17,6 @@ void ObserverGuezRequestBiteReportCBNotifier::newGuezRequestBiteReportIntInstanc
 
 void ObserverGuezRequestBiteReportCBNotifier::deleteInterface()
 {
-  DEBUG_LOG() << "Delete Interface";
+  DEBUG_LOG(m_logger) << "Delete Interface";
   
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_requestbitereport.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_requestbitereport.h
index ef0905e61..8defab082 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_requestbitereport.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_guez_requestbitereport.h
@@ -23,6 +23,8 @@ public:
   void deleteInterface() override;
 
 protected:
+
+NGL::INGLLogger &m_logger;
 signals:
   void newGuezRequestBiteReport(const rpr2::IObserverGuezRequestBiteReportIntInstance &action);
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_munitiondetonation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_munitiondetonation.cpp
index ba944fb85..34c0849a3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_munitiondetonation.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_munitiondetonation.cpp
@@ -17,6 +17,6 @@ void ObserverMunitionDetonationCBNotifier::newMunitionDetonationIntInstance(cons
 
 void ObserverMunitionDetonationCBNotifier::deleteInterface()
 {
-  DEBUG_LOG() << "Delete Interface";
+  DEBUG_LOG(m_logger) << "Delete Interface";
   
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_munitiondetonation.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_munitiondetonation.h
index 0528e2e22..d7170ca95 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_munitiondetonation.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_munitiondetonation.h
@@ -24,6 +24,8 @@ public:
   void deleteInterface() override;
 
 protected:
+
+NGL::INGLLogger &m_logger;
 signals:
   void newMunitionDetonation(const rpr2::IObserverMunitionDetonationIntInstance &interaction);
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_weaponfire.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_weaponfire.cpp
index 03c2aa975..2f4dce195 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_weaponfire.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_weaponfire.cpp
@@ -23,6 +23,6 @@ void ObserverWeaponFireCBNotifier::newWeaponFireIntInstance(const rpr2::IObserve
 
 void ObserverWeaponFireCBNotifier::deleteInterface()
 {
-  DEBUG_LOG() << "Delete Interface";
+  DEBUG_LOG(m_logger) << "Delete Interface";
   
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_weaponfire.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_weaponfire.h
index be317f4f7..b26d4d149 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_weaponfire.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_ia_weaponfire.h
@@ -25,6 +25,8 @@ public:
   void deleteInterface() override;
 
 protected:
+
+NGL::INGLLogger &m_logger;
 signals:
   void newWeaponFire(const rpr2::IObserverWeaponFireIntInstance &interaction);
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_observer_object_instance_cb.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_observer_object_instance_cb.h
index e0b9acdf1..aa64ffbad 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_observer_object_instance_cb.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/rpr/rpr_observer_object_instance_cb.h
@@ -25,7 +25,7 @@ public:
   
   void deleteObjectInstance() override
   {
-    DEBUG_LOG() << "deleteObjectInstance";
+    DEBUG_LOG(m_logger) << "deleteObjectInstance";
     if (m_pCB && m_pIObject)
       m_pCB->deleteObjectInstance(*m_pIObject);
     delete this;
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 ddf4f57d7..359194695 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
@@ -15,12 +15,11 @@
 namespace HighLevelArchitecture
 {
 
-WebSocketHandler::WebSocketHandler(int exerciseId, MainHandler *mainHandler, QObject *parent)
-  : QObject(parent)
+WebSocketHandler::WebSocketHandler(int exerciseId, MainHandler *mainHandler, QObject *parent) : QObject(parent)
   , m_webSocketServer(new QWebSocketServer(QStringLiteral("WLS"), QWebSocketServer::NonSecureMode, this))
   , m_mainHandler(mainHandler)
-  , m_exerciseId(exerciseId)
-{}
+  , m_exerciseId(exerciseId),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 WebSocketHandler::~WebSocketHandler()
 {
@@ -32,7 +31,7 @@ bool WebSocketHandler::init(quint16 listenPort)
 {
   if (!m_webSocketServer->listen(QHostAddress::Any, listenPort))
   {
-    WARNING_LOG() << "Can not listen on port " << listenPort << " - aborting";
+    WARNING_LOG(m_logger) << "Can not listen on port " << listenPort << " - aborting";
     return false;
   }
   connect(m_webSocketServer, &QWebSocketServer::newConnection,
@@ -51,7 +50,7 @@ bool WebSocketHandler::sendTelegramInternal(const TrainingAreaBase::TetraIcd::Tr
 
 
   const QString jsonStr = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact));
-  DEBUG_LOG() << "jsonStr: " << jsonStr;
+  DEBUG_LOG(m_logger) << "jsonStr: " << jsonStr;
 
   bool bOk = false;
   for (const auto &wsw : std::as_const(m_webSockets))
@@ -68,12 +67,12 @@ void WebSocketHandler::sendHlaConnectionState()
   TrainingAreaBase::TetraIcd::ProxyConnectionState connState;
   connState.connectedToSystem = m_mainHandler->isConnectedToHla();
   sendTelegram(&connState, m_exerciseId);
-  DEBUG_LOG() << "sendHlaConnectionState, isConnected: " << connState.connectedToSystem;
+  DEBUG_LOG(m_logger) << "sendHlaConnectionState, isConnected: " << connState.connectedToSystem;
 }
 
 void WebSocketHandler::sendParticipantConnectionStates()
 {
-  DEBUG_LOG() << "sendParticipantConnectionStates";
+  DEBUG_LOG(m_logger) << "sendParticipantConnectionStates";
   TrainingAreaBase::TetraIcd::WlsParticipantsConnectionState partConnState;
   partConnState.equipmentNumber = -1;
   partConnState.dataCommunicationPossible = false;
@@ -81,7 +80,7 @@ void WebSocketHandler::sendParticipantConnectionStates()
 
   if (!m_mainHandler->isConnectedToHla())
   {
-    INFO_LOG() << "We are (not) yet connected to HLA - don't send participant connection states";
+    INFO_LOG(m_logger) << "We are (not) yet connected to HLA - don't send participant connection states";
     return;
   }
   const auto externalEquipmentNumbers = m_mainHandler->ngsHandler()->ppmHandler()->externalEquipmentNumbers();
@@ -117,7 +116,7 @@ void WebSocketHandler::onNewConnection()
   QWebSocket *ws = m_webSocketServer->nextPendingConnection();
   if (!ws)
     return;
-  DEBUG_LOG() << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
+  DEBUG_LOG(m_logger) << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
   auto wsw = std::make_shared<WebSocketWrapper>(ws);
 
   connect(wsw.get(), &WebSocketWrapper::textMessageReceived,
@@ -132,11 +131,11 @@ void WebSocketHandler::onTextMessageReceived(const QByteArray &baJson)
 {
   using namespace TrainingAreaBase::TetraIcd;
 
-  TRACE_LOG() << "WebSocketHandler::onTextMessageReceived: " << baJson;
+  TRACE_LOG(m_logger) << "WebSocketHandler::onTextMessageReceived: " << baJson;
   WebSocketWrapper *wsw = qobject_cast<WebSocketWrapper *>(sender());
   if (!wsw)
   {
-    ERROR_LOG() << "Internal error - sender is no WebSocketWrapper";
+    ERROR_LOG(m_logger) << "Internal error - sender is no WebSocketWrapper";
     return;
   }
 
@@ -156,7 +155,7 @@ void WebSocketHandler::onTextMessageReceived(const QByteArray &baJson)
   const QJsonValue typeId = obj.value(QStringLiteral("typeId"));
   if (!typeId.isDouble())
   {
-    ERROR_LOG() << "Can not read type id: " << baJson;
+    ERROR_LOG(m_logger) << "Can not read type id: " << baJson;
     return;
   }
   const QJsonObject data = obj.value(QStringLiteral("data")).toObject();
@@ -185,14 +184,14 @@ void WebSocketHandler::onTextMessageReceived(const QByteArray &baJson)
       emit vulnerabilityStateRequest(DemandVulnerabilityStateChange::fromJson(data));
       break;
     default:
-      WARNING_LOG() << "Handler for telegram Id " << typeId.toInt()
+      WARNING_LOG(m_logger) << "Handler for telegram Id " << typeId.toInt()
                             << " not yet implemented (" << baJson << ")";
       return;
     }
   }
   catch (const std::exception &e)
   {
-    WARNING_LOG() << "Could not parse json: " << e.what() << " (" << baJson << ")";
+    WARNING_LOG(m_logger) << "Could not parse json: " << e.what() << " (" << baJson << ")";
     return;
   }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/web_socket_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/web_socket_handler.h
index e51febb05..d72b74e1d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/web_socket_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/web_socket_handler.h
@@ -53,6 +53,7 @@ public Q_SLOTS:
   void onExternalEquipmentNumberRemoved(int equipNo);
 
 private:
+  NGL::INGLLogger &m_logger;
   void sendDataCommunicationState(int equipNo, bool bIsAvailable);
   bool sendTelegramInternal(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data,
                             const QString &type, int exerciseId);
@@ -61,6 +62,7 @@ private Q_SLOTS:
   void onWebSocketDisconnected();
   void onTextMessageReceived(const QByteArray &baJson);
 private:
+  NGL::INGLLogger &m_logger;
   QWebSocketServer *m_webSocketServer;
   QVector<std::shared_ptr<WebSocketWrapper>> m_webSockets;
   MainHandler *m_mainHandler;
@@ -84,6 +86,7 @@ Q_SIGNALS:
 private Q_SLOTS:
   void onTextMessageReceived(const QString &data);
 private:
+  NGL::INGLLogger &m_logger;
   QWebSocket *m_webSocket;
   int m_exerciseId;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/main_handler.cpp
index 2327abdb3..f7fd91c7a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/main_handler.cpp
@@ -15,10 +15,9 @@
 namespace HighLevelArchitecture
 {
 
-MainHandler::MainHandler(QObject *parent)
-  : QObject(parent)
-  , m_exerciseId(0)
-{}
+MainHandler::MainHandler(QObject *parent) : QObject(parent)
+  , m_exerciseId(0),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 MainHandler::~MainHandler()
 {
@@ -50,7 +49,7 @@ bool MainHandler::init(int exerciseId)
     int port = 23456;
     if (!m_wsInterface->init(port))
     {
-      ERROR_LOG() << Q_FUNC_INFO
+      ERROR_LOG(m_logger) << Q_FUNC_INFO
                           << " WsInterface::init failed on port: " << port;
       return false;
     }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/main_handler.h
index 3c3efce2a..aa0120473 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/main_handler.h
@@ -27,6 +27,7 @@ public:
 private Q_SLOTS:
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<NgsHandler>  m_ngsHandler;
   std::shared_ptr<WsInterface> m_wsInterface; 
   int m_exerciseId;
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 5f5ecd235..ef18d9ecc 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
@@ -130,8 +130,7 @@ static inline rpr2::EnvironmentObjectTypeStruct dummyEOS()
 
 
 
-NgsConnector::NgsConnector(const QString &fedName, NgsHandler *ngsHandler)
-  : m_ngsHandler(ngsHandler)
+NgsConnector::NgsConnector(const QString &fedName, NgsHandler *ngsHandler) : m_ngsHandler(ngsHandler)
   , m_fedName(fedName)
   , m_swadmin(&ngs::SimulatedWorldAPI::getSimulatedWorldAdmin())
   , m_master(nullptr)
@@ -150,8 +149,8 @@ NgsConnector::NgsConnector(const QString &fedName, NgsHandler *ngsHandler)
   , m_requestBiteReportCallback(new ObserverGuezRequestBiteReportCBNotifier())
   , m_bInitialized(false)
   , m_bCanPublishData(false)
-  , m_timer(new QTimer(this))
-{
+  , m_timer(new QTimer(this)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   connect(m_timer, &QTimer::timeout,
           this, &NgsConnector::go);
   connect(m_playerCallback, &PlayerCallback::firstTick,
@@ -230,7 +229,7 @@ bool NgsConnector::initialize(ngs::IObserver::ProtocolType protocol, const QStri
   }
   catch (const ngs::NGSSimWorldException &e)
   {
-    ERROR_LOG() << "caught exception during init (getIFederationMaster): " << e.print();
+    ERROR_LOG(m_logger) << "caught exception during init (getIFederationMaster): " << e.print();
     return false;
   }
 
@@ -245,7 +244,7 @@ bool NgsConnector::initialize(ngs::IObserver::ProtocolType protocol, const QStri
     }
     catch (const NGSException &e)
     {
-      ERROR_LOG() << "caught exception during init (createFederation): " << e.print();
+      ERROR_LOG(m_logger) << "caught exception during init (createFederation): " << e.print();
       return false;
     }
     player = &m_swadmin->getIPlayer(m_fedName.toStdString(), playerName.toStdString(), *m_playerCallback, Settings::swConfFileName().toLatin1().data(), Settings::fomIdentifier().toStdString(), Settings::rtiIdentifier().toStdString());
@@ -295,27 +294,27 @@ void NgsConnector::subscribeAtNgs()
   m_enitityNumberCounter = 1; 
   m_eventCount = 1;
 
-  INFO_LOG() << "Subscribe at NGS - Guez Human Objects";
+  INFO_LOG(m_logger) << "Subscribe at NGS - Guez Human Objects";
   rpr2::IObserverGuezHumanObjClass &humanObjClass = m_somPlayer->getObserverGuezHumanObjClass(*m_humanCallback);
   humanObjClass.subscribeAllAttributes();
   humanObjClass.subscribe();
 
-  INFO_LOG() << "Subscribe at NGS - Guez ObserverController Objects";
+  INFO_LOG(m_logger) << "Subscribe at NGS - Guez ObserverController Objects";
   rpr2::IObserverGuezObserverControllerObjClass &observerControllerObjClass = m_somPlayer->getObserverGuezObserverControllerObjClass(*m_observerControllerCallback);
   observerControllerObjClass.subscribeAllAttributes();
   observerControllerObjClass.subscribe();
 
-  INFO_LOG() << "Subscribe at NGS - Guez GroundVehicle Objects";
+  INFO_LOG(m_logger) << "Subscribe at NGS - Guez GroundVehicle Objects";
   rpr2::IObserverGuezGroundVehicleObjClass &groundVehicleObjClass = m_somPlayer->getObserverGuezGroundVehicleObjClass(*m_groundVehicleCallback);
   groundVehicleObjClass.subscribeAllAttributes();
   groundVehicleObjClass.subscribe();
 
-  INFO_LOG() << "Subscribe at NGS - Guez MineField Objects";
+  INFO_LOG(m_logger) << "Subscribe at NGS - Guez MineField Objects";
   rpr2::IObserverGuezMineFieldObjClass &minefieldObjClass = m_somPlayer->getObserverGuezMineFieldObjClass(*m_minefieldCallback);
   minefieldObjClass.subscribeAllAttributes();
   minefieldObjClass.subscribe();
 
-  INFO_LOG() << "Subscribe at NGS - Guez MineField Breach Objects";
+  INFO_LOG(m_logger) << "Subscribe at NGS - Guez MineField Breach Objects";
   rpr2::IObserverGuezMineFieldBreachObjClass &minefieldBreachObjClass = m_somPlayer->getObserverGuezMineFieldBreachObjClass(*m_minefieldBreachCallback);
   minefieldBreachObjClass.subscribeAllAttributes();
   minefieldBreachObjClass.subscribe();
@@ -351,23 +350,23 @@ void NgsConnector::unsubscribeFromNgs()
 
   if (m_somPlayer)
   {
-    INFO_LOG() << "Unsubscribe at NGS - Guez Human Objects";
+    INFO_LOG(m_logger) << "Unsubscribe at NGS - Guez Human Objects";
     rpr2::IObserverGuezHumanObjClass &humanObjClass = m_somPlayer->getObserverGuezHumanObjClass(*m_humanCallback);
     humanObjClass.unsubscribe();
 
-    INFO_LOG() << "Unsubscribe at NGS - Guez ObserverController Objects";
+    INFO_LOG(m_logger) << "Unsubscribe at NGS - Guez ObserverController Objects";
     rpr2::IObserverGuezObserverControllerObjClass &observerControllerObjClass = m_somPlayer->getObserverGuezObserverControllerObjClass(*m_observerControllerCallback);
     observerControllerObjClass.unsubscribe();
 
-    INFO_LOG() << "Unsubscribe at NGS - Guez GroundVehicle Objects";
+    INFO_LOG(m_logger) << "Unsubscribe at NGS - Guez GroundVehicle Objects";
     rpr2::IObserverGuezGroundVehicleObjClass &groundVehicleObjClass = m_somPlayer->getObserverGuezGroundVehicleObjClass(*m_groundVehicleCallback);
     groundVehicleObjClass.unsubscribe();
 
-    INFO_LOG() << "Unsubscribe at NGS - Guez MineField Objects";
+    INFO_LOG(m_logger) << "Unsubscribe at NGS - Guez MineField Objects";
     rpr2::IObserverGuezMineFieldObjClass &minefieldObjClass = m_somPlayer->getObserverGuezMineFieldObjClass(*m_minefieldCallback);
     minefieldObjClass.unsubscribe();
 
-    INFO_LOG() << "Unsubscribe at NGS - Guez MineField Breach Objects";
+    INFO_LOG(m_logger) << "Unsubscribe at NGS - Guez MineField Breach Objects";
     rpr2::IObserverGuezMineFieldBreachObjClass &minefieldBreachObjClass = m_somPlayer->getObserverGuezMineFieldBreachObjClass(*m_minefieldBreachCallback);
     minefieldBreachObjClass.unsubscribe();
   }
@@ -777,11 +776,11 @@ void NgsConnector::go()
   }
   catch (const NGSException &ex)
   {
-    ERROR_LOG() << "NGS Exception caught in Event Loop" << ex.print();
+    ERROR_LOG(m_logger) << "NGS Exception caught in Event Loop" << ex.print();
   }
   catch (const std::exception &e)
   {
-    ERROR_LOG() << "Standard Exception caught in Event Loop: " << e.what();
+    ERROR_LOG(m_logger) << "Standard Exception caught in Event Loop: " << e.what();
   }
   catch (...)
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_connector.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_connector.h
index 6f9af4088..a2d353d69 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_connector.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_connector.h
@@ -283,6 +283,7 @@ signals:
   void newMinefieldBreach(AreaEffectSimulation::MineCorridorModifyRequest &mc);
 
 protected:
+  NGL::INGLLogger &m_logger;
   void subscribeAtNgs();
   void unsubscribeFromNgs();
 
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 2330370f9..ccf5a0c9d 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
@@ -17,9 +17,8 @@
 namespace HighLevelArchitecture
 {
 
-NgsHandler::NgsHandler(QObject *parent)
-  : QObject(parent)
-{}
+NgsHandler::NgsHandler(QObject *parent) : QObject(parent),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 NgsHandler::~NgsHandler()
 {
@@ -36,7 +35,7 @@ bool NgsHandler::init()
 
   if (myVec < myVec2)
   {
-    INFO_LOG() << "Protocol = ";
+    INFO_LOG(m_logger) << "Protocol = ";
   }
 
 
@@ -50,7 +49,7 @@ bool NgsHandler::init()
 
   ngs::IObserver::ProtocolType protocol = Settings::hlaProtocol();
 
-  INFO_LOG() << "Protocol = " << protToStr.value(protocol, QStringLiteral("UNKNOWN"));
+  INFO_LOG(m_logger) << "Protocol = " << protToStr.value(protocol, QStringLiteral("UNKNOWN"));
 
   m_ngsConnector = 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_handler.h
index 69866fefa..d19ba79bd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_handler.h
@@ -37,6 +37,7 @@ Q_SIGNALS:
 private slots:
   void onFirstTickFinished();
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<NgsConnector> m_ngsConnector;
 };
 } 
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 228fe02bb..7cfee8add 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
@@ -19,26 +19,25 @@ namespace HighLevelArchitecture
 
 
 
-WsInterface::WsInterface(std::shared_ptr<NgsHandler> ngsHandler, QObject *parent)
-  : QObject(parent)
+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"))
-{
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  .getNGLLogger("HlaTestTool.WsInterface")),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 WsInterface::~WsInterface()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   for (auto client : std::as_const(m_clients))
   {
     client->disconnect(this);
     client->close();
   }
   qDeleteAll(m_clients);
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool WsInterface::init(quint16 listenPort)
@@ -50,14 +49,14 @@ bool WsInterface::init(quint16 listenPort)
 
   if (!m_wsServer->listen(QHostAddress::Any, listenPort))
   {
-    WARNING_LOG() << "Cannot listen on port " << listenPort << " - aborting";
+    WARNING_LOG(m_logger) << "Cannot listen on port " << listenPort << " - aborting";
     return false;
   }
-  DEBUG_LOG() << "Listening on port " << listenPort;
+  DEBUG_LOG(m_logger) << "Listening on port " << listenPort;
   connect(m_wsServer, &QWebSocketServer::newConnection,
           this, &WsInterface::onNewConnection);
 
-  TRACE_LOG() << Q_FUNC_INFO << " END, listenPort=" << listenPort;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, listenPort=" << listenPort;
   return true;
 
 }
@@ -79,19 +78,19 @@ void WsInterface::onNewConnection()
 
 void WsInterface::onWebSocketDisconnected()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   QWebSocket *ws = qobject_cast<QWebSocket *>(sender());
   if (!ws)
     return;
   NOTICE_LOG(m_logger) << "Websocket connection closed, ptr: " << ws;
   m_clients.remove(ws);
   ws->deleteLater();
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void WsInterface::onError(QAbstractSocket::SocketError error)
 {
-  ERROR_LOG() << Q_FUNC_INFO << " Error occured, QAbstractSocket::SocketError = " << error;
+  ERROR_LOG(m_logger) << Q_FUNC_INFO << " Error occured, QAbstractSocket::SocketError = " << error;
 }
 
 void WsInterface::onTextMessageReceived(const QString &msg)
@@ -100,15 +99,15 @@ void WsInterface::onTextMessageReceived(const QString &msg)
 
   if (msg.isEmpty())
   {
-    ERROR_LOG() << "Empty message received";
+    ERROR_LOG(m_logger) << "Empty message received";
     return;
   }
-  DEBUG_LOG() << "incoming telegram: " << msg;
+  DEBUG_LOG(m_logger) << "incoming telegram: " << msg;
 
   const QByteArray baJson = msg.toUtf8();
   processMessage(baJson);
 
-  DEBUG_LOG() << Q_FUNC_INFO << " END";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void WsInterface::processMessage(const QByteArray baJson)
@@ -120,7 +119,7 @@ void WsInterface::processMessage(const QByteArray baJson)
 
   if (parseError.error != QJsonParseError::NoError)
   {
-    ERROR_LOG() << "Could not parse JSON "
+    ERROR_LOG(m_logger) << "Could not parse JSON "
                         << ". Reason: "
                         << parseError.errorString()
                         << "; baJson: '"
@@ -156,7 +155,7 @@ void WsInterface::processMessage(const QByteArray baJson)
     }
     catch (const JsonException &ex)
     {
-      ERROR_LOG() << "Could not parse json telegram: "
+      ERROR_LOG(m_logger) << "Could not parse json telegram: "
                           << ", error: " << ex.what();
     }
     break;
@@ -176,7 +175,7 @@ void WsInterface::processMessage(const QByteArray baJson)
     }
     catch (const JsonException &ex)
     {
-      ERROR_LOG() << "Could not parse json telegram: "
+      ERROR_LOG(m_logger) << "Could not parse json telegram: "
                           << ", error: " << ex.what();
       return;
     }
@@ -206,7 +205,7 @@ void WsInterface::processMessage(const QByteArray baJson)
     }
     catch (const JsonException &ex)
     {
-      ERROR_LOG() << "Could not parse json telegram: "
+      ERROR_LOG(m_logger) << "Could not parse json telegram: "
                           << ", error: " << ex.what();
       return;
     }
@@ -219,7 +218,7 @@ void WsInterface::processMessage(const QByteArray baJson)
 
   default:
   {
-    ERROR_LOG() << "Telegram with typeId '" << typeId << "' not handled in switch"
+    ERROR_LOG(m_logger) << "Telegram with typeId '" << typeId << "' not handled in switch"
                         << ", doc= " << doc.toJson(QJsonDocument::Compact) << "<<<";
   }
   } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/web_socket_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/web_socket_interface.h
index 753002ac0..6eaed0451 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/web_socket_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/web_socket_interface.h
@@ -33,6 +33,8 @@ public:
 signals:
 
 private:
+
+NGL::INGLLogger &m_logger;
   QWebSocketServer               *m_wsServer;
   QSet<QWebSocket *>             m_clients;
 
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 a687683fa..96acf575e 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
@@ -47,24 +47,24 @@ bool AesHandler::init(MainDispatcher *mainDispatcher)
 
   if (!m_ftcAes->enableAirSupportImpactModify() || !m_dtcAes->enableExplosionSingle())
   {
-    ERROR_LOG() << "Can not enableAirSupportImpactModify or enableExplosionSingle";
+    ERROR_LOG(m_logger) << "Can not enableAirSupportImpactModify or enableExplosionSingle";
     
   }
 
   if (!m_dtcAes->enableExplosionCluster() || !m_ftcAes->enableExplosionClusterModify() || !m_ftcAes->enableExplosionClusterReleaseReceived()
       || !m_ftcAes->enableExplosionClusterPauseResume() || !m_ftcAes->enableTrajectoryAdlerModify() || !m_ftcAes->enableEffectClusterFireHalt())
   {
-    ERROR_LOG() << "Can not enableExplosionCluster or enableExplosionClusterModify";
+    ERROR_LOG(m_logger) << "Can not enableExplosionCluster or enableExplosionClusterModify";
     
   }
   if (!m_dtcAes->enableEffectCluster() || !m_ftcAes->enableEffectClusterModify() || !m_ftcAes->enableEffectClusterReleaseReceived()
       || !m_ftcAes->enableEffectClusterPauseResume() || !m_ftcAes->enableEffectClusterRemove())
   {
-    ERROR_LOG() << "Can not enableEffectnCluster or enableEffectClusterModify";
+    ERROR_LOG(m_logger) << "Can not enableEffectnCluster or enableEffectClusterModify";
     
   }
 
-  DEBUG_LOG() << "------ Connect Explosion Single Changed ------- ";
+  DEBUG_LOG(m_logger) << "------ Connect Explosion Single Changed ------- ";
   connect(m_dtcAes.get(), &AreaEffectSimulation::Interface::Dtc::explosionSingleChanged, this, &AesHandler::onExplosionSingleChanged);
   connect(m_dtcAes.get(), &AreaEffectSimulation::Interface::Dtc::effectClusterChanged, this, &AesHandler::onEffectClusterChanged);
 
@@ -73,24 +73,24 @@ bool AesHandler::init(MainDispatcher *mainDispatcher)
 
 void AesHandler::onOffRouteMineModifyReply(const Core::FunctionReplyObject &replyObject)
 {
-  DEBUG_LOG() << "onOffRouteMineModifyReply"
+  DEBUG_LOG(m_logger) << "onOffRouteMineModifyReply"
                       << ", replyObject.id :" << replyObject.id() << ", str :" << replyObject.str() << ", tanslated :" << replyObject.translated();
 };
 
 void AesHandler::onEffectClusterModifyReply(const Core::FunctionReplyObject &replyObject)
 {
-  DEBUG_LOG() << "onEffectClusterModifyReply"
+  DEBUG_LOG(m_logger) << "onEffectClusterModifyReply"
                       << ", replyObject.id :" << replyObject.id() << ", str :" << replyObject.str() << ", tanslated :" << replyObject.translated()
                       << ", additinal Info :" << replyObject.additionalInfo();
   m_requestHelper->requestReply(replyObject);
 
-  DEBUG_LOG() << "Got Reply";
+  DEBUG_LOG(m_logger) << "Got Reply";
 
   if (replyObject.error())
   {
     
     
-    DEBUG_LOG() << "Got onEffectClusterModifyReply ERROR: " << replyObject.translated();
+    DEBUG_LOG(m_logger) << "Got onEffectClusterModifyReply ERROR: " << replyObject.translated();
     ExTqTechnischeQuittung extq;
     extq.technischeDaten.beschreibung = replyObject.translated();
     extq.technischeDaten.status = Status_L32::DAT;
@@ -100,11 +100,11 @@ void AesHandler::onEffectClusterModifyReply(const Core::FunctionReplyObject &rep
   }
   QJsonObject propertiesObject = QJsonDocument::fromJson(QByteArray::fromStdString(replyObject.additionalInfo())).object();
 
-  ERROR_LOG() << "Try send notification0";
+  ERROR_LOG(m_logger) << "Try send notification0";
   m_aesId = replyObject.id();
   ProjectDataManagement::EffectSource effectSource
       = static_cast<ProjectDataManagement::EffectSource::type>(propertiesObject.value(QStringLiteral("effectSource")).toInt());
-  ERROR_LOG() << "Try send notification1 " << effectSource;
+  ERROR_LOG(m_logger) << "Try send notification1 " << effectSource;
 
   if (effectSource != ProjectDataManagement::EffectSource::ES_ADLER)
     return;
@@ -181,14 +181,14 @@ void AesHandler::onEffectClusterModifyReply(const Core::FunctionReplyObject &rep
     m_mainDispatcher->ddsHandler()->ftcNom()->createNotificationRequest(req, this);
   }
   else
-    WARNING_LOG() << "No recipent found for exercise";
+    WARNING_LOG(m_logger) << "No recipent found for exercise";
   
 }
 
 void AesHandler::onCreateNotificationReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    ERROR_LOG() << "Got onCreateNotificationReply ERROR: " << replyObject.translated();
+    ERROR_LOG(m_logger) << "Got onCreateNotificationReply ERROR: " << replyObject.translated();
 }
 
 bool AesHandler::sendAesModifyRequest(const QJsonObject &data)
@@ -247,7 +247,7 @@ void AesHandler::handleCreateSingleExplosion(const TrainingAreaBase::TetraIcd::C
 {
   auto strFromObj = QJsonDocument(data.toJson()).toJson(QJsonDocument::Compact);
   m_singleExplosions.insert(data.aesDdsId, AreaEffectSimulation::AesEffectState_def::EsCreated);
-  DEBUG_LOG() << "TEST SINGLE EXPLOSION CREATED " << strFromObj;
+  DEBUG_LOG(m_logger) << "TEST SINGLE EXPLOSION CREATED " << strFromObj;
 }
 
 void AesHandler::handleEXFire(const Feuerkampfdaten &data, int wsId)
@@ -280,7 +280,7 @@ void AesHandler::handleEXDontFire(const Feuerkampfdaten &data, int wsId)
 
   const auto saa = m_mainDispatcher->jsonDispatcher()->getSAAByWs(wsId);
 
-  DEBUG_LOG() << "[EX-FQ(nFN)] data from SSA " << wsId << " : "
+  DEBUG_LOG(m_logger) << "[EX-FQ(nFN)] data from SSA " << wsId << " : "
                       << "verein: " << data.verein << " "
                       << "kenner: " << data.kenner.underlying() << " "
                       << "feuerkampfReferenz: " << data.feuerkampfReferenz;
@@ -295,18 +295,18 @@ void AesHandler::handleEXDontFire(const Feuerkampfdaten &data, int wsId)
 
 void AesHandler::onTrajectoryAdlerModifyReply(const Core::FunctionReplyObject &reply)
 {
-  DEBUG_LOG() << "onTrajectoryAdlerModifyReply"
+  DEBUG_LOG(m_logger) << "onTrajectoryAdlerModifyReply"
                       << ", aesId :" << reply.id() << ", str :" << reply.str() << ", m_wirkmittelIndex :" << m_wirkmittelIndex
                       << ", m_data.feuerkommando.wirkmittel.size() :" << m_wirkfeldPlanungsData.feuerkommando.wirkmittel.size();
   if (reply.error())
-    ERROR_LOG() << reply.translated();
+    ERROR_LOG(m_logger) << reply.translated();
   if (m_wirkmittelIndex == m_wirkfeldPlanungsData.feuerkommando.wirkmittel.size() - 1)
   {
     
-    DEBUG_LOG() << "TAB->SAA EX-MQ"
+    DEBUG_LOG(m_logger) << "TAB->SAA EX-MQ"
                         << ", feuerkampfReferenz :" << m_wirkfeldPlanungsData.feuerkampfReferenz;
 
-    DEBUG_LOG() << "onTrajectoryAdlerModifyReply " << reply.id();
+    DEBUG_LOG(m_logger) << "onTrajectoryAdlerModifyReply " << reply.id();
     ExFeuerbereit exFB;
     
     exFB.feuerkampfdaten.feuerkampfReferenz = m_wirkfeldPlanungsData.feuerkampfReferenz;
@@ -318,7 +318,7 @@ void AesHandler::onTrajectoryAdlerModifyReply(const Core::FunctionReplyObject &r
   if (m_wirkmittelIndex < m_wirkfeldPlanungsData.feuerkommando.wirkmittel.size() - 1)
   {
     m_wirkmittelIndex++;
-    DEBUG_LOG() << "sendTrajectoryAdlerModifyRequest"
+    DEBUG_LOG(m_logger) << "sendTrajectoryAdlerModifyRequest"
                         << ", m_participantId :" << m_participantId << ", m_wirkmittelIndex :" << m_wirkmittelIndex << ", m_aesId :" << m_aesId;
     sendTrajectoryAdlerModifyRequest(m_wirkfeldPlanungsData, m_participantId, m_wirkmittelIndex, m_aesId);
   }
@@ -327,7 +327,7 @@ void AesHandler::onTrajectoryAdlerModifyReply(const Core::FunctionReplyObject &r
 void AesHandler::sendTrajectoryAdlerModifyRequest(const WirkfeldplanungData &data, int participantId, int wirkmittelIndex, int aesId)
 {
 
-  DEBUG_LOG() << "sendTrajectoryAdlerModifyRequest"
+  DEBUG_LOG(m_logger) << "sendTrajectoryAdlerModifyRequest"
                       << ", participantId :" << participantId << ", wirkmittelIndex :" << wirkmittelIndex << ", aesId:" << aesId;
   std::vector<Core::RelativePositionRelativeTime> geometryRef;
   geometryRef.clear();
@@ -338,7 +338,7 @@ void AesHandler::sendTrajectoryAdlerModifyRequest(const WirkfeldplanungData &dat
 
   for (int subordinate : std::as_const(subordinates))
   {
-    DEBUG_LOG() << "subordinates(" << participantId << ") :" << subordinate;
+    DEBUG_LOG(m_logger) << "subordinates(" << participantId << ") :" << subordinate;
     subordinatePositions.append(m_dtcPpm->participantPosition(subordinate));
   }
 
@@ -385,10 +385,10 @@ void AesHandler::sendTrajectoryAdlerModifyRequest(const WirkfeldplanungData &dat
     matrix.rotate(-grad);
 
     QPointF point(pntGeo.x(), pntGeo.y());
-    DEBUG_LOG() << " POS bevore rot: " << point;
+    DEBUG_LOG(m_logger) << " POS bevore rot: " << point;
 
     auto rotatePoint = matrix.map(point);
-    DEBUG_LOG() << " POS after rot: " << rotatePoint;
+    DEBUG_LOG(m_logger) << " POS after rot: " << rotatePoint;
 
     pntGeo.setX(rotatePoint.x());
     pntGeo.setY(rotatePoint.y());
@@ -410,11 +410,11 @@ void AesHandler::sendTrajectoryAdlerModifyRequest(const WirkfeldplanungData &dat
   impactPosition.z(data.zieldaten.koordinate.hoehe);
   newRequest->impactPosition(impactPosition);
   newRequest->geometry(geometryRef);
-  DEBUG_LOG() << "geometryRef.size=" << geometryRef.size() << ", newRequest->geometry().size() :" << newRequest->geometry().size();
+  DEBUG_LOG(m_logger) << "geometryRef.size=" << geometryRef.size() << ", newRequest->geometry().size() :" << newRequest->geometry().size();
 
   if (newRequest->aesItemId() <= 0)
   {
-    ERROR_LOG() << "newRequest->aesItemId() <=0"
+    ERROR_LOG(m_logger) << "newRequest->aesItemId() <=0"
                         << ", aesItemId :" << newRequest->aesItemId();
     return;
   }
@@ -428,12 +428,12 @@ void AesHandler::sendTrajectoryAdlerModifyRequest(const WirkfeldplanungData &dat
 
 void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
 {
-  DEBUG_LOG() << "AesHandler::handleEffectCluster (Empfang WirkfeldplanungData)"
+  DEBUG_LOG(m_logger) << "AesHandler::handleEffectCluster (Empfang WirkfeldplanungData)"
                       << ", feuerkampfReferenz :" << data.feuerkampfReferenz << ", wirkmittel.size() :" << data.feuerkommando.wirkmittel.size();
   
   if (!m_mainDispatcher->jsonDispatcher()->getSAAByWs(wsId))
   {
-    ERROR_LOG() << "!m_mainDispatcher->jsonDispatcher()->getSAAByWs(" << wsId << ") return";
+    ERROR_LOG(m_logger) << "!m_mainDispatcher->jsonDispatcher()->getSAAByWs(" << wsId << ") return";
     return;
   }
   const QString &verein = data.feuerkommando.verein;
@@ -448,7 +448,7 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
   
   if (part.id() <= 0)
   {
-    ERROR_LOG() << "Got EffectClusterData for " << verein << " but unit not found";
+    ERROR_LOG(m_logger) << "Got EffectClusterData for " << verein << " but unit not found";
     return;
   }
 
@@ -472,7 +472,7 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
   AreaEffectSimulation::AesExplosionGeometry geometry = AreaEffectSimulation::AesExplosionGeometry::EgArea;
   AreaEffectSimulation::Area area;
   const bool createArea = data.zieldaten.breiteRadius == 0 && data.zieldaten.tiefe == 0;
-  ERROR_LOG() << "create AREA??? " << createArea << "  breite " << data.zieldaten.breiteRadius << "  tiefe " << data.zieldaten.tiefe;
+  ERROR_LOG(m_logger) << "create AREA??? " << createArea << "  breite " << data.zieldaten.breiteRadius << "  tiefe " << data.zieldaten.tiefe;
 
   if (!createArea && data.zieldaten.geometrie == ProjectDataManagement::L4_TargetGeometry::Point)
   {
@@ -485,7 +485,7 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
     const int igniterFunctionId = m_mainDispatcher->pdmHandler()->getDtc()->getIgniterFunctionIdFromAdlerIgniterFunction(chargeData.zuenderFunktion);
     const int impactRadius = m_mainDispatcher->pdmHandler()->getDtc()->impactRadius(chargeTypeId, igniterTypeId, igniterFunctionId);
 
-    DEBUG_LOG() << "Impact Radius for " << chargeTypeId << " " << igniterTypeId << " " << igniterTypeId << "  is " << impactRadius;
+    DEBUG_LOG(m_logger) << "Impact Radius for " << chargeTypeId << " " << igniterTypeId << " " << igniterTypeId << "  is " << impactRadius;
     area.height(impactRadius * 2);
     area.width(impactRadius * 2);
   }
@@ -515,28 +515,28 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
     
     const QPointF bl = QTransform().rotate(-area.rotation()).map(rect.topLeft());
     const LtsCoordTrans::UtmCoordinate centerUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(centerPoint);
-    DEBUG_LOG() << "centerUtm="
+    DEBUG_LOG(m_logger) << "centerUtm="
                         << ", x :" << centerUtm.x << ", y :" << centerUtm.y << ", zone :" << centerUtm.zone;
     const QPointF &bottomLeft = centerUtm.geographic(bl);
-    DEBUG_LOG() << "bl="
+    DEBUG_LOG(m_logger) << "bl="
                         << ", x :" << bl.x() << ", y :" << bl.y();
-    DEBUG_LOG() << "bottomLeft="
+    DEBUG_LOG(m_logger) << "bottomLeft="
                         << ", x :" << bottomLeft.x() << ", y :" << bottomLeft.y();
     area.cornerBottomLeft(Core::GeoPosition2D(bottomLeft.x(), bottomLeft.y()));
-    DEBUG_LOG() << "area.cornerBottomLeft="
+    DEBUG_LOG(m_logger) << "area.cornerBottomLeft="
                         << ", lon :" << area.cornerBottomLeft().lon() << ", lat :" << area.cornerBottomLeft().lat();
 
     const LtsCoordTrans::UtmCoordinate cornerBottomLeftUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(area.cornerBottomLeft().lon(), area.cornerBottomLeft().lat());
-    DEBUG_LOG() << "cornerBottomLeftUtm="
+    DEBUG_LOG(m_logger) << "cornerBottomLeftUtm="
                         << ", x :" << cornerBottomLeftUtm.x << ", y :" << cornerBottomLeftUtm.y << ", zone :" << cornerBottomLeftUtm.zone;
   }
   else
   {
-    DEBUG_LOG() << " Need to generate area";
+    DEBUG_LOG(m_logger) << " Need to generate area";
     if (data.feuerkommando.wirkmittel.size() == 1)
     {
 
-      DEBUG_LOG() << " Need to generate area SINGLE";
+      DEBUG_LOG(m_logger) << " Need to generate area SINGLE";
       geometry = AreaEffectSimulation::AesExplosionGeometry::EgPoint;
 
       
@@ -549,7 +549,7 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
       const int igniterFunctionId = m_mainDispatcher->pdmHandler()->getDtc()->getIgniterFunctionIdFromAdlerIgniterFunction(chargeData.zuenderFunktion);
       const int impactRadius = m_mainDispatcher->pdmHandler()->getDtc()->impactRadius(chargeTypeId, igniterTypeId, igniterFunctionId);
 
-      DEBUG_LOG() << "Impact Radius for " << chargeTypeId << " " << igniterTypeId << " " << igniterTypeId << "  is " << impactRadius;
+      DEBUG_LOG(m_logger) << "Impact Radius for " << chargeTypeId << " " << igniterTypeId << " " << igniterTypeId << "  is " << impactRadius;
       area.height(impactRadius * 2);
       area.width(impactRadius * 2);
 
@@ -561,25 +561,25 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
       
       const QPointF bl = QTransform().rotate(-area.rotation()).map(rect.topLeft());
       const LtsCoordTrans::UtmCoordinate centerUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(centerPoint);
-      DEBUG_LOG() << "centerUtm="
+      DEBUG_LOG(m_logger) << "centerUtm="
                           << ", x :" << centerUtm.x << ", y :" << centerUtm.y << ", zone :" << centerUtm.zone;
       const QPointF bottomLeft = centerUtm.geographic(bl);
-      DEBUG_LOG() << "bl="
+      DEBUG_LOG(m_logger) << "bl="
                           << ", x :" << bl.x() << ", y :" << bl.y();
-      DEBUG_LOG() << "bottomLeft="
+      DEBUG_LOG(m_logger) << "bottomLeft="
                           << ", x :" << bottomLeft.x() << ", y :" << bottomLeft.y();
       area.cornerBottomLeft(Core::GeoPosition2D(bottomLeft.x(), bottomLeft.y()));
-      DEBUG_LOG() << "area.cornerBottomLeft="
+      DEBUG_LOG(m_logger) << "area.cornerBottomLeft="
                           << ", lon :" << area.cornerBottomLeft().lon() << ", lat :" << area.cornerBottomLeft().lat();
 
       const LtsCoordTrans::UtmCoordinate cornerBottomLeftUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(area.cornerBottomLeft().lon(), area.cornerBottomLeft().lat());
-      ERROR_LOG() << "cornerBottomLeftUtm="
+      ERROR_LOG(m_logger) << "cornerBottomLeftUtm="
                           << ", x :" << cornerBottomLeftUtm.x << ", y :" << cornerBottomLeftUtm.y << ", zone :" << cornerBottomLeftUtm.zone;
     }
     else if (data.feuerkommando.wirkmittel.size() > 1)
     {
 
-      DEBUG_LOG() << " Need to generate area AREA";
+      DEBUG_LOG(m_logger) << " Need to generate area AREA";
       
       geometry = AreaEffectSimulation::AesExplosionGeometry::EgArea;
       
@@ -590,7 +590,7 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
       const int igniterFunctionId = m_mainDispatcher->pdmHandler()->getDtc()->getIgniterFunctionIdFromAdlerIgniterFunction(chargeData.zuenderFunktion);
       const int impactRadius = m_mainDispatcher->pdmHandler()->getDtc()->impactRadius(chargeTypeId, igniterTypeId, igniterFunctionId);
 
-      DEBUG_LOG() << "Impact Radius for " << chargeTypeId << " " << igniterTypeId << " " << igniterTypeId << "  is " << impactRadius;
+      DEBUG_LOG(m_logger) << "Impact Radius for " << chargeTypeId << " " << igniterTypeId << " " << igniterTypeId << "  is " << impactRadius;
 
       
       QList<AreaEffectSimulation::Area> areas;
@@ -628,11 +628,11 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
 
       
       area = createMinimumRect(zone, vecPoints);
-      DEBUG_LOG() << "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)
     {
-      DEBUG_LOG() << " Need to generate area AREA";
+      DEBUG_LOG(m_logger) << " Need to generate area AREA";
       
       geometry = AreaEffectSimulation::AesExplosionGeometry::EgArea;
       
@@ -677,7 +677,7 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
 
       
       area = createMinimumRect(zone, vecPoints);
-      DEBUG_LOG() << "FINAL AREA " << area.cornerBottomLeft() << "   " << area.height() << " " << area.width();
+      DEBUG_LOG(m_logger) << "FINAL AREA " << area.cornerBottomLeft() << "   " << area.height() << " " << area.width();
     }
   }
 
@@ -725,9 +725,9 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
       effectorData.chargeStruct().igniterTypeId() = m_mainDispatcher->pdmHandler()->getDtc()->getIgniterTypeIdFromAdlerIgniter(effectorAdler.geschoss.zuender);
       effectorData.chargeStruct().igniterFunctionId()
           = m_mainDispatcher->pdmHandler()->getDtc()->getIgniterFunctionIdFromAdlerIgniterFunction(effectorAdler.geschoss.zuenderFunktion);
-      DEBUG_LOG() << "FOUND chargeTypeId " << effectorData.chargeStruct().chargeTypeId() << " for " << effectorAdler.geschoss.geschosssorte;
-      DEBUG_LOG() << "igniterTypeId: " << effectorData.chargeStruct().igniterTypeId();
-      DEBUG_LOG() << "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();
       std::vector<Core::RelativePositionRelativeTime> flightCurve;
@@ -735,20 +735,20 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
 
       const auto &startPos = m_dtcPpm->participantPosition(effectorData.participantId());
       const auto coordStart = LtsCoordTrans::UtmCoordinate::fromGeographic(startPos.pos().lon(), startPos.pos().lat());
-      DEBUG_LOG() << "Start point: " << coordStart;
+      DEBUG_LOG(m_logger) << "Start point: " << coordStart;
 
       const auto coordEnd = LtsCoordTrans::UtmCoordinate::fromGeographic(effectorAdler.auftreffpunkt.koordinate.longitude * (M_PI / 180.0),
                                                                          effectorAdler.auftreffpunkt.koordinate.latitude * (M_PI / 180.0));
-      DEBUG_LOG() << "End point: " << coordEnd;
+      DEBUG_LOG(m_logger) << "End point: " << coordEnd;
       LtsCoordTrans::UtmCoordinate coordDiff = coordEnd;
 
       coordDiff.x = coordDiff.x - coordStart.x;
       coordDiff.y = coordDiff.y - coordStart.y;
-      DEBUG_LOG() << "Last point: " << coordDiff.x << " " << coordDiff.y;
-      DEBUG_LOG() << "Last point ATAN: " << std::atan2(coordDiff.y, coordDiff.x);
+      DEBUG_LOG(m_logger) << "Last point: " << coordDiff.x << " " << coordDiff.y;
+      DEBUG_LOG(m_logger) << "Last point ATAN: " << std::atan2(coordDiff.y, coordDiff.x);
 
       const double useNewGrad = -90 + std::atan2(coordDiff.y, coordDiff.x) * (180.0 / M_PI);
-      DEBUG_LOG() << "Atan2 Deg to: last point " << std::atan2(coordDiff.y, coordDiff.x) * (180.0 / M_PI);
+      DEBUG_LOG(m_logger) << "Atan2 Deg to: last point " << std::atan2(coordDiff.y, coordDiff.x) * (180.0 / M_PI);
 
       for (const auto &flightPointAdler : std::as_const(effectorAdler.flugbahnpunkt))
       {
@@ -761,10 +761,10 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
         QTransform matrix;
         matrix.rotate(useNewGrad);
         const QPointF point(flightPoint.offsetX(), flightPoint.offsetY());
-        TRACE_LOG() << " POS bevore rot: " << point;
+        TRACE_LOG(m_logger) << " POS bevore rot: " << point;
 
         const auto rotatePoint = matrix.map(point);
-        TRACE_LOG() << " POS after rot: " << rotatePoint;
+        TRACE_LOG(m_logger) << " POS after rot: " << rotatePoint;
 
         flightPoint.offsetX() = rotatePoint.x();
         flightPoint.offsetY() = rotatePoint.y();
@@ -785,8 +785,8 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
       effectorData.mhpScatterLengthDetonationHeight() = effectorAdler.streuung.laengsstreuungH;
       effectorData.mhpScatterWidth() = effectorAdler.streuung.seitenstreuung;
       effectorData.mhpScatterWidthDetonationHeight() = effectorAdler.streuung.seitenstreuungH;
-      DEBUG_LOG() << effectorAdler.kenner;
-      DEBUG_LOG() << "Looking for participantID with stats = party: " << part.partyId() << " unitname: " << part.name()
+      DEBUG_LOG(m_logger) << effectorAdler.kenner;
+      DEBUG_LOG(m_logger) << "Looking for participantID with stats = party: " << part.partyId() << " unitname: " << part.name()
                           << " effectorname: " << waffensystemkennerMap.key(effectorAdler.kenner);
       effectorData.peakHeight() = effectorAdler.gipfelhoehe;
       effectorVec.push_back(effectorData);
@@ -809,14 +809,14 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
       effectorData.chargeStruct().igniterFunctionId()
           = m_mainDispatcher->pdmHandler()->getDtc()->getIgniterFunctionIdFromAdlerIgniterFunction(effectorAdler.geschoss.zuenderFunktion);
 
-      DEBUG_LOG() << "FOUND chargeTypeId " << effectorData.chargeStruct().chargeTypeId() << " for " << effectorAdler.geschoss.geschosssorte;
-      DEBUG_LOG() << "igniterTypeId: " << effectorData.chargeStruct().igniterTypeId();
-      DEBUG_LOG() << "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() << "Could not find participant for partiyId " << part.partyId() << ", name " << part.name() << ", kenner " << effectorAdler.kenner;
+        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;
 
@@ -852,7 +852,7 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
       AreaEffectSimulation::TrajectoryGeoPosition trajectoryWithoutTime;
 
       if (!AreaEffectSimulation::TrajectoryGenerator::getInstance()->generateTrajectoryBiedziak(trajectoryStart, trajectoryEnd, 45.0, trajectoryWithoutTime))
-        ERROR_LOG() << "Could not create trajectory for Feuerkommando " << data.feuerkommando.verein;
+        ERROR_LOG(m_logger) << "Could not create trajectory for Feuerkommando " << data.feuerkommando.verein;
       
 
       
@@ -897,12 +897,12 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
   req.tla(data.zieldaten.zog); 
 
   if (data.feuerkommando.wirkmittel.empty())
-    DEBUG_LOG() << "flugzeit :"
+    DEBUG_LOG(m_logger) << "flugzeit :"
                         << " -";
   else
-    DEBUG_LOG() << "flugzeit :" << data.feuerkommando.wirkmittel.at(0).flugzeit;
+    DEBUG_LOG(m_logger) << "flugzeit :" << data.feuerkommando.wirkmittel.at(0).flugzeit;
 
-  DEBUG_LOG() << "SEND " << data.feuerkampfReferenz << " ";
+  DEBUG_LOG(m_logger) << "SEND " << data.feuerkampfReferenz << " ";
   int ammoCounter = 0;
   std::vector<ProjectDataManagement::L27_EffectorId> refWirkmittel;
   refWirkmittel.reserve(data.feuerkommando.wirkmittel.size());
@@ -910,7 +910,7 @@ void AesHandler::handleEffectCluster(const WirkfeldplanungData &data, int wsId)
   for (const auto &wm : std::as_const(data.feuerkommando.wirkmittel))
   {
     ammoCounter += wm.geschoss.anzahl; 
-    DEBUG_LOG() << "INSERT KENNER INTO MAP: " << data.feuerkampfReferenz << "---------" << wm.kenner;
+    DEBUG_LOG(m_logger) << "INSERT KENNER INTO MAP: " << data.feuerkampfReferenz << "---------" << wm.kenner;
     refWirkmittel.push_back(wm.kenner);
   }
 
@@ -966,7 +966,7 @@ void AesHandler::handleAmmoCount(const Feuerkampfdaten &data, int saaPartyId, bo
     bool outOfAmmo = false;
     const int newAmmoAmount = std::max(0, refAmmoCounter - 1);
 
-    DEBUG_LOG() << "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)
@@ -991,7 +991,7 @@ void AesHandler::handleAmmoCount(const Feuerkampfdaten &data, int saaPartyId, bo
         exvm.feuerkampfdaten.kenner = kenner;
         exvm.feuerkampfdaten.verein = data.verein;
 
-        DEBUG_LOG() << "------------ SENDE ExVollzugsmeldung für ------------ " << kenner;
+        DEBUG_LOG(m_logger) << "------------ SENDE ExVollzugsmeldung für ------------ " << kenner;
 
         m_mainDispatcher->jsonDispatcher()->sendExVollzugsmeldung(exvm, saaPartyId);
       }
@@ -1014,15 +1014,15 @@ void AesHandler::removeAllPendingEffectCluster(int partyId)
   if (effectClusterIds.isEmpty())
     return;
 
-  INFO_LOG() << "Pending effect cluster size: " << effectClusterIds.size();
+  INFO_LOG(m_logger) << "Pending effect cluster size: " << effectClusterIds.size();
   Core::RemoveElementRequest req;
   for (const qint32 id : std::as_const(effectClusterIds))
   {
     req.id(id);
-    INFO_LOG() << "Remove effect cluster id: " << id;
+    INFO_LOG(m_logger) << "Remove effect cluster id: " << id;
 
     qint32 ret = m_ftcAes->effectClusterRemoveRequest(req);
-    INFO_LOG() << "m_ftsAes->effectClusterRemoveRequest(req) --> " << ret;
+    INFO_LOG(m_logger) << "m_ftsAes->effectClusterRemoveRequest(req) --> " << ret;
   }
 }
 
@@ -1046,13 +1046,13 @@ void AesHandler::onExplosionSingleChanged(const AreaEffectSimulation::ExplosionS
 
   if (modType == DataModification::eRemoved)
   {
-    DEBUG_LOG() << "----------------- remove area ------------- ";
+    DEBUG_LOG(m_logger) << "----------------- remove area ------------- ";
     m_singleExplosions.remove(data.id());
     return;
   }
   if (modType == DataModification::eAdded)
   {
-    DEBUG_LOG() << "----------------- add area ------------- " << data.effectStateId();
+    DEBUG_LOG(m_logger) << "----------------- add area ------------- " << data.effectStateId();
     m_singleExplosions.insert(data.id(), data.effectStateId());
     return;
   }
@@ -1060,7 +1060,7 @@ void AesHandler::onExplosionSingleChanged(const AreaEffectSimulation::ExplosionS
       && m_singleExplosions.value(data.id(), AreaEffectSimulation::AesEffectState::EsActivated) != AreaEffectSimulation::AesEffectState_def::EsActivated)
   {
     const auto state = data.effectStateId();
-    DEBUG_LOG() << "----------------- switch state ------------- " << state;
+    DEBUG_LOG(m_logger) << "----------------- switch state ------------- " << state;
     m_singleExplosions.insert(data.id(), state);
     QJsonObject telegram;
     telegram[QStringLiteral("typeId")] = 80082;
@@ -1089,12 +1089,12 @@ void AesHandler::onExplosionSingleChanged(const AreaEffectSimulation::ExplosionS
 
 void AesHandler::onEffectClusterChanged(const AreaEffectSimulation::EffectCluster &data, DataModification modType)
 {
-  DEBUG_LOG() << "Try auto handle effectCluster: " << data.name();
+  DEBUG_LOG(m_logger) << "Try auto handle effectCluster: " << data.name();
 
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG() << "Try auto handle effectCluster: probs: " << data.properties();
+  DEBUG_LOG(m_logger) << "Try auto handle effectCluster: probs: " << data.properties();
 
   if (data.properties().empty())
     return;
@@ -1102,20 +1102,20 @@ void AesHandler::onEffectClusterChanged(const AreaEffectSimulation::EffectCluste
   if (!data.partyId().is_set())
     return;
 
-  DEBUG_LOG() << "has PARTY " << data.properties();
+  DEBUG_LOG(m_logger) << "has PARTY " << data.properties();
 
   if (!data.participantId().is_set())
     return;
 
   if (data.effectSourceId() != ProjectDataManagement::EffectSource::ES_ADLER)
     return;
-  DEBUG_LOG() << "has PARTICIPANTID " << data.properties();
+  DEBUG_LOG(m_logger) << "has PARTICIPANTID " << data.properties();
 
   QJsonObject propertiesObject = QJsonDocument::fromJson(QByteArray::fromStdString(data.properties())).object();
   if (!propertiesObject.value(QStringLiteral("useReceived")).toBool())
     return;
 
-  DEBUG_LOG() << "has USE RECEIVED " << data.effectStateId().underlying();
+  DEBUG_LOG(m_logger) << "has USE RECEIVED " << data.effectStateId().underlying();
 
   switch (data.effectStateId().underlying())
   {
@@ -1136,7 +1136,7 @@ void AesHandler::onEffectClusterChanged(const AreaEffectSimulation::EffectCluste
 
       
       m_aesIdToFeuerkampfReferenz.remove(data.id());
-      DEBUG_LOG() << "SEND MQ for " << data.name() << " " << reference;
+      DEBUG_LOG(m_logger) << "SEND MQ for " << data.name() << " " << reference;
       break;
     }
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.h
index 9ed52cb1e..88925ee27 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.h
@@ -60,16 +60,19 @@ class AesHandler
   std::shared_ptr<AreaEffectSimulation::Interface::Ftc> getFtc() { return m_ftcAes; };
 
   private:
+  NGL::INGLLogger &m_logger;
   AreaEffectSimulation::Area createMinimumRect(int zone, const QVector<QPointF> &points);
 
   signals:
   void explosionSingleChanged(const QJsonObject &jsonObj);
 
   private:
+  NGL::INGLLogger &m_logger;
   QList<qint32> findAllPendingEffectCluster(int partyId);
   void handleAmmoCount(const Feuerkampfdaten &data, int saaPartyId, bool sendExVollzug = false);
 
   private:
+  NGL::INGLLogger &m_logger;
   MainDispatcher *m_mainDispatcher;
   std::shared_ptr<AreaEffectSimulation::Interface::Ftc> m_ftcAes;
   std::shared_ptr<AreaEffectSimulation::Interface::Dtc> m_dtcAes;
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 10c324ff0..1d28adcc1 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
@@ -25,7 +25,7 @@ bool AsmHandler::init(MainDispatcher* mainDispatcher)
   m_dtcAsm = AssetManagement::Interface::Dtc::create(mainDispatcher->ddsHandler()->ddsConnector());
   if (!m_dtcAsm->enableAsset())
   {
-    ERROR_LOG()<<" Can't read data from ASM";
+    ERROR_LOG(m_logger)<<" Can't read data from ASM";
     return false;
   }
   m_exerciseId = mainDispatcher->exerciseId();
@@ -37,7 +37,7 @@ bool AsmHandler::init(MainDispatcher* mainDispatcher)
 
 void AsmHandler::modifyAssetAdlerProperties(int assetId, bool isSaaConnected)
 {
-  WARNING_LOG()<<">> modify asset properties: set exerciseId: "<<m_exerciseId<<" assetName: "<<assetId;
+  WARNING_LOG(m_logger)<<">> modify asset properties: set exerciseId: "<<m_exerciseId<<" assetName: "<<assetId;
   
   AssetManagement::Asset asset = m_dtcAsm->asset(assetId);
   if (asset.id() <= 0)
@@ -51,7 +51,7 @@ void AsmHandler::modifyAssetAdlerProperties(int assetId, bool isSaaConnected)
 
 void AsmHandler::onAssetModifyReply(const Core::FunctionReplyObject &reply)
 {
-  DEBUG_LOG() << "Got Function Reply error ? "<<reply.error();
+  DEBUG_LOG(m_logger) << "Got Function Reply error ? "<<reply.error();
 }
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/asm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/asm_handler.h
index b43b4a2e7..21a98bfa5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/asm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/asm_handler.h
@@ -34,9 +34,11 @@ public:
   std::shared_ptr<AssetManagement::Interface::Ftc> getFtc() { return m_ftcAsm; }
   void modifyAssetAdlerProperties(int assetId, bool isSaaConnected = false);
 private:
+  NGL::INGLLogger &m_logger;
   void onAssetModifyReply(const Core::FunctionReplyObject &reply) override;
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<AssetManagement::Interface::Dtc> m_dtcAsm;
   std::shared_ptr<AssetManagement::Interface::Ftc> m_ftcAsm;
   int m_exerciseId;
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 0e43480df..666bb32e4 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
@@ -48,7 +48,7 @@ bool FlmHandler::init(MainDispatcher *mainDispatcher)
 
 bool FlmHandler::processHQMessage(int partyId, const QString &name, int meldungsnummer, const QJsonObject &obj)
 {
-  ERROR_LOG() << "exerciseId: " << m_exerciseId << ", partyId: " << partyId
+  ERROR_LOG(m_logger) << "exerciseId: " << m_exerciseId << ", partyId: " << partyId
                       << ", name: " << name
                       << ", meldungsnummer: " << meldungsnummer;
 
@@ -58,11 +58,11 @@ bool FlmHandler::processHQMessage(int partyId, const QString &name, int meldungs
   const QString folderName = QStringLiteral("Messages");
   int folderHXMessagesId = m_dtcFlm->findFolder(partyFolderId, folderName);
 
-  ERROR_LOG() << "folderHXMessagesId: " << folderHXMessagesId;
+  ERROR_LOG(m_logger) << "folderHXMessagesId: " << folderHXMessagesId;
 
   if (folderHXMessagesId <= 0)
   {
-    ERROR_LOG() << "Folder Messages does not exist for exerciseId: " << m_exerciseId << ", partyId: " << partyId;
+    ERROR_LOG(m_logger) << "Folder Messages does not exist for exerciseId: " << m_exerciseId << ", partyId: " << partyId;
     return false;
   }
 
@@ -84,7 +84,7 @@ bool FlmHandler::processHQMessage(int partyId, const QString &name, int meldungs
   fileContentReq.exerciseId(m_exerciseId);
   fileContentReq.operatorId(99); 
 
-  DEBUG_LOG() << "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+$"));
@@ -93,12 +93,12 @@ bool FlmHandler::processHQMessage(int partyId, const QString &name, int meldungs
 
   
   baseName = baseName.normalized(QString::NormalizationForm_C);
-  ERROR_LOG() << "BaseName: " << baseName << "|";
+  ERROR_LOG(m_logger) << "BaseName: " << baseName << "|";
 
   QStringList fileNames;
   if (!m_dtcFlm->getAllFiles(fileContentReq.fileType(), folderHXMessagesId, fileNames, true))
   {
-    ERROR_LOG() << "Error while reading fileNames for folderId: " << folderHXMessagesId;
+    ERROR_LOG(m_logger) << "Error while reading fileNames for folderId: " << folderHXMessagesId;
     return false;
   }
 
@@ -106,13 +106,13 @@ bool FlmHandler::processHQMessage(int partyId, const QString &name, int meldungs
   for (const QString &fileName : std::as_const(fileNames))
   {
     QString normalizedName = fileName.normalized(QString::NormalizationForm_C);
-    DEBUG_LOG() << "normalized fileName: " << normalizedName << "|";
+    DEBUG_LOG(m_logger) << "normalized fileName: " << normalizedName << "|";
 
     if (!normalizedName.startsWith(baseName))
       continue;
 
     QString rest = fileName.mid(baseName.length());
-    DEBUG_LOG() << "rest: " << rest;
+    DEBUG_LOG(m_logger) << "rest: " << rest;
     if (rest.contains(QStringLiteral(".")))
       rest = rest.section(QStringLiteral("."), 0, 0);
 
@@ -128,12 +128,12 @@ bool FlmHandler::processHQMessage(int partyId, const QString &name, int meldungs
       if (ok)
         maxNumber = std::max(maxNumber, currentNum);
     }
-    DEBUG_LOG() << " maxNumber: " << maxNumber;
+    DEBUG_LOG(m_logger) << " maxNumber: " << maxNumber;
   }
 
   const QString newName = baseName
       + QStringLiteral("_") + QString::number(++maxNumber);
-  DEBUG_LOG() << "newName : " << newName;
+  DEBUG_LOG(m_logger) << "newName : " << newName;
   fileContentReq.name(newName.toStdString());
 
   
@@ -172,7 +172,7 @@ void FlmHandler::createHQNotification(const int partyId, const int folderId, con
   notif.expiryTime(expiryTime);
 
   int prio = s->getInteger(QStringLiteral("NOM/notificationPriority"), 3); 
-  DEBUG_LOG() << " Setting: NotificationPriority: " << prio;
+  DEBUG_LOG(m_logger) << " Setting: NotificationPriority: " << prio;
   notif.priority(static_cast<NotificationManagement::Priority_def::type>(prio));
   notif.processedPriority(NotificationManagement::Priority_def::Low);
   notif.exerciseId(m_exerciseId);
@@ -191,7 +191,7 @@ void FlmHandler::createHQNotification(const int partyId, const int folderId, con
   notifReq.notification(notif);
 
   if (!m_ftcNom->createNotificationRequest(notifReq, this))
-    ERROR_LOG() << "Error requesting create Notification data";
+    ERROR_LOG(m_logger) << "Error requesting create Notification data";
 }
 
 void FlmHandler::initHQFolders(int partyId)
@@ -201,7 +201,7 @@ void FlmHandler::initHQFolders(int partyId)
 
   if (exerciseFolderId <= 0)
   {
-    ERROR_LOG() << "No exercise Folder for exerciseId: " << m_exerciseId;
+    ERROR_LOG(m_logger) << "No exercise Folder for exerciseId: " << m_exerciseId;
     return;
   }
 
@@ -220,27 +220,27 @@ void FlmHandler::initHQFolders(int partyId)
 
 void FlmHandler::onFileContentModifyReply(const Core::FunctionReplyObject &reply)
 {
-  DEBUG_LOG() << "Got Function Reply: " << reply.translated();
+  DEBUG_LOG(m_logger) << "Got Function Reply: " << reply.translated();
 
   if (reply.error())
-    ERROR_LOG() << "Error while insert HX Message: " << reply.translated() << ", error: " << reply.error();
+    ERROR_LOG(m_logger) << "Error while insert HX Message: " << reply.translated() << ", error: " << reply.error();
   else
     createHQNotification(m_partyId, m_folderHXMessagesId, reply.id());
 }
 
 void FlmHandler::onPathCreateReply(const Core::FunctionReplyObject &reply)
 {
-  DEBUG_LOG() << "Got Function Reply: " << reply.translated();
+  DEBUG_LOG(m_logger) << "Got Function Reply: " << reply.translated();
 
   if (reply.error())
   {
-    ERROR_LOG() << "Error while creating folders: " << reply.translated() << ", error: " << reply.error();
+    ERROR_LOG(m_logger) << "Error while creating folders: " << reply.translated() << ", error: " << reply.error();
   }
 }
 
 void FlmHandler::onCreateNotificationReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "FlmHandler: Got createReply with id " << replyObject.id() << " and errorString " << replyObject.translated();
+  INFO_LOG(m_logger) << "FlmHandler: Got createReply with id " << replyObject.id() << " and errorString " << replyObject.translated();
 }
 
 bool FlmHandler::parseContent(const QString &contentString, QMap<QString, QString> &retMap)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/flm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/flm_handler.h
index dee7ccfb7..97e0e3e22 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/flm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/flm_handler.h
@@ -41,12 +41,14 @@ class FlmHandler
   void initHQFolders(int partyId);
 
   private:
+  NGL::INGLLogger &m_logger;
   void onFileContentModifyReply(const Core::FunctionReplyObject &reply) override;
   void onPathCreateReply(const Core::FunctionReplyObject &reply) override;
   void onCreateNotificationReply(const Core::FunctionReplyObject &replyObject) override final;
   bool parseContent(const QString &contentString, QMap<QString, QString> &retMap);
 
   private:
+  NGL::INGLLogger &m_logger;
   MainDispatcher *m_mainDispatcher = nullptr;
   int m_exerciseId;
   int m_parentFolderId;
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 e1a378c92..57e84f9bd 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
@@ -44,7 +44,7 @@ JsonDispatcher::JsonDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
     , m_webSocketReconnectTimer(new QTimer(this))
     , m_bWarnedOnce(false)
 {
-  DEBUG_LOG() << "JsonDispatcher::JsonDispatcher";
+  DEBUG_LOG(m_logger) << "JsonDispatcher::JsonDispatcher";
 
   m_sendToWebsocket->setWSInterface(m_webSocketInterface);
   connect(m_webSocketInterface.get(), &TrainingAreaBase::WebSocketInterface::recivedTelegram, this, &JsonDispatcher::onRecivedTelegram, Qt::UniqueConnection);
@@ -55,19 +55,19 @@ JsonDispatcher::JsonDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
 bool JsonDispatcher::init() { return true; }
 void JsonDispatcher::connectWebsocket()
 {
-  DEBUG_LOG() << "JsonDispatcher::connectWebsocket()";
+  DEBUG_LOG(m_logger) << "JsonDispatcher::connectWebsocket()";
   if (!m_webSocketInterface->init(Settings::getWebSocketServerPortRange(3)))
   {
-    DEBUG_LOG() << "Adler Could not open WebSocketInterface";
+    DEBUG_LOG(m_logger) << "Adler Could not open WebSocketInterface";
   }
   else
   {
-    DEBUG_LOG() << "Adler Could open WebSocketInterface on port " << m_webSocketInterface->getPort();
+    DEBUG_LOG(m_logger) << "Adler Could open WebSocketInterface on port " << m_webSocketInterface->getPort();
   }
   emit websocketConnected(m_webSocketInterface->getPort());
   const QUrl url(webSocketUrl());
   if (!m_bWarnedOnce)
-    DEBUG_LOG() << "Adler: Using WebSocket url: " << url.toString();
+    DEBUG_LOG(m_logger) << "Adler: Using WebSocket url: " << url.toString();
   if (m_webSocket->state() != QAbstractSocket::ConnectedState)
     m_webSocket->open(url);
 }
@@ -76,7 +76,7 @@ void JsonDispatcher::onKeepAliveTimerTimeout()
 {
   QTimer *timer = qobject_cast<QTimer *>(sender());
   int wsId = m_connectionKeepaliveTimer.key(timer);
-  DEBUG_LOG() << "onKeepAliveTimerTimeout Timeout from " << wsId << " still in list " << (getSAAByWs(wsId) != nullptr);
+  DEBUG_LOG(m_logger) << "onKeepAliveTimerTimeout Timeout from " << wsId << " still in list " << (getSAAByWs(wsId) != nullptr);
 
   auto saa = getSAAByWs(wsId);
 
@@ -86,14 +86,14 @@ void JsonDispatcher::onKeepAliveTimerTimeout()
     const ParticipantManagement::ConnectState connectState = ParticipantManagement::ConnectState::NoHeartbeat;
     const bool isSaaConnected = (connectState == ParticipantManagement::ConnectState::Connected);
     const int assetId = getAssetId(saa->getSAAName());
-    DEBUG_LOG() << "Timeout from " << saa->getSAAName() << " ==> SAA URL: " << saaUrl.toString();
+    DEBUG_LOG(m_logger) << "Timeout from " << saa->getSAAName() << " ==> SAA URL: " << saaUrl.toString();
     m_ppmHandler
         ->modifyPartyAdlerProperties(wsId, assetId, saa->getPartyId(), saa->getSAAName(), saa->getSzenarName(), connectState, saa->getIsVerbund());
     m_mainDispatcher->asmHandler()->modifyAssetAdlerProperties(assetId, isSaaConnected);
     saa->setIsAlive(false);
   }
   else
-    ERROR_LOG() << "Trying to remove an saa after timeout with the websocketId: " << wsId << " that is not connected";
+    ERROR_LOG(m_logger) << "Trying to remove an saa after timeout with the websocketId: " << wsId << " that is not connected";
 
   m_connectionKeepaliveTimer.remove(wsId);
   timer->stop();
@@ -131,11 +131,11 @@ std::shared_ptr<TrainingAreaBase::SendToTab> JsonDispatcher::sendToTab() { retur
 bool JsonDispatcher::canSendData() const { return m_webSocket && m_webSocket->state() == QAbstractSocket::ConnectedState; }
 void JsonDispatcher::onNewWebsocketConnected(const int wsId, const QString &address, qint16 port)
 {
-  DEBUG_LOG() << "New Connection from: " << address << ", port: " << port << ", with id: " << wsId;
+  DEBUG_LOG(m_logger) << "New Connection from: " << address << ", port: " << port << ", with id: " << wsId;
 }
 void JsonDispatcher::onWSDisconnected(const int wsId)
 {
-  DEBUG_LOG() << "Connection disconnect wsId: " << wsId;
+  DEBUG_LOG(m_logger) << "Connection disconnect wsId: " << wsId;
   auto saa = getSAAByWs(wsId);
 
   if (saa)
@@ -143,7 +143,7 @@ void JsonDispatcher::onWSDisconnected(const int wsId)
 }
 std::shared_ptr<SAAInterface> JsonDispatcher::getSAAByParty(const int partyId)
 {
-  DEBUG_LOG() << "getSAAByParty partyId: " << partyId;
+  DEBUG_LOG(m_logger) << "getSAAByParty partyId: " << partyId;
   if (m_saaInterfaces.empty())
     return nullptr;
   auto it
@@ -159,9 +159,9 @@ std::shared_ptr<SAAInterface> JsonDispatcher::getSAAByName(const QString &saaNam
 
 std::shared_ptr<SAAInterface> JsonDispatcher::getSAAByWs(const int wsId)
 {
-  TRACE_LOG() << "m_saaInterfaces.size :" << m_saaInterfaces.size() << ", wsId=" << wsId;
+  TRACE_LOG(m_logger) << "m_saaInterfaces.size :" << m_saaInterfaces.size() << ", wsId=" << wsId;
   for (int i = 0; i < m_saaInterfaces.size(); i++)
-    TRACE_LOG() << "i=" << i << ", getPartyId :" << m_saaInterfaces[i]->getPartyId() << ", getWsId :" << m_saaInterfaces[i]->getWsId();
+    TRACE_LOG(m_logger) << "i=" << i << ", getPartyId :" << m_saaInterfaces[i]->getPartyId() << ", getWsId :" << m_saaInterfaces[i]->getWsId();
 
   auto it = std::find_if(m_saaInterfaces.begin(), m_saaInterfaces.end(), [wsId](const std::shared_ptr<SAAInterface> &saa) { return saa.get()->getWsId() == wsId; });
   return it != m_saaInterfaces.end() ? *it : nullptr;
@@ -169,11 +169,11 @@ std::shared_ptr<SAAInterface> JsonDispatcher::getSAAByWs(const int wsId)
 
 bool JsonDispatcher::sendExFeuerbereit(const ExFeuerbereit &exFBDataIn, const int partyId)
 {
-  DEBUG_LOG() << "TRY SEND EXFeuerbereit attempt for party " << partyId;
+  DEBUG_LOG(m_logger) << "TRY SEND EXFeuerbereit attempt for party " << partyId;
   auto saa = getSAAByParty(partyId);
   if (!saa)
   {
-    ERROR_LOG() << "sendExFeuerbereit no saa for paty:" << partyId;
+    ERROR_LOG(m_logger) << "sendExFeuerbereit no saa for paty:" << partyId;
     return false;
   }
 
@@ -181,7 +181,7 @@ bool JsonDispatcher::sendExFeuerbereit(const ExFeuerbereit &exFBDataIn, const in
   exFB.sender = QStringLiteral("EXCON@GUEZ.DE");
   exFB.receiver = saa->getSAAName();
   exFB.timestamp = QDateTime::currentDateTime().toString(Qt::DateFormat::ISODate);
-  WARNING_LOG() << "TRY SEND EXFeuerbereit attempt for SAA NAME " << saa->getSAAName() << " esid " << saa->getWsId();
+  WARNING_LOG(m_logger) << "TRY SEND EXFeuerbereit attempt for SAA NAME " << saa->getSAAName() << " esid " << saa->getWsId();
   m_sendToWebsocket->onGenericTelegram1(saa->getWsId(), exFB.toJson());
 
   return true;
@@ -189,7 +189,7 @@ bool JsonDispatcher::sendExFeuerbereit(const ExFeuerbereit &exFBDataIn, const in
 
 bool JsonDispatcher::sendExAbgefeuert(const ExAbgefeuert &exAFDataIn, const int partyId)
 {
-  DEBUG_LOG() << "TRY SEND EXFeuerbereit attempt for party " << partyId;
+  DEBUG_LOG(m_logger) << "TRY SEND EXFeuerbereit attempt for party " << partyId;
   auto saa = getSAAByParty(partyId);
   if (!saa)
     return false;
@@ -198,7 +198,7 @@ bool JsonDispatcher::sendExAbgefeuert(const ExAbgefeuert &exAFDataIn, const int
   exAF.sender = QStringLiteral("EXCON@GUEZ.DE");
   exAF.receiver = saa->getSAAName();
   exAF.timestamp = QDateTime::currentDateTime().toString(Qt::DateFormat::ISODate);
-  WARNING_LOG() << "TRY SEND sendExAbgefeuert attempt for SAA NAME " << saa->getSAAName() << " esid " << saa->getWsId();
+  WARNING_LOG(m_logger) << "TRY SEND sendExAbgefeuert attempt for SAA NAME " << saa->getSAAName() << " esid " << saa->getWsId();
   m_sendToWebsocket->onGenericTelegram1(saa->getWsId(), exAF.toJson());
 
   return true;
@@ -206,7 +206,7 @@ bool JsonDispatcher::sendExAbgefeuert(const ExAbgefeuert &exAFDataIn, const int
 
 bool JsonDispatcher::sendExMqManuelleQuittung(const ExMqManuelleQuittung &exMQDataIn, int partyId)
 {
-  DEBUG_LOG() << "TRY SEND ExMqManuelleQuittung attempt for party " << partyId;
+  DEBUG_LOG(m_logger) << "TRY SEND ExMqManuelleQuittung attempt for party " << partyId;
   auto saa = getSAAByParty(partyId);
   if (!saa)
     return false;
@@ -215,7 +215,7 @@ bool JsonDispatcher::sendExMqManuelleQuittung(const ExMqManuelleQuittung &exMQDa
   exMQ.sender = QStringLiteral("EXCON@GUEZ.DE");
   exMQ.receiver = saa->getSAAName();
   exMQ.timestamp = QDateTime::currentDateTime().toString(Qt::DateFormat::ISODate);
-  DEBUG_LOG() << "TRY SEND ExMqManuelleQuittung attempt for SAA NAME " << saa->getSAAName() << " esid " << saa->getWsId();
+  DEBUG_LOG(m_logger) << "TRY SEND ExMqManuelleQuittung attempt for SAA NAME " << saa->getSAAName() << " esid " << saa->getWsId();
   m_sendToWebsocket->onGenericTelegram1(saa->getWsId(), exMQ.toJson());
 
   return true;
@@ -223,7 +223,7 @@ bool JsonDispatcher::sendExMqManuelleQuittung(const ExMqManuelleQuittung &exMQDa
 
 bool JsonDispatcher::sendExTqTechnischeQuittung(const ExTqTechnischeQuittung &exTQDataIn, int partyId)
 {
-  DEBUG_LOG() << "TRY SEND ExTqTechnischeQuittung attempt for party " << partyId;
+  DEBUG_LOG(m_logger) << "TRY SEND ExTqTechnischeQuittung attempt for party " << partyId;
   auto saa = getSAAByParty(partyId);
   if (!saa)
     return false;
@@ -232,7 +232,7 @@ bool JsonDispatcher::sendExTqTechnischeQuittung(const ExTqTechnischeQuittung &ex
   exMQ.sender = QStringLiteral("EXCON@GUEZ.DE");
   exMQ.receiver = saa->getSAAName();
   exMQ.timestamp = QDateTime::currentDateTime().toString(Qt::DateFormat::ISODate);
-  DEBUG_LOG() << "TRY SEND ExMqManuelleQuittung attempt for SAA NAME " << saa->getSAAName() << " esid " << saa->getWsId();
+  DEBUG_LOG(m_logger) << "TRY SEND ExMqManuelleQuittung attempt for SAA NAME " << saa->getSAAName() << " esid " << saa->getWsId();
   m_sendToWebsocket->onGenericTelegram1(saa->getWsId(), exMQ.toJson());
 
   return true;
@@ -240,7 +240,7 @@ bool JsonDispatcher::sendExTqTechnischeQuittung(const ExTqTechnischeQuittung &ex
 
 bool JsonDispatcher::sendExVollzugsmeldung(const ExVollzugsmeldung &exVZDataIn, int partyId)
 {
-  DEBUG_LOG() << "TRY SEND ExVollzugsmeldung attempt for party " << partyId;
+  DEBUG_LOG(m_logger) << "TRY SEND ExVollzugsmeldung attempt for party " << partyId;
   auto saa = getSAAByParty(partyId);
   if (!saa)
     return false;
@@ -249,33 +249,33 @@ bool JsonDispatcher::sendExVollzugsmeldung(const ExVollzugsmeldung &exVZDataIn,
   exVZ.sender = QStringLiteral("EXCON@GUEZ.DE");
   exVZ.receiver = saa->getSAAName();
   exVZ.timestamp = QDateTime::currentDateTime().toString(Qt::DateFormat::ISODate);
-  WARNING_LOG() << "TRY SEND ExVollzugsmeldung attempt for SAA NAME " << saa->getSAAName() << " WSID " << saa->getWsId();
+  WARNING_LOG(m_logger) << "TRY SEND ExVollzugsmeldung attempt for SAA NAME " << saa->getSAAName() << " WSID " << saa->getWsId();
   m_sendToWebsocket->onGenericTelegram1(saa->getWsId(), exVZ.toJson());
   return true;
 }
 
 void JsonDispatcher::onSAARegistration(const int wsId, const int partyId, const QString &saaName, const QString &szenarName, bool isVerbund, const QString &uuid)
 {
-  DEBUG_LOG() << "Registration attempt from " << saaName << " for party " << partyId << ", saaName: " << saaName << ", uuid: " << uuid << ", wsId: " << wsId;
+  DEBUG_LOG(m_logger) << "Registration attempt from " << saaName << " for party " << partyId << ", saaName: " << saaName << ", uuid: " << uuid << ", wsId: " << wsId;
   ExAnmeldebestaetigung exRC;
   exRC.referenceUuid = uuid;
   exRC.timestamp = QDateTime::currentDateTime().toString(Qt::DateFormat::ISODate);
   exRC.anBestaetigungsdaten.error = AdlerJson::L45_AnmeldebestaetigungFehlercode::Ok;
   auto saa = getSAAByName(saaName);
-  DEBUG_LOG() << "is saa " << saa;
+  DEBUG_LOG(m_logger) << "is saa " << saa;
   if (saa)
   {
-    DEBUG_LOG() << "saa.get()->getPartyId(): " << saa.get()->getPartyId() << " partyId: " << partyId;
+    DEBUG_LOG(m_logger) << "saa.get()->getPartyId(): " << saa.get()->getPartyId() << " partyId: " << partyId;
     if (saa.get()->getPartyId() == partyId)
     {
-      DEBUG_LOG() << "saa already connected, reconnect!";
+      DEBUG_LOG(m_logger) << "saa already connected, reconnect!";
       
       onSAADeregistration(saa.get()->getWsId(), partyId);
       
     }
     else
     {
-      DEBUG_LOG() << "other saa connected to this party";
+      DEBUG_LOG(m_logger) << "other saa connected to this party";
 
       
       
@@ -283,7 +283,7 @@ void JsonDispatcher::onSAARegistration(const int wsId, const int partyId, const
   }
   else if (getSAAByParty(partyId))
   {
-    DEBUG_LOG() << "party is used by other saa";
+    DEBUG_LOG(m_logger) << "party is used by other saa";
     
     
   }
@@ -296,10 +296,10 @@ void JsonDispatcher::onSAARegistration(const int wsId, const int partyId, const
     m_saaInterfaces.append(newSaa);
     
     int adlerOffset = m_settings->settings()->value(QLatin1String("TrainingAreaBase/AdlerKeepalive"), 30000).toInt();
-    DEBUG_LOG() << "adlerOffset =" << adlerOffset;
+    DEBUG_LOG(m_logger) << "adlerOffset =" << adlerOffset;
     if (adlerOffset > 0)
     {
-      DEBUG_LOG() << "Started SAA with Keppalive Timer: " << adlerOffset;
+      DEBUG_LOG(m_logger) << "Started SAA with Keppalive Timer: " << adlerOffset;
       QTimer *keepaliveTimer = new QTimer(this);
       keepaliveTimer->setInterval(adlerOffset);
       m_connectionKeepaliveTimer.insert(wsId, keepaliveTimer);
@@ -309,7 +309,7 @@ void JsonDispatcher::onSAARegistration(const int wsId, const int partyId, const
     saa = newSaa;
     
 
-    DEBUG_LOG() << "emit or answer without error wsId: " << wsId;
+    DEBUG_LOG(m_logger) << "emit or answer without error wsId: " << wsId;
   }
   exRC.sender = getSender();
   exRC.receiver = saa->getSAAName();
@@ -326,7 +326,7 @@ void JsonDispatcher::onSAARegistration(const int wsId, const int partyId, const
   const ParticipantManagement::ConnectState connectState = ParticipantManagement::ConnectState::Connected;
   const bool isSaaConnected = (connectState == ParticipantManagement::ConnectState::Connected);
   const int assetId = getAssetId(saaName);
-  DEBUG_LOG() << "onSAARegistration modifyParty"
+  DEBUG_LOG(m_logger) << "onSAARegistration modifyParty"
                       << " ==> SAA name " << saaName;
   createNotificationRequest(wsId, QString::fromUtf8(tr_lts("Notification", "Reconnect to SAA")),
                             NotificationManagement::MessageType_def::Success,
@@ -340,7 +340,7 @@ void JsonDispatcher::onSAARegistration(const int wsId, const int partyId, const
 
 void JsonDispatcher::onSAADeregistration(const int wsId, const int partyId)
 {
-  DEBUG_LOG() << "onSAADeregistration"
+  DEBUG_LOG(m_logger) << "onSAADeregistration"
                       << " wsId: " << wsId << ", partyId: " << partyId;
   auto saa = getSAAByWs(wsId);
 
@@ -349,7 +349,7 @@ void JsonDispatcher::onSAADeregistration(const int wsId, const int partyId)
     const ParticipantManagement::ConnectState connectState = ParticipantManagement::ConnectState::Disconnected;
     const bool isSaaConnected = (connectState == ParticipantManagement::ConnectState::Connected);
     const int assetId = getAssetId(saa->getSAAName());
-    DEBUG_LOG() << "Deregistation from " << saa->getSAAName();
+    DEBUG_LOG(m_logger) << "Deregistation from " << saa->getSAAName();
     createNotificationRequest(wsId, QString::fromUtf8(tr_lts("Notification", "SAADeregistration")),
                               NotificationManagement::MessageType_def::Info,
                               NotificationManagement::NotificationType::AdlerNotification,
@@ -360,12 +360,12 @@ void JsonDispatcher::onSAADeregistration(const int wsId, const int partyId)
     m_saaInterfaces.removeOne(saa);
   }
   else
-    ERROR_LOG() << "Trying to remove an saa with the websocketId: " << wsId << " that is not connected";
+    ERROR_LOG(m_logger) << "Trying to remove an saa with the websocketId: " << wsId << " that is not connected";
 }
 
 void JsonDispatcher::onSAAConnectionTest(const int wsId, const QString &uuid)
 {
-  DEBUG_LOG() << "onSAAConnectionTest"
+  DEBUG_LOG(m_logger) << "onSAAConnectionTest"
                       << " wsId: " << wsId << ", uuid: " << uuid;
 
   auto saa = getSAAByWs(wsId);
@@ -379,10 +379,10 @@ void JsonDispatcher::onSAAConnectionTest(const int wsId, const QString &uuid)
     QTimer *connectionTimer = m_connectionKeepaliveTimer.value(wsId);
     if (connectionTimer)
     {
-      DEBUG_LOG() << "connectionTimer->start()";
+      DEBUG_LOG(m_logger) << "connectionTimer->start()";
       connectionTimer->start(); 
     }
-    DEBUG_LOG() << "ConnectionTest from " << saa->getSAAName();
+    DEBUG_LOG(m_logger) << "ConnectionTest from " << saa->getSAAName();
     EXConnectionTestReply exCTR;
     exCTR.referenceUuid = uuid;
     exCTR.timestamp = QDateTime::currentDateTime().toString(Qt::DateFormat::ISODate);
@@ -392,13 +392,13 @@ void JsonDispatcher::onSAAConnectionTest(const int wsId, const QString &uuid)
 }
 void JsonDispatcher::onSAAStatus(const int wsId, const EXStatus &status)
 {
-  DEBUG_LOG() << "onSAAStatus"
+  DEBUG_LOG(m_logger) << "onSAAStatus"
                       << " wsId: " << wsId << ", status: " << static_cast<int>(status.status);
   auto saa = getSAAByWs(wsId);
 
   if (saa)
   {
-    DEBUG_LOG() << "Status from " << saa->getSAAName() << AdlerJson::szenarstatusToStr(status.status);
+    DEBUG_LOG(m_logger) << "Status from " << saa->getSAAName() << AdlerJson::szenarstatusToStr(status.status);
     saa->setStatus(status.status);
     QString title;
     switch (status.status)
@@ -429,7 +429,7 @@ 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() << "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());
@@ -440,11 +440,11 @@ QString JsonDispatcher::getParticipantInfoLink(const QString &verein, const int
 
 void JsonDispatcher::onSAAExceptionStatus(const int wsId, const TechnischeDaten &exceptionStatus)
 {
-  DEBUG_LOG() << "onSAAExceptionStatus"
+  DEBUG_LOG(m_logger) << "onSAAExceptionStatus"
                       << ", wsId: " << wsId << ", status: " << StatusL32Map.key(exceptionStatus.status) << ", beschreibung: " << exceptionStatus.beschreibung;
   const auto saa = getSAAByWs(wsId);
 
-  DEBUG_LOG() << "Sende Notification Technische Quittung";
+  DEBUG_LOG(m_logger) << "Sende Notification Technische Quittung";
 
   QString content = QString::fromUtf8(tr_lts("Notification", "<B>Status: </B>%1<br /><B> Description: </B>%2"));
 
@@ -467,7 +467,7 @@ void JsonDispatcher::onSAAExceptionStatus(const int wsId, const TechnischeDaten
 
 void JsonDispatcher::onSAASQWS(const int wsId, const Waffensystemdaten &exSQWS)
 {
-  DEBUG_LOG() << "onSAASQWS";
+  DEBUG_LOG(m_logger) << "onSAASQWS";
   const bool isVerbund = true;
   auto saa = getSAAByWs(wsId);
   int partyId = saa->getPartyId();
@@ -481,7 +481,7 @@ void JsonDispatcher::onSAASQWS(const int wsId, const Waffensystemdaten &exSQWS)
   args.append(QString::number(exSQWS.einheit.r));
   args.append(exSQWS.einheit.verein);
 
-  DEBUG_LOG() << "Stellungsmeldung Waffensystem content=" << content;
+  DEBUG_LOG(m_logger) << "Stellungsmeldung Waffensystem content=" << content;
   createNotificationRequest(wsId,
                             QString::fromUtf8(tr_lts("Notification","Weapon System Position Report")),
                             NotificationManagement::MessageType_def::Info,
@@ -494,7 +494,7 @@ void JsonDispatcher::onSAASQWS(const int wsId, const Waffensystemdaten &exSQWS)
 
 void JsonDispatcher::onSAASQFS(const int wsId, const Feuerstellungsdaten &exSQFS)
 {
-  DEBUG_LOG() << "onSAASQFS";
+  DEBUG_LOG(m_logger) << "onSAASQFS";
   auto saa = getSAAByWs(wsId);
   int partyId = saa->getPartyId();
   const bool isVerbund = true;
@@ -508,7 +508,7 @@ void JsonDispatcher::onSAASQFS(const int wsId, const Feuerstellungsdaten &exSQFS
   args.append(QString::number(exSQFS.feuereinheit.r));
   args.append(exSQFS.feuereinheit.verein);
 
-  DEBUG_LOG() << "Stellungsmeldung Feuerstellung content=" << content;
+  DEBUG_LOG(m_logger) << "Stellungsmeldung Feuerstellung content=" << content;
   createNotificationRequest(wsId,
                             QString::fromUtf8(tr_lts("Notification","Position Report: Firing Unit")),
                             NotificationManagement::MessageType_def::Info,
@@ -521,14 +521,14 @@ void JsonDispatcher::onSAASQFS(const int wsId, const Feuerstellungsdaten &exSQFS
 
 void JsonDispatcher::onSAASQLP(const int wsId, const Ladeplatzdaten &exSQLP)
 {
-  DEBUG_LOG() << "onSAASQLP";
+  DEBUG_LOG(m_logger) << "onSAASQLP";
   auto saa = getSAAByWs(wsId);
   int partyId = saa->getPartyId();
   const bool isVerbund = true;
   QStringList args;
 
   const ParticipantManagement::Participant &part = m_ppmHandler->findParticipantByInternalName(exSQLP.einheit.verein, partyId, isVerbund);
-  DEBUG_LOG() << "ParticipantId=" << part.id();
+  DEBUG_LOG(m_logger) << "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"));
 
@@ -543,29 +543,29 @@ void JsonDispatcher::onSAASQLP(const int wsId, const Ladeplatzdaten &exSQLP)
                             NotificationManagement::NotificationType::AdlerNotification,
                             content,
                             args);
-  DEBUG_LOG() << "Stellungsmeldung Ladeplatz content=" << content;
+  DEBUG_LOG(m_logger) << "Stellungsmeldung Ladeplatz content=" << content;
   
   m_ppmHandler->parseSQLP(exSQLP, wsId);
 }
 
 void JsonDispatcher::onSAATrajectoryData(const int wsId, const Flugbahndaten &exFlugbahndaten, const QString referenceUuid)
 {
-  DEBUG_LOG() << "onSAATrajectoryData wsId=" << wsId << ", referenceUuid :" << referenceUuid;
+  DEBUG_LOG(m_logger) << "onSAATrajectoryData wsId=" << wsId << ", referenceUuid :" << referenceUuid;
   auto saa = getSAAByWs(wsId);
   if (!saa)
   {
-    ERROR_LOG() << "onSAATrajectoryData but SAA with wsId " << wsId << " not found";
+    ERROR_LOG(m_logger) << "onSAATrajectoryData but SAA with wsId " << wsId << " not found";
     return;
   }
   QString referenceUuidAlt = referenceUuid;
   referenceUuidAlt = referenceUuidAlt.replace(QStringLiteral("-"), QStringLiteral(""));
   if (!m_trajectoryIdentifier.contains(referenceUuidAlt))
   {
-    DEBUG_LOG() << "referenceUuid not found in m_trajectoryIdentifier"
+    DEBUG_LOG(m_logger) << "referenceUuid not found in m_trajectoryIdentifier"
                         << ", referenceUuid : " << referenceUuidAlt;
     for (auto it = m_trajectoryIdentifier.constBegin(); it != m_trajectoryIdentifier.constEnd(); ++it)
     {
-      DEBUG_LOG() << "m_trajectoryIdentifier key : " << it.key() << ", value aesItemId :" << it.value().aesItemId << ", explosionId :" << it.value().explosionId;
+      DEBUG_LOG(m_logger) << "m_trajectoryIdentifier key : " << it.key() << ", value aesItemId :" << it.value().aesItemId << ", explosionId :" << it.value().explosionId;
     }
   }
 
@@ -583,7 +583,7 @@ void JsonDispatcher::onSAAHXGuidingLines(const int wsId, const Koordinierungsdat
   auto saa = getSAAByWs(wsId);
   if (!saa)
   {
-    ERROR_LOG() << "SQ HX (K) from SAA but SAA with id " << wsId << " not found";
+    ERROR_LOG(m_logger) << "SQ HX (K) from SAA but SAA with id " << wsId << " not found";
     return;
   }
 
@@ -598,7 +598,7 @@ void JsonDispatcher::onSAAHXGuidingLinesAndBoundaries(const int wsId, const Fueh
   auto saa = getSAAByWs(wsId);
   if (!saa)
   {
-    ERROR_LOG() << "SQ HX (G) from SAA but SAA with id " << wsId << " not found";
+    ERROR_LOG(m_logger) << "SQ HX (G) from SAA but SAA with id " << wsId << " not found";
     return;
   }
 
@@ -614,10 +614,10 @@ void JsonDispatcher::onSSAEXFIREHALT(const int wsId, const FeuerHaltDaten &feuer
   const auto saa = getSAAByWs(wsId);
   if (!saa)
   {
-    ERROR_LOG() << "EX-FH from SSA but SAA with id " << wsId << " not found";
+    ERROR_LOG(m_logger) << "EX-FH from SSA but SAA with id " << wsId << " not found";
   }
 
-  DEBUG_LOG() << "[EX-FH] data from SSA " << wsId << " : "
+  DEBUG_LOG(m_logger) << "[EX-FH] data from SSA " << wsId << " : "
                       << "verein: " << feuerhaltdaten.verein << " "
                       << "kenner: " << feuerhaltdaten.kenner.underlying() << " "
                       << "kategorie: " << feuerhaltdaten.kategorie.underlying() << " "
@@ -683,7 +683,7 @@ void JsonDispatcher::onWebSocketError()
   if (!m_webSocket)
     return;
   if (!m_bWarnedOnce)
-    WARNING_LOG() << "Error connecting to " << webSocketUrl().toString() << ": " << m_webSocket->errorString();
+    WARNING_LOG(m_logger) << "Error connecting to " << webSocketUrl().toString() << ": " << m_webSocket->errorString();
   m_webSocket->close();
   m_webSocketReconnectTimer->start(5000);
   m_bWarnedOnce = true;
@@ -715,11 +715,11 @@ void JsonDispatcher::onRecivedTelegram(int wsId, const QJsonObject &telegram)
   QJsonDocument doc(telegram);
   if (!isConnectionTest(doc))
   {
-    DEBUG_LOG() << "Text Message received: " << doc.toJson() << ", wsId: " << wsId;
+    DEBUG_LOG(m_logger) << "Text Message received: " << doc.toJson() << ", wsId: " << wsId;
   }
   else
   {
-    TRACE_LOG() << "Text Message received: " << doc.toJson() << ", wsId: " << wsId;
+    TRACE_LOG(m_logger) << "Text Message received: " << doc.toJson() << ", wsId: " << wsId;
   }
   
   int errorcode = 0;
@@ -728,7 +728,7 @@ void JsonDispatcher::onRecivedTelegram(int wsId, const QJsonObject &telegram)
   
   
 
-  TRACE_LOG() << "errorcode = " << errorcode;
+  TRACE_LOG(m_logger) << "errorcode = " << errorcode;
   const int typeId = telegram[JsonKeys::TYPE_ID()].toInt();
   if (typeId != TelegramIds::EX_FLUGBAHNDATEN())
     return;
@@ -738,7 +738,7 @@ void JsonDispatcher::onRecivedTelegram(int wsId, const QJsonObject &telegram)
     QString errorStr = FehlercodeMap.key(fehlercode);
 
     QString completeErrorStr = QStringLiteral("Calculate Trajectory failed: ") + errorStr;
-    DEBUG_LOG() << "errorStr :" << errorStr << ", completeErrorStr :" << completeErrorStr;
+    DEBUG_LOG(m_logger) << "errorStr :" << errorStr << ", completeErrorStr :" << completeErrorStr;
 
     Core::FunctionReplyObject reply = Core::FunctionReplyObject(-1, tr_lts("dds", completeErrorStr.toStdString()), {errorStr.toStdString()});
     reply.setId(m_explosionIndex);
@@ -753,7 +753,7 @@ void JsonDispatcher::onRecivedTelegram(int wsId, const QJsonObject &telegram)
 }
 void JsonDispatcher::onTextMessageReceived(const QByteArray &message)
 {
-  DEBUG_LOG() << "Text Message received: " << message;
+  DEBUG_LOG(m_logger) << "Text Message received: " << message;
   
   m_recvFromWebsocket->handleTelegram(message);
 }
@@ -765,7 +765,7 @@ void JsonDispatcher::onAdlerCalculateTrajectoryRequest(const rti::core::SampleId
   Core::FunctionReplyObject ret;
   m_explosionIndex = request.explosionIndex();
   m_cookieCalculateTrajectoryAdler = cookie;
-  DEBUG_LOG() << "Adler Plugin onSendCalculateTrajectoryAdlerRequest"
+  DEBUG_LOG(m_logger) << "Adler Plugin onSendCalculateTrajectoryAdlerRequest"
                       << ", m_saaInterfaces.size=" << m_saaInterfaces.size();
 
   int wsId = 0;
@@ -775,13 +775,13 @@ void JsonDispatcher::onAdlerCalculateTrajectoryRequest(const rti::core::SampleId
 
   if (wsId == 0)
   {
-    DEBUG_LOG() << " No wsId found wsId=" << wsId << " return";
+    DEBUG_LOG(m_logger) << " No wsId found wsId=" << wsId << " return";
     ret.setId(request.explosionIndex());
     m_ftsTab->adlerCalculateTrajectoryReply(cookie, ret);
 
     return;
   }
-  DEBUG_LOG() << "Adler Plugin onSendCalculateTrajectoryAdlerRequest"
+  DEBUG_LOG(m_logger) << "Adler Plugin onSendCalculateTrajectoryAdlerRequest"
                       << " connect to SAA and send data"
                       << ", partyId :" << request.partyId() << ", wsId :" << wsId;
   ExFlugbahnberechnung exFlugbahnberechnung;
@@ -790,7 +790,7 @@ void JsonDispatcher::onAdlerCalculateTrajectoryRequest(const rti::core::SampleId
   auto saa = getSAAByWs(wsId);
   if (!saa)
   {
-    ERROR_LOG() << "SQ WS from SAA but SAA with id " << wsId << " not found";
+    ERROR_LOG(m_logger) << "SQ WS from SAA but SAA with id " << wsId << " not found";
     return;
   }
   exFlugbahnberechnung.receiver = saa->getSAAName();
@@ -806,27 +806,27 @@ void JsonDispatcher::onAdlerCalculateTrajectoryRequest(const rti::core::SampleId
   exFlugbahnberechnung.flugbahnberechnungDaten.zielkoordinate.hoehe = request.positionTarget().z();
 
   exFlugbahnberechnung.flugbahnberechnungDaten.waffensystem = ProjectDataManagement::L26_EffectingSystemType::inner_enum(request.weaponSystemType().underlying() + 1);
-  DEBUG_LOG() << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77  weaponSystemType " << request.weaponSystemType().underlying();
+  DEBUG_LOG(m_logger) << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77  weaponSystemType " << request.weaponSystemType().underlying();
 
-  DEBUG_LOG() << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77  L26_EffectingSystemType " << exFlugbahnberechnung.flugbahnberechnungDaten.waffensystem;
+  DEBUG_LOG(m_logger) << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77  L26_EffectingSystemType " << exFlugbahnberechnung.flugbahnberechnungDaten.waffensystem;
 
   exFlugbahnberechnung.flugbahnberechnungDaten.geschoss.geschosssorte
       = m_mainDispatcher->pdmHandler()->getDtc()->adlerChargeTypeName(request.trajectory().chargeTypeId());
-  DEBUG_LOG() << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77  chargeTypeId " << request.trajectory().chargeTypeId();
-  DEBUG_LOG() << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77  geschosssorte " << exFlugbahnberechnung.flugbahnberechnungDaten.geschoss.geschosssorte;
+  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() << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77  igniterTypeId " << request.trajectory().igniterTypeId();
-  DEBUG_LOG() << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77  zuender " << exFlugbahnberechnung.flugbahnberechnungDaten.geschoss.zuender;
+  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() << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77  igniterFunctionId " << request.trajectory().igniterFunctionId();
-  DEBUG_LOG() << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77  zuenderFunktion " << exFlugbahnberechnung.flugbahnberechnungDaten.geschoss.zuenderFunktion;
+  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());
-  DEBUG_LOG() << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77  ladung " << exFlugbahnberechnung.flugbahnberechnungDaten.geschoss.ladung;
+  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());
@@ -835,12 +835,12 @@ void JsonDispatcher::onAdlerCalculateTrajectoryRequest(const rti::core::SampleId
   
 
   if (request.properties().empty())
-    ERROR_LOG() << "No properties available";
-  DEBUG_LOG() << ", request.aesItemId() :" << request.aesItemId();
+    ERROR_LOG(m_logger) << "No properties available";
+  DEBUG_LOG(m_logger) << ", request.aesItemId() :" << request.aesItemId();
 
   
 
-  DEBUG_LOG() << "UUID=" << exFlugbahnberechnung.uuid;
+  DEBUG_LOG(m_logger) << "UUID=" << exFlugbahnberechnung.uuid;
   TrajectoryIdentifier trajectoryIdentifier;
 
   trajectoryIdentifier.aesItemId = request.aesItemId();
@@ -851,7 +851,7 @@ void JsonDispatcher::onAdlerCalculateTrajectoryRequest(const rti::core::SampleId
 
   QJsonObject telegram;
   telegram = exFlugbahnberechnung.toJson();
-  DEBUG_LOG() << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77   " << QJsonDocument(telegram).toJson(QJsonDocument::JsonFormat::Compact);
+  DEBUG_LOG(m_logger) << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77   " << QJsonDocument(telegram).toJson(QJsonDocument::JsonFormat::Compact);
   m_sendToWebsocket->onGenericTelegram1(wsId, telegram);
 }
 
@@ -859,7 +859,7 @@ void JsonDispatcher::cleanupSaaInterfaces(const QString &saaName, int wsId, int
 {
   
   
-  DEBUG_LOG() << "cleanup saa partyId: " << partyId << " name: " << saaName << " wsId " << wsId;
+  DEBUG_LOG(m_logger) << "cleanup saa partyId: " << partyId << " name: " << saaName << " wsId " << wsId;
 
   const auto copy = m_saaInterfaces;
   for (const auto &saa : copy)
@@ -867,7 +867,7 @@ void JsonDispatcher::cleanupSaaInterfaces(const QString &saaName, int wsId, int
     if ((partyId > 0 && saa.get()->getPartyId() == partyId) || (!saaName.isEmpty() && saa.get()->getSAAName() == saaName) 
         || (wsId > 0 && saa.get()->getWsId() == wsId))
     {
-      DEBUG_LOG() << "Cleanup SAA " << saa->getSAAName() << " for Party: " << saa->getPartyId();
+      DEBUG_LOG(m_logger) << "Cleanup SAA " << saa->getSAAName() << " for Party: " << saa->getPartyId();
       m_saaInterfaces.removeOne(saa);
     }
   }
@@ -894,7 +894,7 @@ void JsonDispatcher::getCreateNotificationRequestData(const int wsId,
   const auto saa = getSAAByWs(wsId);
   if (!saa)
   {
-    WARNING_LOG() << "No valid SAA for wsId";
+    WARNING_LOG(m_logger) << "No valid SAA for wsId";
     return;
   }
   
@@ -919,7 +919,7 @@ void JsonDispatcher::getCreateNotificationRequestData(const int wsId,
                                                                                                        partyId,
                                                                                                        OperatorRights::AdlerExplosionClusterEdit,
                                                                                                        data.notification().notificationType().underlying());
-  DEBUG_LOG() << "getCreateNotificationRequestData recipientIds.size=" << recipientIds.size()
+  DEBUG_LOG(m_logger) << "getCreateNotificationRequestData recipientIds.size=" << recipientIds.size()
                       << ", exerciseId=" << m_mainDispatcher->exerciseId();
   std::vector<NotificationManagement::Address> recipientIdsDds;
   recipientIdsDds.reserve(recipientIds.size());
@@ -933,7 +933,7 @@ void JsonDispatcher::getCreateNotificationRequestData(const int wsId,
     addr.name(user.name());
     addr.addressType(NotificationManagement::AddressType_def::Operator);
     notif.recipientIds().push_back(addr);
-    DEBUG_LOG() << "recipientId=" << addr.name()
+    DEBUG_LOG(m_logger) << "recipientId=" << addr.name()
                         << ", addr.addressId=" << addr.addressId();
   }
 
@@ -952,44 +952,44 @@ void JsonDispatcher::createNotificationRequest(const int wsId,
                                                const QString &content,
                                                const QStringList &args)
 {
-  DEBUG_LOG() << "createNotificationRequest"
+  DEBUG_LOG(m_logger) << "createNotificationRequest"
                        << ", content=" << content;
   NotificationManagement::CreateNotification req;
   getCreateNotificationRequestData(wsId, title, req, content, args);
   if (req.notification().content().empty())
   {
-    INFO_LOG() << "req.notification().content().empty()";
+    INFO_LOG(m_logger) << "req.notification().content().empty()";
     return;
   }
   req.notification().messageType(messageType);
   req.notification().notificationType(notificationType);
 
-  INFO_LOG() << "trying to send CreateNotificationRequest";
+  INFO_LOG(m_logger) << "trying to send CreateNotificationRequest";
   if (req.notification().recipientIds().size() == 0)
   {
-    INFO_LOG() << "req.notification().recipientIds().size() == 0";
+    INFO_LOG(m_logger) << "req.notification().recipientIds().size() == 0";
     return;
   }
-  INFO_LOG() << "CreateNotificationRequest";
+  INFO_LOG(m_logger) << "CreateNotificationRequest";
   if (!m_ftcNom->createNotificationRequest(req, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
   }
 }
 
 
 void JsonDispatcher::onCreateNotificationReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got createReply with id " << replyObject.id() << " and errorString " << replyObject.translated();
+  INFO_LOG(m_logger) << "Got createReply with id " << replyObject.id() << " and errorString " << replyObject.translated();
 
   if (replyObject.error())
   {
-    ERROR_LOG() << "Error requesting CreateNotification";
+    ERROR_LOG(m_logger) << "Error requesting CreateNotification";
     return;
   }
   else
   {
-    DEBUG_LOG() << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
+    DEBUG_LOG(m_logger) << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
   }
 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.h
index 29a9c870f..6469de47a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.h
@@ -115,6 +115,7 @@ class JsonDispatcher final
   void websocketConnected(quint16 port);
 
   private:
+  NGL::INGLLogger &m_logger;
   QUrl webSocketUrl() const;
   bool isConnectionTest(QJsonDocument &doc);
   QString getParticipantInfoLink(const QString &verein, const int partyId, const bool isVerbund);
@@ -122,6 +123,7 @@ class JsonDispatcher final
   std::shared_ptr<SAAInterface> getSAAByName(const QString &saaName);
 
   private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<TrainingAreaBase::RecvFromTab> m_recvFromTabCb;
   std::shared_ptr<JsonHandlerRx> m_recvFromWebsocket;
   std::shared_ptr<JsonHandlerTx> m_sendToWebsocket;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_handler_rx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_handler_rx.cpp
index aab782b86..821c6c4af 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_handler_rx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_handler_rx.cpp
@@ -14,15 +14,14 @@ JsonHandlerRx::JsonHandlerRx(const std::shared_ptr<TrainingAreaBase::RecvFromTab
                              const std::shared_ptr<TrainingAreaBase::TxMixin> &sendToTabCb,
                              JsonDispatcher *dispatcher,
                              AesHandler *aesHandler,
-                             PpmHandler *ppmHandler)
-    : m_rxHandler(recvFromTabCb)
+                             PpmHandler *ppmHandler) : m_rxHandler(recvFromTabCb)
     , m_txHandler(sendToTabCb) 
     , m_dispatcher(dispatcher)
     , m_bWarnedOnce(false)
     , m_bWarnedOnceTx(false)
     , m_aesHandler(aesHandler)
-    , m_ppmHandler(ppmHandler)
-{
+    , m_ppmHandler(ppmHandler),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 bool JsonHandlerRx::handleTelegram(int wsId, const QJsonObject &telegram, int &errorcode)
 {
@@ -31,7 +30,7 @@ bool JsonHandlerRx::handleTelegram(int wsId, const QJsonObject &telegram, int &e
 
   if (!telegram.contains(JsonKeys::TYPE_ID()))
   {
-    ERROR_LOG() << "telegram not contains typeId";
+    ERROR_LOG(m_logger) << "telegram not contains typeId";
   }
 
   const int typeId = telegram[JsonKeys::TYPE_ID()].toInt();
@@ -39,7 +38,7 @@ bool JsonHandlerRx::handleTelegram(int wsId, const QJsonObject &telegram, int &e
   const QString uuid = telegram[JsonKeys::UUID_()].toString();
   const QString referenceUuid = telegram[JsonKeys::REFERENCE_UUID()].toString();
 
-  INFO_LOG() << "[handleTelegram] typeId=" << typeId << " typeName=" << typeName << " uuid=" << uuid << " referenceUuid=" << referenceUuid;
+  INFO_LOG(m_logger) << "[handleTelegram] typeId=" << typeId << " typeName=" << typeName << " uuid=" << uuid << " referenceUuid=" << referenceUuid;
 
   try
   {
@@ -53,7 +52,7 @@ bool JsonHandlerRx::handleTelegram(int wsId, const QJsonObject &telegram, int &e
         QString szenarName = dataObj.value(JsonKeys::SZENAR()).toString();
         bool isVerbund = dataObj.value(JsonKeys::ADLER_VERBUND()).toBool();
         m_dispatcher->onSAARegistration(wsId, partyId, saaName, szenarName, isVerbund, uuid);
-        WARNING_LOG() << "On Register ------------------- partyId= " << partyId << ", saaName= " << saaName << ", szenarName= " << szenarName
+        WARNING_LOG(m_logger) << "On Register ------------------- partyId= " << partyId << ", saaName= " << saaName << ", szenarName= " << szenarName
                               << ", isVerbund= " << isVerbund << ", wsId= " << wsId;
         break;
       }
@@ -61,18 +60,18 @@ bool JsonHandlerRx::handleTelegram(int wsId, const QJsonObject &telegram, int &e
       {
         const int partyId = telegram[JsonKeys::DATA()].toObject().value(JsonKeys::PARTY_ID()).toInt(0);
         m_dispatcher->onSAADeregistration(wsId, partyId);
-        WARNING_LOG() << "[EX_DEREGISTRATION_REQUEST] EX-Abmeldung -------------------------------------";
+        WARNING_LOG(m_logger) << "[EX_DEREGISTRATION_REQUEST] EX-Abmeldung -------------------------------------";
         break;
       }
       case TelegramIds::EX_CONNECTION_TEST_REQUEST(): 
       {
-        DEBUG_LOG() << "[EX_CONNECTION_TEST_REQUEST] EX-Verbindungsanfrage -------------------------------------";
+        DEBUG_LOG(m_logger) << "[EX_CONNECTION_TEST_REQUEST] EX-Verbindungsanfrage -------------------------------------";
         m_dispatcher->onSAAConnectionTest(wsId, uuid);
         break;
       }
       case TelegramIds::EX_STATUS(): 
       {
-        WARNING_LOG() << "[EX_STATUS] EX-Status -------------------------------------";
+        WARNING_LOG(m_logger) << "[EX_STATUS] EX-Status -------------------------------------";
         auto data = telegram[JsonKeys::DATA()];
         const QString status = data.toObject().value(JsonKeys::STATUS()).toString(QStringLiteral(""));
 
@@ -84,7 +83,7 @@ bool JsonHandlerRx::handleTelegram(int wsId, const QJsonObject &telegram, int &e
       }
     case TelegramIds::EX_TQ(): 
     {
-      WARNING_LOG() << "[EX_TQ] Technische Quittierung -------------------------------------";
+      WARNING_LOG(m_logger) << "[EX_TQ] Technische Quittierung -------------------------------------";
       const auto data = telegram[JsonKeys::DATA()].toObject();
       bool bOk = true;
       TechnischeDaten technischeDaten;
@@ -94,7 +93,7 @@ bool JsonHandlerRx::handleTelegram(int wsId, const QJsonObject &telegram, int &e
     }
       case TelegramIds::EX_FIRE(): 
       {
-        WARNING_LOG() << "[EX-FQ(FN)] EX-Feuern -------------------------------------";
+        WARNING_LOG(m_logger) << "[EX-FQ(FN)] EX-Feuern -------------------------------------";
         auto data = telegram[JsonKeys::DATA()].toObject();
         bool bOk = true;
         Feuerkampfdaten exFire;
@@ -107,12 +106,12 @@ bool JsonHandlerRx::handleTelegram(int wsId, const QJsonObject &telegram, int &e
       }
       case TelegramIds::EX_AWES_PLANNING(): 
       {
-        WARNING_LOG() << "[EX_AWES_PLANNING] EX-FQ(BA-BB-FK) Wirkfeldplanung";
+        WARNING_LOG(m_logger) << "[EX_AWES_PLANNING] EX-FQ(BA-BB-FK) Wirkfeldplanung";
         auto data = telegram[JsonKeys::DATA()].toObject();
         WirkfeldplanungData wirkfeldplanungData;
         bool bOk = true;
         wirkfeldplanungDataFromJson(data, wirkfeldplanungData, bOk);
-        DEBUG_LOG() << "\n-------------------"
+        DEBUG_LOG(m_logger) << "\n-------------------"
                             << "\nwirkfeldplanungData"
                             << "\n dauer: " << wirkfeldplanungData.dauer << "\n abfeuerungsArt: " << static_cast<int>(wirkfeldplanungData.abfeuerungsArt)
                             << "\n feuerkampfReferenz: '" << wirkfeldplanungData.feuerkampfReferenz << "'"
@@ -124,14 +123,14 @@ bool JsonHandlerRx::handleTelegram(int wsId, const QJsonObject &telegram, int &e
       }
       case TelegramIds::EX_POSITION_REPORT_WEAPON(): 
       {
-        DEBUG_LOG() << "[EX_POSITION_REPORT_WEAPON] Ex-SQ(WS) Stellungsmeldung Waffensystem";
+        DEBUG_LOG(m_logger) << "[EX_POSITION_REPORT_WEAPON] Ex-SQ(WS) Stellungsmeldung Waffensystem";
         auto data = telegram[JsonKeys::DATA()].toObject();
         Waffensystemdaten exSQWS;
         bool bOk = true;
         waffensystemdatenFromJson(data, exSQWS, bOk);
         if (!bOk)
         {
-          ERROR_LOG() << "Received Ex-SQ(WS) but couldn't parse the jsondata ";
+          ERROR_LOG(m_logger) << "Received Ex-SQ(WS) but couldn't parse the jsondata ";
           break;
         }
 
@@ -141,14 +140,14 @@ bool JsonHandlerRx::handleTelegram(int wsId, const QJsonObject &telegram, int &e
       }
       case TelegramIds::EX_POSITION_REPORT_FIRE(): 
       {
-        DEBUG_LOG() << "[EX_POSITION_REPORT_FIRE] Ex-SQ(FS) Stellungsmeldung Feuerstellung";
+        DEBUG_LOG(m_logger) << "[EX_POSITION_REPORT_FIRE] Ex-SQ(FS) Stellungsmeldung Feuerstellung";
         auto data = telegram[JsonKeys::DATA()].toObject();
         Feuerstellungsdaten exSQFS;
         bool bOk = true;
         feuerstellungsdatenFromJson(data, exSQFS, bOk);
         if (!bOk)
         {
-          ERROR_LOG() << "Received Ex-SQ(FS) but couldn't parse the jsondata ";
+          ERROR_LOG(m_logger) << "Received Ex-SQ(FS) but couldn't parse the jsondata ";
           break;
         }
 
@@ -158,14 +157,14 @@ bool JsonHandlerRx::handleTelegram(int wsId, const QJsonObject &telegram, int &e
       }
       case TelegramIds::EX_POSITION_REPORT_LOADING_PLACE(): 
       {
-        DEBUG_LOG() << "[EX_POSITION_REPORT_LOADING_PLACE] EX-SQ(LP)Stellungsmeldung Ladeplatz";
+        DEBUG_LOG(m_logger) << "[EX_POSITION_REPORT_LOADING_PLACE] EX-SQ(LP)Stellungsmeldung Ladeplatz";
         auto data = telegram[JsonKeys::DATA()].toObject();
         Ladeplatzdaten exSQLP;
         bool bOk = true;
         ladeplatzdatenFromJson(data, exSQLP, bOk);
         if (!bOk)
         {
-          ERROR_LOG() << "Received Ex-SQ(LP) but couldn't parse the jsondata ";
+          ERROR_LOG(m_logger) << "Received Ex-SQ(LP) but couldn't parse the jsondata ";
           break;
         }
 
@@ -175,17 +174,17 @@ bool JsonHandlerRx::handleTelegram(int wsId, const QJsonObject &telegram, int &e
       }
       case TelegramIds::EX_FLUGBAHNDATEN(): 
       {
-        DEBUG_LOG() << "[EX_FLUGBAHNDATEN] EX-Flugbahndaten";
+        DEBUG_LOG(m_logger) << "[EX_FLUGBAHNDATEN] EX-Flugbahndaten";
         auto data = telegram[JsonKeys::DATA()].toObject();
         Flugbahndaten flugbahndaten;
         bool bOk = true;
         flugbahndatenFromJson(data, flugbahndaten, bOk);
         if (!bOk)
         {
-          ERROR_LOG() << "Received EX-Flugbahndaten but couldn't parse the jsondata ";
+          ERROR_LOG(m_logger) << "Received EX-Flugbahndaten but couldn't parse the jsondata ";
           break;
         }
-        DEBUG_LOG() << "Vor onSAATrajectoryData wsId=" << wsId;
+        DEBUG_LOG(m_logger) << "Vor onSAATrajectoryData wsId=" << wsId;
         if (static_cast<int>(flugbahndaten.fehlercode) == 0)
           m_dispatcher->onSAATrajectoryData(wsId, flugbahndaten, referenceUuid);
         else
@@ -194,7 +193,7 @@ bool JsonHandlerRx::handleTelegram(int wsId, const QJsonObject &telegram, int &e
       }
       case TelegramIds::EX_GUIDING_LINES(): 
       {
-        DEBUG_LOG() << "[EX_GUIDING_LINES] EX-HQ Koordinierungsmassnahmen";
+        DEBUG_LOG(m_logger) << "[EX_GUIDING_LINES] EX-HQ Koordinierungsmassnahmen";
         auto data = telegram[JsonKeys::DATA()].toObject();
         Koordinierungsdaten koordinierungsdaten;
         bool bOk = true;
@@ -210,7 +209,7 @@ bool JsonHandlerRx::handleTelegram(int wsId, const QJsonObject &telegram, int &e
       }
       case TelegramIds::EX_GUIDING_LINES_AND_BOUNDARIES(): 
       {
-        DEBUG_LOG() << "[EX_GUIDING_LINES_AND_BOUNDARIES] EX-HQ(G)Fuehrungslinien und Grenzen ";
+        DEBUG_LOG(m_logger) << "[EX_GUIDING_LINES_AND_BOUNDARIES] EX-HQ(G)Fuehrungslinien und Grenzen ";
         auto data = telegram[JsonKeys::DATA()].toObject();
         Fuehrungsdaten fuehrungsdaten;
         bool bOk = true;
@@ -226,7 +225,7 @@ bool JsonHandlerRx::handleTelegram(int wsId, const QJsonObject &telegram, int &e
       }
       case TelegramIds::EX_FIRE_HALT(): 
       {
-        WARNING_LOG() << "[EX_FIRE_HALT] Feuerhalt";
+        WARNING_LOG(m_logger) << "[EX_FIRE_HALT] Feuerhalt";
 
         auto data = telegram[QStringLiteral("data")].toObject();
         bool bOk = true;
@@ -239,7 +238,7 @@ bool JsonHandlerRx::handleTelegram(int wsId, const QJsonObject &telegram, int &e
       }
       case TelegramIds::EX_DONT_FIRE(): 
       {
-        WARNING_LOG() << "[EX_DONT_FIRE] Dont Fire";
+        WARNING_LOG(m_logger) << "[EX_DONT_FIRE] Dont Fire";
         auto data = telegram[QStringLiteral("data")].toObject();
         bool bOk = true;
         Feuerkampfdaten feuerkampfdaten;
@@ -251,20 +250,20 @@ bool JsonHandlerRx::handleTelegram(int wsId, const QJsonObject &telegram, int &e
       }
       default:
       {
-        WARNING_LOG() << "Cant handle Telegram typeId=" << typeId;
+        WARNING_LOG(m_logger) << "Cant handle Telegram typeId=" << typeId;
       }
     }
   }
   catch (const std::exception &e)
   {
-    WARNING_LOG() << "Could not parse json: " << e.what() << " (" << ")";
+    WARNING_LOG(m_logger) << "Could not parse json: " << e.what() << " (" << ")";
     return false;
   }
   return true;
 }
 bool JsonHandlerRx::handleTelegram(const QByteArray &baJson)
 {
-  DEBUG_LOG() << "JsonHandlerRx::handleTelegram";
+  DEBUG_LOG(m_logger) << "JsonHandlerRx::handleTelegram";
 
   if (baJson.isEmpty())
     return false;
@@ -273,19 +272,19 @@ bool JsonHandlerRx::handleTelegram(const QByteArray &baJson)
   const QJsonValue typeId = obj.value(QStringLiteral("typeId"));
   if (!typeId.isDouble())
   {
-    ERROR_LOG() << "Can not read type id: " << baJson;
+    ERROR_LOG(m_logger) << "Can not read type id: " << baJson;
     return false;
   }
   const QJsonObject data = obj.value(QStringLiteral("data")).toObject();
   if (typeId.toInt() != 21)
-    ERROR_LOG() << "Telegram before filter: " << baJson;
+    ERROR_LOG(m_logger) << "Telegram before filter: " << baJson;
   try
   {
     QJsonValue header = data[QStringLiteral("header")];
 
     QJsonObject obj = header.toObject();
 
-    ERROR_LOG() << "Telegram header: " << obj.count();
+    ERROR_LOG(m_logger) << "Telegram header: " << obj.count();
     if (!obj.isEmpty())
     {
       int eqNo = obj[QStringLiteral("equipmentNumber")].toInt(0);
@@ -295,11 +294,11 @@ bool JsonHandlerRx::handleTelegram(const QByteArray &baJson)
         return false;
     }
     if (typeId.toInt() != 21)
-      ERROR_LOG() << "Telegram after filter: " << baJson;
+      ERROR_LOG(m_logger) << "Telegram after filter: " << baJson;
   }
   catch (const std::exception &e)
   {
-    WARNING_LOG() << "Could not parse json: " << e.what() << " (" << baJson << ")";
+    WARNING_LOG(m_logger) << "Could not parse json: " << e.what() << " (" << baJson << ")";
     return false;
   }
   return true;
@@ -313,7 +312,7 @@ template <typename T> void JsonHandlerRx::rxData(const T &data)
   {
     if (!m_bWarnedOnce)
     {
-      ERROR_LOG() << "No RecvFromTab available";
+      ERROR_LOG(m_logger) << "No RecvFromTab available";
       m_bWarnedOnce = true;
     }
     return;
@@ -328,7 +327,7 @@ template <typename T> void JsonHandlerRx::txData(const T &data)
   {
     if (!m_bWarnedOnceTx)
     {
-      ERROR_LOG() << "No RecvFromTab available";
+      ERROR_LOG(m_logger) << "No RecvFromTab available";
       m_bWarnedOnceTx = true;
     }
     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 bb209aef8..cde4ecaaa 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
@@ -39,7 +39,7 @@ void JsonHandlerTx::onWebsocketConnectedToExternalSystem(bool bConnected)
 {
     m_bWebsocketConnectedToExternalSystem = bConnected;
 
-  INFO_LOG() << "Connected to SAA";
+  INFO_LOG(m_logger) << "Connected to SAA";
   const auto tele2 = m_pdp->exerciseEnvironmentData();
   sendToTx(&tele2, true);
   connect(m_mainDispatcher->aesHandler().get(), &AesHandler::explosionSingleChanged, this, &JsonHandlerTx::onGenericTelegram, Qt::UniqueConnection);
@@ -353,7 +353,7 @@ bool JsonHandlerTx::txData(const TrainingAreaBase::TetraIcd::ExConfirmationRepor
 
 void JsonHandlerTx::onParticipantConnectionState(const int equipmentNumber, const bool dataCommunicationPossible)
 {
-  INFO_LOG() << "onParticipantConnectionState - " << equipmentNumber
+  INFO_LOG(m_logger) << "onParticipantConnectionState - " << equipmentNumber
                      << ", communication possible: " << dataCommunicationPossible;
   if (equipmentNumber == -1)
     m_dataCommunicationPossible.clear();
@@ -365,7 +365,7 @@ void JsonHandlerTx::onGenericTelegram(const QJsonObject &telegram)
   if (!m_webSocket || !m_bWebsocketConnectedToExternalSystem)
     return;
   const QByteArray ba = QJsonDocument(telegram).toJson(QJsonDocument::Compact);
-  DEBUG_LOG() << "Sending tele: " << ba;
+  DEBUG_LOG(m_logger) << "Sending tele: " << ba;
   m_webSocket->sendTextMessage(QString::fromUtf8(ba));
 }
 
@@ -381,7 +381,7 @@ bool JsonHandlerTx::sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTeleg
   telegram[QStringLiteral("data")] = data->toJson();
   telegram[QStringLiteral("type")] = data->type();
   telegram[QStringLiteral("typeId")] = data->id();
-  ERROR_LOG() << QJsonDocument(telegram).toJson(QJsonDocument::Compact).toStdString();
+  ERROR_LOG(m_logger) << QJsonDocument(telegram).toJson(QJsonDocument::Compact).toStdString();
   onGenericTelegram(telegram);
   return true;
 }
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 ceae1438e..a81211dcd 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
@@ -26,7 +26,7 @@ MainDispatcher::MainDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
   , m_domainId(pdp->domainId())
   , m_exerciseId(pdp->exerciseId())
 {
-  INFO_LOG() << "Plugin AdlerJson started";
+  INFO_LOG(m_logger) << "Plugin AdlerJson started";
 }
 
 MainDispatcher::~MainDispatcher()
@@ -79,7 +79,7 @@ bool MainDispatcher::init()
 }
 void MainDispatcher::onWebsocketConnected(quint16 port)
 {
-  ERROR_LOG() << "ApAdler started, Domain Id: " << QString::number(port);
+  ERROR_LOG(m_logger) << "ApAdler started, Domain Id: " << QString::number(port);
   m_ddsHandler->pacemaker()->addPort(port, Core::PortType::WebSocketAdlerServer);
 
   m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/main_dispatcher.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/main_dispatcher.h
index 91dd21c35..1baee6b30 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/main_dispatcher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/main_dispatcher.h
@@ -55,6 +55,7 @@ public:
   const char *name             () const override { return tr_lts("dds", "ApHlaJson"); }
 
 private:
+  NGL::INGLLogger &m_logger;
   JsonDispatcher *m_adlerDispatcher;
 
   std::shared_ptr<TrainingAreaBase::RecvFromTab>    m_recvFromTabCb;
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 98717dcf5..daf626e7e 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
@@ -10,9 +10,8 @@ namespace AdlerJson
 {
 
 
-PdmHandler::PdmHandler(QObject *parent)
-  : QObject(parent)
-{}
+PdmHandler::PdmHandler(QObject *parent) : QObject(parent),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 bool PdmHandler::init(MainDispatcher* mainDispatcher)
 {
@@ -20,7 +19,7 @@ bool PdmHandler::init(MainDispatcher* mainDispatcher)
 
   if (!m_dtcPdm->enableChargeType())
   {
-    ERROR_LOG() << "Can not read data from Pdm";
+    ERROR_LOG(m_logger) << "Can not read data from Pdm";
     return false;
   }
 
@@ -33,7 +32,7 @@ bool PdmHandler::init(MainDispatcher* mainDispatcher)
 
 void PdmHandler::getChargeTypes()
 {
-  DEBUG_LOG() << "Get Charge Types";
+  DEBUG_LOG(m_logger) << "Get Charge Types";
   QJsonObject obj;
   QJsonArray dataArray;
   obj[QStringLiteral("type")] = QStringLiteral("ApacheHlaSendChargeTypes"); 
@@ -43,7 +42,7 @@ void PdmHandler::getChargeTypes()
   QMap<qint32, ProjectDataManagement::ChargeType> chargeTypes = m_dtcPdm->chargeTypes();
   QMap<qint32, ProjectDataManagement::GearType> gearTypes = m_dtcPdm->gearTypes();
   QMap<qint32, ProjectDataManagement::GearTypeChargeType> gearTypeChargeTypes = m_dtcPdm->gearTypeChargeTypes();
-  DEBUG_LOG() << "Fetched " << chargeTypes.size() << " ChargeTypes to send to WebSocket. Ommiting those without DIS-Entity though.";
+  DEBUG_LOG(m_logger) << "Fetched " << chargeTypes.size() << " ChargeTypes to send to WebSocket. Ommiting those without DIS-Entity though.";
 
   for(const ProjectDataManagement::ChargeType &charge : chargeTypes)
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/pdm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/pdm_handler.h
index b225c2d23..173c2b2f6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/pdm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/pdm_handler.h
@@ -32,6 +32,7 @@ public slots:
 
 private:
 
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_dtcPdm;
 };
 
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 d81e791a5..85f1d69fc 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
@@ -36,10 +36,10 @@ bool PpmHandler::init(MainDispatcher *mainDispatcher)
 
   m_dtcPpm = ParticipantManagement::Interface::Dtc::create(m_mainDispatcher->ddsHandler()->ddsConnector());
 
-  DEBUG_LOG() << "-------------<><><>------" << m_mainDispatcher->exerciseId();
+  DEBUG_LOG(m_logger) << "-------------<><><>------" << m_mainDispatcher->exerciseId();
   if (!m_dtcPpm->enableParticipant() || !m_dtcPpm->enableDynamicParticipantData() || !m_dtcPpm->enableParticipantPosition())
   {
-    ERROR_LOG() << "Can not read data from Ppm";
+    ERROR_LOG(m_logger) << "Can not read data from Ppm";
     return false;
   }
 
@@ -70,7 +70,7 @@ void PpmHandler::modifyPartyAdlerProperties(const int wsId,
                                             const ParticipantManagement::ConnectState &connectState,
                                             const bool isVerbund)
 {
-  DEBUG_LOG() << "modifyParty"
+  DEBUG_LOG(m_logger) << "modifyParty"
                       << " assetId=" << assetId << " partyId=" << partyId << " saaName=" << saaName << " szenarName=" << szenarName << " connectState=" << connectState
                       << " isVerbund=" << isVerbund;
 
@@ -93,11 +93,11 @@ void PpmHandler::modifyPartyAdlerProperties(const int wsId,
 
   if (parserError.error != QJsonParseError::NoError)
   {
-    ERROR_LOG() << "Error parsing json document: " << parserError.errorString() << " '" << propertiesBa << "'";
+    ERROR_LOG(m_logger) << "Error parsing json document: " << parserError.errorString() << " '" << propertiesBa << "'";
     doc = QJsonDocument();
   }
 
-  DEBUG_LOG() << "json to parse: " << doc.toJson();
+  DEBUG_LOG(m_logger) << "json to parse: " << doc.toJson();
 
   QJsonObject obj(doc.object());
   obj[QStringLiteral("Adler")] = adlerPropertiesObj;
@@ -110,11 +110,11 @@ void PpmHandler::modifyPartyAdlerProperties(const int wsId,
 
 void PpmHandler::parseSQFS(const Feuerstellungsdaten &exSQFS, const int wsId)
 {
-  DEBUG_LOG() << "Start parse SQFS";
+  DEBUG_LOG(m_logger) << "Start parse SQFS";
   auto saa = m_mainDispatcher->jsonDispatcher()->getSAAByWs(wsId);
   if (!saa)
   {
-    ERROR_LOG() << "SQ WS from SAA but SAA with id " << wsId << " not found";
+    ERROR_LOG(m_logger) << "SQ WS from SAA but SAA with id " << wsId << " not found";
     return;
   }
   const QString &verein = exSQFS.feuereinheit.verein;
@@ -179,7 +179,7 @@ void PpmHandler::parseSQFS(const Feuerstellungsdaten &exSQFS, const int wsId)
     const auto root = findRootUnit(saa->getPartyId());
     if (root.id() > 0)
     {
-      DEBUG_LOG() << "Append FS Unit to root Unit";
+      DEBUG_LOG(m_logger) << "Append FS Unit to root Unit";
       list.push_back(root);
     }
 
@@ -214,11 +214,11 @@ void PpmHandler::parseSQFS(const Feuerstellungsdaten &exSQFS, const int wsId)
 
 void PpmHandler::parseSQWS(const Waffensystemdaten &exSQWS, const int wsId)
 {
-  DEBUG_LOG() << "Start parse SQWS";
+  DEBUG_LOG(m_logger) << "Start parse SQWS";
   auto saa = m_mainDispatcher->jsonDispatcher()->getSAAByWs(wsId);
   if (!saa)
   {
-    ERROR_LOG() << "SQ WS from SAA but SAA with id " << wsId << " not found";
+    ERROR_LOG(m_logger) << "SQ WS from SAA but SAA with id " << wsId << " not found";
     return;
   }
   const ProjectDataManagement::L27_EffectorId &internalName = exSQWS.kenner;
@@ -253,7 +253,7 @@ void PpmHandler::parseSQWS(const Waffensystemdaten &exSQWS, const int wsId)
   if (pp.id() > 0)
   {
     
-    DEBUG_LOG() << "Found Participant only update pos";
+    DEBUG_LOG(m_logger) << "Found Participant only update pos";
     sendPositionFromTempMap(currentRandomNumber, saa->getPartyId(), saa->getIsVerbund());
     sendChargesFromTempMap(currentRandomNumber, saa->getPartyId(), saa->getIsVerbund());
     
@@ -267,10 +267,10 @@ 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() << "found type with id: " << type.id() << " for name: " << waffensystemtypMap.key(internalType);
+    DEBUG_LOG(m_logger) << "found type with id: " << type.id() << " for name: " << waffensystemtypMap.key(internalType);
     if (type.id() <= 0)
     {
-      ERROR_LOG() << "NO Type Found";
+      ERROR_LOG(m_logger) << "NO Type Found";
       return;
     }
 
@@ -280,12 +280,12 @@ 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() << "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)
     {
       superiorModId = pUdata.modId();
-      DEBUG_LOG() << "FOUND UNIT in list use their modId " << superiorModId << " RND: " << currentRandomNumber;
+      DEBUG_LOG(m_logger) << "FOUND UNIT in list use their modId " << superiorModId << " RND: " << currentRandomNumber;
     }
     else if (pUnit.id() > 0)
     {
@@ -296,7 +296,7 @@ void PpmHandler::parseSQWS(const Waffensystemdaten &exSQWS, const int wsId)
 
       list.push_back(pUData);
       m_tempPartDataList.insert(currentRandomNumber, list);
-      DEBUG_LOG() << "CREATE Uit from ppm " << superiorModId << " RND: " << currentRandomNumber;
+      DEBUG_LOG(m_logger) << "CREATE Uit from ppm " << superiorModId << " RND: " << currentRandomNumber;
       ParticipantManagement::Participant tmp = pUnit;
       while (tmp.superiorId() > 0)
       {
@@ -314,11 +314,11 @@ void PpmHandler::parseSQWS(const Waffensystemdaten &exSQWS, const int wsId)
       const auto root = findRootUnit(saa->getPartyId());
       if (root.id() > 0)
       {
-        DEBUG_LOG() << "Append to Unit" << superiorModId << " RND: " << currentRandomNumber;
+        DEBUG_LOG(m_logger) << "Append to Unit" << superiorModId << " RND: " << currentRandomNumber;
         list.push_back(root);
       }
       const ParticipantManagement::Type unitType = m_dtcPpm->getTypeFromAdlerType(waffensystemtypMap.key(internalType), true, saa->getIsVerbund());
-      DEBUG_LOG() << "CREATE NEW Unit use supId" << superiorModId << " RND: " << currentRandomNumber;
+      DEBUG_LOG(m_logger) << "CREATE NEW Unit use supId" << superiorModId << " RND: " << currentRandomNumber;
       ParticipantManagement::ParticipantData data;
       data.id(0);
       data.partyId(saa->getPartyId());
@@ -337,7 +337,7 @@ void PpmHandler::parseSQWS(const Waffensystemdaten &exSQWS, const int wsId)
       list.push_back(data);
     }
     
-    DEBUG_LOG() << "Create new Participant"
+    DEBUG_LOG(m_logger) << "Create new Participant"
                         << " RND: " << currentRandomNumber;
 
     ParticipantManagement::ParticipantData data;
@@ -366,11 +366,11 @@ void PpmHandler::parseSQWS(const Waffensystemdaten &exSQWS, const int wsId)
 
 void PpmHandler::parseSQLP(const Ladeplatzdaten &exSQLP, const int wsId)
 {
-  DEBUG_LOG() << "START parse  SQLP";
+  DEBUG_LOG(m_logger) << "START parse  SQLP";
   auto saa = m_mainDispatcher->jsonDispatcher()->getSAAByWs(wsId);
   if (!saa)
   {
-    ERROR_LOG() << "SQ LP from SAA but SAA with id " << wsId << " not found";
+    ERROR_LOG(m_logger) << "SQ LP from SAA but SAA with id " << wsId << " not found";
     return;
   }
   const QString &verein = exSQLP.einheit.verein;
@@ -409,7 +409,7 @@ void PpmHandler::parseSQLP(const Ladeplatzdaten &exSQLP, const int wsId)
     
 
     
-    DEBUG_LOG() << "Create new Participant LP";
+    DEBUG_LOG(m_logger) << "Create new Participant LP";
     std::vector<ParticipantManagement::ParticipantData> list;
 
     
@@ -418,7 +418,7 @@ void PpmHandler::parseSQLP(const Ladeplatzdaten &exSQLP, const int wsId)
     const auto root = findRootUnit(saa->getPartyId());
     if (root.id() > 0)
     {
-      DEBUG_LOG() << "Append LP to Unit";
+      DEBUG_LOG(m_logger) << "Append LP to Unit";
       list.push_back(root);
     }
 
@@ -471,7 +471,7 @@ void PpmHandler::removeAllSAAParticipants(const int partyId)
     list.push_back(pToDel);
   }
   req.data(list);
-  DEBUG_LOG() << "Remove all participants (without Units): " << list.size();
+  DEBUG_LOG(m_logger) << "Remove all participants (without Units): " << list.size();
   m_ftcPpm->modifyParticipantDataRequest(req, this);
 }
 
@@ -676,7 +676,7 @@ void PpmHandler::onSendParticipantDataTimeout()
 {
   m_sendParticipantDataTimer->stop();
   if (m_randomNumbers.empty())
-    ERROR_LOG() << "Cant Send ParticipantData RandomNumbers is empty";
+    ERROR_LOG(m_logger) << "Cant Send ParticipantData RandomNumbers is empty";
   ParticipantManagement::ModifyParticipantDataRequest *newRequest = new ParticipantManagement::ModifyParticipantDataRequest();
   int currentRandomNumber = m_randomNumbers.first();
   newRequest->requestId(currentRandomNumber); 
@@ -707,7 +707,7 @@ void PpmHandler::handleParticipantPositionChangedExternal(const ParticipantManag
 
 void PpmHandler::handleParticipantPositionChangedInternal(const ParticipantManagement::ParticipantPosition &position)
 {
-  DEBUG_LOG() << "handleParticipantPositionChangedInternal";
+  DEBUG_LOG(m_logger) << "handleParticipantPositionChangedInternal";
   ParticipantManagement::Participant part = m_dtcPpm->participant(position.participantId());
 
   const bool hasMountedParticipants = position.mountedParticipants().is_set() && position.mountedParticipants().get().size() > 0;
@@ -739,7 +739,7 @@ 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());
-  ERROR_LOG() << "Mount Participant";
+  ERROR_LOG(m_logger) << "Mount Participant";
   QJsonObject telegram;
   
   telegram[QStringLiteral("type")] = QStringLiteral("UFomHlaParticipantMount");
@@ -759,7 +759,7 @@ void PpmHandler::sendParticipantMount(const ParticipantManagement::Participant &
 void PpmHandler::sendParticipantUnmount(const ParticipantManagement::Participant &participant)
 {
   m_mountedParticipants.remove(participant.equipmentNumber().get());
-  DEBUG_LOG() << "Unmount Participant";
+  DEBUG_LOG(m_logger) << "Unmount Participant";
   QJsonObject telegram;
   
   telegram[QStringLiteral("type")] = QStringLiteral("UFomHlaParticipantUnmount");
@@ -800,7 +800,7 @@ void PpmHandler::sendParticipantPositionChanged(const ParticipantManagement::Par
 
 void PpmHandler::onModifyParticipantDataReply(const Core::FunctionReplyObject &reply)
 {
-  DEBUG_LOG() << "Got Function Reply " << reply.str();
+  DEBUG_LOG(m_logger) << "Got Function Reply " << reply.str();
 
   if (!reply.error())
   {
@@ -815,7 +815,7 @@ void PpmHandler::onModifyParticipantDataReply(const Core::FunctionReplyObject &r
 
     const bool isVerbund = m_mainDispatcher->jsonDispatcher()->getSAAByParty(partyId)->getIsVerbund();
 
-    DEBUG_LOG() << "Got ModifyParticipant Reply SEND from temp Maps (partyId: " << partyId << " , isVerbund: " << isVerbund << ")";
+    DEBUG_LOG(m_logger) << "Got ModifyParticipant Reply SEND from temp Maps (partyId: " << partyId << " , isVerbund: " << isVerbund << ")";
 
     if (m_tempPositionMap.contains(reply.id()))
       sendPositionFromTempMap(reply.id(), partyId, isVerbund);
@@ -828,7 +828,7 @@ void PpmHandler::onModifyParticipantDataReply(const Core::FunctionReplyObject &r
   }
   else
   {
-    ERROR_LOG() << "GOT ModifyParticipant Replay with error " << reply.translated();
+    ERROR_LOG(m_logger) << "GOT ModifyParticipant Replay with error " << reply.translated();
   }
 
   
@@ -845,7 +845,7 @@ void PpmHandler::onModifyParticipantDataReply(const Core::FunctionReplyObject &r
   m_tempPartDataList.remove(reply.id());
 }
 
-void PpmHandler::onModifyPartyDataReply(const Core::FunctionReplyObject &reply) { DEBUG_LOG() << "Got Function Reply " << reply.str(); }
+void PpmHandler::onModifyPartyDataReply(const Core::FunctionReplyObject &reply) { DEBUG_LOG(m_logger) << "Got Function Reply " << reply.str(); }
 
 QList<ParticipantManagement::Participant> PpmHandler::findAllSAAParticipants(const int partyId)
 {
@@ -908,7 +908,7 @@ ParticipantManagement::ParticipantData PpmHandler::findRootUnit(const int partyI
 ParticipantManagement::Participant PpmHandler::findParticipantByInternalName(const QString &internalName, const int partyId, const bool isVerbund)
 {
   ParticipantManagement::Participant pp;
-  DEBUG_LOG() << "START find participant: " << internalName;
+  DEBUG_LOG(m_logger) << "START find participant: " << internalName;
   auto participantMap = m_dtcPpm->participants();
   for (const auto &part : std::as_const(participantMap))
   {
@@ -931,13 +931,13 @@ ParticipantManagement::Participant PpmHandler::findParticipantByInternalName(con
 
 void PpmHandler::onPartyChanged(const ParticipantManagement::Party &data, DataModification modType)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << ", modType: " << modType;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << ", modType: " << modType;
 
   if (modType == DataModification::eRemoved)
     return;
 
   const ParticipantManagement::ConnectState connectState = m_dtcPpm->saaConnectedState(data.id());
-  DEBUG_LOG() << "++++ connectState: " << connectState;
+  DEBUG_LOG(m_logger) << "++++ connectState: " << connectState;
 
   
   if (connectState != ParticipantManagement::ConnectState::Disconnecting)
@@ -947,7 +947,7 @@ void PpmHandler::onPartyChanged(const ParticipantManagement::Party &data, DataMo
   if (!saa)
     return;
 
-  DEBUG_LOG() << "++++ szenarName: " << saa->getSzenarName() << ", wsId: " << saa->getWsId();
+  DEBUG_LOG(m_logger) << "++++ szenarName: " << saa->getSzenarName() << ", wsId: " << saa->getWsId();
 
   EXStatus status;
   status.status = Szenarstatus::Gestoppt;
@@ -1015,7 +1015,7 @@ void PpmHandler::sendChargesFromTempMap(const int rndNmbr, const int partyId, co
       if (chargeTypeId <= 0)
         continue;
 
-      DEBUG_LOG() << "---- 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);
       
@@ -1059,7 +1059,7 @@ int PpmHandler::convertStatus_L28(const ProjectDataManagement::L28_Status &statu
       return ADLER_NOT_OPERATIONAL;
 
     default:
-      WARNING_LOG() << "Status " << status << " not handled in switch";
+      WARNING_LOG(m_logger) << "Status " << status << " not handled in switch";
       break;
   }
 
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 72b3240d4..cc1d03af0 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
@@ -65,6 +65,7 @@ private slots:
   void onDynamicParticipantDataChanged(const ParticipantManagement::DynamicParticipantData &data, DataModification modType);
   void onSendParticipantDataTimeout();
 private:
+  NGL::INGLLogger &m_logger;
   void handleParticipantPositionChangedExternal(const ParticipantManagement::ParticipantPosition &position);
   void handleParticipantPositionChangedInternal(const ParticipantManagement::ParticipantPosition &position);
 
@@ -85,6 +86,7 @@ private:
 
   QVector<AdlerJson::Geschoss> sumUpAnzahlForSameGeschoss(const QVector<AdlerJson::Geschoss> &geschosse) const;
 private:
+  NGL::INGLLogger &m_logger;
   MainDispatcher *m_mainDispatcher;
   std::shared_ptr<ParticipantManagement::Interface::Dtc> m_dtcPpm;
   std::shared_ptr<ParticipantManagement::Interface::Ftc> m_ftcPpm;
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 5fc7d5d55..3aca9071c 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
@@ -73,7 +73,7 @@ bool SAAInterface::init(std::shared_ptr<PpmHandler> ppmHandler,
 
   m_ftcAes = m_aesHandler->getFtc();
 
-  DEBUG_LOG() << "INIT SAA Interface";
+  DEBUG_LOG(m_logger) << "INIT SAA Interface";
 
   return true;
 }
@@ -123,7 +123,7 @@ static Core::RelativePositionRelativeTime convertFlugbahnpunkt(const Flugbahnpun
 
 void SAAInterface::parseFlugbahndaten(const Flugbahndaten &flugbahndaten, int aesItemId, int exposionId, const Core::GeoPosition &positionLaunch)
 {
-  DEBUG_LOG() << "SAAInterface::parseFlugbahndaten";
+  DEBUG_LOG(m_logger) << "SAAInterface::parseFlugbahndaten";
 
   std::vector<Core::RelativePositionRelativeTime> geometryRef;
   geometryRef.clear();
@@ -138,22 +138,22 @@ void SAAInterface::parseFlugbahndaten(const Flugbahndaten &flugbahndaten, int ae
   const auto &utmLaunch = LtsCoordTrans::UtmCoordinate::fromGeographic(positionLaunch.lon(), positionLaunch.lat(), zone);
 
   
-  DEBUG_LOG() << " mmilirad: " << flugbahndaten.schussrichtung;
+  DEBUG_LOG(m_logger) << " mmilirad: " << flugbahndaten.schussrichtung;
   double grad = (flugbahndaten.schussrichtung / 6400.) * 360.0;
-  DEBUG_LOG() << " milli rad to degree" << (flugbahndaten.schussrichtung / 6400.) * 360;
-  DEBUG_LOG() << "Degree to target" << grad;
+  DEBUG_LOG(m_logger) << " milli rad to degree" << (flugbahndaten.schussrichtung / 6400.) * 360;
+  DEBUG_LOG(m_logger) << "Degree to target" << grad;
 
-  DEBUG_LOG() << "Start point: " << positionLaunch;
+  DEBUG_LOG(m_logger) << "Start point: " << positionLaunch;
 
   const auto &coordEnd = LtsCoordTrans::UtmCoordinate::fromGeographic(flugbahndaten.zielkoordinate.koordinate.longitude * (M_PI / 180.0),
                                                                       flugbahndaten.zielkoordinate.koordinate.latitude * (M_PI / 180.0));
-  DEBUG_LOG() << "End point: " << coordEnd;
+  DEBUG_LOG(m_logger) << "End point: " << coordEnd;
   LtsCoordTrans::UtmCoordinate coordDiff = coordEnd;
 
   coordDiff.x = coordDiff.x - utmLaunch.x;
   coordDiff.y = coordDiff.y - utmLaunch.y;
   const double useNewGrad = -90 + std::atan2(coordDiff.y, coordDiff.x) * (180.0 / M_PI);
-  DEBUG_LOG() << "use new Degree " << useNewGrad;
+  DEBUG_LOG(m_logger) << "use new Degree " << useNewGrad;
 
   QTransform matrix;
   matrix.rotate(useNewGrad);
@@ -169,11 +169,11 @@ void SAAInterface::parseFlugbahndaten(const Flugbahndaten &flugbahndaten, int ae
     if (m_logger.isDebugEnabled())
     {
       const auto &fbPosRelative = convertFlugbahnpunkt(pos, matrix, utmLaunch, m_logger);
-      DEBUG_LOG() << " fbPosRelative " << fbPosRelative;
+      DEBUG_LOG(m_logger) << " fbPosRelative " << fbPosRelative;
     }
 
 
-    TRACE_LOG() << "Flugbahnpunkt:"
+    TRACE_LOG(m_logger) << "Flugbahnpunkt:"
                          << ", xRelativ :" << pos.xRelativ
                          << ", yRelativ :" << pos.yRelativ
                          << ", zRelativ :" << pos.zRelativ
@@ -198,7 +198,7 @@ void SAAInterface::parseFlugbahndaten(const Flugbahndaten &flugbahndaten, int ae
     utmCoord.zone = utmLaunch.zone;
     QPointF pntGeo = utmCoord.geographic();
 
-    TRACE_LOG() << "utmCoord :" << utmCoord.x << " / " << utmCoord.y << ", utmCoord.zone :" << utmCoord.zone << ", utmCoord.isValid() :" << utmCoord.isValid()
+    TRACE_LOG(m_logger) << "utmCoord :" << utmCoord.x << " / " << utmCoord.y << ", utmCoord.zone :" << utmCoord.zone << ", utmCoord.isValid() :" << utmCoord.isValid()
                         << ", pntGeo :" << pntGeo.x() << " / " << pntGeo.y() << " / " << z;
     QTransform matrix;
     matrix.rotate(useNewGrad);
@@ -210,15 +210,15 @@ void SAAInterface::parseFlugbahndaten(const Flugbahndaten &flugbahndaten, int ae
     flightPoint.relativeTime() = pos.zeit;
     QPointF point(flightPoint.offsetX(), flightPoint.offsetY());
 
-    TRACE_LOG() << " POS bevore rot: " << point;
+    TRACE_LOG(m_logger) << " POS bevore rot: " << point;
 
     auto rotatePoint = matrix.map(point);
-    TRACE_LOG() << " POS after rot: " << rotatePoint;
+    TRACE_LOG(m_logger) << " POS after rot: " << rotatePoint;
 
     pntGeo.setX(rotatePoint.x());
     pntGeo.setY(rotatePoint.y());
 
-    TRACE_LOG() << "utmCoord :" << utmCoord.x << " / " << utmCoord.y << ", utmCoord.zone :" << utmCoord.zone << ", utmCoord.isValid() :" << utmCoord.isValid()
+    TRACE_LOG(m_logger) << "utmCoord :" << utmCoord.x << " / " << utmCoord.y << ", utmCoord.zone :" << utmCoord.zone << ", utmCoord.isValid() :" << utmCoord.isValid()
                         << ", pntGeo :" << pntGeo.x() << " / " << pntGeo.y() << " / " << z;
     
     
@@ -245,7 +245,7 @@ void SAAInterface::parseFlugbahndaten(const Flugbahndaten &flugbahndaten, int ae
   newRequest->mhpScatterWidthDetonationHeight(flugbahndaten.streuung.seitenstreuungH);
   newRequest->shootDirection((flugbahndaten.schussrichtung / 6400.) * 360);
   newRequest->errorcode(static_cast<int>(flugbahndaten.fehlercode));
-  DEBUG_LOG() << "!!!!!!!!!!!geometryRef.size=" << geometryRef.size() << ", newRequest->geometry().size() :" << newRequest->geometry().size()
+  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);
 
@@ -254,10 +254,10 @@ void SAAInterface::parseFlugbahndaten(const Flugbahndaten &flugbahndaten, int ae
 
 void SAAInterface::onTrajectoryAdlerModifyReply(const Core::FunctionReplyObject &reply)
 {
-  DEBUG_LOG() << "onTrajectoryAdlerModifyReply";
+  DEBUG_LOG(m_logger) << "onTrajectoryAdlerModifyReply";
   if (reply.error())
   {
-    ERROR_LOG() << reply.translated();
+    ERROR_LOG(m_logger) << reply.translated();
   }
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/saa_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/saa_interface.h
index 7f00b100c..84fa31ddc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/saa_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/saa_interface.h
@@ -75,6 +75,8 @@ public:
   void rxData         (const T &data      );
 
 private:
+
+NGL::INGLLogger &m_logger;
   void onTrajectoryAdlerModifyReply(const Core::FunctionReplyObject &reply) override;
 
   int m_wsId;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ws_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ws_handler.cpp
index 9e83d8539..7ab3f24ca 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ws_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ws_handler.cpp
@@ -58,25 +58,25 @@ bool WebSocketHandler::sendTelegram(int typeId, const QJsonObject *data, int exe
 
 bool WebSocketHandler::sendTelegram(const int wsId, const QJsonObject *data)
 {
-  DEBUG_LOG() << "Send Telegram esId=" << wsId
+  DEBUG_LOG(m_logger) << "Send Telegram esId=" << wsId
                        << ", m_connections.size=" << m_connections.size();
 
   for (auto it = m_connections.begin(); it != m_connections.end(); it++)
-    DEBUG_LOG() << "key: " << it.key();
+    DEBUG_LOG(m_logger) << "key: " << it.key();
 
   const QString jsonStr = QString::fromUtf8(QJsonDocument(*data).toJson(QJsonDocument::Compact));
   if(!m_connections.contains(wsId))
   {
-    DEBUG_LOG() << "!m_connections.contains(" << wsId << ") return false;";
+    DEBUG_LOG(m_logger) << "!m_connections.contains(" << wsId << ") return false;";
     return false;
   }
   std::shared_ptr<WebSocketWrapper> ws = m_connections.value(wsId);
 
-  DEBUG_LOG() << "Send Telegram to SAA: " << jsonStr<< " \n LocalPort" << ws->webSocket()->localAddress().toString()
+  DEBUG_LOG(m_logger) << "Send Telegram to SAA: " << jsonStr<< " \n LocalPort" << ws->webSocket()->localAddress().toString()
                        << "." << ws->webSocket()->localPort()
                        << " PeerPort " << ws->webSocket()->peerAddress().toString()
                        << ":" <<ws->webSocket()->peerPort();
-  DEBUG_LOG() << "VERSION  " << ws->webSocket()->version();
+  DEBUG_LOG(m_logger) << "VERSION  " << ws->webSocket()->version();
   return ws->sendTextMessage(jsonStr);
 }
 
@@ -84,7 +84,7 @@ bool WebSocketHandler::disconnectWs(int wsId)
 {
   if(!m_connections.contains(wsId))
   {
-    DEBUG_LOG() << "!m_connections.contains(" << wsId << ") return false;";
+    DEBUG_LOG(m_logger) << "!m_connections.contains(" << wsId << ") return false;";
     return false;
   }
   std::shared_ptr<WebSocketWrapper> ws = m_connections.value(wsId);
@@ -124,7 +124,7 @@ int WebSocketHandler::getExerciseId(int wsId) const
 
 void WebSocketHandler::onTextMessageReceived(const QByteArray &baJson)
 {
-  DEBUG_LOG() << "Receive Telegram from SAA <<<<< " << baJson;
+  DEBUG_LOG(m_logger) << "Receive Telegram from SAA <<<<< " << baJson;
   using namespace TrainingAreaBase::TetraIcd;
 
   WebSocketWrapper *wsw = qobject_cast<WebSocketWrapper *>(sender());
@@ -147,7 +147,7 @@ void WebSocketHandler::onNewConnection()
   if (!ws)
     return;
   
-  DEBUG_LOG() << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
+  DEBUG_LOG(m_logger) << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
   auto wsw = std::make_shared<WebSocketWrapper>(ws);
   int wsId = m_nextWsId;
 
@@ -158,7 +158,7 @@ void WebSocketHandler::onNewConnection()
   wsw->setWsId(wsId);
   emit newConnection( wsId, ws->peerAddress().toString(),ws->peerPort());
   m_connections.insert(wsId ,wsw);
-  DEBUG_LOG() << "m_connections.insert"
+  DEBUG_LOG(m_logger) << "m_connections.insert"
                        << ", wsId :" << wsId;
   m_nextWsId++;
 
@@ -181,10 +181,10 @@ void WebSocketHandler::onWebSocketDisconnected()
   for (auto it = copy.begin(); it != copy.end(); ++it)
   {
     auto wsw = *it;
-    DEBUG_LOG() << "peerPort :" << wsw->webSocket()->peerPort() << ", localPort :" << wsw->webSocket()->localPort();
+    DEBUG_LOG(m_logger) << "peerPort :" << wsw->webSocket()->peerPort() << ", localPort :" << wsw->webSocket()->localPort();
     if (wsw->webSocket() == ws)
     {
-      DEBUG_LOG() << it.key() << " Emit Disconnect ------------------------------------- esId=" << it.key();
+      DEBUG_LOG(m_logger) << it.key() << " Emit Disconnect ------------------------------------- esId=" << it.key();
       emit wsDisconnected(it.key());
       m_connections.remove(it.key());
       break;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/aes_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/aes_handler.cpp
index 4a3e5ced4..312bfae60 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/aes_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/aes_handler.cpp
@@ -25,7 +25,7 @@ bool AesHandler::init(MainDispatcher* mainDispatcher)
 
   if (!m_ftcAes->enableAirSupportImpactModify())
   {
-    ERROR_LOG() << "Can not enableAirSupportImpactModify ";
+    ERROR_LOG(m_logger) << "Can not enableAirSupportImpactModify ";
     return false;
   }
 
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 e88ca1ca0..65a159e58 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
@@ -33,6 +33,7 @@ public:
 
 private:
 
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<AreaEffectSimulation::Interface::Ftc> m_ftcAes;
   std::shared_ptr<ParticipantManagement::Interface::Dtc> m_dtcPpm;
   LtsUtils::RequestHelper *m_requestHelper;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/dds_handler.cpp
index 3380ed410..2c49cbb21 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/dds_handler.cpp
@@ -8,17 +8,16 @@
 namespace ApHlaJson
 {
 
-DdsHandler::DdsHandler(int domainId, int exerciseId)
-  : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId))
-{
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+DdsHandler::DdsHandler(int domainId, int exerciseId) : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/dds_handler.h
index f1810b524..77be0a850 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/dds_handler.h
@@ -31,6 +31,7 @@ public:
   }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector>       m_ddsConnector;
   std::shared_ptr<Core::Pacemaker>                  m_pacemaker;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_dispatcher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_dispatcher.cpp
index acd922914..dbe6c7719 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_dispatcher.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_dispatcher.cpp
@@ -67,7 +67,7 @@ bool HlaDispatcher::canSendData() const
 
 void HlaDispatcher::onWebSocketConnected()
 {
-  INFO_LOG() << "WebSocket connected";
+  INFO_LOG(m_logger) << "WebSocket connected";
   QWebSocket *ws = qobject_cast<QWebSocket *>(sender());
   m_sendToHla->onWebSocketConnected(ws);
   m_webSocketReconnectTimer->stop();
@@ -76,7 +76,7 @@ void HlaDispatcher::onWebSocketConnected()
 
 void HlaDispatcher::onWebsocketDisconnected()
 {
-  INFO_LOG() << "Hla socket disconnected";
+  INFO_LOG(m_logger) << "Hla socket disconnected";
   m_sendToHla->onWebSocketDisconnected();
 
   emit connectionState(QString::fromUtf8(name()), false);
@@ -95,7 +95,7 @@ void HlaDispatcher::onWebSocketError()
   if (!m_webSocket)
     return;
   if (!m_bWarnedOnce)
-    WARNING_LOG() << "Error connecting to " << webSocketUrl().toString() << ": " << m_webSocket->errorString();
+    WARNING_LOG(m_logger) << "Error connecting to " << webSocketUrl().toString() << ": " << m_webSocket->errorString();
   m_webSocket->close();
   m_webSocketReconnectTimer->start(5000);
   m_bWarnedOnce = true;
@@ -106,7 +106,7 @@ void HlaDispatcher::onWebSocketError()
 void HlaDispatcher::onTextMessageReceived(const QByteArray &message)
 {
 
-  INFO_LOG() << "Text Message received: " << message;
+  INFO_LOG(m_logger) << "Text Message received: " << message;
   
   m_recvFromHla->handleTelegram(message);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_dispatcher.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_dispatcher.h
index 4902a66bb..c29208f47 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_dispatcher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_dispatcher.h
@@ -50,8 +50,10 @@ Q_SIGNALS:
   void broadcastTelegramsRequest(int equipmentNumber, int broadcastIndex, int resetCounter);
   void hlaTelegramReceived(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *tele);
 private:
+  NGL::INGLLogger &m_logger;
   QUrl webSocketUrl() const;
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<TrainingAreaBase::RecvFromTab> m_recvFromTabCb;
   std::shared_ptr<HlaHandlerRx> m_recvFromHla;
   std::shared_ptr<HlaHandlerTx> m_sendToHla;
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 fe3f389af..65fae01f0 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
@@ -16,15 +16,14 @@ HlaHandlerRx::HlaHandlerRx(const std::shared_ptr<TrainingAreaBase::RecvFromTab>
                            const std::shared_ptr<TrainingAreaBase::TxMixin> &sendToTabCb,
                            HlaDispatcher *dispatcher,
                            AesHandler* aesHandler,
-                           PpmHandler* ppmHandler)
-  : m_rxHandler(recvFromTabCb)
+                           PpmHandler* ppmHandler) : m_rxHandler(recvFromTabCb)
   , m_txHandler(sendToTabCb)
   , m_dispatcher(dispatcher)
   , m_bWarnedOnce(false)
   , m_bWarnedOnceTx(false)
   , m_aesHandler(aesHandler)
-  , m_ppmHandler(ppmHandler)
-{}
+  , m_ppmHandler(ppmHandler),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 bool HlaHandlerRx::handleTelegram(const QByteArray &baJson)
 {
@@ -38,12 +37,12 @@ bool HlaHandlerRx::handleTelegram(const QByteArray &baJson)
   const QJsonValue typeId = obj.value(QStringLiteral("typeId"));
   if (!typeId.isDouble())
   {
-    ERROR_LOG() << "Can not read type id: " << baJson;
+    ERROR_LOG(m_logger) << "Can not read type id: " << baJson;
     return false;
   }
   const QJsonObject data = obj.value(QStringLiteral("data")).toObject();
   if(typeId.toInt() != 21)
-    ERROR_LOG() << "Telegram before filter: " << baJson;
+    ERROR_LOG(m_logger) << "Telegram before filter: " << baJson;
   try
   {
     QJsonValue header = data[QStringLiteral("header")];
@@ -57,7 +56,7 @@ bool HlaHandlerRx::handleTelegram(const QByteArray &baJson)
         return false;
     }
     if(typeId.toInt() != 21)
-      ERROR_LOG() << "Telegram after filter: " << baJson;
+      ERROR_LOG(m_logger) << "Telegram after filter: " << baJson;
     switch (typeId.toInt())
     {
     case Constraints<ProxyConnectionState>::id(): 
@@ -110,7 +109,7 @@ bool HlaHandlerRx::handleTelegram(const QByteArray &baJson)
   }
   catch (const std::exception &e)
   {
-    WARNING_LOG() << "Could not parse json: " << e.what() << " (" << baJson << ")";
+    WARNING_LOG(m_logger) << "Could not parse json: " << e.what() << " (" << baJson << ")";
     return false;
   }
   return true;
@@ -130,7 +129,7 @@ void HlaHandlerRx::rxData(const T &data)
   {
     if (!m_bWarnedOnce)
     {
-      ERROR_LOG() << "No RecvFromTab available";
+      ERROR_LOG(m_logger) << "No RecvFromTab available";
       m_bWarnedOnce = true;
     }
     return;
@@ -146,7 +145,7 @@ void HlaHandlerRx::txData(const T &data)
   {
     if (!m_bWarnedOnceTx)
     {
-      ERROR_LOG() << "No RecvFromTab available";
+      ERROR_LOG(m_logger) << "No RecvFromTab available";
       m_bWarnedOnceTx = true;
     }
     return;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_rx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_rx.h
index 419435c34..8c5057104 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_rx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_rx.h
@@ -31,12 +31,14 @@ public:
 Q_SIGNALS:
   void participantConnectionState(int equipmentNumber, bool dataCommunicationPossible);
 private:
+  NGL::INGLLogger &m_logger;
   template<typename T>
   void rxData(const T &data);
 
   template<typename T>
   void txData(const T &data);
 private:
+  NGL::INGLLogger &m_logger;
   bool checkExercise(int equipmentNumber) const;
 
   std::shared_ptr<TrainingAreaBase::RecvFromTab> m_rxHandler;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_tx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_tx.cpp
index f0bc32efb..6ad5ae4b8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_tx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_tx.cpp
@@ -296,7 +296,7 @@ bool HlaHandlerTx::txData(const TrainingAreaBase::TetraIcd::SelectiveReammunitio
 
 void HlaHandlerTx::onParticipantConnectionState(int equipmentNumber, bool dataCommunicationPossible)
 {
-  INFO_LOG() << "onParticipantConnectionState - " << equipmentNumber
+  INFO_LOG(m_logger) << "onParticipantConnectionState - " << equipmentNumber
                      << ", communication possible: " << dataCommunicationPossible;
   if (equipmentNumber == -1)
     m_dataCommunicationPossible.clear();
@@ -308,7 +308,7 @@ void HlaHandlerTx::onGenericTelegram(const QJsonObject &telegram)
   if (!m_webSocket || !m_bHlaConnectedToExternalSystem)
     return;
   const QByteArray ba = QJsonDocument(telegram).toJson(QJsonDocument::Compact);
-  DEBUG_LOG() << "Sending tele: " << ba;
+  DEBUG_LOG(m_logger) << "Sending tele: " << ba;
   m_webSocket->sendTextMessage(QString::fromUtf8(ba));
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_tx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_tx.h
index bf0c2a4b9..904559856 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_tx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/hla_handler_tx.h
@@ -74,8 +74,10 @@ public slots:
   void onGenericTelegram(const QJsonObject &telegram);
 
 private:
+  NGL::INGLLogger &m_logger;
   bool sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data, bool bForce = false);
 private:
+  NGL::INGLLogger &m_logger;
   QHash<int, bool> m_dataCommunicationPossible; 
   TrainingAreaBase::Plugin::DataProvider *m_pdp;
   PpmHandler* m_ppmHandler;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/main_dispatcher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/main_dispatcher.cpp
index d3aba8e68..ce9332c16 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/main_dispatcher.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/main_dispatcher.cpp
@@ -23,7 +23,7 @@ MainDispatcher::MainDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
   , m_domainId(pdp->domainId())
   , m_exerciseId(pdp->exerciseId())
 {
-  INFO_LOG() << "ApHla started, Domain Id: " << m_domainId << " ExerciseId: " << m_exerciseId;
+  INFO_LOG(m_logger) << "ApHla started, Domain Id: " << m_domainId << " ExerciseId: " << m_exerciseId;
 }
 
 MainDispatcher::~MainDispatcher()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/main_dispatcher.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/main_dispatcher.h
index a36d39a84..d992b5bde 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/main_dispatcher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/main_dispatcher.h
@@ -61,6 +61,7 @@ public:
   const char *name() const override { return tr_lts("dds", "ApHlaJson"); }
 
 private:
+  NGL::INGLLogger &m_logger;
   HlaDispatcher *m_hlaDispatcher;
 
   std::shared_ptr<TrainingAreaBase::RecvFromTab> m_recvFromTabCb;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/main_handler_tx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/main_handler_tx.h
index 1f0c2618c..bc150f75f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/main_handler_tx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/main_handler_tx.h
@@ -61,6 +61,7 @@ public:
   bool txData(const TrainingAreaBase::TetraIcd::SelectiveReammunition &data) override;
 private:
 
+NGL::INGLLogger &m_logger;
   template <typename T>
   bool sendToTxMixin(const T *data);
 private:
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 1c3d7c16d..05543980f 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
@@ -10,9 +10,8 @@ namespace ApHlaJson
 {
 
 
-PdmHandler::PdmHandler(QObject *parent)
-  : QObject(parent)
-{}
+PdmHandler::PdmHandler(QObject *parent) : QObject(parent),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 bool PdmHandler::init(MainDispatcher* mainDispatcher)
 {
@@ -20,7 +19,7 @@ bool PdmHandler::init(MainDispatcher* mainDispatcher)
 
   if (!m_dtcPdm->enableChargeType())
   {
-    ERROR_LOG() << "Can not read data from Pdm";
+    ERROR_LOG(m_logger) << "Can not read data from Pdm";
     return false;
   }
 
@@ -36,7 +35,7 @@ bool PdmHandler::init(MainDispatcher* mainDispatcher)
 
 void PdmHandler::getChargeTypes()
 {
-  DEBUG_LOG() << "Get Charge Types";
+  DEBUG_LOG(m_logger) << "Get Charge Types";
   QJsonObject obj;
   QJsonArray dataArray;
   obj[QStringLiteral("type")] = QStringLiteral("ApacheHlaSendChargeTypes");
@@ -46,7 +45,7 @@ void PdmHandler::getChargeTypes()
   QMap<qint32, ProjectDataManagement::ChargeType> chargeTypes = m_dtcPdm->chargeTypes();
   QMap<qint32, ProjectDataManagement::GearType> gearTypes = m_dtcPdm->gearTypes();
   QMap<qint32, ProjectDataManagement::GearTypeChargeType> gearTypeChargeTypes = m_dtcPdm->gearTypeChargeTypes();
-  DEBUG_LOG() << "Fetched " << chargeTypes.size() << " ChargeTypes to send to WebSocket. Ommiting those without DIS-Entity though.";
+  DEBUG_LOG(m_logger) << "Fetched " << chargeTypes.size() << " ChargeTypes to send to WebSocket. Ommiting those without DIS-Entity though.";
 
   for(const ProjectDataManagement::ChargeType &charge : chargeTypes)
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/pdm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/pdm_handler.h
index f53540786..6a30dac1c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/pdm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/pdm_handler.h
@@ -29,6 +29,7 @@ public slots:
 
 private:
 
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_dtcPdm;
 };
 
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 988c10529..6c00976c4 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
@@ -11,9 +11,8 @@ namespace ApHlaJson
 
 
 
-PpmHandler::PpmHandler(QObject *parent)
-  : QObject(parent)
-{}
+PpmHandler::PpmHandler(QObject *parent) : QObject(parent),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 bool PpmHandler::init(MainDispatcher* mainDispatcher)
 {
@@ -24,7 +23,7 @@ bool PpmHandler::init(MainDispatcher* mainDispatcher)
 
   if (!m_dtcPpm->enableParticipant() || !m_dtcPpm->enableDynamicParticipantData() || !m_dtcPpm->enableParticipantPosition())
   {
-    ERROR_LOG() << "Can not read data from Ppm";
+    ERROR_LOG(m_logger) << "Can not read data from Ppm";
     return false;
   }
 
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 33b65af4e..c59c6a00e 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
@@ -35,6 +35,7 @@ private slots:
   void onDynamicParticipantDataChanged(const ParticipantManagement::DynamicParticipantData &data, DataModification modType);
 private:
 
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<ParticipantManagement::Interface::Dtc> m_dtcPpm;
   QHash<int, int> m_participantIdsByEqNo; 
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/convert_to_json_file.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/convert_to_json_file.h
index ad7b550d9..cf2347bc2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/convert_to_json_file.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/convert_to_json_file.h
@@ -63,6 +63,8 @@ public:
   bool txData(const TrainingAreaBase::TetraIcd::ExConfirmationReport &data) override;
   
 protected:
+  
+NGL::INGLLogger &m_logger;
   template <typename T>
   bool sendToTx(const T *data);
 protected:
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 db9b37200..4246afc3f 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
@@ -19,12 +19,11 @@ namespace TetraRadio
 
 
 
-DirectoryCleaner::DirectoryCleaner(const QString &directory, unsigned int maxAgeSec, QObject *parent)
-  : QObject(parent)
+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"))
-{
+  .getNGLLogger("TAB.Plugin.DirectoryCleaner")),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   QDir().mkpath(directory);
   doInitialCleanup(directory);
   m_worker->moveToThread(m_cleanerThread);
@@ -44,7 +43,7 @@ void DirectoryCleaner::doInitialCleanup(const QString &directory)
   QDir d(directory);
   if (!d.exists())
   {
-    WARNING_LOG() << "Directory " << directory
+    WARNING_LOG(m_logger) << "Directory " << directory
                           << " does not exist - can not cleanup directory";
     return;
   }
@@ -113,7 +112,7 @@ void DirectoryCleanerWorker::doCleanup()
   if (!d.exists())
   {
     if (!m_bWarnedOnce)
-      WARNING_LOG() << "Directory " << m_directory
+      WARNING_LOG(m_logger) << "Directory " << m_directory
                             << " does not exist - can not cleanup directory";
     m_bWarnedOnce = true;
     return;
@@ -127,12 +126,12 @@ void DirectoryCleanerWorker::doCleanup()
     const QString filename(it.fileName());
     bool bOk = false;
     qint64 timestampUSec = filename.toLongLong(&bOk);
-    TRACE_LOG() << "File: " << filename
+    TRACE_LOG(m_logger) << "File: " << filename
                         << " timestamp: " << timestampUSec
                         << " remove time: " << tRemoveTimeMSec * 1000;
     if (!bOk)
     {
-      WARNING_LOG() << "Found file with name '" << filepath
+      WARNING_LOG(m_logger) << "Found file with name '" << filepath
                             << " which is not a valid xdr filename"
                             << " - removing this file when mtime older than "
                             << m_maxAgeSec << "seconds";
@@ -146,9 +145,9 @@ void DirectoryCleanerWorker::doCleanup()
       if (timestampMSec < tRemoveTimeMSec)
       {
         if (!QFile::remove(filepath))
-          WARNING_LOG() << "Could not remove " << filepath;
+          WARNING_LOG(m_logger) << "Could not remove " << filepath;
         else
-          TRACE_LOG() << "Removed " << filepath;
+          TRACE_LOG(m_logger) << "Removed " << filepath;
       }
     }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/directory_cleaner.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/directory_cleaner.h
index aaa604705..e0d22461e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/directory_cleaner.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/DebugJsonDir/directory_cleaner.h
@@ -19,6 +19,7 @@ public:
 private:
   
   
+  NGL::INGLLogger &m_logger;
   void doInitialCleanup(const QString &directory);
   bool teleShouldBeRemoved(int teleId);
   QThread *m_cleanerThread;
@@ -34,8 +35,10 @@ public:
 public Q_SLOTS:
   void onTimeout();
 private:
+  NGL::INGLLogger &m_logger;
   void doCleanup();
 private:
+  NGL::INGLLogger &m_logger;
   QString m_directory;
   qint64 m_maxAgeSec;
   bool m_bWarnedOnce;
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 41076860d..de8c33fa0 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
@@ -67,7 +67,7 @@ void HlaDispatcher::onHlaConnected()
 
 void HlaDispatcher::onHlaDisconnected()
 {
-  INFO_LOG() << "Hla socket disconnected";
+  INFO_LOG(m_logger) << "Hla socket disconnected";
   m_webSocketReconnectTimer->start(5000);
   m_sendToHla->onHlaDisconnected();
 
@@ -85,7 +85,7 @@ void HlaDispatcher::onWebSocketError()
   if (!m_webSocket)
     return;
   if (!m_bWarnedOnce)
-    WARNING_LOG() << "Error connecting to " << webSocketUrl().toString() << ": " << m_webSocket->errorString();
+    WARNING_LOG(m_logger) << "Error connecting to " << webSocketUrl().toString() << ": " << m_webSocket->errorString();
   m_webSocket->close();
   m_webSocketReconnectTimer->start(5000);
   m_bWarnedOnce = true;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_dispatcher.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_dispatcher.h
index 12996c3bb..8dcc54034 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_dispatcher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_dispatcher.h
@@ -41,8 +41,10 @@ Q_SIGNALS:
   void broadcastTelegramsRequest(int equipmentNumber, int broadcastIndex, int resetCounter);
   void wlsTelegramReceived(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *tele);
 private:
+  NGL::INGLLogger &m_logger;
   QUrl webSocketUrl() const;
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<TrainingAreaBase::RecvFromTab> m_recvFromTabCb;
   std::shared_ptr<HlaHandlerRx> m_recvFromHla;
   std::shared_ptr<HlaHandlerTx> m_sendToHla;
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 8dcc50a5d..a98986309 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
@@ -11,11 +11,10 @@ namespace HlaJson
 {
 
 HlaHandlerRx::HlaHandlerRx(const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb,
-                           HlaDispatcher *dispatcher)
-  : m_rxHandler(recvFromTabCb)
+                           HlaDispatcher *dispatcher) : m_rxHandler(recvFromTabCb)
   , m_dispatcher(dispatcher)
-  , m_bWarnedOnce(false)
-{}
+  , m_bWarnedOnce(false),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 bool HlaHandlerRx::handleTelegram(const QByteArray &baJson)
 {
@@ -24,7 +23,7 @@ bool HlaHandlerRx::handleTelegram(const QByteArray &baJson)
   if (baJson.isEmpty())
     return false;
   const QJsonObject obj = QJsonDocument::fromJson(baJson).object();
-  TRACE_LOG() << "incoming telegram: " << baJson;
+  TRACE_LOG(m_logger) << "incoming telegram: " << baJson;
 
 
 
@@ -39,7 +38,7 @@ bool HlaHandlerRx::handleTelegram(const QByteArray &baJson)
   const QJsonValue typeId = obj.value(QStringLiteral("typeId"));
   if (!typeId.isDouble())
   {
-    ERROR_LOG() << "Can not read type id: " << baJson;
+    ERROR_LOG(m_logger) << "Can not read type id: " << baJson;
     return false;
   }
   const QJsonObject data = obj.value(QStringLiteral("data")).toObject();
@@ -125,7 +124,7 @@ bool HlaHandlerRx::handleTelegram(const QByteArray &baJson)
   }
   catch (const std::exception &e)
   {
-    WARNING_LOG() << "Could not parse json: " << e.what() << " (" << baJson << ")";
+    WARNING_LOG(m_logger) << "Could not parse json: " << e.what() << " (" << baJson << ")";
     return false;
   }
   return true;
@@ -138,7 +137,7 @@ void HlaHandlerRx::rxData(const T &data)
   {
     if (!m_bWarnedOnce)
     {
-      ERROR_LOG() << "No RecvFromTab available";
+      ERROR_LOG(m_logger) << "No RecvFromTab available";
       m_bWarnedOnce = true;
     }
     return;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_rx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_rx.h
index 2772b8038..3a339012a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_rx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_rx.h
@@ -24,9 +24,11 @@ public:
 Q_SIGNALS:
   void participantConnectionState(int equipmentNumber, bool dataCommunicationPossible);
 private:
+  NGL::INGLLogger &m_logger;
   template<typename T>
   void rxData(const T &data);
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<TrainingAreaBase::RecvFromTab> m_rxHandler;
   HlaDispatcher *m_dispatcher;
   bool m_bWarnedOnce;
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 f3dcba2c8..3ff382a56 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
@@ -295,7 +295,7 @@ bool HlaHandlerTx::txData(const TrainingAreaBase::TetraIcd::OcCommand &data)
 
 void HlaHandlerTx::onParticipantConnectionState(int equipmentNumber, bool dataCommunicationPossible)
 {
-  INFO_LOG() << "onParticipantConnectionState - " << equipmentNumber
+  INFO_LOG(m_logger) << "onParticipantConnectionState - " << equipmentNumber
                      << ", communication possible: " << dataCommunicationPossible;
   if (equipmentNumber == -1)
     m_dataCommunicationPossible.clear();
@@ -314,7 +314,7 @@ bool HlaHandlerTx::sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTelegr
   
   const QByteArray ba = QJsonDocument(obj).toJson(QJsonDocument::Compact);
   if (data->id() != TrainingAreaBase::TetraIcd::TelegramId::BESTAETIGUNG)
-    DEBUG_LOG() << "Sending tele: " << ba;
+    DEBUG_LOG(m_logger) << "Sending tele: " << ba;
   m_webSocket->sendTextMessage(QString::fromUtf8(ba));
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_tx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_tx.h
index 49f14e697..9bb89a424 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_tx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/hla_handler_tx.h
@@ -73,8 +73,10 @@ public:
 public Q_SLOTS:
   void onParticipantConnectionState(int equipmentNumber, bool dataCommunicationPossible);
 private:
+  NGL::INGLLogger &m_logger;
   bool sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data, bool bForce = false);
 private:
+  NGL::INGLLogger &m_logger;
   QHash<int, bool> m_dataCommunicationPossible; 
   TrainingAreaBase::Plugin::DataProvider *m_pdp;
   QWebSocket *m_webSocket;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/main_dispatcher.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/main_dispatcher.h
index d56dc7ef4..2a1eadd03 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/main_dispatcher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/main_dispatcher.h
@@ -31,6 +31,8 @@ public:
   const char *name() const override { return tr_lts("dds", "HlaJson"); }
 
 private:
+
+NGL::INGLLogger &m_logger;
   HlaDispatcher *m_wlsDispatcher;
 
   std::shared_ptr<TrainingAreaBase::RecvFromTab> m_recvFromTabCb;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/main_handler_tx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/main_handler_tx.h
index dc2205f37..fc7295e1a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/main_handler_tx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/HlaJson/main_handler_tx.h
@@ -68,6 +68,7 @@ public:
   bool txData(const TrainingAreaBase::TetraIcd::ExConfirmationReport &) override { return false; };
 private:
 
+NGL::INGLLogger &m_logger;
   template <typename T>
   bool sendToTxMixin(const T *data);
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/main_dispatcher.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/main_dispatcher.h
index bac1e7035..16931d285 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/main_dispatcher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/main_dispatcher.h
@@ -31,6 +31,8 @@ public:
   const char *name() const override { return tr_lts("dds", "Nme"); }
 
 private:
+
+NGL::INGLLogger &m_logger;
   NmeaDispatcher *m_tetraDispatcher;
   NGL::Settings *m_settings;
   std::shared_ptr<TrainingAreaBase::RecvFromTab> m_recvFromTabCb;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/main_handler_tx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/main_handler_tx.h
index c1771c6a8..f438f60f7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/main_handler_tx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/main_handler_tx.h
@@ -62,6 +62,7 @@ public:
   bool txData(const TrainingAreaBase::TetraIcd::SetDevicePowerRequest &data) override;
   bool txData(const TrainingAreaBase::TetraIcd::UAVPerformMission &data) override;
 private:
+NGL::INGLLogger &m_logger;
   template <typename T>
   bool sendToTxMixin(const T *data);
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_dispatcher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_dispatcher.cpp
index 1e370d0bc..996b8ccd7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_dispatcher.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_dispatcher.cpp
@@ -29,7 +29,7 @@ NmeaDispatcher::NmeaDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
   m_nmeaHost = getNmeaHost();
   m_nmeaPort = getNmeaPort();
 
-  DEBUG_LOG() << "Host: " << m_nmeaHost << " Port: " << m_nmeaPort;
+  DEBUG_LOG(m_logger) << "Host: " << m_nmeaHost << " Port: " << m_nmeaPort;
   m_socket = new QUdpSocket(this);
   connect(m_socket, &QUdpSocket::connected, this, &NmeaDispatcher::connected);
   connect(m_socket, &QUdpSocket::disconnected, this, &NmeaDispatcher::disconnected);
@@ -59,12 +59,12 @@ void NmeaDispatcher::exerciseChanged()
 
 void NmeaDispatcher::reconnect()
 {
-  INFO_LOG() << "Connecting,.." << " host = " << m_nmeaHost
+  INFO_LOG(m_logger) << "Connecting,.." << " host = " << m_nmeaHost
                      <<  " port = " << m_nmeaPort;;
 
   if(!m_socket->bind(m_nmeaPort, QAbstractSocket::BindFlag::ShareAddress | QAbstractSocket::BindFlag::ReuseAddressHint))
   {
-    ERROR_LOG() << "Error from Socket: " << m_socket->errorString();
+    ERROR_LOG(m_logger) << "Error from Socket: " << m_socket->errorString();
     m_reconnectTimer->start(10000);
   }
   else
@@ -77,25 +77,25 @@ void NmeaDispatcher::connected()
 {
   m_reconnectTimer->stop();
   m_txHandler->onUdpSocketConnected(m_socket, m_nmeaPort, m_nmeaHost);
-  DEBUG_LOG() << "Connected!";
+  DEBUG_LOG(m_logger) << "Connected!";
 }
 
 
 void NmeaDispatcher::disconnected()
 {
   m_reconnectTimer->start();
-  DEBUG_LOG() << "Disconnected!";
+  DEBUG_LOG(m_logger) << "Disconnected!";
 }
 
 void NmeaDispatcher::bytesWritten(qint64 bytes)
 {
-  DEBUG_LOG() << "We wrote: " << bytes;
+  DEBUG_LOG(m_logger) << "We wrote: " << bytes;
 }
 
 void NmeaDispatcher::reconnectTimerSlot()
 {
   m_reconnectTimer->stop();
-  INFO_LOG() << "Reconnect NMEA-Socket "
+  INFO_LOG(m_logger) << "Reconnect NMEA-Socket "
                      << " host = " << m_nmeaHost
                      <<  " port = " << m_nmeaPort;
   reconnect();
@@ -104,7 +104,7 @@ void NmeaDispatcher::reconnectTimerSlot()
 
 void NmeaDispatcher::readyRead()
 {
-  DEBUG_LOG() << "Reading...";
+  DEBUG_LOG(m_logger) << "Reading...";
   
 
   QByteArray ba;
@@ -114,18 +114,18 @@ void NmeaDispatcher::readyRead()
 
     ba.resize(int(m_socket->pendingDatagramSize()));
     m_socket->readDatagram(ba.data(), ba.size());
-    INFO_LOG() << ba;
+    INFO_LOG(m_logger) << ba;
     QByteArray nmeaDataBa = ba; 
     std::string nmeaDataStd = nmeaDataBa.toStdString() ;
     QString nmeaData = QString::fromLocal8Bit(nmeaDataStd.c_str());
 
 
-    DEBUG_LOG() << "nmeaDecoder :" << nmeaData;
+    DEBUG_LOG(m_logger) << "nmeaDecoder :" << nmeaData;
     
     m_rxHandler->handleTelegram(nmeaData);
 
-    DEBUG_LOG() << "NMEA-Data=" << nmeaData;
-    DEBUG_LOG() << "NMEA-Data ba=" << ba;
+    DEBUG_LOG(m_logger) << "NMEA-Data=" << nmeaData;
+    DEBUG_LOG(m_logger) << "NMEA-Data ba=" << ba;
   }
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_dispatcher.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_dispatcher.h
index 88d7475be..eb3676b8b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_dispatcher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_dispatcher.h
@@ -42,10 +42,12 @@ private slots:
   void readyRead();
   void reconnectTimerSlot();
 private:
+  NGL::INGLLogger &m_logger;
   void reconnect();
   QString getNmeaHost();
   int getNmeaPort();
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<NmeaHandlerRx> m_rxHandler;
   std::shared_ptr<NmeaHandlerTx> m_txHandler;
   TrainingAreaBase::Plugin::DataProvider *m_dataProvider;
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 70dd75b62..215b21210 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
@@ -11,10 +11,9 @@
 namespace Nmea
 {
 
-NmeaHandlerRx::NmeaHandlerRx(const std::shared_ptr<TrainingAreaBase::RecvFromTab> &rxHandler)
-  : m_rxHandler(rxHandler)
-  , m_bWarnedOnce(false)
-{
+NmeaHandlerRx::NmeaHandlerRx(const std::shared_ptr<TrainingAreaBase::RecvFromTab> &rxHandler) : m_rxHandler(rxHandler)
+  , m_bWarnedOnce(false),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 
   
 
@@ -48,7 +47,7 @@ void NmeaHandlerRx::decode(QString nmeaPackage)
   nmeaPackage.remove(0, startingPoint);
 
   nmeaType = nmeaPackage.mid(1, 5);
-  INFO_LOG() << "nmeaType=" << nmeaType;
+  INFO_LOG(m_logger) << "nmeaType=" << nmeaType;
 
   if (nmeaType == QStringLiteral("IIXDR"))
   {
@@ -57,10 +56,10 @@ void NmeaHandlerRx::decode(QString nmeaPackage)
 
   if (nmeaType == QStringLiteral("GPGGA"))
   {
-    INFO_LOG() << "Eigenposition";
+    INFO_LOG(m_logger) << "Eigenposition";
     if (checksum(nmeaPackage))
     {
-      INFO_LOG() << "Eigenposition checksum ok";
+      INFO_LOG(m_logger) << "Eigenposition checksum ok";
       GPGGA(nmeaPackage);
     }
   }
@@ -132,29 +131,29 @@ void NmeaHandlerRx::IIXDR(const QString &package)
   ServiceControl serviceControl;
   QRegExp sep(QStringLiteral("(\\,|\\*)"));
   QStringList pkt_data = package.split(sep);
-  INFO_LOG() << "----------------------------------------------------";
-  INFO_LOG() << "batteryState pkt_data.size=" << pkt_data.size();
+  INFO_LOG(m_logger) << "----------------------------------------------------";
+  INFO_LOG(m_logger) << "batteryState pkt_data.size=" << pkt_data.size();
   for (int i = 0; i < pkt_data.size(); i++)
-    INFO_LOG() << "i=" << i << "Value=" << pkt_data[i];
+    INFO_LOG(m_logger) << "i=" << i << "Value=" << pkt_data[i];
 
 
   int index = pkt_data.indexOf(QLatin1String("S")) + 1;
   if ( index >= 1)
   {
-    INFO_LOG() << "Ausschalten!!!";
+    INFO_LOG(m_logger) << "Ausschalten!!!";
     if (pkt_data[4] == QStringLiteral("SERVICE_CONTROL_PRESHUTDOWN"))
     {
-      INFO_LOG() << "SERVICE_CONTROL_PRESHUTDOWN";
+      INFO_LOG(m_logger) << "SERVICE_CONTROL_PRESHUTDOWN";
       serviceControl.serviceControlState = ServiceControlEnum::PRESHUTDOWN;
     }
     if (pkt_data[4] == QStringLiteral("SERVICE_CONTROL_SHUTDOWN"))
     {
-      INFO_LOG() << "SERVICE_CONTROL_SHUTDOWN";
+      INFO_LOG(m_logger) << "SERVICE_CONTROL_SHUTDOWN";
       serviceControl.serviceControlState = ServiceControlEnum::SHUTDOWN;
     }
     if (pkt_data[4] == QStringLiteral("SERVICE_CONTROL_STOP"))
     {
-      INFO_LOG() << "SERVICE_CONTROL_STOP";
+      INFO_LOG(m_logger) << "SERVICE_CONTROL_STOP";
       serviceControl.serviceControlState = ServiceControlEnum::STOP;
     }
     serviceControl.header.equipmentNumber = 1;
@@ -229,7 +228,7 @@ void NmeaHandlerRx::IIXDR(const QString &package)
   batteryState.voltage = voltage;
 
   batteryState.serialNumber = serialNumber;
-  INFO_LOG() << "publish batteryState serialNumber=" << serialNumber;
+  INFO_LOG(m_logger) << "publish batteryState serialNumber=" << serialNumber;
   batteryInfo.batteryStates = {batteryState};
   batteryInfo.header.equipmentNumber = 1;
   batteryInfo.header.timeStamp = QDateTime::currentMSecsSinceEpoch();
@@ -243,7 +242,7 @@ void NmeaHandlerRx::IIALR(const QString &package)
   QRegExp sep(QStringLiteral("(\\,|\\*)"));
   QStringList pkt_data = package.split(sep);
   alarm_state packageData;
-  INFO_LOG() << "pkt_data.size=" << pkt_data.size();
+  INFO_LOG(m_logger) << "pkt_data.size=" << pkt_data.size();
   
   
   
@@ -262,7 +261,7 @@ void NmeaHandlerRx::IIALR(const QString &package)
 
   qint64 timeAlarm = getDateTime(packageData.time);
 
-  INFO_LOG() << "time=" << packageData.time
+  INFO_LOG(m_logger) << "time=" << packageData.time
                      << " timeAlarm=" << timeAlarm
                      << " number=" << packageData.number
                      << " condition=" <<  packageData.condition
@@ -339,9 +338,9 @@ void NmeaHandlerRx::GPGGA(const QString &package)
     lonDeg *= -1;
   }
 
-  DEBUG_LOG() << "RAW Nmea Position: " << packageData.D_longitude << " | " << packageData.B_latitude;
-  DEBUG_LOG() << "Lat: " << latDeg;
-  DEBUG_LOG() << "Lon: " << lonDeg;
+  DEBUG_LOG(m_logger) << "RAW Nmea Position: " << packageData.D_longitude << " | " << packageData.B_latitude;
+  DEBUG_LOG(m_logger) << "Lat: " << latDeg;
+  DEBUG_LOG(m_logger) << "Lon: " << lonDeg;
 
   PositionExcon.geoPosition.lat = latDeg * M_PI / 180.0;
   PositionExcon.geoPosition.lon = lonDeg * M_PI / 180.0;
@@ -371,7 +370,7 @@ void NmeaHandlerRx::GPRMC(const QString &package)
   packageData.K_variacao_magnetica_coord = pkt_data[11].toStdString()[0];
 
 
-  INFO_LOG() << "velocidade=" << QString::number(packageData.G_velocity * 1.852);
+  INFO_LOG(m_logger) << "velocidade=" << QString::number(packageData.G_velocity * 1.852);
 
 }
 
@@ -404,7 +403,7 @@ void NmeaHandlerRx::sendTestMessages()
   batteryState.generic = 1;
   batteryState.serialNumber = QStringLiteral("Test");
   batteryState.temperature = 38.8;
-  DEBUG_LOG() << "Send BatteryInfo Message";
+  DEBUG_LOG(m_logger) << "Send BatteryInfo Message";
   batteryInfo.batteryStates = {batteryState};
   batteryInfo.header.equipmentNumber = 1;
   batteryInfo.header.timeStamp = QDateTime::currentMSecsSinceEpoch();
@@ -419,7 +418,7 @@ void NmeaHandlerRx::rxData(const T &data)
   {
     if (!m_bWarnedOnce)
     {
-      ERROR_LOG() << "No RecvFromTab available";
+      ERROR_LOG(m_logger) << "No RecvFromTab available";
       m_bWarnedOnce = true;
     }
     return;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_rx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_rx.h
index 6c5845a1f..26c03f25d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_rx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_rx.h
@@ -123,6 +123,7 @@ private:
   qint64 getDateTime(QString receivedTimeStr);
   QStringList m_batteries;
 protected:
+  NGL::INGLLogger &m_logger;
   const std::shared_ptr<TrainingAreaBase::RecvFromTab> m_rxHandler;
   bool m_bWarnedOnce;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_tx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_tx.h
index c6fecb47a..2c94c8c0b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_tx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/Nmea/nmea_handler_tx.h
@@ -69,6 +69,8 @@ signals:
   void outgoingMessage(const QByteArray &msg);
 
 private:
+
+NGL::INGLLogger &m_logger;
   QUdpSocket *m_udpSocket;
   QString     m_nmeaHost;
   int         m_nmeaPort;
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 56f016070..321f61689 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
@@ -11,11 +11,10 @@ namespace TetraRadio
 {
 
 ConvertFromJson::ConvertFromJson(const std::shared_ptr<TrainingAreaBase::RecvFromTab> &rxHandler,
-                                 const char *loggerName)
-  : m_rxHandler(rxHandler)
+                                 const char *loggerName) : m_rxHandler(rxHandler)
   , m_bWarnedOnce(false)
-  .getNGLLogger(loggerName))
-{}
+  .getNGLLogger(loggerName)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 bool ConvertFromJson::handleTelegram(const QByteArray &baJson, int &recvCounter)
 {
@@ -30,14 +29,14 @@ bool ConvertFromJson::handleTelegram(const QByteArray &baJson, int &recvCounter)
     if (!sendCounter.isDouble())
       return false;
     recvCounter = sendCounter.toInt(-1);
-    DEBUG_LOG() << "Incoming telegram with Id " << obj.value(QStringLiteral("type")).toString();
+    DEBUG_LOG(m_logger) << "Incoming telegram with Id " << obj.value(QStringLiteral("type")).toString();
     if (recvCounter < 0)
       return false;
   }
   const QJsonValue typeId = obj.value(QStringLiteral("typeId"));
   if (!typeId.isDouble())
   {
-    ERROR_LOG() << "Can not read type id: " << baJson;
+    ERROR_LOG(m_logger) << "Can not read type id: " << baJson;
     return false;
   }
   const QJsonObject data = obj.value(QStringLiteral("data")).toObject();
@@ -163,14 +162,14 @@ bool ConvertFromJson::handleTelegram(const QByteArray &baJson, int &recvCounter)
        
        break;
     default:
-      WARNING_LOG() << "Handler for telegram Id " << typeId.toInt()
+      WARNING_LOG(m_logger) << "Handler for telegram Id " << typeId.toInt()
                             << " not yet implemented (" << baJson << ")";
       return false;
     }
   }
   catch (const std::exception &e)
   {
-    WARNING_LOG() << "Could not parse json: " << e.what() << " (" << baJson << ")";
+    WARNING_LOG(m_logger) << "Could not parse json: " << e.what() << " (" << baJson << ")";
     return false;
   }
   return true;
@@ -183,7 +182,7 @@ void ConvertFromJson::rxData(const T &data)
   {
     if (!m_bWarnedOnce)
     {
-      ERROR_LOG() << "No RecvFromTab available";
+      ERROR_LOG(m_logger) << "No RecvFromTab available";
       m_bWarnedOnce = true;
     }
     return;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_from_json.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_from_json.h
index fb39e3bdd..b2a5bbed5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_from_json.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_from_json.h
@@ -16,6 +16,7 @@ public:
   virtual ~ConvertFromJson() = default;
 
 protected:
+  NGL::INGLLogger &m_logger;
   bool handleTelegram(const QByteArray &baJson, int &recvCounter);
   virtual void handleAcknowledge(qint64 timeStamp, int counter) = 0;
   virtual void handleTetraConnectionChanged(bool bConnected) = 0;
@@ -28,6 +29,7 @@ private:
   static TrainingAreaBase::TetraIcd::BiteError convertBiteError(const QJsonObject &obj);
   std::shared_ptr<TrainingAreaBase::RecvFromTab> m_rxHandler;
 protected:
+  NGL::INGLLogger &m_logger;
   bool m_bWarnedOnce;
 };
 
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 990d26cf2..c84836713 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
@@ -240,7 +240,7 @@ bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::Sanitation &data)
 
 bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::SelectiveReammunition &data)
 {
-  DEBUG_LOG() << "ConvertToJson::txData SelectiveReammunition";
+  DEBUG_LOG(m_logger) << "ConvertToJson::txData SelectiveReammunition";
   return sendToTx(&data);
 }
 
@@ -251,7 +251,7 @@ bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::SetDevicePowerReque
 
 bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::OcCommand &data)
 {
-  DEBUG_LOG() << "ConvertToJson::txData OcCommand";
+  DEBUG_LOG(m_logger) << "ConvertToJson::txData OcCommand";
   return sendToTx(&data);
 }
 
@@ -280,7 +280,7 @@ bool ConvertToJson::sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTeleg
     obj[QStringLiteral("counter")] = m_sendCounter++;
   const QByteArray ba = QJsonDocument(obj).toJson(QJsonDocument::Compact);
   if (data->id() != TrainingAreaBase::TetraIcd::TelegramId::BESTAETIGUNG)
-    DEBUG_LOG() << "Sending tele: " << ba;
+    DEBUG_LOG(m_logger) << "Sending tele: " << ba;
   emit outgoingMessage(ba);
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_to_json.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_to_json.h
index 5a9b850c9..02179ae50 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_to_json.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_to_json.h
@@ -72,7 +72,9 @@ public:
 Q_SIGNALS:
   void outgoingMessage(const QByteArray &msg);
 protected:
+  NGL::INGLLogger &m_logger;
 protected:
+  NGL::INGLLogger &m_logger;
   int m_sendCounter;
   bool m_bConnected;
 };
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 35353e55a..b19701868 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
@@ -45,7 +45,7 @@ TetraJsonInterfaceImpl::TetraJsonInterfaceImpl(TrainingAreaBase::Plugin::DataPro
         settings->settings()->value(QLatin1String("AES/use2BytesForSingleFireDiameter"), true).toBool());
   N_CoPrtCnv::CoPrtCnvTelegramConverter::setUsePvSan(
         settings->settings()->value(QLatin1String("TrainingAreaBase/UsePvSan"), false).toBool());
-  ERROR_LOG() << "hello i got this!";
+  ERROR_LOG(m_logger) << "hello i got this!";
 }
 
 TetraJsonInterfaceImpl::~TetraJsonInterfaceImpl()
@@ -70,7 +70,7 @@ void TetraJsonInterfaceImpl::exerciseChanged()
   NOTICE_LOG(m_logger) << "TetraJsonInterfaceImpl::exerciseChanged";
   if (m_pdp->exerciseRadioGroup().id() != m_radioGrpId) 
     if (!updatePrtCnv())
-      ERROR_LOG() << "Error changing PrtCnv state from radio grp id: "
+      ERROR_LOG(m_logger) << "Error changing PrtCnv state from radio grp id: "
                           << m_radioGrpId
                           << " to " << m_pdp->exerciseRadioGroup().id();
 }
@@ -92,7 +92,7 @@ bool TetraJsonInterfaceImpl::updatePrtCnv()
     QFile::remove(iniFileOut());
     if (!QFile::copy(iniFileIn(), iniFileOut()))
     {
-      ERROR_LOG() << "Error creating ini file for PrtCnv: " << iniFileOut();
+      ERROR_LOG(m_logger) << "Error creating ini file for PrtCnv: " << iniFileOut();
       return false;
     }
 
@@ -133,10 +133,10 @@ bool TetraJsonInterfaceImpl::checkConfigTemplates()
 {
   if (!QFile::exists(iniFileIn()))
   {
-    INFO_LOG() << "Creating " << iniFileIn();
+    INFO_LOG(m_logger) << "Creating " << iniFileIn();
     if (!QFile::copy(QStringLiteral(":/PrtCnv.dat"), iniFileIn()))
     {
-      ERROR_LOG() << "Error creating " << iniFileIn();
+      ERROR_LOG(m_logger) << "Error creating " << iniFileIn();
       return false;
     }
     else
@@ -145,10 +145,10 @@ bool TetraJsonInterfaceImpl::checkConfigTemplates()
 
   if (!QFile::exists(playerIdsFile()))
   {
-    INFO_LOG() << "Creating " << playerIdsFile();
+    INFO_LOG(m_logger) << "Creating " << playerIdsFile();
     if (!QFile::copy(QStringLiteral(":/playerIds.dat"), playerIdsFile()))
     {
-      ERROR_LOG() << "Error creating " << playerIdsFile();
+      ERROR_LOG(m_logger) << "Error creating " << playerIdsFile();
       return false;
     }
     else
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/plugin.h
index a7e608842..024d260f6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/plugin.h
@@ -48,6 +48,7 @@ public:
 private Q_SLOTS:
   void onTetraConnectionChanged(bool bConnected);
 private:
+NGL::INGLLogger &m_logger;
   void cleanupProcess();
   static QString iniFileIn();
   QString iniFileOut() const;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_cbit_status.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_cbit_status.cpp
index 4e86180b2..b9ca1eac1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_cbit_status.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_cbit_status.cpp
@@ -31,7 +31,7 @@ void Dispatcher::ReportCBitStatus(const std::string &KeyId, const M_BuiltInTest:
 {
   if (IsRemoved)
   {
-    DEBUG_LOG() << "isRemoved";
+    DEBUG_LOG(m_logger) << "isRemoved";
     return;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_cbit_status.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_cbit_status.h
index 499c8d17f..a15d4a22b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_cbit_status.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_cbit_status.h
@@ -25,6 +25,7 @@ public:
   Dispatcher();
   void ReportCBitStatus(const std::string &KeyId, const M_BuiltInTest::BitStatusType &status, bool IsRemoved) override;
 private:
+NGL::INGLLogger &m_logger;
 };
 } 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_device_status.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_device_status.cpp
index 45524dd6e..f49edaa1f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_device_status.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_device_status.cpp
@@ -37,23 +37,23 @@ Dispatcher::Dispatcher()
 
 void Dispatcher::ReportDeviceStatus(M_Device::DeviceStatusType const& status, bool IsRemoved)
 {
-  DEBUG_LOG() << "start";
+  DEBUG_LOG(m_logger) << "start";
 
   if (IsRemoved)
   {
-    DEBUG_LOG() << "isRemoved";
+    DEBUG_LOG(m_logger) << "isRemoved";
     return;
   }
 
   if (status.OperationStatus.Mode.empty())
   {
-    DEBUG_LOG() << "no mode!";
+    DEBUG_LOG(m_logger) << "no mode!";
     return;
   }
 
   if (status.OperationStatus.Mode.front().EnumeratedValue.empty())
   {
-    DEBUG_LOG() << "no enum value in mode!";
+    DEBUG_LOG(m_logger) << "no enum value in mode!";
     return;
   }
 
@@ -62,7 +62,7 @@ void Dispatcher::ReportDeviceStatus(M_Device::DeviceStatusType const& status, bo
   Message msg;
   msg.Status = operationModeStateKindFromTms(val);
 
-  DEBUG_LOG() << "dispatch!";
+  DEBUG_LOG(m_logger) << "dispatch!";
 
   dispatch(msg);
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_device_status.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_device_status.h
index ac3263b4b..804054a7b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_device_status.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_device_status.h
@@ -26,6 +26,7 @@ public:
   Dispatcher();
   void ReportDeviceStatus(M_Device::DeviceStatusType const& status, bool IsRemoved) override;
 private:
+NGL::INGLLogger &m_logger;
 };
 } 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_mission_status.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_mission_status.cpp
index 8d19d9d30..491b2a8e3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_mission_status.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_mission_status.cpp
@@ -47,19 +47,19 @@ void Dispatcher::ReportMissionStatus(M_MissionCtrl::MissionStatusType const& Mis
 {
   if (IsRemoved)
   {
-    DEBUG_LOG() << "isRemoved";
+    DEBUG_LOG(m_logger) << "isRemoved";
     return;
   }
 
   if (MissionStatus.CurrentAction.CurrentTask.EnumeratedValue.empty())
   {
-    DEBUG_LOG() << "MissionStatus.CurrentAction.CurrentTask.EnumeratedValue empty";
+    DEBUG_LOG(m_logger) << "MissionStatus.CurrentAction.CurrentTask.EnumeratedValue empty";
     return;
   }
 
   if (!MissionStatus.CurrentAction.CurrentTask.TextualValue.empty())
   {
-    DEBUG_LOG() << "text: " << QString::fromStdString(MissionStatus.CurrentAction.CurrentTask.TextualValue.front());
+    DEBUG_LOG(m_logger) << "text: " << QString::fromStdString(MissionStatus.CurrentAction.CurrentTask.TextualValue.front());
   }
   const Task currentTask = taskFromTms(MissionStatus.CurrentAction.CurrentTask.EnumeratedValue.front());
 
@@ -81,7 +81,7 @@ void Dispatcher::ReportMissionStatus(M_MissionCtrl::MissionStatusType const& Mis
   }
 
   std::string missionName = MissionStatus.CurrentMissionName;
-  DEBUG_LOG() << "missionName before: " << missionName;
+  DEBUG_LOG(m_logger) << "missionName before: " << missionName;
   if (missionName.empty())
   {
     for (const auto &additionalInfo : std::as_const(MissionStatus.CurrentAction.CurrentTask.AdditionalInfo))
@@ -93,7 +93,7 @@ void Dispatcher::ReportMissionStatus(M_MissionCtrl::MissionStatusType const& Mis
       }
     }
   }
-  DEBUG_LOG() << "missionName after: " << missionName;
+  DEBUG_LOG(m_logger) << "missionName after: " << missionName;
 
   dispatch({ missionName, currentTask, currentlyAllowedTasks, {} });
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_mission_status.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_mission_status.h
index 008182f2c..b68822667 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_mission_status.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_mission_status.h
@@ -24,6 +24,7 @@ public:
   Dispatcher();
   void ReportMissionStatus(M_MissionCtrl::MissionStatusType const& MissionStatus, bool IsRemoved) override;
 private:
+NGL::INGLLogger &m_logger;
 };
 } 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_point.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_point.cpp
index eb9d6dd59..8b0b5b999 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_point.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_point.cpp
@@ -17,7 +17,7 @@ Dispatcher::Dispatcher()
 
 void Dispatcher::ReportPoint(const M_Common::ObjectIdType &KeyId, const M_ObjectManager::PointObjectType &, bool IsRemoved)
 {
-  DEBUG_LOG() << "start";
+  DEBUG_LOG(m_logger) << "start";
 
   Message msg;
 
@@ -25,13 +25,13 @@ void Dispatcher::ReportPoint(const M_Common::ObjectIdType &KeyId, const M_Object
   msg.uasId = std::stoi(KeyId);
   }catch(...)
   {
-    ERROR_LOG() << "KeyId not an int !";
+    ERROR_LOG(m_logger) << "KeyId not an int !";
     return;
   }
 
   msg.isRemoved = IsRemoved;
 
-  DEBUG_LOG() << "dispatch!";
+  DEBUG_LOG(m_logger) << "dispatch!";
 
   dispatch(msg);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_point.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_point.h
index 484a04cbb..8ba2be4d9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_point.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_point.h
@@ -23,6 +23,7 @@ public:
   Dispatcher();
   void ReportPoint(const M_Common::ObjectIdType &KeyId, const M_ObjectManager::PointObjectType &Obj, bool IsRemoved) override;
 private:
+NGL::INGLLogger &m_logger;
 };
 } 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_positions.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_positions.cpp
index 32530d729..fd72599ba 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_positions.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_positions.cpp
@@ -19,14 +19,14 @@ void Dispatcher::ReportPositions(const std::string &KeyId, const M_Common::Posit
 {
   if (IsRemoved)
   {
-    DEBUG_LOG() << "isRemoved";
+    DEBUG_LOG(m_logger) << "isRemoved";
     return;
   }
 
   
   if (KeyId != "UTM_GLOBAL_POSITION" && KeyId != "CURRENT_AIRFRAME_RAW" && KeyId != "CURRENT_AIRFRAME")
   {
-    DEBUG_LOG() << "KeyId unwanted (is '" << QString::fromStdString(KeyId) << "')";
+    DEBUG_LOG(m_logger) << "KeyId unwanted (is '" << QString::fromStdString(KeyId) << "')";
     return;
   }
 
@@ -34,7 +34,7 @@ void Dispatcher::ReportPositions(const std::string &KeyId, const M_Common::Posit
   
   if (PositionList.empty())
   {
-    DEBUG_LOG() << "PositionList is empty";
+    DEBUG_LOG(m_logger) << "PositionList is empty";
     return;
   }
 
@@ -42,7 +42,7 @@ void Dispatcher::ReportPositions(const std::string &KeyId, const M_Common::Posit
 
   if (pos.Ellipsoidal.empty())
   {
-    DEBUG_LOG() << "PositionList.Ellipsoidal is empty";
+    DEBUG_LOG(m_logger) << "PositionList.Ellipsoidal is empty";
     return;
   }
 
@@ -50,7 +50,7 @@ void Dispatcher::ReportPositions(const std::string &KeyId, const M_Common::Posit
 
   if (elip.Altitude.empty())
   {
-    DEBUG_LOG() << "PositionList.Ellipsoidal.Altitude is empty";
+    DEBUG_LOG(m_logger) << "PositionList.Ellipsoidal.Altitude is empty";
     return;
   }
 
@@ -58,7 +58,7 @@ void Dispatcher::ReportPositions(const std::string &KeyId, const M_Common::Posit
 
   if (pos.Timestamp.empty())
   {
-    DEBUG_LOG() << "PositionList[0].Timestamp is empty";
+    DEBUG_LOG(m_logger) << "PositionList[0].Timestamp is empty";
     return;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_positions.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_positions.h
index 1675eec6c..686bf0c7a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_positions.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_positions.h
@@ -23,6 +23,7 @@ public:
   Dispatcher();
   void ReportPositions(const std::string &KeyId, const M_Common::PositionListType &PositionList, bool IsRemoved) override;
 private:
+NGL::INGLLogger &m_logger;
 };
 } 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_radio_link_connection_state.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_radio_link_connection_state.cpp
index 11af7f2f3..0b26d67c5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_radio_link_connection_state.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_radio_link_connection_state.cpp
@@ -34,13 +34,13 @@ void Dispatcher::ReportRadioConnectionStatus(const std::string &, const M_Teleop
 {
   if (IsRemoved)
   {
-    DEBUG_LOG() << "isRemoved";
+    DEBUG_LOG(m_logger) << "isRemoved";
     return;
   }
 
   if (RadioConnectionStatus.LinkConnectionState == M_Teleoperation::RadioLinkConnectionState::Undefined)
   {
-    DEBUG_LOG() << "MissionStatus.CurrentAction.CurrentTask.EnumeratedValue empty";
+    DEBUG_LOG(m_logger) << "MissionStatus.CurrentAction.CurrentTask.EnumeratedValue empty";
     return;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_radio_link_connection_state.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_radio_link_connection_state.h
index 702676da5..c4bc95dc0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_radio_link_connection_state.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/dispatchers/report_radio_link_connection_state.h
@@ -25,6 +25,7 @@ public:
   Dispatcher();
   void ReportRadioConnectionStatus(std::string const& KeyId, M_Teleoperation::RadioConnectionStatusType const& RadioConnectionStatus, bool IsRemoved) override;
 private:
+NGL::INGLLogger &m_logger;
 };
 } 
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/tms_if_adapter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/tms_if_adapter.cpp
index baf0ed608..7bb14a891 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/tms_if_adapter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/tms_if_adapter.cpp
@@ -67,7 +67,7 @@ public:
     , m_reader(m_master.dispatcher())
     , m_writer(m_master.client())
   {
-    ERROR_LOG() << "ctor";
+    ERROR_LOG(m_logger) << "ctor";
 
     connect(m_reader.readerSignal(), &ReaderSignal::dataReady, this, &InterfaceAdapterInitializer::updatePoint);
 
@@ -77,7 +77,7 @@ public:
     {
       if (m_activeUas.empty())
       {
-        ERROR_LOG() << "trying to stop active uas - DONE!";
+        ERROR_LOG(m_logger) << "trying to stop active uas - DONE!";
 
         t->stop();
         m_parent->setReady();
@@ -85,7 +85,7 @@ public:
         return;
       }
 
-      ERROR_LOG() << "trying to stop active uas:" << m_activeUas.size();
+      ERROR_LOG(m_logger) << "trying to stop active uas:" << m_activeUas.size();
 
       for (const int activeUas : m_activeUas)
       {
@@ -137,7 +137,7 @@ private:
 TmsIfAdapterImpl::TmsIfAdapterImpl()
   : m_iai(new InterfaceAdapterInitializer(this))
 {
-  ERROR_LOG() << "TmsIfAdapter running!";
+  ERROR_LOG(m_logger) << "TmsIfAdapter running!";
 }
 
 
@@ -145,7 +145,7 @@ TmsIfAdapterImpl::~TmsIfAdapterImpl()
 {
   delete m_iai;
   delete m_guard;
-  ERROR_LOG() << "!!! TmsIfAdapterImpl DTOR!";
+  ERROR_LOG(m_logger) << "!!! TmsIfAdapterImpl DTOR!";
 }
 
 
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 377405a7a..5b5a554d8 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
@@ -15,9 +15,8 @@ using namespace LtsUtils;
 
 namespace UAS
 {
-Resolver::Resolver(QObject *parent)
-  : QObject(parent)
-{
+Resolver::Resolver(QObject *parent) : QObject(parent),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   connect(this, &Resolver::resolve, this, &QObject::deleteLater);
   connect(this, &Resolver::reject, this, [this](){deleteLater();});
 }
@@ -33,7 +32,7 @@ UAVCommanderImpl::UAVCommanderImpl(int domainId, int uasId, QObject *parent)
   , m_Device(std::string("UAV_Device_") + std::to_string(uasId), domainId)
   , m_CoordinateFrame(std::string("UAV_CoordinateFrame_") + std::to_string(uasId), domainId)
 {
-  ERROR_LOG() << "ctor: " << (quintptr)this;
+  ERROR_LOG(m_logger) << "ctor: " << (quintptr)this;
 
   connect(m_MissionCtrl.reader.readerSignal(), &ReaderSignal::dataReady, this, &UAVCommanderImpl::updateMissionStatus);
   connect(m_TeleOperation.reader.readerSignal(), &ReaderSignal::dataReady, this, &UAVCommanderImpl::updateOperationalState);
@@ -81,7 +80,7 @@ UAVCommanderImpl::MissionCtrlContainer::MissionCtrlContainer(const std::string &
 
 UAVCommanderImpl::~UAVCommanderImpl()
 {
-  ERROR_LOG() << "dtor: " << (quintptr)this;
+  ERROR_LOG(m_logger) << "dtor: " << (quintptr)this;
 
   if (m_createInterfaceAdapterInstance)
   {
@@ -108,13 +107,13 @@ void UAVCommanderImpl::updateMissionStatus()
 
       const auto oldTask = m_MissionCtrl.currentTask;
       m_MissionCtrl.currentTask = msg.currentTask;
-      ERROR_LOG() << "currentTask = " << (int)m_MissionCtrl.currentTask;
+      ERROR_LOG(m_logger) << "currentTask = " << (int)m_MissionCtrl.currentTask;
 
       const auto oldMission = m_MissionCtrl.currentMission;
       m_MissionCtrl.currentMission = QString::fromStdString(msg.currentMissionName);
-      ERROR_LOG() << "oldTask = " << (int)oldTask;
+      ERROR_LOG(m_logger) << "oldTask = " << (int)oldTask;
 
-      ERROR_LOG() << "currentMission = " << QString::fromStdString(msg.currentMissionName);
+      ERROR_LOG(m_logger) << "currentMission = " << QString::fromStdString(msg.currentMissionName);
 
       m_MissionCtrl.currentlyAllowedTasks.swap(msg.currentlyAllowedTasks); 
 
@@ -122,7 +121,7 @@ void UAVCommanderImpl::updateMissionStatus()
       {
         
 
-        ERROR_LOG() << "Old Task" << oldTask << "new task " <<  m_MissionCtrl.currentTask ;
+        ERROR_LOG(m_logger) << "Old Task" << oldTask << "new task " <<  m_MissionCtrl.currentTask ;
         if (oldTask != m_MissionCtrl.currentTask)
         {
           if (!oldMission.isEmpty() && m_MissionCtrl.currentMission.isEmpty())
@@ -131,11 +130,11 @@ void UAVCommanderImpl::updateMissionStatus()
           }
 
           m_MissionCtrl.ReportMissionStatus_Callback(msg);
-          ERROR_LOG() << "################################# sending " << (int)m_MissionCtrl.currentTask << " " << (quintptr)this;
+          ERROR_LOG(m_logger) << "################################# sending " << (int)m_MissionCtrl.currentTask << " " << (quintptr)this;
         }
         else
         {
-          ERROR_LOG() << "################################# VERWERFING ! " << (int)m_MissionCtrl.currentTask << " " << (quintptr)this;
+          ERROR_LOG(m_logger) << "################################# VERWERFING ! " << (int)m_MissionCtrl.currentTask << " " << (quintptr)this;
         }
       }
 
@@ -151,7 +150,7 @@ void UAVCommanderImpl::updateMissionStatus()
         case MissionCtrl::Shutdown:
         {
           m_isReady = false;
-          ERROR_LOG() << "UAV not ready yet! currentTask: " << (int)m_MissionCtrl.currentTask;
+          ERROR_LOG(m_logger) << "UAV not ready yet! currentTask: " << (int)m_MissionCtrl.currentTask;
           break;
         }
 
@@ -166,7 +165,7 @@ void UAVCommanderImpl::updateMissionStatus()
           {
             m_isReady_Callback();
           }
-          ERROR_LOG() << "UAV now ready!";
+          ERROR_LOG(m_logger) << "UAV now ready!";
           break; 
         }
       }
@@ -253,7 +252,7 @@ void UAVCommanderImpl::updateCBitStaus()
 
 void UAVCommanderImpl::updateDeviceModeState()
 {
-  ERROR_LOG() << "start";
+  ERROR_LOG(m_logger) << "start";
 
   while (true)
   {
@@ -264,10 +263,10 @@ void UAVCommanderImpl::updateDeviceModeState()
       m_Device.currentMessage.clear();
       m_Device.currentMessage.emplace_back(msg);
 
-      ERROR_LOG() << "before callback";
+      ERROR_LOG(m_logger) << "before callback";
       if (m_Device.ReportDeviceStatus_Callback)
       {
-        ERROR_LOG() << "callback!";
+        ERROR_LOG(m_logger) << "callback!";
         m_Device.ReportDeviceStatus_Callback(msg);
       }
     }
@@ -281,11 +280,11 @@ void UAVCommanderImpl::updateDeviceModeState()
 
 void UAVCommanderImpl::prepareMission(Resolver *resolver)
 {
-  ERROR_LOG() << "resolver = " << (quintptr)resolver;
+  ERROR_LOG(m_logger) << "resolver = " << (quintptr)resolver;
 
   if (isTaskAllowed(MissionCtrl::Task::Observe) || m_MissionCtrl.currentTask == MissionCtrl::Task::Connect )
   {
-    ERROR_LOG() << "DONE! resolving " << (quintptr)resolver;
+    ERROR_LOG(m_logger) << "DONE! resolving " << (quintptr)resolver;
     emit resolver->resolve();
     return;
   }
@@ -294,7 +293,7 @@ void UAVCommanderImpl::prepareMission(Resolver *resolver)
   connect(r, &Resolver::reject, resolver, &Resolver::reject);
   connect(r, &Resolver::resolve, resolver, [this, resolver]()
   {
-    ERROR_LOG() << "r ("<<(quintptr)resolver<<")! resolving!";
+    ERROR_LOG(m_logger) << "r ("<<(quintptr)resolver<<")! resolving!";
     Resolver *r2 = new Resolver(this);
     connect(r2, &Resolver::reject, resolver, &Resolver::reject);
     connect(r2, &Resolver::resolve, resolver, &Resolver::resolve);
@@ -303,7 +302,7 @@ void UAVCommanderImpl::prepareMission(Resolver *resolver)
 
   if (!m_MissionCtrl.currentMission.isEmpty()) 
   {
-    ERROR_LOG() << " > mission '"<< m_MissionCtrl.currentMission << "' currently active - aborting mission and waiting for loitering";
+    ERROR_LOG(m_logger) << " > mission '"<< m_MissionCtrl.currentMission << "' currently active - aborting mission and waiting for loitering";
     sendCommand(r, {QStringLiteral("mission:abort (%1)").arg(m_MissionCtrl.currentMission), MissionCtrl::Task::Connect, [this]() { _abortMission(m_MissionCtrl.currentMission); }}); 
     return;
   }
@@ -312,28 +311,28 @@ void UAVCommanderImpl::prepareMission(Resolver *resolver)
   {
     case MissionCtrl::Task::Disarm:
     {
-      ERROR_LOG() << " > arm";
+      ERROR_LOG(m_logger) << " > arm";
       arm(r);
       break;
     }
 
     case MissionCtrl::Task::Arm:
     {
-      ERROR_LOG() << " > takeoff";
+      ERROR_LOG(m_logger) << " > takeoff";
       takeoff(r);
       break;
     }
 
     case MissionCtrl::Task::Takeoff:
     {
-      ERROR_LOG() << " > waiting for Loiter ...";
+      ERROR_LOG(m_logger) << " > waiting for Loiter ...";
       sendCommand(r, {QStringLiteral("loiter"), MissionCtrl::Task::Loiter, nullptr});
       break;
     }
 
     case MissionCtrl::Task::Loiter:
     {
-      ERROR_LOG() << " >WE loiter start to resolve";
+      ERROR_LOG(m_logger) << " >WE loiter start to resolve";
       emit resolver->resolve();
       break;
     }
@@ -342,7 +341,7 @@ void UAVCommanderImpl::prepareMission(Resolver *resolver)
 
     default:
     {
-      ERROR_LOG() << "help, I don't know what to do with "<<(int)m_MissionCtrl.currentTask<<" :(";
+      ERROR_LOG(m_logger) << "help, I don't know what to do with "<<(int)m_MissionCtrl.currentTask<<" :(";
       break;
     }
   }
@@ -353,7 +352,7 @@ void UAVCommanderImpl::sendMission(double lat, double lon, double alt, const QSt
 {
   if (!m_isReady)
   {
-    ERROR_LOG() << "not ready";
+    ERROR_LOG(m_logger) << "not ready";
     throw std::runtime_error("UAV not ready");
   }
 
@@ -373,21 +372,21 @@ void UAVCommanderImpl::sendMission(double lat, double lon, double alt, const QSt
   }
 
   Resolver *r = new Resolver(this);
-  connect(r, &Resolver::reject, this, [this](const QString &msg) { ERROR_LOG() << "rejected: " << msg; });
+  connect(r, &Resolver::reject, this, [this](const QString &msg) { ERROR_LOG(m_logger) << "rejected: " << msg; });
   connect(r, &Resolver::resolve, [this, lat, lon, alt, missionName]()
   {
-    ERROR_LOG() << "!!!!!!!!!!!!!!!!!!!!!! going to observe now!!";
+    ERROR_LOG(m_logger) << "!!!!!!!!!!!!!!!!!!!!!! going to observe now!!";
 
     
     Resolver *r2 = new Resolver(this);
-    connect(r2, &Resolver::reject, [this](const QString &msg) { ERROR_LOG() << "################ failed to start mission :( " << msg; });
+    connect(r2, &Resolver::reject, [this](const QString &msg) { ERROR_LOG(m_logger) << "################ failed to start mission :( " << msg; });
     connect(r2, &Resolver::resolve, [this, missionName]()
     {
       Resolver *r3 = new Resolver(this);
-      connect(r3, &Resolver::reject, [this](const QString &msg) { ERROR_LOG() << "################ failed to wait for loiter :( " << msg; });
+      connect(r3, &Resolver::reject, [this](const QString &msg) { ERROR_LOG(m_logger) << "################ failed to wait for loiter :( " << msg; });
       connect(r3, &Resolver::resolve, [this, missionName]()
       {
-        ERROR_LOG() << "################ mission done" << missionName << " "  << this << " ";
+        ERROR_LOG(m_logger) << "################ mission done" << missionName << " "  << this << " ";
         
         
 
@@ -395,7 +394,7 @@ void UAVCommanderImpl::sendMission(double lat, double lon, double alt, const QSt
         
       });
       sendCommand(r3, {QStringLiteral("wait for mission to end (Loiter)"), MissionCtrl::Task::Loiter, nullptr}, -1);
-      ERROR_LOG() << "################ successfully started mission :)";
+      ERROR_LOG(m_logger) << "################ successfully started mission :)";
     });
     sendCommand(r2, { QStringLiteral("mission:observe"), MissionCtrl::Task::Observe, [this, lat, lon, alt, missionName]() { _sendMission(lat, lon, alt, missionName); } });
   });
@@ -419,18 +418,18 @@ void UAVCommanderImpl::_abortMission(const QString &missionName)
 
 void UAVCommanderImpl::_sendMission(double lat, double lon, double alt, const QString &missionName)
 {
-  ERROR_LOG() << "lat = " << lat << ", lon = " << lon << ", alt = " << alt << ", missionName = " << missionName;
+  ERROR_LOG(m_logger) << "lat = " << lat << ", lon = " << lon << ", alt = " << alt << ", missionName = " << missionName;
 
   M_Common::EllipsoidalPositionType pos;
 
   if (alt <= 0.1)
   {
-    ERROR_LOG() << "alt very low (<= 0.1) !";
+    ERROR_LOG(m_logger) << "alt very low (<= 0.1) !";
   }
 
   pos.Latitude = lat / LtsCoordTrans::deg2rad();
   pos.Longitude = lon / LtsCoordTrans::deg2rad();
-  ERROR_LOG() << "DEG lat = " <<  pos.Latitude << ", lon = " << pos.Longitude << ", alt = " << alt << ", missionName = " << missionName;
+  ERROR_LOG(m_logger) << "DEG lat = " <<  pos.Latitude << ", lon = " << pos.Longitude << ", alt = " << alt << ", missionName = " << missionName;
 
   pos.Altitude.push_back(alt);
 
@@ -447,8 +446,8 @@ void UAVCommanderImpl::_sendMission(double lat, double lon, double alt, const QS
 void UAVCommanderImpl::returnToHome()
 {
   Resolver *r = new Resolver(this);
-  connect(r, &Resolver::reject, this, [this](const QString &error) { ERROR_LOG() << "returnToHome failed: " << error; });
-  connect(r, &Resolver::resolve, this, [this]() { ERROR_LOG() << "returnToHome done :)"; });
+  connect(r, &Resolver::reject, this, [this](const QString &error) { ERROR_LOG(m_logger) << "returnToHome failed: " << error; });
+  connect(r, &Resolver::resolve, this, [this]() { ERROR_LOG(m_logger) << "returnToHome done :)"; });
   sendCommand(r, { QStringLiteral("return"), MissionCtrl::Task::Return, [this]() { _returnToHome(); } }, -1 );
 }
 
@@ -467,12 +466,12 @@ void UAVCommanderImpl::sendCommand(Resolver *resolver, const Command &cmd, int t
 
   if (m_tried != 0)
   {
-    ERROR_LOG() << commandName << ": another request already running - replacing ("<<m_tried__ACTIVE<<")";
+    ERROR_LOG(m_logger) << commandName << ": another request already running - replacing ("<<m_tried__ACTIVE<<")";
   }
 
   if (m_MissionCtrl.currentTask == type)
   {
-    ERROR_LOG() << commandName << ": current task already matches new task '"<< commandName <<"' - replacing anyways";
+    ERROR_LOG(m_logger) << commandName << ": current task already matches new task '"<< commandName <<"' - replacing anyways";
   }
 
   if (m_currentResolver) 
@@ -481,7 +480,7 @@ void UAVCommanderImpl::sendCommand(Resolver *resolver, const Command &cmd, int t
   }
   m_currentResolver = resolver;
 
-  ERROR_LOG() << commandName << ": sending '" << commandName <<"' command ...";
+  ERROR_LOG(m_logger) << commandName << ": sending '" << commandName <<"' command ...";
   m_tried = 1;
   m_tried__ACTIVE = cmd.name;
 
@@ -494,14 +493,14 @@ void UAVCommanderImpl::sendCommand(Resolver *resolver, const Command &cmd, int t
   {
     if (commandFn)
     {
-      ERROR_LOG() << commandName << ": sending '"<< commandName <<"' command failed - timeout, trying again !";
+      ERROR_LOG(m_logger) << commandName << ": sending '"<< commandName <<"' command failed - timeout, trying again !";
       try
       {
         commandFn();
       }
       catch(const std::exception &ex)
       {
-        ERROR_LOG() << commandName << ": sending '"<< commandName <<"' command failed:" << ex.what();
+        ERROR_LOG(m_logger) << commandName << ": sending '"<< commandName <<"' command failed:" << ex.what();
       }
     }
   };
@@ -521,7 +520,7 @@ void UAVCommanderImpl::sendCommand(Resolver *resolver, const Command &cmd, int t
       {
         timeout->stop();
         guard->deleteLater();
-        ERROR_LOG() << commandName << ": sending '"<< commandName <<"' command failed - max tries reached, giving up !";
+        ERROR_LOG(m_logger) << commandName << ": sending '"<< commandName <<"' command failed - max tries reached, giving up !";
         m_tried = 0; 
         m_currentResolver.clear();
         emit resolver->reject(QStringLiteral("Sending %1 command timed out!").arg(commandName));
@@ -540,7 +539,7 @@ void UAVCommanderImpl::sendCommand(Resolver *resolver, const Command &cmd, int t
   connect(reader->readerSignal(), &ReaderSignal::dataReady,
           this, [this, reader, guard, timeout, commandName, type, resolver]()
   {
-    ERROR_LOG() << commandName << ": reader signal for '"<< commandName <<"' !";
+    ERROR_LOG(m_logger) << commandName << ": reader signal for '"<< commandName <<"' !";
 
     while(true)
     {
@@ -548,14 +547,14 @@ void UAVCommanderImpl::sendCommand(Resolver *resolver, const Command &cmd, int t
       {
         const auto msg = reader->getNext();
 
-        ERROR_LOG() << "########## READER SIGNAL (should: " << (int)type << ", is: " << (int)msg.currentTask << ")";
+        ERROR_LOG(m_logger) << "########## READER SIGNAL (should: " << (int)type << ", is: " << (int)msg.currentTask << ")";
 
         if (msg.currentTask == type
             
             || (type == MissionCtrl::Task::Takeoff && msg.currentTask == MissionCtrl::Task::Connect)
             || (type == MissionCtrl::Task::Return && (msg.currentTask == MissionCtrl::Task::Disarm || msg.currentTask == MissionCtrl::Task::Land)))
         {
-          ERROR_LOG() << commandName << ": successfully set new task '"<< commandName <<"' !";
+          ERROR_LOG(m_logger) << commandName << ": successfully set new task '"<< commandName <<"' !";
 
           
           QTimer *x = new QTimer(guard);
@@ -565,7 +564,7 @@ void UAVCommanderImpl::sendCommand(Resolver *resolver, const Command &cmd, int t
           connect(guard, &QObject::destroyed, x, &QTimer::stop);
           connect(x, &QTimer::timeout, this, [this, timeout, guard, resolver]()
           {
-            ERROR_LOG() << "############# RESOLVE AFTER 1s";
+            ERROR_LOG(m_logger) << "############# RESOLVE AFTER 1s";
 
             m_tried = 0;
             if (timeout != nullptr)
@@ -588,7 +587,7 @@ void UAVCommanderImpl::sendCommand(Resolver *resolver, const Command &cmd, int t
       }
     }
 
-    ERROR_LOG() << commandName << ": command '"<< commandName <<"' not accepted (yet)";
+    ERROR_LOG(m_logger) << commandName << ": command '"<< commandName <<"' not accepted (yet)";
 
     
   });
@@ -642,7 +641,7 @@ void UAVCommanderImpl::sendTryReclaimAutoMode()
   }
   catch(const std::exception &ex)
   {
-    ERROR_LOG() << "Failed to send DeviceMode:" << ex.what();
+    ERROR_LOG(m_logger) << "Failed to send DeviceMode:" << ex.what();
   }
 }
 
@@ -669,25 +668,25 @@ CreateInterfaceAdapterInstance::CreateInterfaceAdapterInstance(int uasId, const
   connect(m_reader.readerSignal(), &ReaderSignal::dataReady,
     this, [this, uasId]()
     {
-      ERROR_LOG() << "readerSignal for uasId" << m_uasId;
+      ERROR_LOG(m_logger) << "readerSignal for uasId" << m_uasId;
 
       const auto msgs = readAll<ObjectManager::ReportPoint::Message>(m_reader);
-      ERROR_LOG() << "msgs.size" << msgs.size() << m_uasId;
+      ERROR_LOG(m_logger) << "msgs.size" << msgs.size() << m_uasId;
 
       for (const auto &msg : msgs)
       {
-        ERROR_LOG() << "msg uas" << msg.uasId << "removed" << msg.isRemoved;
+        ERROR_LOG(m_logger) << "msg uas" << msg.uasId << "removed" << msg.isRemoved;
         if (msg.uasId == uasId && !msg.isRemoved)
         {
           
-          ERROR_LOG() << "DONE!!";
+          ERROR_LOG(m_logger) << "DONE!!";
           m_timeout->stop();
           return;
         }
       }
 
       
-      ERROR_LOG() << "no ia instance for"<<m_uasId<<"found !! starting timeout";
+      ERROR_LOG(m_logger) << "no ia instance for"<<m_uasId<<"found !! starting timeout";
       if (!m_timeout->isActive()) 
       {
         m_timeout->start();
@@ -706,7 +705,7 @@ CreateInterfaceAdapterInstance::CreateInterfaceAdapterInstance(int uasId, const
 
 void CreateInterfaceAdapterInstance::onStart()
 {
-  ERROR_LOG() << " -- CreateInterfaceAdapterInstance -- ::onStart() CmdAddUpdatePoint" << m_uasId<<" ip: "<<m_ip<<" use TCP ? "<<m_useTcp;
+  ERROR_LOG(m_logger) << " -- CreateInterfaceAdapterInstance -- ::onStart() CmdAddUpdatePoint" << m_uasId<<" ip: "<<m_ip<<" use TCP ? "<<m_useTcp;
 
   M_ObjectManager::PointObjectType pot;
   pot.AdditionalInfo.push_back({ "IP", m_ip, {}, {}, M_Common::PropertyAccessKind::Type::Undefined });
@@ -720,7 +719,7 @@ void CreateInterfaceAdapterInstance::onStart()
   }
   catch (const std::exception &ex)
   {
-    ERROR_LOG() << "CmdAddUpdatePoint FAILED!" << m_uasId << ":" << ex.what();
+    ERROR_LOG(m_logger) << "CmdAddUpdatePoint FAILED!" << m_uasId << ":" << ex.what();
   }
 }
 
@@ -742,18 +741,18 @@ KillInterfaceAdapterInstanceAsync::KillInterfaceAdapterInstanceAsync(int uasId)
         return;
       }
       
-      ERROR_LOG() << "readerSignal for uasId" << m_uasId;
+      ERROR_LOG(m_logger) << "readerSignal for uasId" << m_uasId;
 
       const auto msgs = readAll<ObjectManager::ReportPoint::Message>(m_reader);
-      ERROR_LOG() << "msgs.size" << msgs.size() << m_uasId;
+      ERROR_LOG(m_logger) << "msgs.size" << msgs.size() << m_uasId;
 
       for (const auto &msg : msgs)
       {
-        ERROR_LOG() << "msg uas" << msg.uasId << "removed" << msg.isRemoved;
+        ERROR_LOG(m_logger) << "msg uas" << msg.uasId << "removed" << msg.isRemoved;
         if (msg.uasId == uasId && msg.isRemoved)
         {
           
-          ERROR_LOG() << "DONE!!";
+          ERROR_LOG(m_logger) << "DONE!!";
           m_done = true;
           deleteLater();
           return;
@@ -778,7 +777,7 @@ void KillInterfaceAdapterInstanceAsync::onStop()
   }
   catch (const std::exception &ex)
   {
-    ERROR_LOG() << "CmdRemove" << m_uasId << ":" << ex.what();
+    ERROR_LOG(m_logger) << "CmdRemove" << m_uasId << ":" << ex.what();
   }
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/uav_commander_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/uav_commander_impl.h
index 2303d982b..4fe0eb30a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/uav_commander_impl.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/uav_commander_impl.h
@@ -48,6 +48,8 @@ private slots:
   void onStart();
 
 private:
+
+NGL::INGLLogger &m_logger;
   mutable CommunicationMaster<M_ObjectManager::Client, ObjectManager::ReportPoint::Dispatcher> m_master;
   Reader<ObjectManager::ReportPoint::Message> m_reader;
   M_ObjectManager::Client m_writer;
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 a664e83f8..45a37bdef 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
@@ -115,12 +115,12 @@ bool FromTab::txData(const TrainingAreaBase::TetraIcd::Init &data)
 bool FromTab::txData(const TrainingAreaBase::TetraIcd::UAVPerformMission &data)
 {
   const int eqId = data.header.equipmentNumber;
-  DEBUG_LOG() << "eqId: " << eqId;
+  DEBUG_LOG(m_logger) << "eqId: " << eqId;
   const ParticipantManagement::Participant p = m_dtcPpm->participant(m_dtcPpm->participantIdByEquipmentNumber(eqId));
 
   if (p.id() <= 0)
   {
-    WARNING_LOG() << "participant not found - stop";
+    WARNING_LOG(m_logger) << "participant not found - stop";
     return false;
   }
 
@@ -130,7 +130,7 @@ bool FromTab::txData(const TrainingAreaBase::TetraIcd::UAVPerformMission &data)
 
   if (!m_uavIAManager->waypoint(p.id(), action.absPosition, QStringLiteral("%1_%2").arg(data.missionId).arg(data.missionName))) 
   {
-    WARNING_LOG() << "sending waypoint failed!";
+    WARNING_LOG(m_logger) << "sending waypoint failed!";
     return false;
   }
 
@@ -145,7 +145,7 @@ bool FromTab::txData(const TrainingAreaBase::TetraIcd::UAVChangeState &data)
 
   if (p.id() <= 0)
   {
-    WARNING_LOG() << "participant not found - stop";
+    WARNING_LOG(m_logger) << "participant not found - stop";
     return false;
   }
 
@@ -167,23 +167,23 @@ bool FromTab::txData(const TrainingAreaBase::TetraIcd::CesHitRequest &data)
 {
   
 
-  DEBUG_LOG() << "data.chargeTasCodeDirect = " << data.chargeTasCodeDirect;
+  DEBUG_LOG(m_logger) << "data.chargeTasCodeDirect = " << data.chargeTasCodeDirect;
 
   
   if (!m_dtcPdm->isJamming(data.chargeTasCodeDirect,0,0))
   {
-    WARNING_LOG() << "not jamming";
+    WARNING_LOG(m_logger) << "not jamming";
     return false;
   }
 
-  DEBUG_LOG() << "participantEventChanged: JAMMING! chargetasCodeDirect = " << data.chargeTasCodeDirect;
+  DEBUG_LOG(m_logger) << "participantEventChanged: JAMMING! chargetasCodeDirect = " << data.chargeTasCodeDirect;
 
   const int eqId = data.header.equipmentNumber;
   const ParticipantManagement::Participant p = m_dtcPpm->participant(m_dtcPpm->participantIdByEquipmentNumber(eqId));
 
   if (p.id() <= 0)
   {
-    WARNING_LOG() << "participant not found - stop";
+    WARNING_LOG(m_logger) << "participant not found - stop";
     return false;
   }
 
@@ -196,7 +196,7 @@ bool FromTab::txData(const TrainingAreaBase::TetraIcd::CesHitRequest &data)
   msg.vulnerabilityState = TrainingAreaBase::TetraIcd::VulnerabilityState::CatastrophicKill;
   msg.originatorId = data.originatorEquipmentNumber;
 
-  DEBUG_LOG() << "sending state change direct (kill) with jamming for eqId " << msg.header.equipmentNumber;
+  DEBUG_LOG(m_logger) << "sending state change direct (kill) with jamming for eqId " << msg.header.equipmentNumber;
 
   m_sendToDds->rxData(msg);
 
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 2f29564f2..5fda34d4e 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
@@ -84,6 +84,7 @@ Q_SIGNALS:
   void outgoingMessage(const QByteArray &msg);
 
 protected:
+  NGL::INGLLogger &m_logger;
   bool m_isConnected;
   std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_dtcPdm;
   std::shared_ptr<ParticipantManagement::Interface::Dtc> m_dtcPpm;
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 185d0a9af..e5d039b2d 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
@@ -23,9 +23,8 @@
 
 namespace UAS
 {
-TmsIfModuleHandle::TmsIfModuleHandle()
-  : m_handle(ModuleLoader::load(QString(QCoreApplication::applicationDirPath() + QStringLiteral("/../lib/")).toStdString())) 
-{}
+TmsIfModuleHandle::TmsIfModuleHandle() : m_handle(ModuleLoader::load(QString(QCoreApplication::applicationDirPath() + QStringLiteral("/../lib/")).toStdString())),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 
 TmsIfModuleHandle::~TmsIfModuleHandle()
@@ -55,11 +54,11 @@ PluginInstance::PluginInstance(TrainingAreaBase::Plugin::DataProvider *dataProvi
   , m_uavIAManager(new UAVInterfaceAdapterManager(m_ddsHandler, m_sendToDds, m_tmsIfAdapter, m_exerciseId, this))
   , m_fromTab(new FromTab(ddsHandler, m_sendToDds, m_uavIAManager, m_exerciseId))
 {
-  DEBUG_LOG() << "UAS PluginInstance running!";
+  DEBUG_LOG(m_logger) << "UAS PluginInstance running!";
 
   if (!m_dtcPdm)
   {
-    WARNING_LOG() << "m_dtcPdm failed";
+    WARNING_LOG(m_logger) << "m_dtcPdm failed";
     throw std::runtime_error("m_dtcPdm failed");
   }
   m_dtcPdm->enableChargeType(); 
@@ -68,7 +67,7 @@ PluginInstance::PluginInstance(TrainingAreaBase::Plugin::DataProvider *dataProvi
 
   if (!m_dtcPpm)
   {
-    WARNING_LOG() << "m_dtcPpm failed";
+    WARNING_LOG(m_logger) << "m_dtcPpm failed";
     throw std::runtime_error("m_dtcPpm failed");
   }
   m_dtcPpm->enableParticipant(); 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/plugin_instance.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/plugin_instance.h
index 0286fdf0b..7872b5b20 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/plugin_instance.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/plugin_instance.h
@@ -37,6 +37,8 @@ public:
   }
 
 private:
+
+NGL::INGLLogger &m_logger;
   void *m_handle { nullptr };
 };
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia.cpp
index 9d2b04140..450aa10db 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia.cpp
@@ -18,7 +18,7 @@ UAVInterfaceAdapter::UAVInterfaceAdapter(UAVInterfaceAdapterConfig uavConfig, UA
 
 UAVInterfaceAdapter::~UAVInterfaceAdapter()
 {
-  DEBUG_LOG() << "terminating IA for UAV - " << (quintptr)this;
+  DEBUG_LOG(m_logger) << "terminating IA for UAV - " << (quintptr)this;
   delete m_commander;
 }
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia.h
index c31945941..36b1bb869 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia.h
@@ -57,6 +57,8 @@ public:
   UAVCommander &commander() { return *m_commander; }
 
 private:
+
+NGL::INGLLogger &m_logger;
   UAVInterfaceAdapterConfig m_config;
   UAVCommander *m_commander;
 };
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 d35ead2d7..4bfe0e5c0 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
@@ -25,19 +25,18 @@ const int UAVInterfaceAdapterManager::s_domainId = 4;
 
 UAVInterfaceAdapterManager::UAVInterfaceAdapterManager(const std::shared_ptr<TrainingAreaBase::DdsHandler> &ddsHandler,
                                                        const std::shared_ptr<TrainingAreaBase::RecvFromTab> &sendToDds,
-                                                       TmsIfAdapter &tmsIfAdapter, int exerciseId, QObject *parent)
-  : QObject(parent)
+                                                       TmsIfAdapter &tmsIfAdapter, int exerciseId, QObject *parent) : QObject(parent)
   , m_exerciseId(exerciseId)
   , m_dtcPpm(ParticipantManagement::Interface::Dtc::create(ddsHandler->ddsConnector()))
   , m_ftcPpm(ParticipantManagement::Interface::Ftc::create(ddsHandler->ddsConnector()))
   , m_tmsIfAdapter(tmsIfAdapter)
-  , m_sendToDds(sendToDds)
-{}
+  , m_sendToDds(sendToDds),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 
 void UAVInterfaceAdapterManager::init()
 {
-  DEBUG_LOG() << "UAVInterfaceAdapterManager starting for ex " << m_exerciseId;
+  DEBUG_LOG(m_logger) << "UAVInterfaceAdapterManager starting for ex " << m_exerciseId;
 
   m_dtcPpm->waitForHistoricalDataDynamicParticipantData(3000);
   m_dtcPpm->waitForHistoricalDataParticipant(3000);
@@ -80,7 +79,7 @@ void UAVInterfaceAdapterManager::init()
     m_dtcPpm->enableUAS();
   }
 
-  DEBUG_LOG() << "done";
+  DEBUG_LOG(m_logger) << "done";
 }
 
 
@@ -95,21 +94,21 @@ void UAVInterfaceAdapterManager::removed(const ParticipantManagement::UAS &uas)
   
   if (m_uavs.find(uas.id()) != m_uavs.cend())
   {
-    WARNING_LOG() << "tried removing participant " << uas.id() << " that doesn't exist";
+    WARNING_LOG(m_logger) << "tried removing participant " << uas.id() << " that doesn't exist";
     return;
   }
-  DEBUG_LOG() << "UAV with uas id " << uas.id() << " found! removing.....";
+  DEBUG_LOG(m_logger) << "UAV with uas id " << uas.id() << " found! removing.....";
   stop(uas);
 }
 
 
 void UAVInterfaceAdapterManager::modified(const ParticipantManagement::UAS &uas)
 {
-  DEBUG_LOG() << "modify uas " << uas.id();
+  DEBUG_LOG(m_logger) << "modify uas " << uas.id();
   
   if (uas.participantId() <= 0)
   {
-    WARNING_LOG() << "UAV with uas id " << uas.id() << " not a UAV anymore - removing";
+    WARNING_LOG(m_logger) << "UAV with uas id " << uas.id() << " not a UAV anymore - removing";
     stop(uas); 
     return;
   }
@@ -121,14 +120,14 @@ void UAVInterfaceAdapterManager::modified(const ParticipantManagement::UAS &uas)
   const auto i = m_uavs.find(uasId);
   if (i == m_uavs.cend())
   {
-    WARNING_LOG() << "UAV with uas id " << uas.id() << " was modified but now found in our list - feeding it as 'added' instead as a bail-out";
+    WARNING_LOG(m_logger) << "UAV with uas id " << uas.id() << " was modified but now found in our list - feeding it as 'added' instead as a bail-out";
     added(uas); 
     return;
   }
 
   const UAVInterfaceAdapter &uav2 = *i->second;
 
-  DEBUG_LOG() << "UAV with uas id " << uas.id() << " found";
+  DEBUG_LOG(m_logger) << "UAV with uas id " << uas.id() << " found";
 
   try
   {
@@ -136,7 +135,7 @@ void UAVInterfaceAdapterManager::modified(const ParticipantManagement::UAS &uas)
 
     if (uav2.config() == config)
     {
-      DEBUG_LOG() << "UAV with uas id " << uas.id() << " already running and config has not changed - doing nothing (irrelevant data has changed)";
+      DEBUG_LOG(m_logger) << "UAV with uas id " << uas.id() << " already running and config has not changed - doing nothing (irrelevant data has changed)";
       return;
     }
 
@@ -149,14 +148,14 @@ void UAVInterfaceAdapterManager::modified(const ParticipantManagement::UAS &uas)
   }
   catch(const std::exception &ex)
   {
-    WARNING_LOG() << "Failed to modify UAV: " << ex.what();
+    WARNING_LOG(m_logger) << "Failed to modify UAV: " << ex.what();
   }
 }
 
 
 void UAVInterfaceAdapterManager::added(const ParticipantManagement::UAS &uas)
 {
-  DEBUG_LOG() << "exId: " << m_exerciseId << ", uas: " << uas.id() << ", participantId: " << uas.participantId()<<" ## use tcp ? "<<uas.useTcp();
+  DEBUG_LOG(m_logger) << "exId: " << m_exerciseId << ", uas: " << uas.id() << ", participantId: " << uas.participantId()<<" ## use tcp ? "<<uas.useTcp();
 
   const auto participant = m_dtcPpm->participant(uas.participantId());
 
@@ -170,17 +169,17 @@ void UAVInterfaceAdapterManager::added(const ParticipantManagement::UAS &uas)
     return;
   }
 
-  DEBUG_LOG() << "added uav with id " << uas.id() << " for pId " << uas.participantId();
+  DEBUG_LOG(m_logger) << "added uav with id " << uas.id() << " for pId " << uas.participantId();
 
   if (m_uavs.find(uas.id()) != m_uavs.cend())
   {
     
-    DEBUG_LOG() << "participant " << uas.id() << " already started - doing nothing";
+    DEBUG_LOG(m_logger) << "participant " << uas.id() << " already started - doing nothing";
     return;
   }
 
-  DEBUG_LOG() << "############# ALLES OKAY uas: " << uas.id() << " - pId: " << uas.participantId();
-  DEBUG_LOG() << "UAV with uas id " << uas.id() << " found";
+  DEBUG_LOG(m_logger) << "############# ALLES OKAY uas: " << uas.id() << " - pId: " << uas.participantId();
+  DEBUG_LOG(m_logger) << "UAV with uas id " << uas.id() << " found";
 
   try
   {
@@ -189,7 +188,7 @@ void UAVInterfaceAdapterManager::added(const ParticipantManagement::UAS &uas)
   }
   catch (const std::exception &ex)
   {
-    WARNING_LOG() << "Failed to start uav ia: " << ex.what();
+    WARNING_LOG(m_logger) << "Failed to start uav ia: " << ex.what();
   }
 }
 
@@ -212,7 +211,7 @@ void UAVInterfaceAdapterManager::start(const ParticipantManagement::UAS &uas, UA
     const int droneDomainId = s_domainId;
     const bool useTcp = uas.useTcp();
 
-    DEBUG_LOG() << "starting IA for eqId = " << droneEqId << ", pid = " << droneParticipantId << ", domain = " << droneDomainId << ", uasId = " << uasId<<"  // ** useTcp: "<<uas.useTcp();
+    DEBUG_LOG(m_logger) << "starting IA for eqId = " << droneEqId << ", pid = " << droneParticipantId << ", domain = " << droneDomainId << ", uasId = " << uasId<<"  // ** useTcp: "<<uas.useTcp();
 
     auto *uav = m_tmsIfAdapter.createUAV(droneDomainId, uasId); 
 
@@ -221,13 +220,13 @@ void UAVInterfaceAdapterManager::start(const ParticipantManagement::UAS &uas, UA
 
     const auto fn = [this, droneDomainId, droneParticipantId, droneEqId, useTcp]()
     {
-      DEBUG_LOG() << "UAV " << droneDomainId << " / " << droneParticipantId <<"  / use TCP ? "<<useTcp<< " ready !!"; 
+      DEBUG_LOG(m_logger) << "UAV " << droneDomainId << " / " << droneParticipantId <<"  / use TCP ? "<<useTcp<< " ready !!"; 
 
       const auto pdata = m_dtcPpm->dynamicParticipantData(droneParticipantId);
 
       if (pdata.participantId() < 1 || pdata.stateHistory().empty()) 
       {
-        DEBUG_LOG() << "pdata or state history for pid " << droneParticipantId << " is empty - sending init";
+        DEBUG_LOG(m_logger) << "pdata or state history for pid " << droneParticipantId << " is empty - sending init";
 
         TrainingAreaBase::TetraIcd::StateChange msg;
         msg.header.equipmentNumber = droneEqId;
@@ -240,11 +239,11 @@ void UAVInterfaceAdapterManager::start(const ParticipantManagement::UAS &uas, UA
 
         m_sendToDds->rxData(msg);
 
-        DEBUG_LOG() << "sent combat ready for " << droneParticipantId << " - done";
+        DEBUG_LOG(m_logger) << "sent combat ready for " << droneParticipantId << " - done";
       }
       else
       {
-        WARNING_LOG() << "state history for pid " << droneParticipantId << " not empty - nothing to do";
+        WARNING_LOG(m_logger) << "state history for pid " << droneParticipantId << " not empty - nothing to do";
       }
     };
     uav->set_isReady_Callback(fn);
@@ -259,7 +258,7 @@ void UAVInterfaceAdapterManager::start(const ParticipantManagement::UAS &uas, UA
       msg.header.timeStamp =  QDateTime::currentMSecsSinceEpoch(); 
       msg.geoPosition = { data.lon * LtsCoordTrans::deg2rad(), data.lat * LtsCoordTrans::deg2rad(), data.alt }; 
 
-      DEBUG_LOG() << "POSITION! sending PositionReport into TAB"; 
+      DEBUG_LOG(m_logger) << "POSITION! sending PositionReport into TAB"; 
 
       m_sendToDds->rxData(msg);
     });
@@ -317,19 +316,19 @@ void UAVInterfaceAdapterManager::start(const ParticipantManagement::UAS &uas, UA
       }
 
       m_sendToDds->rxData(msg);
-      DEBUG_LOG() << "RadioLinkConnectionState! sending RadioLinkConnectionState into TAB"; 
+      DEBUG_LOG(m_logger) << "RadioLinkConnectionState! sending RadioLinkConnectionState into TAB"; 
     });
 
 
     uav->set_ReportRadioLinkConnectionState_Callback([this, droneEqId](const TeleOperation::RadioLinkConnectionState::Message &data)
     {
-      DEBUG_LOG() << "COULD! send  RadioLinkConnectionState! sending RadioLinkConnectionState into TAB << " << droneEqId  << " " << data.status; 
+      DEBUG_LOG(m_logger) << "COULD! send  RadioLinkConnectionState! sending RadioLinkConnectionState into TAB << " << droneEqId  << " " << data.status; 
     });
 
 
     uav->set_ReportMissionStatus_Callback([this, droneEqId](const MissionCtrl::ReportMissionStatus::Message &data)
     {
-      DEBUG_LOG() << "ReportMissionStatus! sending ReportMissionStatus into TAB << " << droneEqId  << " - currentTask = " << (int)data.currentTask << ", currentMission = " << data.currentMissionName;
+      DEBUG_LOG(m_logger) << "ReportMissionStatus! sending ReportMissionStatus into TAB << " << droneEqId  << " - currentTask = " << (int)data.currentTask << ", currentMission = " << data.currentMissionName;
 
       TrainingAreaBase::TetraIcd::UAVMissionStatus msg;
       msg.header.equipmentNumber = droneEqId;
@@ -345,7 +344,7 @@ void UAVInterfaceAdapterManager::start(const ParticipantManagement::UAS &uas, UA
       case MissionCtrl::Task::Connect: msg.currentAction = TrainingAreaBase::TetraIcd::UAVActionTask::Connect; break;
       case MissionCtrl::Task::Loiter: msg.currentAction = TrainingAreaBase::TetraIcd::UAVActionTask::Loiter; break;
       case MissionCtrl::Task::Return: msg.currentAction = TrainingAreaBase::TetraIcd::UAVActionTask::Return;
-        DEBUG_LOG() << "Return";
+        DEBUG_LOG(m_logger) << "Return";
         setMissionActionFulfilled(droneEqId);
         break;
       case MissionCtrl::Task::Observe: msg.currentAction = TrainingAreaBase::TetraIcd::UAVActionTask::Observe; break;
@@ -358,23 +357,23 @@ void UAVInterfaceAdapterManager::start(const ParticipantManagement::UAS &uas, UA
 
     uav->startIA(config.m_ip.toStdString(), config.m_port, config.m_useTcp);
 
-    DEBUG_LOG() << "DONE STARTING UAV!";
+    DEBUG_LOG(m_logger) << "DONE STARTING UAV!";
   }
   catch (const std::exception &ex)
   {
     
-    WARNING_LOG() << "Failed to start UAV: " << ex.what();
+    WARNING_LOG(m_logger) << "Failed to start UAV: " << ex.what();
   }
 }
 
 
 void UAVInterfaceAdapterManager::stop(const ParticipantManagement::UAS &uas)
 {
-  DEBUG_LOG() << "############################### STOP !! " << uas.id();
+  DEBUG_LOG(m_logger) << "############################### STOP !! " << uas.id();
   auto it = m_uavs.find(uas.id());
   if (it == m_uavs.cend())
   {
-    DEBUG_LOG() << "uav not found - ignoring :/";
+    DEBUG_LOG(m_logger) << "uav not found - ignoring :/";
     return;
   }
   it->second->deleteLater();
@@ -388,7 +387,7 @@ bool UAVInterfaceAdapterManager::kill(int participantId)
 
   if (uas.id() < 1)
   {
-    DEBUG_LOG() << "uas by participant id " << participantId << " not found - stop";
+    DEBUG_LOG(m_logger) << "uas by participant id " << participantId << " not found - stop";
     return false;
   }
 
@@ -396,7 +395,7 @@ bool UAVInterfaceAdapterManager::kill(int participantId)
 
   if (i == m_uavs.cend())
   {
-    DEBUG_LOG() << "uav by participant id " << participantId << " not found - stop";
+    DEBUG_LOG(m_logger) << "uav by participant id " << participantId << " not found - stop";
     return false;
   }
 
@@ -413,7 +412,7 @@ bool UAVInterfaceAdapterManager::waypoint(int participantId, TrainingAreaBase::T
 
   if (uas.id() < 1)
   {
-    DEBUG_LOG() << "uas by participant id " << participantId << " not found - stop";
+    DEBUG_LOG(m_logger) << "uas by participant id " << participantId << " not found - stop";
     return false;
   }
 
@@ -421,11 +420,11 @@ bool UAVInterfaceAdapterManager::waypoint(int participantId, TrainingAreaBase::T
 
   if (i == m_uavs.cend())
   {
-    DEBUG_LOG() << "uav by participant id " << participantId << " not found - stop";
+    DEBUG_LOG(m_logger) << "uav by participant id " << participantId << " not found - stop";
 
     for (const auto &uav : m_uavs)
     {
-      DEBUG_LOG() << "pid: " << uav.first;
+      DEBUG_LOG(m_logger) << "pid: " << uav.first;
     }
 
     return false;
@@ -433,7 +432,7 @@ bool UAVInterfaceAdapterManager::waypoint(int participantId, TrainingAreaBase::T
 
   if (i->second == nullptr)
   {
-    WARNING_LOG() << "UAVInterfaceAdapterManager::waypoint: NULLPTR for "<<participantId;
+    WARNING_LOG(m_logger) << "UAVInterfaceAdapterManager::waypoint: NULLPTR for "<<participantId;
     return false;
   }
 
@@ -447,7 +446,7 @@ bool UAVInterfaceAdapterManager::waypoint(int participantId, TrainingAreaBase::T
   }
   catch (const std::exception& e)
   {
-    WARNING_LOG() << "UAVInterfaceAdapterManager::waypoint: " << e.what();
+    WARNING_LOG(m_logger) << "UAVInterfaceAdapterManager::waypoint: " << e.what();
     return false;
   }
 }
@@ -457,7 +456,7 @@ void UAVInterfaceAdapterManager::setMissionActionFulfilled(int equipmentNumber)
 {
   
 
-  DEBUG_LOG() << "setMissionActionFulfilled equipmentId=" << equipmentNumber;
+  DEBUG_LOG(m_logger) << "setMissionActionFulfilled equipmentId=" << equipmentNumber;
 
   const int missionId = m_dtcPpm->uasMissionIdByEquipmentNumber(equipmentNumber); 
 
@@ -472,7 +471,7 @@ void UAVInterfaceAdapterManager::setMissionActionFulfilled(int equipmentNumber)
   }
   catch (const std::exception &e)
   {
-    WARNING_LOG() << " -- unable to abort mission with planId:"<<abortReq.missionId() << ": " << e.what();
+    WARNING_LOG(m_logger) << " -- unable to abort mission with planId:"<<abortReq.missionId() << ": " << e.what();
   } 
 
   return;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia_manager.h
index b74f33309..9d465f7c7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia_manager.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia_manager.h
@@ -50,6 +50,8 @@ public:
   bool tryChangeModeToAuto(int participantId);
   
 private:
+  
+NGL::INGLLogger &m_logger;
   void removed(const ParticipantManagement::UAS &uas);
   void modified(const ParticipantManagement::UAS &uas);
   void added(const ParticipantManagement::UAS &uas);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_dispatcher.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_dispatcher.h
index 9b38fd2ec..00421424c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_dispatcher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/main_dispatcher.h
@@ -32,6 +32,8 @@ public:
   const char *name() const override { return tr_lts("dds", "WlsTetra"); }
 
 private:
+
+NGL::INGLLogger &m_logger;
   WlsDispatcher *m_wlsDispatcher;
   TetraDispatcher *m_tetraDispatcher;
 
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 7b3592057..3880c6042 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
@@ -250,7 +250,7 @@ bool MainHandlerTx::txData(const TetraIcd::Sanitation &data)
 
 bool MainHandlerTx::txData(const TetraIcd::SelectiveReammunition &data)
 {
-  DEBUG_LOG() << "MainHandlerTx::txData SelectiveReammunition";
+  DEBUG_LOG(m_logger) << "MainHandlerTx::txData SelectiveReammunition";
   return sendToTxMixin(&data);
 }
 bool MainHandlerTx::txData(const TetraIcd::SetDevicePowerRequest &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 72e7e177a..8d6f74066 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
@@ -64,9 +64,11 @@ public:
   bool txData(const TrainingAreaBase::TetraIcd::SetDevicePowerRequest &data) override;
   bool txData(const TrainingAreaBase::TetraIcd::UAVPerformMission &data) override;
 private:
+  NGL::INGLLogger &m_logger;
   template <typename T>
   bool sendToTxMixin(const T *data);
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<WlsHandlerTx> m_wlsHandlerTx;
   std::shared_ptr<TetraHandlerTx> m_tetraHandlerTx;
 };
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 5a370f73b..2d2e00b51 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
@@ -90,7 +90,7 @@ void TetraDispatcher::onSendInitialData()
   m_txHandler->setConnected(true);
   if (m_dataProvider)
   {
-    INFO_LOG() << "sending initial data";
+    INFO_LOG(m_logger) << "sending initial data";
     
     if (m_dataProvider->exerciseId() > 0)
     {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_dispatcher.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_dispatcher.h
index 63d6a9b87..d61a0d361 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_dispatcher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_dispatcher.h
@@ -39,6 +39,7 @@ public:
   const char *name() const override { return tr_lts("dds", "TETRA"); }
 
 private:
+  NGL::INGLLogger &m_logger;
   bool init(PrtCnv::PrtCnvApplication *prtCnvApp);
 
 private Q_SLOTS:
@@ -46,9 +47,11 @@ private Q_SLOTS:
   void onSendInitialData();
 
 private:
+  NGL::INGLLogger &m_logger;
   void disconnectSocket(QWebSocket *s);
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<TetraHandlerRx> m_rxHandler;
   std::shared_ptr<TetraHandlerTx> m_txHandler;
   TetraPrtCnv *m_tetraPrtCnv;
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 ff63a0c27..0f568d116 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
@@ -10,13 +10,12 @@
 namespace WlsTetra
 {
 
-TetraHandlerRx::TetraHandlerRx(const std::shared_ptr<TrainingAreaBase::RecvFromTab> &rxHandler)
-  : m_rxHandler(rxHandler)
+TetraHandlerRx::TetraHandlerRx(const std::shared_ptr<TrainingAreaBase::RecvFromTab> &rxHandler) : m_rxHandler(rxHandler)
   , m_ackTimer(new QTimer(this))
   , m_receiveCounter(0)
   , m_bWarnedOnce(false)
-  , m_bWaitForInitialAck(true)
-{
+  , m_bWaitForInitialAck(true),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_ackTimer->setInterval(1000);
   m_ackTimer->setSingleShot(false);
   connect(m_ackTimer, &QTimer::timeout,
@@ -37,14 +36,14 @@ bool TetraHandlerRx::handleTelegram(const QByteArray &baJson)
     if (!sendCounter.isDouble())
       return false;
     m_receiveCounter = sendCounter.toInt(-1);
-    DEBUG_LOG() << "Incoming telegram with Id " << obj.value(QStringLiteral("type")).toString();
+    DEBUG_LOG(m_logger) << "Incoming telegram with Id " << obj.value(QStringLiteral("type")).toString();
     if (m_receiveCounter < 0)
       return false;
   }
   const QJsonValue typeId = obj.value(QStringLiteral("typeId"));
   if (!typeId.isDouble())
   {
-    ERROR_LOG() << "Can not read type id: " << baJson;
+    ERROR_LOG(m_logger) << "Can not read type id: " << baJson;
     return false;
   }
   const QJsonObject data = obj.value(QStringLiteral("data")).toObject();
@@ -167,14 +166,14 @@ bool TetraHandlerRx::handleTelegram(const QByteArray &baJson)
       emit participantLicenseChange(ParticipantLicenseChange::fromJson(data));
       break;
     default:
-      WARNING_LOG() << "Handler for telegram Id " << typeId.toInt()
+      WARNING_LOG(m_logger) << "Handler for telegram Id " << typeId.toInt()
                             << " not yet implemented (" << baJson << ")";
       return false;
     }
   }
   catch (const std::exception &e)
   {
-    WARNING_LOG() << "Could not parse json: " << e.what() << " (" << baJson << ")";
+    WARNING_LOG(m_logger) << "Could not parse json: " << e.what() << " (" << baJson << ")";
     return false;
   }
   return true;
@@ -182,7 +181,7 @@ bool TetraHandlerRx::handleTelegram(const QByteArray &baJson)
 
 void TetraHandlerRx::handleAcknowledge(qint64 timeStamp, int counter)
 {
-  TRACE_LOG() << "Ack from Socket for time " << timeStamp
+  TRACE_LOG(m_logger) << "Ack from Socket for time " << timeStamp
                       << " with counter " << counter
                       << ", initial: " << m_bWaitForInitialAck;
   if (m_bWaitForInitialAck)
@@ -209,7 +208,7 @@ void TetraHandlerRx::rxData(const T &data)
   {
     if (!m_bWarnedOnce)
     {
-      ERROR_LOG() << "No RecvFromTab available";
+      ERROR_LOG(m_logger) << "No RecvFromTab available";
       m_bWarnedOnce = true;
     }
     return;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_rx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_rx.h
index 3dbb728e5..bb424b5d3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_rx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_handler_rx.h
@@ -33,6 +33,7 @@ private:
   void rxData(const T &data);
 
 protected:
+  NGL::INGLLogger &m_logger;
   const std::shared_ptr<TrainingAreaBase::RecvFromTab> m_rxHandler;
   QTimer *m_ackTimer;
   int m_receiveCounter;
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 c263b9465..aa040b83e 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
@@ -40,14 +40,14 @@ bool TetraHandlerTx::sendTele(const QByteArray &ba)
   const QJsonValue typeId = obj[QStringLiteral("typeId")];
   if (typeId.toInt() == TrainingAreaBase::TetraIcd::TelegramId::BESTAETIGUNG)
   {
-    TRACE_LOG() << "Outgoing ack";
+    TRACE_LOG(m_logger) << "Outgoing ack";
     emit outgoingMessage(ba);
     return true;
   }
 
   obj[QStringLiteral("counter")] = m_sendCounter++;
   const QByteArray baToSend = QJsonDocument(obj).toJson(QJsonDocument::Compact);
-  DEBUG_LOG() << "Outgoing message: " << typeId.toInt();
+  DEBUG_LOG(m_logger) << "Outgoing message: " << typeId.toInt();
   emit outgoingMessage(baToSend);
   return true;
 }
@@ -234,7 +234,7 @@ bool TetraHandlerTx::txData(const TrainingAreaBase::TetraIcd::Sanitation &data)
 
 bool TetraHandlerTx::txData(const TrainingAreaBase::TetraIcd::SelectiveReammunition &data)
 {
-  DEBUG_LOG() << " TetraHandlerTx::txData: SelectiveReammunition";
+  DEBUG_LOG(m_logger) << " TetraHandlerTx::txData: SelectiveReammunition";
   return sendToTx(&data);
 }
 
@@ -261,7 +261,7 @@ bool TetraHandlerTx::sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTele
     obj[QStringLiteral("counter")] = m_sendCounter++;
   const QByteArray ba = QJsonDocument(obj).toJson(QJsonDocument::Compact);
   if (data->id() != TrainingAreaBase::TetraIcd::TelegramId::BESTAETIGUNG)
-    DEBUG_LOG() << "Sending tele: " << ba;
+    DEBUG_LOG(m_logger) << "Sending tele: " << ba;
   emit outgoingMessage(ba);
   return true;
 }
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 1aa5449eb..4c07577a3 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
@@ -67,7 +67,9 @@ public:
 Q_SIGNALS:
   void outgoingMessage(const QByteArray &msg);
 protected:
+  NGL::INGLLogger &m_logger;
 protected:
+  NGL::INGLLogger &m_logger;
   int m_sendCounter = 1;
   bool m_bConnected = false;
 };
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 93849de9d..f5203d238 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
@@ -43,7 +43,7 @@ void TetraPrtCnv::onExerciseChanged()
 {
   if (m_pdp->exerciseRadioGroup().id() != m_radioGrpId) 
     if (!updatePrtCnv())
-      ERROR_LOG() << "Error changing PrtCnv state from radio grp id: "
+      ERROR_LOG(m_logger) << "Error changing PrtCnv state from radio grp id: "
                           << m_radioGrpId
                           << " to " << m_pdp->exerciseRadioGroup().id();
 }
@@ -72,7 +72,7 @@ bool TetraPrtCnv::updatePrtCnv()
     if (!QFile::copy(QStringLiteral(":/PrtCnv.dat"), iniFileOut()) ||
         !QFile::setPermissions(iniFileOut(), QFile::ReadOwner | QFile::WriteOwner))
     {
-      ERROR_LOG() << "Error creating ini file for PrtCnv: " << iniFileOut();
+      ERROR_LOG(m_logger) << "Error creating ini file for PrtCnv: " << iniFileOut();
       return false;
     }
 
@@ -112,10 +112,10 @@ bool TetraPrtCnv::checkConfigTemplates()
 {
   if (!QFile::exists(playerIdsFile()))
   {
-    INFO_LOG() << "Creating " << playerIdsFile();
+    INFO_LOG(m_logger) << "Creating " << playerIdsFile();
     if (!QFile::copy(QStringLiteral(":/playerIds.dat"), playerIdsFile()))
     {
-      ERROR_LOG() << "Error creating " << playerIdsFile();
+      ERROR_LOG(m_logger) << "Error creating " << playerIdsFile();
       return false;
     }
     else
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_prtcnv.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_prtcnv.h
index 16099c93d..370be53ae 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_prtcnv.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/tetra_prtcnv.h
@@ -31,6 +31,7 @@ Q_SIGNALS:
   void textMessageToPrtCnv(const QByteArray &message);
   void broadcastTelegramsRequest(int equipmentNumber, int broadcastIndex, int resetCounter);
 private:
+NGL::INGLLogger &m_logger;
   void cleanupProcess();
   static QString iniFileIn();
   QString iniFileOut() const;
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 4379165a3..f3a8dc3a5 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
@@ -67,7 +67,7 @@ void WlsDispatcher::onWlsConnected()
 
 void WlsDispatcher::onWlsDisconnected()
 {
-  INFO_LOG() << "Wls socket disconnected";
+  INFO_LOG(m_logger) << "Wls socket disconnected";
   m_webSocketReconnectTimer->start(5000);
   m_sendToWls->onWlsDisconnected();
 
@@ -85,7 +85,7 @@ void WlsDispatcher::onWebSocketError()
   if (!m_webSocket)
     return;
   if (!m_bWarnedOnce)
-    WARNING_LOG() << "Error connecting to " << webSocketUrl().toString() << ": " << m_webSocket->errorString();
+    WARNING_LOG(m_logger) << "Error connecting to " << webSocketUrl().toString() << ": " << m_webSocket->errorString();
   m_webSocket->close();
   m_webSocketReconnectTimer->start(5000);
   m_bWarnedOnce = true;
@@ -101,7 +101,7 @@ void WlsDispatcher::onTextMessageReceived(const QString &message)
 
 void WlsDispatcher::onParticipantLicenseChange(const TrainingAreaBase::TetraIcd::ParticipantLicenseChange &lc)
 {
-  INFO_LOG() << "onParticipantLicenseChange id=" << lc.id()
+  INFO_LOG(m_logger) << "onParticipantLicenseChange id=" << lc.id()
                       << " equipmentNumber=" << lc.equipmentNumber;
   m_recvFromWls->participantLicenseChange(lc);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_dispatcher.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_dispatcher.h
index 59ef79280..b8f171dd6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_dispatcher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_dispatcher.h
@@ -43,8 +43,10 @@ Q_SIGNALS:
   void wlsTelegramReceived(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *tele);
   void wlsTelegramSent(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *tele);
 private:
+  NGL::INGLLogger &m_logger;
   QUrl webSocketUrl() const;
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<TrainingAreaBase::RecvFromTab> m_recvFromTabCb;
   std::shared_ptr<WlsHandlerRx> m_recvFromWls;
   std::shared_ptr<WlsHandlerTx> m_sendToWls;
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 fa0ccb886..2f299fe14 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
@@ -15,11 +15,10 @@ namespace WlsTetra
 {
 
 WlsHandlerRx::WlsHandlerRx(const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb,
-                           WlsDispatcher *dispatcher)
-  : m_rxHandler(recvFromTabCb)
+                           WlsDispatcher *dispatcher) : m_rxHandler(recvFromTabCb)
   , m_dispatcher(dispatcher)
-  , m_bWarnedOnce(false)
-{}
+  , m_bWarnedOnce(false),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 bool WlsHandlerRx::handleTelegram(const QByteArray &baJson)
 {
@@ -28,7 +27,7 @@ bool WlsHandlerRx::handleTelegram(const QByteArray &baJson)
   if (baJson.isEmpty())
     return false;
   const QJsonObject obj = QJsonDocument::fromJson(baJson).object();
-  TRACE_LOG() << "incoming telegram: " << baJson;
+  TRACE_LOG(m_logger) << "incoming telegram: " << baJson;
 
 
 
@@ -43,7 +42,7 @@ bool WlsHandlerRx::handleTelegram(const QByteArray &baJson)
   const QJsonValue typeId = obj.value(QStringLiteral("typeId"));
   if (!typeId.isDouble())
   {
-    ERROR_LOG() << "Can not read type id: " << baJson;
+    ERROR_LOG(m_logger) << "Can not read type id: " << baJson;
     return false;
   }
   const QJsonObject data = obj.value(QStringLiteral("data")).toObject();
@@ -70,7 +69,7 @@ bool WlsHandlerRx::handleTelegram(const QByteArray &baJson)
   }
   catch (const std::exception &e)
   {
-    WARNING_LOG() << "Could not parse json: " << e.what() << " (" << baJson << ")";
+    WARNING_LOG(m_logger) << "Could not parse json: " << e.what() << " (" << baJson << ")";
     return false;
   }
   return true;
@@ -187,7 +186,7 @@ bool WlsHandlerRx::handleTelegram(TrainingAreaBase::TetraIcd::TrainingAreaTelegr
     rxData(toSpecialized<ParticipantConfigurationReport>(tabTele));
     break;
   default:
-    ERROR_LOG() << "WlsHandlerRx::handleTelegram no Handler for " << tabTele->id();
+    ERROR_LOG(m_logger) << "WlsHandlerRx::handleTelegram no Handler for " << tabTele->id();
     return false;
   }
   return true;
@@ -210,7 +209,7 @@ void WlsHandlerRx::sfmData(const TrainingAreaBase::TetraIcd::WlsBinarySfmData &d
 {
   if (data.payload.size() < 2)
   {
-    ERROR_LOG() << "Invalid binary data from WLS: " << QJsonDocument(data.toJson()).toJson(QJsonDocument::Compact);
+    ERROR_LOG(m_logger) << "Invalid binary data from WLS: " << QJsonDocument(data.toJson()).toJson(QJsonDocument::Compact);
     return;
   }
 
@@ -222,7 +221,7 @@ void WlsHandlerRx::sfmData(const TrainingAreaBase::TetraIcd::WlsBinarySfmData &d
   TrainingAreaBase::TetraIcd::TrainingAreaTelegram *tabTele = CoPrtCnvTelegramConverter::convertToTabTele(&radio);
   if (!tabTele)
   {
-    WARNING_LOG() << "Can not convert binary sfm data to a valid tetra telegram - ignoring ("
+    WARNING_LOG(m_logger) << "Can not convert binary sfm data to a valid tetra telegram - ignoring ("
                           << data.header.equipmentNumber << "): " << QByteArray::fromRawData(reinterpret_cast<const char *>(data.payload.data()),
                                                                                              data.payload.size()).toHex();
     return;
@@ -238,7 +237,7 @@ void WlsHandlerRx::rxData(const T &data)
   {
     if (!m_bWarnedOnce)
     {
-      ERROR_LOG() << "No RecvFromTab available";
+      ERROR_LOG(m_logger) << "No RecvFromTab available";
       m_bWarnedOnce = true;
     }
     return;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_rx.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_rx.h
index 5321b2f41..1611b7480 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_rx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/wls_handler_rx.h
@@ -27,11 +27,13 @@ public:
 Q_SIGNALS:
   void participantConnectionState(int equipmentNumber, bool dataCommunicationPossible);
 private:
+  NGL::INGLLogger &m_logger;
   void sfmData(const TrainingAreaBase::TetraIcd::WlsBinarySfmData &data);
 
   template<typename T>
   void rxData(const T &data);
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<TrainingAreaBase::RecvFromTab> m_rxHandler;
   QSet<int> m_licensedEquipmentNumbers;
   WlsDispatcher *m_dispatcher;
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 79f3179f5..09d9c03c1 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
@@ -301,7 +301,7 @@ bool WlsHandlerTx::txData(const TrainingAreaBase::TetraIcd::UAVPerformMission &d
 
 void WlsHandlerTx::onParticipantConnectionState(int equipmentNumber, bool dataCommunicationPossible)
 {
-  DEBUG_LOG() << "onParticipantConnectionState - " << equipmentNumber
+  DEBUG_LOG(m_logger) << "onParticipantConnectionState - " << equipmentNumber
                       << ", communication possible: " << dataCommunicationPossible;
   m_dataCommunicationPossible[equipmentNumber] = dataCommunicationPossible;
 }
@@ -342,7 +342,7 @@ bool WlsHandlerTx::sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTelegr
   
   const QByteArray ba = QJsonDocument(obj).toJson(QJsonDocument::Compact);
   if (data->id() != TrainingAreaBase::TetraIcd::TelegramId::BESTAETIGUNG)
-    DEBUG_LOG() << "Sending tele: " << ba;
+    DEBUG_LOG(m_logger) << "Sending tele: " << ba;
   m_webSocket->sendTextMessage(QString::fromUtf8(ba));
   if (!bIsAlreadyLogged)
     emit m_dispatcher->wlsTelegramSent(data);
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 1e52304ed..de81c6d1f 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
@@ -68,12 +68,14 @@ public:
 public Q_SLOTS:
   void onParticipantConnectionState(int equipmentNumber, bool dataCommunicationPossible);
 private:
+  NGL::INGLLogger &m_logger;
   template <typename T>
   bool sendToTxBinary(const T *data);
   bool sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data,
                 bool bForce = false,
                 bool bIsAlreadyLogged = false);
 private:
+  NGL::INGLLogger &m_logger;
   QHash<int, bool> m_dataCommunicationPossible; 
   TrainingAreaBase::Plugin::DataProvider *m_pdp;
   QWebSocket *m_webSocket;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/client_message.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/client_message.cpp
index fdf4922db..cdaefc802 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/client_message.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/client_message.cpp
@@ -46,9 +46,8 @@ ClientMessage::ClientMessage(DataManager *dataManager, LtsWebSocket::ReplyHandle
 
 
 
-SendBiteRequest::SendBiteRequest(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const int typeId, const QString &uuid, const QJsonValue &data)
-  : ClientMessage(dataManager, client, type, typeId, uuid, data)
-{}
+SendBiteRequest::SendBiteRequest(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const int typeId, const QString &uuid, const QJsonValue &data) : ClientMessage(dataManager, client, type, typeId, uuid, data),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 void SendBiteRequest::process()
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/websocket_interface_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/websocket_interface_handler.cpp
index 3572a6f82..82343a9fb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/websocket_interface_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/websocket_interface_handler.cpp
@@ -31,7 +31,7 @@ bool WebSocketInterfaceHandler::init()
 {
   cleanup();
 
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "... ok";
 
   m_dataManager = new DataManager(m_mainHandler);
 
@@ -39,16 +39,16 @@ bool WebSocketInterfaceHandler::init()
 
   m_webSocketServer = new LtsWebSocket::LtsWebSocketServer(m_messageFactory, this);
 
-  DEBUG_LOG() << "Initialising LtsWebSocketServer";
+  DEBUG_LOG(m_logger) << "Initialising LtsWebSocketServer";
   if (!m_webSocketServer->init(QStringLiteral("TAB"), Settings::getWebSocketServerPortRange(1)))
   {
-    ERROR_LOG() << "Failed to initialise LtsWebSocketServer";
+    ERROR_LOG(m_logger) << "Failed to initialise LtsWebSocketServer";
     return false;
   }
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "... ok";
 
-  DEBUG_LOG() << "Connection signals and slots";
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "Connection signals and slots";
+  DEBUG_LOG(m_logger) << "... ok";
 
 
   return true;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/dds_handler.cpp
index d870f9865..91f4325b2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/dds_handler.cpp
@@ -12,12 +12,11 @@
 namespace TrainingAreaBase
 {
 
-DdsHandler::DdsHandler(int domainId, int exerciseId)
-  : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId))  
+DdsHandler::DdsHandler(int domainId, int exerciseId) : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId))  
   , m_curMSecSinceEpoch(0)
-  , m_exerciseId(exerciseId)
-{
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  , m_exerciseId(exerciseId),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 DdsHandler::~DdsHandler()
@@ -39,7 +38,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -73,11 +72,11 @@ bool DdsHandler::init(const QStringList &qosFileList)
                                                                 DDS::Helper::getShortTopicName(DDS::topic_type_name<TrainingAreaBase::EmergencyCall>::value()));
 
 
-  INFO_LOG() << "Dts TrainingAreaBase initialised";
+  INFO_LOG(m_logger) << "Dts TrainingAreaBase initialised";
 
   m_ftsTab = TrainingAreaBase::Interface::Fts::create(m_ddsConnector);
   bRet &= m_ftsTab->enableAll();
-  INFO_LOG() << "Fts TrainingAreaBase initialised";
+  INFO_LOG(m_logger) << "Fts TrainingAreaBase initialised";
 
   m_ftcPpm = ParticipantManagement::Interface::Ftc::create(m_ddsConnector);
   bRet &= m_ftcPpm->enableSetMissionActionFulfilled();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/dds_handler.h
index 7a12ca546..20e23ca0a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/dds_handler.h
@@ -47,6 +47,7 @@ public:
   int    getExerciseId() const { return m_exerciseId;}
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector>       m_ddsConnector;  
   std::shared_ptr<DTC::PartitionTimeImpl>           m_dtcPartitionTime;
   std::shared_ptr<Core::Pacemaker>                  m_pacemaker;
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 10fdb6511..2f19c2cce 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
@@ -20,7 +20,7 @@ bool ExmHandler::init()
           this, &ExmHandler::exerciseChanged);
   if (!m_exmDtc->enableExercise())
   {
-    ERROR_LOG() << "Can not read equipment/exercise mappings from PPM";
+    ERROR_LOG(m_logger) << "Can not read equipment/exercise mappings from PPM";
     return false;
   }
   return true;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/exm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/exm_handler.h
index c3c8bc952..43cb1ebd5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/exm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/exm_handler.h
@@ -27,6 +27,7 @@ Q_SIGNALS:
 private Q_SLOTS:
   void onExerciseChanged(const ExerciseManagement::Exercise &data, DataModification modType);
 private:
+  NGL::INGLLogger &m_logger;
   std::unordered_map<int, int> m_exercise2RadioGroup;
   std::shared_ptr<ExerciseManagement::Interface::Dtc> m_exmDtc;
   MainHandler *m_mainHandler;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.cpp
index 8884bf1ba..7412ee6fa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.cpp
@@ -12,12 +12,11 @@
 namespace TrainingAreaBase
 {
 
-IsmHandler::IsmHandler(MainHandler *mainHandler)
-  : m_mainHandler(mainHandler)
+IsmHandler::IsmHandler(MainHandler *mainHandler) : m_mainHandler(mainHandler)
   , m_dtcIsm(nullptr)
   , m_distanceIpsToGps(Settings::distanceIpsToGps())
-  , m_distanceOpsToGps(Settings::distanceOpsToGps())
-{}
+  , m_distanceOpsToGps(Settings::distanceOpsToGps()),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 bool IsmHandler::init()
 {
@@ -39,7 +38,7 @@ bool IsmHandler::init()
       !m_dtcIsm->enableMountingPointAsset()   ||
       !m_dtcIsm->enableMainFootprint())
   {
-    ERROR_LOG() << "Can not read data from ISM";
+    ERROR_LOG(m_logger) << "Can not read data from ISM";
     return false;
   }
 
@@ -63,7 +62,7 @@ IsmHandler::OpsData IsmHandler::dataFromOpsCode(int ipsCode)
 {
   if ( m_opsData.contains(ipsCode))
   {
-    DEBUG_LOG() << "dataFromOpsCode contains ipsCode:" << ipsCode
+    DEBUG_LOG(m_logger) << "dataFromOpsCode contains ipsCode:" << ipsCode
                         << " assetId=" << m_opsData.value(ipsCode).assetId
                         << " roomId=" << m_opsData.value(ipsCode).roomId
                         << " mainStructureElementId=" << m_opsData.value(ipsCode).mainStructureElementId
@@ -81,7 +80,7 @@ IsmHandler::OpsData IsmHandler::dataFromOpsCode(int ipsCode)
 
   if ( assetId < 0)
   {
-    WARNING_LOG() << "No asset for ops code=" << ipsCode << " found";
+    WARNING_LOG(m_logger) << "No asset for ops code=" << ipsCode << " found";
     return {};
   }
   opsData.opsCode = ipsCode;
@@ -95,7 +94,7 @@ IsmHandler::OpsData IsmHandler::dataFromOpsCode(int ipsCode)
 
  
 
-  DEBUG_LOG() << "OpsData.structureElementId=" << opsData.structureElementId
+  DEBUG_LOG(m_logger) << "OpsData.structureElementId=" << opsData.structureElementId
                       << " assetId=" << opsData.assetId
                       << " mountingPointTypeId=" << opsData.mountingPointTypeId
                       << " opsCode=" << opsData.opsCode
@@ -105,7 +104,7 @@ IsmHandler::OpsData IsmHandler::dataFromOpsCode(int ipsCode)
   {
     
     
-    DEBUG_LOG() <<"---------------- UPDATE OPS-Data ------------------";
+    DEBUG_LOG(m_logger) <<"---------------- UPDATE OPS-Data ------------------";
     updateOpsData(opsData, true);
     opsData= m_opsData[opsData.opsCode] ;
   }
@@ -131,7 +130,7 @@ void IsmHandler::onInstrumentationAssetChanged(const InfrastructureManagement::I
         if ( i.value().assetId == data.id())
         {
           opsCode = i.value().opsCode;
-          DEBUG_LOG() << "onInstrumentationAssetChanged assetId=" << data.id();
+          DEBUG_LOG(m_logger) << "onInstrumentationAssetChanged assetId=" << data.id();
           break;
         }
     }
@@ -153,7 +152,7 @@ void IsmHandler::onInstrumentationAssetChanged(const InfrastructureManagement::I
         if ( i.value().assetId == data.id())
         {
           opsCode = i.value().opsCode;
-          DEBUG_LOG() << "onInstrumentationAssetChanged assetId=" << data.id();
+          DEBUG_LOG(m_logger) << "onInstrumentationAssetChanged assetId=" << data.id();
           break;
         }
     }
@@ -179,7 +178,7 @@ void IsmHandler::onMountingPointAssetChanged(const InfrastructureManagement::Mou
     break;
   }
   case DataModification::eRemoved:
-    DEBUG_LOG() << "onMountingPointAssetChanged Unmount id=" << data.id()
+    DEBUG_LOG(m_logger) << "onMountingPointAssetChanged Unmount id=" << data.id()
                          << " assetId=" << data.assetId();
 
     removeOpsAsset(data.assetId());
@@ -193,13 +192,13 @@ void IsmHandler::rotateBuildingFootprint(int mseId)
 
   if ( m_relBuildingFootprintsRotated.contains(mseId))
   {
-    DEBUG_LOG() << " mainStructureElements.Rotate already done id=" << mseId;
+    DEBUG_LOG(m_logger) << " mainStructureElements.Rotate already done id=" << mseId;
     return;
   }
   InfrastructureManagement::MainStructureElement mse = m_dtcIsm->mainStructureElement(mseId);
   TetraIcd::RelativePosition relBldgPosition = m_mainHandler->posHandler()->geographicToRelative(mse.geoPosition());
 
-  DEBUG_LOG() << " mainStructureElements.Rotate id=" << mseId;
+  DEBUG_LOG(m_logger) << " mainStructureElements.Rotate id=" << mseId;
   QMatrix matrix;
   QPolygonF relBuildingFootprintMgrs;
   qreal angle = mse.angle();
@@ -213,13 +212,13 @@ void IsmHandler::rotateBuildingFootprint(int mseId)
     QPointF relBuildingPoint(p.x() + relBldgPosition.offsetX,
                              p.y() + relBldgPosition.offsetY);
     relBuildingFootprintMgrs.append(relBuildingPoint);
-    DEBUG_LOG() << " relBuildingFootprintRotated = " << p.x() << "/" << p.y()
+    DEBUG_LOG(m_logger) << " relBuildingFootprintRotated = " << p.x() << "/" << p.y()
                         << " relBuildingPointMgrs=" << relBuildingPoint.x() << "/" << relBuildingPoint.y()
                         << " angle=" << angle;
   }
   m_relBuildingFootprintsRotatedMgrs.insert(mseId, relBuildingFootprintMgrs);
   m_buildingBoundingBoxesMgrs.insert(mseId, relBuildingFootprintMgrs.boundingRect());
-  DEBUG_LOG() << "BoundingBox bottomLeft=" << relBuildingFootprintMgrs.boundingRect().bottomLeft().x() << "/" << relBuildingFootprintMgrs.boundingRect().bottomLeft().x()
+  DEBUG_LOG(m_logger) << "BoundingBox bottomLeft=" << relBuildingFootprintMgrs.boundingRect().bottomLeft().x() << "/" << relBuildingFootprintMgrs.boundingRect().bottomLeft().x()
                       << " topRight="  << relBuildingFootprintMgrs.boundingRect().topRight().x() << "/" << relBuildingFootprintMgrs.boundingRect().topRight().x();
 }
 
@@ -234,7 +233,7 @@ void IsmHandler::onMainStructureElementChanged(const InfrastructureManagement::M
     int exerciseId = m_mainHandler->ddsHandler()->getExerciseId();
     if ( !m_dtcIsm->isElementAssignedToExercise(data, exerciseId))
     {
-      INFO_LOG() << "HandlerBuildingData::onMainStructureElementChanged() id=" << data.id() << " remove";
+      INFO_LOG(m_logger) << "HandlerBuildingData::onMainStructureElementChanged() id=" << data.id() << " remove";
       
       
       m_buildingBoundingBoxes.remove(data.id());
@@ -258,7 +257,7 @@ void IsmHandler::onMainStructureElementChanged(const InfrastructureManagement::M
         iter.next();
         if (iter.value().mainStructureElementId == data.id())
         {
-          DEBUG_LOG() << "remove from m_opsData, key=" << iter.key();
+          DEBUG_LOG(m_logger) << "remove from m_opsData, key=" << iter.key();
           iter.remove();
           break;
         }
@@ -283,7 +282,7 @@ void IsmHandler::onMainStructureElementChanged(const InfrastructureManagement::M
       if (it != m_opsData.end())
         updateOpsData(it.value());
     }
-    DEBUG_LOG() << " mainStructureElements Vor Rotate id=" << data.id();
+    DEBUG_LOG(m_logger) << " mainStructureElements Vor Rotate id=" << data.id();
     QMap<int, InfrastructureManagement::MainFootprint> mainFootprints = m_dtcIsm->getFootprintsByExerciseId(exerciseId);
 
     
@@ -308,7 +307,7 @@ void IsmHandler::onMainStructureElementChanged(const InfrastructureManagement::M
 
 void IsmHandler::onMainFootprintChanged(const InfrastructureManagement::MainFootprint &data, DataModification modType)
 {
-  DEBUG_LOG() << "onMainFootprintChanged id=" << data.id()
+  DEBUG_LOG(m_logger) << "onMainFootprintChanged id=" << data.id()
                       << " size=" <<  data.elements().size();
 
   switch (modType)
@@ -318,7 +317,7 @@ void IsmHandler::onMainFootprintChanged(const InfrastructureManagement::MainFoot
   {
     
     
-    DEBUG_LOG() << "mainStructureElements onMainFootprintChanged id=" << data.id();
+    DEBUG_LOG(m_logger) << "mainStructureElements onMainFootprintChanged id=" << data.id();
     double minX = 0;
     double maxX = 0;
     double minY = 0;
@@ -335,11 +334,11 @@ void IsmHandler::onMainFootprintChanged(const InfrastructureManagement::MainFoot
 
       QPointF point(relPos.offsetX(), relPos.offsetY());
       relBuildingFootprint.append(point);
-      DEBUG_LOG() << "relBuildingFootprint.append() " << point.x() << "/" << point.y() << ")";
+      DEBUG_LOG(m_logger) << "relBuildingFootprint.append() " << point.x() << "/" << point.y() << ")";
 
     }
     
-    DEBUG_LOG() << "minX=" << minX
+    DEBUG_LOG(m_logger) << "minX=" << minX
                         << " maxX=" << maxX
                         << " minY=" << minY
                         << " maxY=" << maxY
@@ -354,7 +353,7 @@ void IsmHandler::onMainFootprintChanged(const InfrastructureManagement::MainFoot
 
     m_relBuildingFootprints.insert(data.id(), relBuildingFootprint);
     for (const QPointF &p : std::as_const(relBuildingFootprint))
-      DEBUG_LOG() << "relBuildingFootprint = " << p.x() << "/" << p.y();
+      DEBUG_LOG(m_logger) << "relBuildingFootprint = " << p.x() << "/" << p.y();
     rotateBuildingFootprint(data.id());
     break;
   }
@@ -402,7 +401,7 @@ int IsmHandler::getOpsCodeFromJSon(const std::string &s) const
   if (jError.error != QJsonParseError::NoError ||
       !doc.isObject())
   {
-    ERROR_LOG() << "Can not read json data from IPS asset - properties are not parsable: "
+    ERROR_LOG(m_logger) << "Can not read json data from IPS asset - properties are not parsable: "
                         << jError.errorString() << " - '" << s << "'";
     return 0;
   }
@@ -417,7 +416,7 @@ bool IsmHandler::getIsOpsTunnel(const std::string &s) const
   if (jError.error != QJsonParseError::NoError ||
       !doc.isObject())
   {
-    ERROR_LOG() << "Can not read json data from IPS asset - properties are not parsable: "
+    ERROR_LOG(m_logger) << "Can not read json data from IPS asset - properties are not parsable: "
                         << jError.errorString() << " - '" << s << "'";
     return false;
   }
@@ -430,12 +429,12 @@ bool IsmHandler::getIsOpsTunnel(const std::string &s) const
 
 void IsmHandler::updateOpsData(OpsData &data, bool force)
 {
-  DEBUG_LOG() << "updateOpsData"
+  DEBUG_LOG(m_logger) << "updateOpsData"
                        << " opsCode=" << data.opsCode
                        << " assetId=" << data.assetId
                        << " force=" << force;
   int exerciseId = m_mainHandler->ddsHandler()->getExerciseId();
-  DEBUG_LOG() << "updateOpsData for asset " << data.assetId << " with ops id " << data.opsCode;
+  DEBUG_LOG(m_logger) << "updateOpsData for asset " << data.assetId << " with ops id " << data.opsCode;
   const int seId = m_dtcIsm->getStructueElementIdFromAssetId(data.assetId);
 
   data.structureElementId = 0;  
@@ -464,7 +463,7 @@ void IsmHandler::updateOpsData(OpsData &data, bool force)
         data.position = se.geoPosition();
         data.position.z(data.position.z() - mse.geoPosition().z()); 
         m_structure_ElementId2AssetTypeId[seId] = se.mountingPointTypeId().underlying();
-        DEBUG_LOG() << "found position for asset " << data.assetId << " with se id " << seId
+        DEBUG_LOG(m_logger) << "found position for asset " << data.assetId << " with se id " << seId
                             << " " << data.position.lon() << "/" << data.position.lat() << "/" << data.position.z()
                             << " name=" << se.name()
                             << " type=" << se.mountingPointTypeId()
@@ -476,24 +475,24 @@ void IsmHandler::updateOpsData(OpsData &data, bool force)
       }
     }
   }
-  DEBUG_LOG() << "found no position for asset " << data.assetId << " with se id " << seId;
+  DEBUG_LOG(m_logger) << "found no position for asset " << data.assetId << " with se id " << seId;
 }
 
 bool IsmHandler::posInExtendedBuildingFootprint(int mainStructureElementId, const Core::GeoPosition &position, const int mountPointTypeId) const
 {
   int distance = 0;
-  DEBUG_LOG() << "IsmHandler::posInExtendedBuildingFootprint mainStructureElementId=" << mainStructureElementId
+  DEBUG_LOG(m_logger) << "IsmHandler::posInExtendedBuildingFootprint mainStructureElementId=" << mainStructureElementId
                       << " mountPointTypeId=" << mountPointTypeId;
   if (m_distanceIpsToGps <= 0 && m_distanceOpsToGps <= 0)
     return false;
 
   switch (mountPointTypeId) {
   case InfrastructureManagement::MountingPointType_def::OutdoorIPS:
-    DEBUG_LOG() << "posInExtendedBuildingFootprint Distance = m_distanceOpsToGps";
+    DEBUG_LOG(m_logger) << "posInExtendedBuildingFootprint Distance = m_distanceOpsToGps";
     distance = m_distanceOpsToGps;
     break;
   case InfrastructureManagement::MountingPointType_def::IndoorIPS:
-    DEBUG_LOG() << "posInExtendedBuildingFootprint Distance = m_distanceIpsToGps";
+    DEBUG_LOG(m_logger) << "posInExtendedBuildingFootprint Distance = m_distanceIpsToGps";
     distance = m_distanceIpsToGps;
     break;
   default:
@@ -503,7 +502,7 @@ bool IsmHandler::posInExtendedBuildingFootprint(int mainStructureElementId, cons
   
   
   
-  DEBUG_LOG() << "mainStructureElementId=" << mainStructureElementId
+  DEBUG_LOG(m_logger) << "mainStructureElementId=" << mainStructureElementId
                       << " position=" << position;
 
 
@@ -519,7 +518,7 @@ bool IsmHandler::posInExtendedBuildingFootprint(int mainStructureElementId, cons
 
   TetraIcd::RelativePosition relBldgPosition = m_mainHandler->posHandler()->geographicToRelative(mse.geoPosition());
   TetraIcd::RelativePosition relPosition = m_mainHandler->posHandler()->geographicToRelative(position);
-  DEBUG_LOG() << "relBldgPosition=" << relBldgPosition.offsetX << "/" << relBldgPosition.offsetY
+  DEBUG_LOG(m_logger) << "relBldgPosition=" << relBldgPosition.offsetX << "/" << relBldgPosition.offsetY
                       << ", relPosition=" << relPosition.offsetX << "/" << relPosition.offsetY;
   QPointF relPositionMgrs(relPosition.offsetX, relPosition.offsetY);
 
@@ -532,14 +531,14 @@ bool IsmHandler::posInExtendedBuildingFootprint(int mainStructureElementId, cons
   QPointF relPositionF(relPosition.offsetX - relBldgPosition.offsetX, relPosition.offsetY - relBldgPosition.offsetY);
   if (relBuildingFootprint.containsPoint(relPositionF, Qt::OddEvenFill))
   {
-    DEBUG_LOG() << "Position is inside Building-Footprint";
+    DEBUG_LOG(m_logger) << "Position is inside Building-Footprint";
     return true;
   }
 
   
   
   
-  DEBUG_LOG() << "relBuildingFootprint.size=" << relBuildingFootprint.size();
+  DEBUG_LOG(m_logger) << "relBuildingFootprint.size=" << relBuildingFootprint.size();
   for (int i = 0; i < relBuildingFootprint.size() ; i++)
   {
     int nextPoint = i + 1;
@@ -549,17 +548,17 @@ bool IsmHandler::posInExtendedBuildingFootprint(int mainStructureElementId, cons
     QPointF l1(relBuildingFootprint[i].x() + relBldgPosition.offsetX, relBuildingFootprint[i].y() + relBldgPosition.offsetY);
     QPointF l2(relBuildingFootprint[nextPoint].x() + relBldgPosition.offsetX, relBuildingFootprint[nextPoint].y() + relBldgPosition.offsetY);
     double distancePointLineValue = distancePointLine(relPositionMgrs, l1, l2);
-    DEBUG_LOG() << "distancePointLineValue=" << distancePointLineValue
+    DEBUG_LOG(m_logger) << "distancePointLineValue=" << distancePointLineValue
                         << " Point =" << relPositionMgrs.x() << "/" << relPositionMgrs.y()
                         << " Line=" << l1.x() << "/" << l1.y()
                         << "   " << l2.x() << "/" << l2.y();
     if (distancePointLineValue < distance)
     {
-      DEBUG_LOG() << "IsmHandler::posInExtendedBuildingFootprint return true";
+      DEBUG_LOG(m_logger) << "IsmHandler::posInExtendedBuildingFootprint return true";
       return true;
     }
   }
-  DEBUG_LOG() << "IsmHandler::posInExtendedBuildingFootprint return false";
+  DEBUG_LOG(m_logger) << "IsmHandler::posInExtendedBuildingFootprint return false";
   return false;
 }
 
@@ -577,7 +576,7 @@ double IsmHandler::distancePointLine(const QPointF &p, const QPointF &l1,
     qreal length2 = pToP2.length();
     if (length1 < length2)
     {
-      DEBUG_LOG() << "a distancePointLine p=" << p.x() << "/" << p.y()
+      DEBUG_LOG(m_logger) << "a distancePointLine p=" << p.x() << "/" << p.y()
                           << " line: p1=" << l1.x() << "/" << l1.y()
                           << " p2=" << l2.x() << "/" << l2.y()
                           << " distance=" << length1
@@ -586,7 +585,7 @@ double IsmHandler::distancePointLine(const QPointF &p, const QPointF &l1,
     }
     else
     {
-      DEBUG_LOG() << "b distancePointLine p=" << p.x() << "/" << p.y()
+      DEBUG_LOG(m_logger) << "b distancePointLine p=" << p.x() << "/" << p.y()
                           << " line: p1=" << l1.x() << "/" << l1.y()
                           << " p2=" << l2.x() << "/" << l2.y()
                           << " distance=" << length2
@@ -600,7 +599,7 @@ double IsmHandler::distancePointLine(const QPointF &p, const QPointF &l1,
 
   double distance = sqrt(squareLen(p, intersectPnt));
 
-  DEBUG_LOG() << "c distancePointLine p=" << p.x() << "/" << p.y()
+  DEBUG_LOG(m_logger) << "c distancePointLine p=" << p.x() << "/" << p.y()
                       << " line: p1=" << l1.x() << "/" << l1.y()
                       << " p2=" << l2.x() << "/" << l2.y()
                       << " distance=" << distance;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.h
index 65df04ef3..039f978ea 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.h
@@ -54,6 +54,7 @@ private Q_SLOTS:
   void onMainFootprintChanged(const InfrastructureManagement::MainFootprint &data, DataModification modType);
 
 private:
+  NGL::INGLLogger &m_logger;
   void rotateBuildingFootprint(int mseId);
   void removeOpsDataByStructureElementId(int structureElementId);
   void removeOpsAsset(int assetId);
@@ -65,6 +66,7 @@ private:
 
 private:
 
+  NGL::INGLLogger &m_logger;
   MainHandler *m_mainHandler;
 
   QHash<int, OpsData> m_opsData; 
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 383a38a2d..00e4ae37d 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
@@ -120,7 +120,7 @@ bool MainHandler::init(int domainId, int exerciseId)
 
   if (m_interfaces.empty())
   {
-    WARNING_LOG() << "Could not load any training area plugin - can not send data to training area";
+    WARNING_LOG(m_logger) << "Could not load any training area plugin - can not send data to training area";
     return false;
   }
 
@@ -131,15 +131,15 @@ bool MainHandler::init(int domainId, int exerciseId)
 
   
   m_handlerWebSocket =  std::make_shared<WebSocketInterface::WebSocketInterfaceHandler>(this);
-  DEBUG_LOG() << "Reset WebSocketInterfaceHandler successful.";
+  DEBUG_LOG(m_logger) << "Reset WebSocketInterfaceHandler successful.";
 
   if (!m_handlerWebSocket->init())
   {
-    ERROR_LOG() << "Initialisation WebSocketInterfaceHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler failed.";
     return false;
   }
   m_ddsHandler->pacemaker()->addPort(m_handlerWebSocket->serverWebSocketPort(), Core::PortType::WebSocketServer, QStringLiteral("{\"id\":\"TAB\"}"));
-  DEBUG_LOG() << "Initialisation WebSocketInterfaceHandler successful.";
+  DEBUG_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler successful.";
 
 
   m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
@@ -173,19 +173,19 @@ ProjectDataManagement::RadioGroup MainHandler::exerciseRadioGroup() const
 
 bool MainHandler::loadPlugin(const LtsPluginManager::PluginInstance &pi)
 {
-  INFO_LOG() << "Trying to load plugin '" << pi.fullFileName << "'";
+  INFO_LOG(m_logger) << "Trying to load plugin '" << pi.fullFileName << "'";
   Plugin::Plugin *tabPlugin = qobject_cast<Plugin::Plugin *>(pi.plugin);
   if (!tabPlugin)
   {
-    WARNING_LOG() << "failed loading a training area plugin - not a TrainingAreaPlugin object!";
+    WARNING_LOG(m_logger) << "failed loading a training area plugin - not a TrainingAreaPlugin object!";
     return false;
   }
-  INFO_LOG() << "... success";
+  INFO_LOG(m_logger) << "... success";
   std::shared_ptr<Plugin::Interface> ifc = tabPlugin->createInterface(this, m_rxHandler, m_txHandler, m_ddsHandler, Settings::settings());
 
   if (!ifc || !ifc->init())
   {
-    WARNING_LOG() << "Could not initialize training area plugin" << pi.pluginName << pi.fileName;
+    WARNING_LOG(m_logger) << "Could not initialize training area plugin" << pi.pluginName << pi.fileName;
     return false;
   }
 
@@ -241,7 +241,7 @@ TetraIcd::ExerciseEquipmentAssignmentComplete MainHandler::exerciseEquipmentAssi
     const ProjectDataManagement::RadioGroup rg = radioGroups.value(it.second);
     if (rg.id() == 0)
     {
-      WARNING_LOG() << "Got a radio group id " << it.second << " for exercise " << it.first
+      WARNING_LOG(m_logger) << "Got a radio group id " << it.second << " for exercise " << it.first
                             << " but could not find valid data for it - ignoring!";
       continue;
     }
@@ -316,7 +316,7 @@ void MainHandler::onConnectionState(const QString &name, bool connectionState)
     m_ifcConnectionState.insert(name, connectionState);
   }
 
-  DEBUG_LOG() << "Publishing connection states: " << m_ifcConnectionState.size();
+  DEBUG_LOG(m_logger) << "Publishing connection states: " << m_ifcConnectionState.size();
 
   TrainingAreaBase::Connections connections;
   connections.id(1);
@@ -329,7 +329,7 @@ void MainHandler::onConnectionState(const QString &name, bool connectionState)
 
 void MainHandler::onDirectMessage(const QByteArray &jsonMessage)
 {
-  DEBUG_LOG() << "Got direct message " << jsonMessage;
+  DEBUG_LOG(m_logger) << "Got direct message " << jsonMessage;
   WebSocketInterface::Messages::BiteDataMessage::BiteData biteData;
 
   QJsonObject obj = QJsonDocument::fromJson(jsonMessage).object();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.h
index 728c9fd6e..588880b14 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.h
@@ -83,11 +83,13 @@ private Q_SLOTS:
   void onPositionChanged(int equipNo, const ParticipantManagement::ParticipantPosition &pos);
 
 private:
+  NGL::INGLLogger &m_logger;
   bool loadPlugin(const LtsPluginManager::PluginInstance &pi);
   QString getErrorString(const ParticipantManagement::BiteError &error) const;
   QString getCanDeviceName(int id) const;
   QString getSubDeviceName(int id) const;
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler> m_ddsHandler;
   std::shared_ptr<DbHandler> m_dbHandler;
   std::shared_ptr<RecvFromTab> m_rxHandler;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/pdm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/pdm_handler.cpp
index 789f4faf6..d0474d4ca 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/pdm_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/pdm_handler.cpp
@@ -9,10 +9,9 @@
 
 namespace TrainingAreaBase
 {
-PdmHandler::PdmHandler(MainHandler *mainHandler)
-  : m_initialized(false)
-  , m_mainHandler(mainHandler)
-{}
+PdmHandler::PdmHandler(MainHandler *mainHandler) : m_initialized(false)
+  , m_mainHandler(mainHandler),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 bool PdmHandler::init()
 {
@@ -56,7 +55,7 @@ bool PdmHandler::initializePdm()
       !m_dtcPdm->waitForHistoricalDataBuildingChargeEffect(20000) ||
       !m_dtcPdm->waitForHistoricalDataVulnerabilityKind(20000))  
   {
-    ERROR_LOG() << "Can not read charge/gear types from PDM";
+    ERROR_LOG(m_logger) << "Can not read charge/gear types from PDM";
     return false;
   }
   m_chargeTypes = m_dtcPdm->chargeTypes();
@@ -71,7 +70,7 @@ bool PdmHandler::initializePdm()
     const int realTypeId = (k.taVulnerabilityKind() & 0x00FF0000) >> 16;
     const int fallbackTypeId = (k.taVulnerabilityKind() & 0xFF000000) >> 24;
     m_vulnerabilityKinds[realTasKindId] = k;
-    TRACE_LOG() << "realTasKindId: " << realTasKindId << ", realTypeId: " << realTypeId << ", fallbackTypeId: " << fallbackTypeId;
+    TRACE_LOG(m_logger) << "realTasKindId: " << realTasKindId << ", realTypeId: " << realTypeId << ", fallbackTypeId: " << fallbackTypeId;
     if (fallbackTypeId)
       m_vulnerabilityKindFallback[realTypeId] = fallbackTypeId;
   };
@@ -93,7 +92,7 @@ ProjectDataManagement::ChargeType PdmHandler::chargeTypeFromId(int chargeTypeId)
   auto it = m_chargeTypes.constFind(ctId);
   if (it == m_chargeTypes.cend())
   {
-    WARNING_LOG() << "Could not find charge type with id " << chargeTypeId;
+    WARNING_LOG(m_logger) << "Could not find charge type with id " << chargeTypeId;
     return ProjectDataManagement::ChargeType();
   }
   return it.value();
@@ -154,23 +153,23 @@ int PdmHandler::vulnerabilityKindId(int tasVulnerabilityKindId, int equipmentNum
     const int index = (tasVulnerabilityKindId & 0x0000FFFF);
 
     int fallBackTypeId = m_vulnerabilityKindFallback.value(typeId);
-    TRACE_LOG() << "Looking for fallback for typeId " << typeId << ": " << fallBackTypeId;
+    TRACE_LOG(m_logger) << "Looking for fallback for typeId " << typeId << ": " << fallBackTypeId;
     if (!fallBackTypeId)
     {
       fallBackTypeId = m_vulnerabilityKindFallback.value(0);  
-      TRACE_LOG() << "None found - using default: " << fallBackTypeId;
+      TRACE_LOG(m_logger) << "None found - using default: " << fallBackTypeId;
     }
     tasVulnerabilityKindId = (fallBackTypeId << 16) | index;
-    TRACE_LOG() << "Searching for " << tasVulnerabilityKindId;
+    TRACE_LOG(m_logger) << "Searching for " << tasVulnerabilityKindId;
     it = m_vulnerabilityKinds.constFind(tasVulnerabilityKindId);
     if (it == m_vulnerabilityKinds.constEnd())
     {
-      WARNING_LOG() << "Could not find vulnerability type with id " << typeId
+      WARNING_LOG(m_logger) << "Could not find vulnerability type with id " << typeId
                             << " and index " << index
                             << " for equipment " << equipmentNumber;
       return tasVulnerabilityKindId;
     }
-    DEBUG_LOG() << "vulnerability type with id " << typeId
+    DEBUG_LOG(m_logger) << "vulnerability type with id " << typeId
                         << " and index " << index << " is using fallback typeId " << fallBackTypeId;
   }
   return it.value().taVulnerabilityKind();
@@ -229,7 +228,7 @@ int PdmHandler::chargeTypeIdFromGearAndChargeTasCode(int gearTasCode, int charge
   if (m_chargeTypes.contains(chargeTasCode))
     return chargeTasCode;
 
-  WARNING_LOG() << "Got unmapped training area charge type id "
+  WARNING_LOG(m_logger) << "Got unmapped training area charge type id "
                         << chargeTasCode << " for gear type "
                         << gearTasCode;
   return (s_unknownMarker | chargeTasCode);  
@@ -251,7 +250,7 @@ int PdmHandler::gearTypeIdFromTasGearTasCode(int gearTasCode)
       return gearType.id();
   }
 
-  WARNING_LOG() << "Got unmapped training area gear type id "
+  WARNING_LOG(m_logger) << "Got unmapped training area gear type id "
                         << gearTasCode;
   return (s_unknownMarker | gearTasCode);  
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/pdm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/pdm_handler.h
index 2d34266e7..52f9928c8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/pdm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/pdm_handler.h
@@ -46,6 +46,7 @@ public:
 public:
   bool initializePdm();
 private:
+  NGL::INGLLogger &m_logger;
   bool m_initialized;
   std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_dtcPdm;
   QMap<int, ProjectDataManagement::ChargeType> m_chargeTypes;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.cpp
index 1a5805e87..a3954bd6c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.cpp
@@ -8,10 +8,9 @@
 
 using namespace TrainingAreaBase;
 
-PositionHandler::PositionHandler(MainHandler *mainHandler)
-  : QObject()
-  , m_mainHandler(mainHandler)
-{}
+PositionHandler::PositionHandler(MainHandler *mainHandler) : QObject()
+  , m_mainHandler(mainHandler),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 bool PositionHandler::init()
 {
@@ -31,18 +30,18 @@ bool PositionHandler::initCoordinateConversion() const
   const auto ex = m_mainHandler->exmHandler()->exercise(m_mainHandler->exerciseId());
   if (ex.id() <= 0)
   {
-    ERROR_LOG() << "Can not retrieve exercise information for id " << m_mainHandler->exerciseId();
+    ERROR_LOG(m_logger) << "Can not retrieve exercise information for id " << m_mainHandler->exerciseId();
     return false;
   }
   if (!m_dtcAsm->waitForHistoricalDataTrainingArea(ddsTimeout))
   {
-    ERROR_LOG() << "Error initializing AssetManagement DTC";
+    ERROR_LOG(m_logger) << "Error initializing AssetManagement DTC";
     return false;
   }
   const auto ta = m_dtcAsm->trainingArea(ex.trainingAreaId());
   if (ta.id() <= 0)
   {
-    ERROR_LOG() << "Can not retrieve training are information for id " << ex.trainingAreaId();
+    ERROR_LOG(m_logger) << "Can not retrieve training are information for id " << ex.trainingAreaId();
     return false;
   }
   
@@ -103,7 +102,7 @@ Core::GeoPosition PositionHandler::relativeToGeographic(const TetraIcd::Relative
   ret.lon(pos2d.lon());
   ret.lat(pos2d.lat());
   ret.z(p.offsetZ);
-  DEBUG_LOG() << "x/y -> lon/lat: " << p.offsetX << "," << p.offsetY
+  DEBUG_LOG(m_logger) << "x/y -> lon/lat: " << p.offsetX << "," << p.offsetY
                       << " -> " << ret.lon() * LtsCoordTrans::rad2deg() << "," << ret.lat() * LtsCoordTrans::rad2deg();
   return ret;
 }
@@ -132,7 +131,7 @@ TetraIcd::RelativePosition PositionHandler::geographicToRelative(const Core::Geo
 {
   const QPointF rel(geographicToRelativePointF(p));
   const TetraIcd::RelativePosition ret(qRound(rel.x()), qRound(rel.y()), p.z());
-  DEBUG_LOG() << "lon/lat -> x/y: " << p.lon() * LtsCoordTrans::rad2deg()  << "," << p.lat() * LtsCoordTrans::rad2deg()
+  DEBUG_LOG(m_logger) << "lon/lat -> x/y: " << p.lon() * LtsCoordTrans::rad2deg()  << "," << p.lat() * LtsCoordTrans::rad2deg()
                       << " -> " << ret.offsetX << "," << ret.offsetY;
   return ret;
 }
@@ -159,7 +158,7 @@ double PositionHandler::speed (const TetraIcd::RelativePosition &relPos, const i
   QLineF line(QPointF(lastRelPosition.offsetX, lastRelPosition.offsetY),
               QPointF(relPos.offsetX, relPos.offsetY));
   
-  DEBUG_LOG() << "POS alt=" << lastRelPosition.offsetX <<  "/" << lastRelPosition.offsetY
+  DEBUG_LOG(m_logger) << "POS alt=" << lastRelPosition.offsetX <<  "/" << lastRelPosition.offsetY
                       << " POS neu=" <<  relPos.offsetX << "/" << relPos.offsetY
                       << " distance= " << line.length()
                       << " timeStamp=" << timeStamp
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.h
index c0a4d1223..6453afe30 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.h
@@ -65,9 +65,11 @@ public:
   bool isInTrainingArea(const TetraIcd::RelativePosition &relPos) const;
 
 private:
+  NGL::INGLLogger &m_logger;
   bool initCoordinateConversion() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   MainHandler *m_mainHandler;
   mutable std::shared_ptr<AssetManagement::Interface::Dtc> m_dtcAsm;
   mutable LtsCoordTrans::UtmCoordinate m_utm2Geographic;
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 8313fe53c..616ef84bd 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
@@ -27,7 +27,7 @@ bool PpmHandler::init()
   if (!m_ppmDtc->enableEquipmentExerciseMapping() ||
       !m_ppmDtc->enableParticipantPosition())
   {
-    ERROR_LOG() << "Can not read equipment/exercise mappings from PPM";
+    ERROR_LOG(m_logger) << "Can not read equipment/exercise mappings from PPM";
     return false;
   }
   return true;
@@ -57,7 +57,7 @@ void PpmHandler::onParticipantPositionChanged(const ParticipantManagement::Parti
 
 void PpmHandler::onEquipmentExerciseMappingChanged(const ParticipantManagement::EquipmentExerciseMapping &data, DataModification modType)
 {
-  DEBUG_LOG() << "EquipmentExerciseMappingChanged: " << data << ", " << modType;
+  DEBUG_LOG(m_logger) << "EquipmentExerciseMappingChanged: " << data << ", " << modType;
 
   switch (modType)
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.h
index 5121df44c..9818f70e4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.h
@@ -31,6 +31,7 @@ private Q_SLOTS:
   void onEquipmentExerciseMappingChanged(const ParticipantManagement::EquipmentExerciseMapping &data, DataModification modType);
   void sendEquipmentExerciseAssignment();
 private:
+  NGL::INGLLogger &m_logger;
   std::unordered_map<int, std::unordered_set<int>> m_exerciseEquipmentAssignments;
   std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
   MainHandler *m_mainHandler;
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 44adce299..d7d8b4ecd 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
@@ -17,10 +17,9 @@ namespace TrainingAreaBase
 
 
 
-AesStateHandler::AesStateHandler(MainHandler *mainHandler)
-  : m_dbInterface(mainHandler->dbHandler()->db())
-  , m_exerciseId(mainHandler->exerciseId())
-{}
+AesStateHandler::AesStateHandler(MainHandler *mainHandler) : m_dbInterface(mainHandler->dbHandler()->db())
+  , m_exerciseId(mainHandler->exerciseId()),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 
 template<>
@@ -30,7 +29,7 @@ void RecvFromDdsAes::txData(const TrainingAreaBase::TetraIcd::DusMineReactivatio
   m_sentAesTelegrams.push_back(new TrainingAreaBase::TetraIcd::DusMineReactivation(tele));
   m_sentAesTelegramsAesIds.push_back(-1);
   m_checkOutdatedTelegramsTimer->start();
-  DEBUG_LOG() << "Appending " << tele.type() << " to m_sentAesTelegrams";
+  DEBUG_LOG(m_logger) << "Appending " << tele.type() << " to m_sentAesTelegrams";
 }
 
 bool AesStateHandler::init()
@@ -41,14 +40,14 @@ bool AesStateHandler::init()
 
     m_tetraId2ddsId[item.aesTetraId] = item.aesDdsId;
     m_ddsId2TetraId[item.aesDdsId] = item.aesTetraId;
-    DEBUG_LOG() << "AES internal DDS id: " << item.aesDdsId << " - tetra id: " << item.aesTetraId;
+    DEBUG_LOG(m_logger) << "AES internal DDS id: " << item.aesDdsId << " - tetra id: " << item.aesTetraId;
     if (item.isAvailableInTetra)
       m_aesInTetraAvailable += item.aesTetraId;
   };
 
   if (!m_dbInterface->selectByExerciseId(cb, m_exerciseId))
   {
-    ERROR_LOG() << "Error retrieving data from database!";
+    ERROR_LOG(m_logger) << "Error retrieving data from database!";
     return false;
   }
 
@@ -72,7 +71,7 @@ int AesStateHandler::createAesTetraId(int aesDdsId, bool &alreadyExists)
   aes2Ta.exerciseId = m_exerciseId;
   if (!m_dbInterface->insert(aes2Ta))
   {
-    WARNING_LOG() << "Unable to create a valid area effect simulation id for tetra!";
+    WARNING_LOG(m_logger) << "Unable to create a valid area effect simulation id for tetra!";
     return -1;
   }
 
@@ -94,7 +93,7 @@ bool AesStateHandler::update(int aesDdsId, int aesTetraId, bool bSentToTetra)
   aes2Ta.exerciseId = m_exerciseId;
   if (!m_dbInterface->update(aes2Ta))
   {
-    WARNING_LOG() << "Unable to update area effect simulation id for tetra in database!";
+    WARNING_LOG(m_logger) << "Unable to update area effect simulation id for tetra in database!";
     return false;
   }
 
@@ -203,7 +202,7 @@ bool RecvFromDdsAes::init()
     return false;
   }
 
-  DEBUG_LOG() << "RecvFromDdsAes::init() successful";
+  DEBUG_LOG(m_logger) << "RecvFromDdsAes::init() successful";
   return true;
 }
 
@@ -360,7 +359,7 @@ bool RecvFromDdsAes::sendSingleFireSMArt(const SendCesHitRequest &request)
 
   if (!bAlreadyExists)
   {
-    WARNING_LOG() << "Trying to send a SMArt single fire to training area but it was not created until now... !?";
+    WARNING_LOG(m_logger) << "Trying to send a SMArt single fire to training area but it was not created until now... !?";
     bool bOnlyNameChanged;
     dataChanged(data, bOnlyNameChanged); 
   }
@@ -376,7 +375,7 @@ bool RecvFromDdsAes::sendSingleFireSMArt(const SendCesHitRequest &request)
 template <typename T>
 void RecvFromDdsAes::handleEffectSimulation(const T &data, DataModification modType, TetraIcd::AreaEffectSimulationType aesType)
 {
-  DEBUG_LOG() << "RecvFromDdsAes::handleEffectSimulation(id=" << data.id()
+  DEBUG_LOG(m_logger) << "RecvFromDdsAes::handleEffectSimulation(id=" << data.id()
                       << ", modType: " << static_cast<int>(modType)
                       << ", type=" << static_cast<int>(aesType)
                       << ", name: " << data.name()
@@ -390,7 +389,7 @@ void RecvFromDdsAes::handleEffectSimulation(const T &data, DataModification modT
   {
     if (m_mainHandler->pdmHandler()->isSmartChargeType(data.chargeStruct()))
     {
-      DEBUG_LOG() << "Do not send SMART Single/AreaFire to Tetra as broadcast, hits are send directly.";
+      DEBUG_LOG(m_logger) << "Do not send SMART Single/AreaFire to Tetra as broadcast, hits are send directly.";
       return;
     }
   }
@@ -577,7 +576,7 @@ void RecvFromDdsAes::onTriggeredImpactsChanged(const AreaEffectSimulation::Trigg
     const auto &mineArea = it->second;
     if (mineArea.isDus() || mineArea.isConcrete())
     {
-      INFO_LOG() << "Not publishing mineArea single state for " << data.aesItemId() << " - is a DUS mineArea";
+      INFO_LOG(m_logger) << "Not publishing mineArea single state for " << data.aesItemId() << " - is a DUS mineArea";
       return;
     }
 
@@ -588,7 +587,7 @@ void RecvFromDdsAes::onTriggeredImpactsChanged(const AreaEffectSimulation::Trigg
     case AreaEffectSimulation::AesEffectState::EsRemoved:
     case AreaEffectSimulation::AesEffectState::EsUnknown:
     {
-      INFO_LOG() << "Not publishing mineArea single state for " << data.aesItemId() << " - with state " << AreaEffectSimulation::toString(mineArea.effectStateId());
+      INFO_LOG(m_logger) << "Not publishing mineArea single state for " << data.aesItemId() << " - with state " << AreaEffectSimulation::toString(mineArea.effectStateId());
       return;
     }
     default:
@@ -597,7 +596,7 @@ void RecvFromDdsAes::onTriggeredImpactsChanged(const AreaEffectSimulation::Trigg
   }
   else
   {
-    INFO_LOG() << "Storing mineArea single state, as we dont have the corresponding mineArea yet aesId" << data.aesItemId();
+    INFO_LOG(m_logger) << "Storing mineArea single state, as we dont have the corresponding mineArea yet aesId" << data.aesItemId();
     m_temporarySingleMineState[data.aesItemId()] = data;
     return; 
   }
@@ -647,7 +646,7 @@ void RecvFromDdsAes::onDusMineStateChanged(const AreaEffectSimulation::DusMineSt
   if (!m_minesToSend.isEmpty())
     m_sendDusMineReactivtionTimer->start(); 
   else
-    INFO_LOG() << "Nothing changed in DusMineState of MineArea: " << data.id();
+    INFO_LOG(m_logger) << "Nothing changed in DusMineState of MineArea: " << data.id();
 }
 
 void RecvFromDdsAes::onSendDusMineReactivationTimeout()
@@ -660,7 +659,7 @@ void RecvFromDdsAes::onSendDusMineReactivationTimeout()
     out.dusSerialNumbers.push_back(mineId);
   }
   m_minesToSend.clear();
-  INFO_LOG() << "Reactivating " << out.dusSerialNumbers.size() << " mines";
+  INFO_LOG(m_logger) << "Reactivating " << out.dusSerialNumbers.size() << " mines";
   txData(out);
 }
 
@@ -748,7 +747,7 @@ void RecvFromDdsAes::onEffectsChanged(const AreaEffectSimulation::Effects &data,
     const int aesTetraId = m_aesStateHandler->createAesTetraId(aesItemId, bAlreadyExists);
 
 
-    DEBUG_LOG() << "RecvFromDdsAes::onEffectsChanged(Effects, "
+    DEBUG_LOG(m_logger) << "RecvFromDdsAes::onEffectsChanged(Effects, "
                         << aesTetraId << ")";
     TetraIcd::CreateAreaExplosion cAes;
 
@@ -801,7 +800,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::AirS
     sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::ExplosionSingle, aes.id());
     return;
   }
-  DEBUG_LOG() << "RecvFromDdsAes::sendCreateEffectSimulation(AirSupportImpact, "
+  DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(AirSupportImpact, "
                       << aesTetraId << ")";
   TetraIcd::CreateSingleExplosion cAes;
 
@@ -829,7 +828,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::BCCo
     sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::CContamination, aes.id());
     return;
   }
-  DEBUG_LOG() << "RecvFromDdsAes::sendCreateEffectSimulation(BCContamination, "
+  DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(BCContamination, "
                       << aesTetraId << ")";
   TetraIcd::CreateCContamination cAes;
   cAes.expansionFactor = pdm()->dtc()->expansionFactor(aes.chargeStruct().chargeTypeId(),
@@ -876,7 +875,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Expl
     sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::ExplosionArea, aes.id());
     return;
   }
-  DEBUG_LOG() << "RecvFromDdsAes::sendCreateEffectSimulation(ExplosionArea, "
+  DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(ExplosionArea, "
                       << aesTetraId << ")";
   TetraIcd::CreateAreaExplosion cAes;
 
@@ -904,7 +903,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Expl
   
   const bool bIsLaserGuidable = m_mainHandler->pdmHandler()->isLaserGuidable(aes.chargeStruct());
 
-  DEBUG_LOG() << "RecvFromDdsAes::sendCreateEffectSimulation "
+  DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation "
                       << ", aes " << aes
                       << ", bIsLaserGuidable " << bIsLaserGuidable;
 
@@ -920,7 +919,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Expl
     sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::ExplosionArea, aes.id());
     return;
   }
-  DEBUG_LOG() << "RecvFromDdsAes::sendCreateEffectSimulation(ExplosionArea, "
+  DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(ExplosionArea, "
                       << aesTetraId << ")";
   TetraIcd::CreateAreaExplosion cAes;
 
@@ -969,7 +968,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Expl
     sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::ExplosionSingle, aes.id());
     return;
   }
-  DEBUG_LOG() << "RecvFromDdsAes::sendCreateEffectSimulation(ExplosionSingle, "
+  DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(ExplosionSingle, "
                       << aesTetraId << ")";
   TetraIcd::CreateSingleExplosion cAes;
 
@@ -995,7 +994,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Mine
     sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::MineArea, aes.id());
     return;
   }
-  DEBUG_LOG() << "RecvFromDdsAes::sendCreateEffectSimulation(MineArea, "
+  DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(MineArea, "
                       << aesTetraId << ")";
   TetraIcd::CreateMineArea cAes;
 
@@ -1025,20 +1024,20 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Mine
       const QPointF relStart = m_posHandler->geographicToRelativePointF(s.positionStart());
       const QPointF relEnd = m_posHandler->geographicToRelativePointF(s.positionEnd());
       const QLineF line({relStart.x(), relStart.y()}, {relEnd.x(), relEnd.y()});
-      DEBUG_LOG() << "relStart: x: " << relStart.x() << ", y: " << relStart.y();
-      DEBUG_LOG() << "relEnd: x: " << relEnd.x() << ", y: " << relEnd.y();
+      DEBUG_LOG(m_logger) << "relStart: x: " << relStart.x() << ", y: " << relStart.y();
+      DEBUG_LOG(m_logger) << "relEnd: x: " << relEnd.x() << ", y: " << relEnd.y();
       QTransform trans;
       trans.rotate(0-line.angle());
       const QPointF ofs = trans.map(QPointF(aes.width() / 2, 0));
-      DEBUG_LOG() << "ofs: x: " << ofs.x() << ", y: " << ofs.y();
+      DEBUG_LOG(m_logger) << "ofs: x: " << ofs.x() << ", y: " << ofs.y();
 
       segment.relStart.offsetX = qRound(relStart.x() + ofs.y());
       segment.relStart.offsetY = qRound(relStart.y() - ofs.x());
       segment.relEnd.offsetX = qRound(relEnd.x() + ofs.y());
       segment.relEnd.offsetY = qRound(relEnd.y() - ofs.x());
 
-      DEBUG_LOG() << "start offset: x: " << segment.relStart.offsetX << ", y: " << segment.relStart.offsetY;
-      DEBUG_LOG() << "end offset: x: " << segment.relEnd.offsetX << ", y: " << segment.relEnd.offsetY;
+      DEBUG_LOG(m_logger) << "start offset: x: " << segment.relStart.offsetX << ", y: " << segment.relStart.offsetY;
+      DEBUG_LOG(m_logger) << "end offset: x: " << segment.relEnd.offsetX << ", y: " << segment.relEnd.offsetY;
     }
     cAes.segments.push_back(segment);
   }
@@ -1056,7 +1055,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::NCon
     sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::NContamination, aes.id());
     return;
   }
-  DEBUG_LOG() << "RecvFromDdsAes::sendCreateEffectSimulation(NContamination, "
+  DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(NContamination, "
                       << aesTetraId << ")";
   TetraIcd::CreateNContamination cAes;
 
@@ -1080,7 +1079,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Func
     sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::FunctionalArea, aes.id());
     return;
   }
-  DEBUG_LOG() << "RecvFromDdsAes::sendCreateEffectSimulation(FunctionalArea, "
+  DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(FunctionalArea, "
                       << aesTetraId << ")";
   TetraIcd::CreateFunctionalArea fAes;
 
@@ -1106,7 +1105,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Tech
     return;
   }
 
-  DEBUG_LOG() << "RecvFromDdsAes::sendCreateEffectSimulation(TechnicalArea, "
+  DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(TechnicalArea, "
                       << aesTetraId << ")";
   TetraIcd::TechnicalArea fAes;
 
@@ -1128,7 +1127,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::DusS
     sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::DusSingleMineSimulator, aes.id());
     return;
   }
-  DEBUG_LOG() << "RecvFromDdsAes::sendCreateEffectSimulation(DusSingleMine, "
+  DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(DusSingleMine, "
                       << aesTetraId << ")";
   TetraIcd::CreateDusSingleMine dAes;
 
@@ -1157,10 +1156,10 @@ void RecvFromDdsAes::sendModifyEffectSimulationName(TetraIcd::AreaEffectSimulati
 
   if (aesTetraId == 0)
   {
-    WARNING_LOG() << "Trying to modify an effect simulation name but have no aes identification: " << name;
+    WARNING_LOG(m_logger) << "Trying to modify an effect simulation name but have no aes identification: " << name;
     return;
   }
-  DEBUG_LOG() << "RecvFromDdsAes::sendModifyEffectSimulationName(" << static_cast<int>(aesType)
+  DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendModifyEffectSimulationName(" << static_cast<int>(aesType)
                       << ", " << aesTetraId << ", " << name << ")";
 
   TetraIcd::ModifyAreaEffectSimulationName mAes;
@@ -1184,16 +1183,16 @@ void RecvFromDdsAes::sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationTy
   const int aesTetraId = m_aesStateHandler->getAesTetraId(aesDdsId);
   if (aesTetraId == 0)
   {
-    DEBUG_LOG() << "Could not find a valid tetra id for aes dds id " << aesDdsId;
+    DEBUG_LOG(m_logger) << "Could not find a valid tetra id for aes dds id " << aesDdsId;
     return;
   }
 
   if (!m_aesStateHandler->update(aesDdsId, aesTetraId, false))
   {
-    WARNING_LOG() << "Could not update Aes state handler (" << aesDdsId
+    WARNING_LOG(m_logger) << "Could not update Aes state handler (" << aesDdsId
                           << ", " << aesTetraId << ")";
   }
-  DEBUG_LOG() << "RecvFromDdsAes::sendRemoveEffectSimulation(id=" << aesDdsId
+  DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendRemoveEffectSimulation(id=" << aesDdsId
                       << ", type=" << static_cast<int>(aesType)
                       << ", tetraId=" << aesTetraId << ")";
 
@@ -1222,15 +1221,15 @@ void RecvFromDdsAes::sendPauseEffectSimulation(int aesDdsId)
   const int aesTetraId = m_aesStateHandler->getAesTetraId(aesDdsId);
   if (aesTetraId == 0)
   {
-    DEBUG_LOG() << "Could not find a valid tetra id for aes dds id " << aesDdsId ;
+    DEBUG_LOG(m_logger) << "Could not find a valid tetra id for aes dds id " << aesDdsId ;
     return;
   }
   if (!m_aesStateHandler->update(aesDdsId, aesTetraId, true))
   {
-    WARNING_LOG() << "Could not update Aes state handler (" << aesDdsId
+    WARNING_LOG(m_logger) << "Could not update Aes state handler (" << aesDdsId
                           << ", " << aesTetraId << ")";
   }
-  DEBUG_LOG() << "RecvFromDdsAes::sendPauseEffectSimulation(id=" << aesDdsId
+  DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendPauseEffectSimulation(id=" << aesDdsId
                       << ", tetraId=" << aesTetraId << ")";
 
   TetraIcd::PauseEffectSimulation dAes;
@@ -1254,15 +1253,15 @@ void RecvFromDdsAes::sendResumeEffectSimulation(const AreaEffectSimulation::Expl
   const int aesTetraId = m_aesStateHandler->getAesTetraId(aes.id());
   if (aesTetraId == 0)
   {
-    DEBUG_LOG() << "Could not find a valid tetra id for aes dds id " << aesDdsId ;
+    DEBUG_LOG(m_logger) << "Could not find a valid tetra id for aes dds id " << aesDdsId ;
     return;
   }
   if (!m_aesStateHandler->update(aesDdsId, aesTetraId, true))
   {
-    WARNING_LOG() << "Could not update Aes state handler (" << aesDdsId
+    WARNING_LOG(m_logger) << "Could not update Aes state handler (" << aesDdsId
                           << ", " << aesTetraId << ")";
   }
-  DEBUG_LOG() << "RecvFromDdsAes::sendPauseEffectSimulation(id=" << aesDdsId
+  DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendPauseEffectSimulation(id=" << aesDdsId
                       << ", tetraId=" << aesTetraId << ")";
 
   TetraIcd::ResumeEffectSimulation dAes;
@@ -1294,15 +1293,15 @@ void RecvFromDdsAes::sendResumeEffectSimulation(const AreaEffectSimulation::Expl
   const int aesTetraId = m_aesStateHandler->getAesTetraId(aes.id());
   if (aesTetraId == 0)
   {
-    WARNING_LOG() << "Could not find a valid tetra id for aes dds id " << aesDdsId ;
+    WARNING_LOG(m_logger) << "Could not find a valid tetra id for aes dds id " << aesDdsId ;
     return;
   }
   if (!m_aesStateHandler->update(aesDdsId, aesTetraId, true))
   {
-    WARNING_LOG() << "Could not update Aes state handler (" << aesDdsId
+    WARNING_LOG(m_logger) << "Could not update Aes state handler (" << aesDdsId
                           << ", " << aesTetraId << ")";
   }
-  DEBUG_LOG() << "RecvFromDdsAes::sendPauseEffectSimulation(id=" << aesDdsId
+  DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendPauseEffectSimulation(id=" << aesDdsId
                       << ", tetraId=" << aesTetraId << ")";
 
   TetraIcd::ResumeEffectSimulation dAes;
@@ -1340,7 +1339,7 @@ void RecvFromDdsAes::onCheckOutdatedTelegrams()
     }
     if (!deactivatedAesIds.contains(aesId))
       continue;
-    INFO_LOG() << "Removing tele " << tele->type() << " from aes tele stack";
+    INFO_LOG(m_logger) << "Removing tele " << tele->type() << " from aes tele stack";
     delete tele;
     m_sentAesTelegrams.removeAt(i);
     m_sentAesTelegramsAesIds.removeAt(i);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.h
index c7e8ec6fd..af0c45305 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.h
@@ -166,7 +166,7 @@ private:
         if (it == cont.end())
         {
             cont.emplace(std::make_pair(data.id(), std::move(dataTmp)));
-            DEBUG_LOG() << "new AES Item: "  << data;
+            DEBUG_LOG(m_logger) << "new AES Item: "  << data;
             return true;
         }
 
@@ -178,7 +178,7 @@ private:
 
         if (it->second == dataTmp)
         {
-            DEBUG_LOG() << "nothing changed for AES Item: "  << data;
+            DEBUG_LOG(m_logger) << "nothing changed for AES Item: "  << data;
             return false;
         }
 
@@ -190,7 +190,7 @@ private:
 
         std::swap(it->second, dataTmp);  
 
-        DEBUG_LOG() << "changed AES Item: "  << data;
+        DEBUG_LOG(m_logger) << "changed AES Item: "  << data;
         return true;
     }
     bool dataChanged(const AreaEffectSimulation::AirSupportImpact &current, bool &onlyNameChanged)
@@ -333,7 +333,7 @@ private:
         m_sentAesTelegrams.push_back(new T(tele));
         m_sentAesTelegramsAesIds.push_back(tele.aesDdsId);
         m_checkOutdatedTelegramsTimer->start();
-        DEBUG_LOG() << "Appending " << tele.type()<< " to m_sentAesTelegrams";
+        DEBUG_LOG(m_logger) << "Appending " << tele.type()<< " to m_sentAesTelegrams";
     }
 
     void onCheckOutdatedTelegrams();
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 8c848df67..0fe1123b2 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
@@ -174,7 +174,7 @@ void RecvFromDdsFts::onSendEquipmentMessageRequest(const rti::core::SampleIdenti
     else
     {
       m_ftsTab->sendEquipmentMessageReply(cookie, fillFro(0, false));
-      ERROR_LOG() << "Got SendEquipmentMessageRequest but neither message nor messageId is set!";
+      ERROR_LOG(m_logger) << "Got SendEquipmentMessageRequest but neither message nor messageId is set!";
       return;
     }
     bool bRet = true;
@@ -248,7 +248,7 @@ void RecvFromDdsFts::onSendCesHitInformationRequest(const rti::core::SampleIdent
 
 void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie, const SendCesHitRequest &request)
 {
-  DEBUG_LOG() << "onSendCesHitRequest: " << request.equipmentNumber() << " - " << request.effectTime()
+  DEBUG_LOG(m_logger) << "onSendCesHitRequest: " << request.equipmentNumber() << " - " << request.effectTime()
                        << " request.chargeTypeId=" << request.chargeTypeId()
                        << " request.eventType()=" <<  request.eventType()
                        << " request.aesId()=" << request.aesId()
@@ -312,7 +312,7 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
     if ((request.eventType() == ProjectDataManagement::EventType::LeaveHazardDistance) ||
         (request.eventType() == ProjectDataManagement::EventType::EnterHazardDistance))
     {
-      INFO_LOG() << "HarzardArea: " << request.effectTime();
+      INFO_LOG(m_logger) << "HarzardArea: " << request.effectTime();
       data.reserve1 = request.mineId();
       data.aesType = TetraIcd::AreaEffectSimulationType::DangerZoneExplosion;
     }
@@ -338,7 +338,7 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
            ) 
   {
     data.remainEffectTasCodeDirect = calculateRemainEffectTasCode(ct.id(), request.remainEffectPercent());
-    DEBUG_LOG() << "PDM::EventType = " << request.eventType()
+    DEBUG_LOG(m_logger) << "PDM::EventType = " << request.eventType()
                          << " equipmentNumber=" << request.equipmentNumber()
                          << " originatorEquipmentNumber=" << data.originatorEquipmentNumber
                          << " chargeType=" << ct.id()
@@ -361,7 +361,7 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
       
 
       AreaEffectSimulation::FunctionalArea fa = m_mainHandler->aesHandler()->dtcAes()->functionalArea(request.aesId());
-      DEBUG_LOG() << "fa maintMode=" << fa.maintMode()
+      DEBUG_LOG(m_logger) << "fa maintMode=" << fa.maintMode()
                           << " maintTime=" <<fa.maintTime()
                           << " deconMode=" << fa.deconMode()
                           << " deconTime=" << fa.deconTime()
@@ -376,7 +376,7 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
           qint32 msb = AreaEffectSimulation::AesOperatingMode_def::OmWaitingTime << 8;
           qint32 lsb = fa.deconTime() / 1000 / 60 / 10; 
           data.chargeTasCodeIndirect = msb | lsb;
-          DEBUG_LOG() << "deconMode: remainEffectTasCodeDirect=" << data.chargeTasCodeIndirect
+          DEBUG_LOG(m_logger) << "deconMode: remainEffectTasCodeDirect=" << data.chargeTasCodeIndirect
                               << " msb=" << msb
                               << " lsb=" << lsb;
       }
@@ -385,7 +385,7 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
           qint32 msb = AreaEffectSimulation::AesOperatingMode_def::OmWaitingTime << 8;
           qint32 lsb = fa.maintTime() / 1000 / 60 / 10; 
           data.reserve1 = msb | lsb;
-          DEBUG_LOG() << "maintMode: reserve1=" << data.reserve1
+          DEBUG_LOG(m_logger) << "maintMode: reserve1=" << data.reserve1
                               << " msb=" << msb
                               << " lsb=" << lsb;
       }
@@ -394,7 +394,7 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
           qint32 msb = AreaEffectSimulation::AesOperatingMode_def::OmWaitingTime << 8;
           qint32 lsb = fa.medicTime() / 1000 / 60 / 10; 
           data.reserve2 = msb | lsb;
-          DEBUG_LOG() << "medicMode: reserve2=" << data.reserve2
+          DEBUG_LOG(m_logger) << "medicMode: reserve2=" << data.reserve2
                               << " msb=" << msb
                               << " lsb=" << lsb;
       }
@@ -405,7 +405,7 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
 
 void RecvFromDdsFts::onSendParticipantSwVerionsRequest(const rti::core::SampleIdentity &cookie, const SendParticipantSwVerionsRequest &request)
 {
-  DEBUG_LOG() << "onSendParticipantSwVerionsRequest: " << request.equipmentNumber() << " - " << request.equipmentFunctionId();
+  DEBUG_LOG(m_logger) << "onSendParticipantSwVerionsRequest: " << request.equipmentNumber() << " - " << request.equipmentFunctionId();
 
   TetraIcd::ParticipantSwVersionsRequest data;
   data.header.equipmentNumber = request.equipmentNumber();
@@ -489,7 +489,7 @@ void RecvFromDdsFts::onSendParticipantBeStillWarningRequest(const rti::core::Sam
   data.aesType = TetraIcd::AreaEffectSimulationType::BeStillWarning;
   data.remainEffectPercent = 0;
 
-  WARNING_LOG() << "sendParticipantBeStillWarningReply equipmentNumber=" << request.equipmentNumber();
+  WARNING_LOG(m_logger) << "sendParticipantBeStillWarningReply equipmentNumber=" << request.equipmentNumber();
   m_ftsTab->sendParticipantBeStillWarningReply(cookie, fillFro(request.equipmentNumber(), m_txCallback->txData(data)));
 }
 
@@ -509,7 +509,7 @@ void RecvFromDdsFts::onSendSetSanitationRequest(const rti::core::SampleIdentity
 
 void RecvFromDdsFts::onSendSelectiveReammunitionRequest(const rti::core::SampleIdentity &cookie, const SendSelectiveReammunitionRequest &request)
 {
-  DEBUG_LOG() << "onSendSelectiveReammunitionRequest for equipment number: " << request.equipmentNumber();
+  DEBUG_LOG(m_logger) << "onSendSelectiveReammunitionRequest for equipment number: " << request.equipmentNumber();
   TetraIcd::SelectiveReammunition data;
   data.header.equipmentNumber = request.equipmentNumber();
   data.header.timeStamp = QDateTime::currentMSecsSinceEpoch();
@@ -557,7 +557,7 @@ void RecvFromDdsFts::onSetDevicePowerRequest(const rti::core::SampleIdentity &co
 
 void RecvFromDdsFts::onAdlerCalculateTrajectoryRequest(const rti::core::SampleIdentity &cookie, const AdlerCalculateTrajectoryRequest &request)
 {
-  DEBUG_LOG() << "onSendCalculateTrajectoryAdlerRequest";
+  DEBUG_LOG(m_logger) << "onSendCalculateTrajectoryAdlerRequest";
 }
 
 
@@ -587,7 +587,7 @@ void RecvFromDdsFts::onSendUasWaypointRequest(const rti::core::SampleIdentity &c
   mission.missionName = QString::fromStdString(request.name());
   mission.missionId = request.planId();
 
-  ERROR_LOG() << "####################### request.equipmentNumber(): " << request.equipmentNumber() << ", request.name(): " << request.name() << ", mission.header.equipmentNumber: " << mission.header.equipmentNumber << ", properties: " << request.properties();
+  ERROR_LOG(m_logger) << "####################### request.equipmentNumber(): " << request.equipmentNumber() << ", request.name(): " << request.name() << ", mission.header.equipmentNumber: " << mission.header.equipmentNumber << ", properties: " << request.properties();
 
   TetraIcd::UAVAction action;
   action.task = TetraIcd::UAVActionTask::Loiter;
@@ -608,7 +608,7 @@ void RecvFromDdsFts::onSendUasWaypointRequest(const rti::core::SampleIdentity &c
   }
   catch (const std::exception &ex)
   {
-    ERROR_LOG() << "props is missing critical values: " << ex.what();
+    ERROR_LOG(m_logger) << "props is missing critical values: " << ex.what();
     m_ftsTab->sendUasWaypointReply(cookie, fillFro(request.equipmentNumber(), false));
     return;
   }
@@ -772,7 +772,7 @@ uint32_t RecvFromDdsFts::getVulnerabilityVitalityIndexFromVitalityAndVba(uint32_
     vitality += 1;
     if (vitality > 11)
     {
-      ERROR_LOG() << "Cant convert Vitality!";
+      ERROR_LOG(m_logger) << "Cant convert Vitality!";
       return 0;
     }
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.h
index dee43aba7..16ca89d8e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.h
@@ -156,6 +156,7 @@ public:
   void onSendExConfirmationReportRequest(const rti::core::SampleIdentity &cookie, const SendExConfirmationReportRequest &request) override;
 
 private:
+  NGL::INGLLogger &m_logger;
   static Core::FunctionReplyObject fillFro(int participantId, bool bSuccess);
   int calculateRemainEffectTasCode(int chargeTypeIdBase, int remainEffectPercent) const;
   uint32_t getVulnerabilityVitalityIndexFromVitalityAndVba(uint32_t vulnerabilityKind, uint32_t vitality);
@@ -164,6 +165,7 @@ private:
 
 private:
 
+  NGL::INGLLogger &m_logger;
   MainHandler *m_mainHandler;
   std::shared_ptr<Interface::Fts> m_ftsTab;
   std::shared_ptr<SendToTab> m_txCallback;
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 5f75d7b4c..02f2b17a1 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
@@ -230,7 +230,7 @@ void SendToDds::rxData(const TetraIcd::StateChangeDirect &inData)
   
   if (Settings::laserRangeCode() == inData.chargeTypeId)
   {
-    DEBUG_LOG() << "laserRangeCode chargeTypeId=" << inData.chargeTypeId
+    DEBUG_LOG(m_logger) << "laserRangeCode chargeTypeId=" << inData.chargeTypeId
                         << "vulnerabilityState=" << static_cast<int>(inData.vulnerabilityState);
     return;
   }
@@ -773,7 +773,7 @@ void SendToDds::rxData(const TetraIcd::SanitaryMaterialStockReport &inData)
   sanReport.qualification(static_cast<TrainingAreaBase::Qualification::inner_enum>(inData.qualification));
 
   publish(sanReport);
-  DEBUG_LOG() << "SendToDds::rxData(const TetraIcd::SanitaryMaterialStockReport for " << sanReport.equipmentNumber();
+  DEBUG_LOG(m_logger) << "SendToDds::rxData(const TetraIcd::SanitaryMaterialStockReport for " << sanReport.equipmentNumber();
 
   if (sanReport.qualification() == TrainingAreaBase::Qualification::NotDefined)
   {
@@ -812,7 +812,7 @@ void SendToDds::rxData(const TetraIcd::Sanitation &inData)
   sanitation.sanitationResult(static_cast<TrainingAreaBase::SanitationResult::inner_enum>(inData.sanitationResult));
   sanitation.sanitationEvaluation(static_cast<TrainingAreaBase::SanitationEvaluation::inner_enum>(inData.sanitationEvaluation));
   publish(sanitation);
-  DEBUG_LOG() << "SendToDds::rxData(const TetraIcd::Sanitation for " << sanitation.equipmentNumber();
+  DEBUG_LOG(m_logger) << "SendToDds::rxData(const TetraIcd::Sanitation for " << sanitation.equipmentNumber();
 
   if (sanitation.qualification() == TrainingAreaBase::Qualification::NotDefined)
   {
@@ -1062,7 +1062,7 @@ bool SendToDds::setPosition(T &data,
   else if (opsPos.opsId == 0) 
   {
     bool changeReportSource = true;
-    DEBUG_LOG() << "ops == 0 so check for marked invalid to use last position!";
+    DEBUG_LOG(m_logger) << "ops == 0 so check for marked invalid to use last position!";
     if (PositionHandler::isPositionMarkedInvalid(relPos))
     {
       
@@ -1075,7 +1075,7 @@ bool SendToDds::setPosition(T &data,
       
 
       
-      DEBUG_LOG() << "ops == 0 got last Position its source is " << tabPos.reportingSource();
+      DEBUG_LOG(m_logger) << "ops == 0 got last Position its source is " << tabPos.reportingSource();
 
       if (tabPos.reportingSource() != Core::PositionReportingSource::Wls
           && tabPos.reportingSource() != Core::PositionReportingSource::Ops
@@ -1084,14 +1084,14 @@ bool SendToDds::setPosition(T &data,
       else if (tabPos.reportingSource() == Core::PositionReportingSource::Ops
                || tabPos.reportingSource() == Core::PositionReportingSource::OpsTunnel)
         changeReportSource = false;
-      DEBUG_LOG() << "ops == 0 changeSource is " << changeReportSource ;
+      DEBUG_LOG(m_logger) << "ops == 0 changeSource is " << changeReportSource ;
     }
     else
     {
       
       if (!m_posHandler->isInTrainingArea(relPos))
       {
-        DEBUG_LOG() << "bret = false";
+        DEBUG_LOG(m_logger) << "bret = false";
         bRet = false;
       }
       tabPos.position(m_posHandler->relativeToGeographic(relPos));
@@ -1101,15 +1101,15 @@ bool SendToDds::setPosition(T &data,
       
       TrainingAreaBase::TabPosition lastPosition = m_posHandler->lastPosition(data.equipmentNumber());
       {
-        DEBUG_LOG() << "lastPosition.reportingSource=" << lastPosition.reportingSource();
+        DEBUG_LOG(m_logger) << "lastPosition.reportingSource=" << lastPosition.reportingSource();
       }
 
       if (lastPosition.reportingSource() == Core::PositionReportingSource::Ops &&
           lastPosition.moutObjectId().is_set())
       {
-        DEBUG_LOG() << "Check leave Building equipmentNumber=" << data.equipmentNumber();
-        DEBUG_LOG() << "relPos=" << relPos.offsetX << "/" << relPos.offsetY;
-        DEBUG_LOG() << "posInExtendedBuildingFootprint";
+        DEBUG_LOG(m_logger) << "Check leave Building equipmentNumber=" << data.equipmentNumber();
+        DEBUG_LOG(m_logger) << "relPos=" << relPos.offsetX << "/" << relPos.offsetY;
+        DEBUG_LOG(m_logger) << "posInExtendedBuildingFootprint";
         const Core::GeoPosition &position = tabPos.position();
         int moutObjectId = lastPosition.moutObjectId().get();
         const int lastMountPointTypeId = m_posHandler->lastMountPointTypeId(data.equipmentNumber());
@@ -1120,7 +1120,7 @@ bool SendToDds::setPosition(T &data,
         }
         else
         {
-          DEBUG_LOG() << "lastMountPointTypeId =" << m_posHandler->lastMountPointTypeId(data.equipmentNumber());
+          DEBUG_LOG(m_logger) << "lastMountPointTypeId =" << m_posHandler->lastMountPointTypeId(data.equipmentNumber());
 
           if (   m_posHandler->lastMountPointTypeId(data.equipmentNumber())  == InfrastructureManagement::MountingPointType_def::IndoorIPS)
           {
@@ -1129,19 +1129,19 @@ bool SendToDds::setPosition(T &data,
             bool checkSpeed = !m_posHandler->isTimeToPerformSpeedCheckExceeded(data.equipmentNumber(),
                                                                                timeStamp,
                                                                                Settings::maxSpeedCheckTimeout());
-            DEBUG_LOG() << "Check Speed speed="  << speed
+            DEBUG_LOG(m_logger) << "Check Speed speed="  << speed
                                 << " MaxSoldierSpeed=" << Settings::maxSoldierSpeed()
                                 << " checkSpeed=" << checkSpeed;
             if (checkSpeed && speed > Settings::maxSoldierSpeed())
             {
-              DEBUG_LOG() << "Check Speed bRet = false";
+              DEBUG_LOG(m_logger) << "Check Speed bRet = false";
               bRet = false;
               moutCheck = false;
             }
           }
           else
           {
-            DEBUG_LOG() << "Kein Speed check!";
+            DEBUG_LOG(m_logger) << "Kein Speed check!";
           }
         }
       }
@@ -1152,7 +1152,7 @@ bool SendToDds::setPosition(T &data,
   }
   else
   {
-    INFO_LOG() << "Valid OpsData: " << opsPos.opsId;
+    INFO_LOG(m_logger) << "Valid OpsData: " << opsPos.opsId;
 
     IsmHandler::OpsData opsData;
     if (ism())
@@ -1160,7 +1160,7 @@ bool SendToDds::setPosition(T &data,
       opsData = ism()->dataFromOpsCode(opsPos.opsId);
 
       
-      DEBUG_LOG() << "equipmentNumber=" << data.equipmentNumber()
+      DEBUG_LOG(m_logger) << "equipmentNumber=" << data.equipmentNumber()
                           << " AssetId=" << opsData.assetId
                           << " opsData.structureElementId=" << opsData.structureElementId
                           << " opsData.mseId=" << opsData.mainStructureElementId
@@ -1171,17 +1171,17 @@ bool SendToDds::setPosition(T &data,
 
     if (opsData.opsCode != opsPos.opsId)
     {
-      WARNING_LOG() << "found no position data for ops id " << opsPos.opsId;
+      WARNING_LOG(m_logger) << "found no position data for ops id " << opsPos.opsId;
       bRet = false;
     }
     else if (opsData.structureElementId == 0)
     {
-      WARNING_LOG() << "ops id " << opsPos.opsId << " is not mounted";
+      WARNING_LOG(m_logger) << "ops id " << opsPos.opsId << " is not mounted";
       bRet = false;
     }
     else
     {
-      DEBUG_LOG() << "ops id " << opsPos.opsId;
+      DEBUG_LOG(m_logger) << "ops id " << opsPos.opsId;
       tabPos.moutObjectId(opsData.mainStructureElementId);
       tabPos.moutRoomId(opsData.roomId);
       tabPos.position(opsData.position);
@@ -1198,13 +1198,13 @@ bool SendToDds::setPosition(T &data,
   {
     if ( moutCheck )
     {
-      DEBUG_LOG() << "POS = ungueltig";
+      DEBUG_LOG(m_logger) << "POS = ungueltig";
       tabPos.position().lon(nan(""));
       tabPos.position().lat(nan(""));
     }
     else
     {
-      DEBUG_LOG() << "POS = ungueltig => alte Pos mit aktueller Zeit verschicken";
+      DEBUG_LOG(m_logger) << "POS = ungueltig => alte Pos mit aktueller Zeit verschicken";
       TrainingAreaBase::TabPosition  lastPosition = m_posHandler->lastPosition(data.equipmentNumber());
       tabPos.position().lon(lastPosition.position().lon());
       tabPos.position().lat(lastPosition.position().lat());
@@ -1218,12 +1218,12 @@ bool SendToDds::setPosition(T &data,
 
   else
   {
-    DEBUG_LOG() << "set last Position";
+    DEBUG_LOG(m_logger) << "set last Position";
     if (tabPos.reportingSource() == Core::PositionReportingSource::Ops)
-      DEBUG_LOG() << "ReportingSource=OPS";
+      DEBUG_LOG(m_logger) << "ReportingSource=OPS";
     else if (tabPos.reportingSource() == Core::PositionReportingSource::Gps)
-      DEBUG_LOG() << "ReportingSource=GPS";
-    DEBUG_LOG() << "tabPos.reportingSource=" << tabPos.reportingSource()
+      DEBUG_LOG(m_logger) << "ReportingSource=GPS";
+    DEBUG_LOG(m_logger) << "tabPos.reportingSource=" << tabPos.reportingSource()
                         << " timeStamp=" << timeStamp;
     m_posHandler->setLastPosition(data.equipmentNumber(), tabPos);
     m_posHandler->setLastTime(data.equipmentNumber(), timeStamp);
@@ -1248,7 +1248,7 @@ bool SendToDds::setPosition2d(T &data,
     if (!m_posHandler->isInTrainingArea(relPos))
       bRet = false;
 
-    DEBUG_LOG() << "tabPos.reportingSource=" << tabPos.reportingSource();
+    DEBUG_LOG(m_logger) << "tabPos.reportingSource=" << tabPos.reportingSource();
     tabPos.position(m_posHandler->relativeToGeographic(relPos));
     m_posHandler->setLastPosition(data.equipmentNumber(), tabPos);
   }
@@ -1319,7 +1319,7 @@ void SendToDds::publish(const T &data)
   }
   catch (const std::exception &ex)
   {
-    WARNING_LOG() << "Could not send telegram: " << ex.what();
+    WARNING_LOG(m_logger) << "Could not send telegram: " << ex.what();
   }
 }
 
@@ -1341,13 +1341,13 @@ void SendToDds::onEmergencyCallTimerTimeout(int issi)
     TrainingAreaBase::EmergencyCall emergCallData;
     emergCallData.equipmentNumber(issi);
     if (!m_mainHandler->ddsHandler()->emergencyCall()->remove(emergCallData))
-      ERROR_LOG() << Q_FUNC_INFO << " removing of TrainingAreaBase::EmergencyCall failed, issi = " << issi;
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " removing of TrainingAreaBase::EmergencyCall failed, issi = " << issi;
   }
 }
 
 void SendToDds::onPvSanUniqueIdMapping(int uniqueId, int equipNo, qint64 sampleTime)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << "start pvSan mapping " << equipNo << " uniqueId " << uniqueId;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << "start pvSan mapping " << equipNo << " uniqueId " << uniqueId;
 
   
   if (m_uniqueId2EquipmentNumber.value(uniqueId) == equipNo)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/send_to_dds.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/send_to_dds.h
index fcc9f6910..2f6c9a21d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/send_to_dds.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/send_to_dds.h
@@ -66,6 +66,7 @@ public:
   void rxData(const TetraIcd::UAVMissionStatus &inData) override;
 
 private:
+  NGL::INGLLogger &m_logger;
   template <typename T>
   bool setPosition(T &data,
                    const TetraIcd::AbsolutePosition &geoPos,
@@ -92,6 +93,7 @@ private:
   void onPvSanUniqueIdMapping(int uniqueId, int equipNo, qint64 sampleTime);
 
 private:
+  NGL::INGLLogger &m_logger;
   MainHandler *m_mainHandler;
   std::shared_ptr<TrainingAreaBase::Interface::Dts> m_dtsTab;
   const std::shared_ptr<const AesStateHandler> m_aesStateHandler;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tx_mixin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tx_mixin.cpp
index 55a153d6b..3c769de01 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tx_mixin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tx_mixin.cpp
@@ -289,7 +289,7 @@ bool TxMixin::txDataToAll(const T &data)
       if (tx->txData(data))
         bSent = true;
       else
-        WARNING_LOG() << "Can not sent broadcast telegram with id " << (int)data.id() << " to handler " << tx->name()
+        WARNING_LOG(m_logger) << "Can not sent broadcast telegram with id " << (int)data.id() << " to handler " << tx->name()
                               << " but it was requested by this handler ...";
     }
   }
@@ -309,7 +309,7 @@ bool TxMixin::txDataToAll(const T &data)
         break;
       case HandleState::YesConsume:
         if (bConsumed || bSent)
-          WARNING_LOG() << "Handler " << tx->name() << " will consume telegram with id " << (int)data.id()
+          WARNING_LOG(m_logger) << "Handler " << tx->name() << " will consume telegram with id " << (int)data.id()
                                 << " and equipment number " << equipmentNumber
                                 << " but it was already consumed/sent!";
         if (tx->txData(data))
@@ -323,7 +323,7 @@ bool TxMixin::txDataToAll(const T &data)
         break;
       case HandleState::YesShare:
         if (bConsumed)
-          WARNING_LOG() << "Handler " << tx->name() << " will share telegram with id " << (int)data.id()
+          WARNING_LOG(m_logger) << "Handler " << tx->name() << " will share telegram with id " << (int)data.id()
                                 << " and equipment number " << equipmentNumber
                                 << " but it was already consumed!";
         if (tx->txData(data))
@@ -339,7 +339,7 @@ bool TxMixin::txDataToAll(const T &data)
   }
 
   if (!bSent)
-    WARNING_LOG() << "Could not sent telegram with id " << (int)data.id() << " and equipment number " << equipmentNumber
+    WARNING_LOG(m_logger) << "Could not sent telegram with id " << (int)data.id() << " and equipment number " << equipmentNumber
                           << " - no handler found!";
 
   return bSent;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tx_mixin.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tx_mixin.h
index 3ab6855f2..2b12ff117 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tx_mixin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tx_mixin.h
@@ -69,12 +69,14 @@ public:
   bool txData(const TrainingAreaBase::TetraIcd::ExFiredReport &) override ;
   bool txData(const TrainingAreaBase::TetraIcd::ExConfirmationReport &) override ;
 private:
+  NGL::INGLLogger &m_logger;
   bool txData(const TetraIcd::UAVPerformMission &data) override;
   bool txData(const TetraIcd::UAVChangeState &data) override;
 
   template<typename T>
   bool txDataToAll(const T &data);
 private:
+  NGL::INGLLogger &m_logger;
   QVector<std::shared_ptr<SendToTab>> m_txHandler;
 };
 } 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.cpp
index c4e8c503e..c9652e544 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.cpp
@@ -13,12 +13,11 @@
 namespace TrainingAreaBaseOC
 {
 
-TxDdlHandler::TxDdlHandler()
-  : m_state(DdlState::NotStarted)
+TxDdlHandler::TxDdlHandler() : m_state(DdlState::NotStarted)
   , m_segmentToggle(0)
   , m_sentCnt(0)
-  , m_responseTimer(new QTimer(this))
-{
+  , m_responseTimer(new QTimer(this)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_responseTimer->setInterval(1000);
   m_responseTimer->setSingleShot(true);
   connect(m_responseTimer, &QTimer::timeout, this, &TxDdlHandler::sendAbortOrRestartTimeout);
@@ -46,13 +45,13 @@ void TxDdlHandler::process(const QByteArray &data)
   {
   case 1:
   {
-    DEBUG_LOG() << "Segment download confirmation received";
+    DEBUG_LOG(m_logger) << "Segment download confirmation received";
     
     qint32 toggle = ((data[0] & 0x10) >> 4);
 
     if (m_segmentToggle != toggle)
     {
-      ERROR_LOG() << "Toggle bit of confirmation not equal to request";
+      ERROR_LOG(m_logger) << "Toggle bit of confirmation not equal to request";
       sendAbort(130);
     }
 
@@ -62,14 +61,14 @@ void TxDdlHandler::process(const QByteArray &data)
   }
   case 3:
   {
-    DEBUG_LOG() << "Initiate download confirmation received";
+    DEBUG_LOG(m_logger) << "Initiate download confirmation received";
     
     if (m_dataToSend.isEmpty())
       break;
 
     if (DdlState::Initiated != m_state)
     {
-      ERROR_LOG() << "Initiate download confirmation received but ddl wasn't startet yet.";
+      ERROR_LOG(m_logger) << "Initiate download confirmation received but ddl wasn't startet yet.";
       sendAbort();
       break;
     }
@@ -78,7 +77,7 @@ void TxDdlHandler::process(const QByteArray &data)
   }
   case 4:
   {
-    WARNING_LOG() << "Error during domain download";
+    WARNING_LOG(m_logger) << "Error during domain download";
 
     m_state = DdlState::NotStarted;
     if (m_dataToSend.isEmpty())
@@ -90,7 +89,7 @@ void TxDdlHandler::process(const QByteArray &data)
   }
   default:
     
-    ERROR_LOG() << "unknown scs value received: " << scs;
+    ERROR_LOG(m_logger) << "unknown scs value received: " << scs;
     break;
   }
 }
@@ -115,13 +114,13 @@ void TxDdlHandler::initiateDomainDownload()
 {
   if (m_dataToSend.isEmpty())
   {
-    ERROR_LOG() << "::initiateDomainDownload called, but no data to send available";
+    ERROR_LOG(m_logger) << "::initiateDomainDownload called, but no data to send available";
     return;
   }
 
   if (m_sentCnt >= s_maxResendCnt)
   {
-    ERROR_LOG() << "Maximum trys of resending DDL exceeded. ";
+    ERROR_LOG(m_logger) << "Maximum trys of resending DDL exceeded. ";
     m_dataToSend.removeFirst();
     m_sentCnt = 0;
     startNextDomainDownload();
@@ -137,7 +136,7 @@ void TxDdlHandler::initiateDomainDownload()
   data[6] = ((dataSize >> 16) & 0xFF);
   data[7] = ((dataSize >> 24) & 0xFF);
 
-  DEBUG_LOG() << "Initiate DDL Req";
+  DEBUG_LOG(m_logger) << "Initiate DDL Req";
 
   m_state = DdlState::Initiated;
   m_sentCnt++;
@@ -149,7 +148,7 @@ void TxDdlHandler::domainDownload()
 {
   if (m_dataToSend.isEmpty())
   {
-    ERROR_LOG() << "::domainDownload called, but no data to send available";
+    ERROR_LOG(m_logger) << "::domainDownload called, but no data to send available";
     return;
   }
 
@@ -202,7 +201,7 @@ void TxDdlHandler::domainDownload()
 
   m_dataToSend.first().offset = newOffset;
 
-  DEBUG_LOG() << "Segment DDL Req";
+  DEBUG_LOG(m_logger) << "Segment DDL Req";
   m_state = DdlState::Downloading;
 
   emit send(data);
@@ -214,7 +213,7 @@ void TxDdlHandler::sendAbort(quint8 error)
   QByteArray data(8, '\0');
   data[0] = 0x80;
   data[1] = error;
-  DEBUG_LOG() << "Abort DDL Req";
+  DEBUG_LOG(m_logger) << "Abort DDL Req";
 
   m_state = DdlState::NotStarted;
   m_dataToSend.first().offset = 0;
@@ -235,7 +234,7 @@ void RxDdlHandler::process(const QByteArray &data)
   
   case 1:
   {
-    DEBUG_LOG() << "initiate download received";
+    DEBUG_LOG(m_logger) << "initiate download received";
     if (m_isMultiplexed)
       m_multiplexer = (((data[1] & 0xFF) << 16) | ((data[2] & 0xFF) << 8) | (data[3] & 0xFF));
 
@@ -251,10 +250,10 @@ void RxDdlHandler::process(const QByteArray &data)
   
   case 0:
   {
-    DEBUG_LOG() << "download segment received";
+    DEBUG_LOG(m_logger) << "download segment received";
     if (m_state == DdlState::NotStarted)
     {
-      WARNING_LOG() << "download segment and data m_state == DdlState::NotStarted, something went wrong!";
+      WARNING_LOG(m_logger) << "download segment and data m_state == DdlState::NotStarted, something went wrong!";
       sendDPConfirmation(4, 0);
       return;
     }
@@ -284,14 +283,14 @@ void RxDdlHandler::process(const QByteArray &data)
   
   case 4:
   {
-    DEBUG_LOG() << "abort download received";
+    DEBUG_LOG(m_logger) << "abort download received";
     m_messageData.clear();
     m_state = DdlState::NotStarted;
     break;
   }
   default:
   {
-    WARNING_LOG() << "Unknown ccs ID: " << ccs;
+    WARNING_LOG(m_logger) << "Unknown ccs ID: " << ccs;
     break;
   }
   }
@@ -315,7 +314,7 @@ void RxDdlHandler::sendDPConfirmation(const quint32 ccs, const quint32 toggle, c
     else if (1 == toggle)
       data[0] = 0x30;
     else
-      WARNING_LOG() << "Unknown toggle state: " << toggle;
+      WARNING_LOG(m_logger) << "Unknown toggle state: " << toggle;
     m_state = DdlState::Downloading;
   }
   else if (4 == ccs)
@@ -365,7 +364,7 @@ bool CanagHandler::init()
 
   if (!m_handlerAesData->init())
   {
-    ERROR_LOG() << "Could not initialise HandlerAesData.";
+    ERROR_LOG(m_logger) << "Could not initialise HandlerAesData.";
     return false;
   }
 
@@ -459,19 +458,19 @@ bool CanagHandler::txData(const TrainingAreaBase::TetraIcd::OpaquePayloadDataBas
   {
   case TrainingAreaBase::TetraIcd::OpaquePayloadDataBase::Type::OC:
   {
-    INFO_LOG() << "adding DDL CanId::CAN_ID_DATENVERKEHR_SRT_KOPPELRECHNER_TX";
+    INFO_LOG(m_logger) << "adding DDL CanId::CAN_ID_DATENVERKEHR_SRT_KOPPELRECHNER_TX";
     m_txDdlHandler[CanId::OcExconDataTx]->addData(LtsUtils::toQByteArray(data.payload));
     break;
   }
   case TrainingAreaBase::TetraIcd::OpaquePayloadDataBase::Type::FireSmokeMarker:
   {
-    INFO_LOG() << "adding DDL CanId::CAN_ID_DATENVERKEHR_DMF_KOPPELRECHNER_TX";
+    INFO_LOG(m_logger) << "adding DDL CanId::CAN_ID_DATENVERKEHR_DMF_KOPPELRECHNER_TX";
     m_txDdlHandler[CanId::FireSmokeMarkerExconDataTx]->addData(LtsUtils::toQByteArray(data.payload));
     break;
   }
   default:
   {
-    ERROR_LOG() << "Tryed to send unhandled TrainingAreaBase::TetraIcd::OpaquePayloadDataBase::Type " << static_cast<int>(data.payloadType);
+    ERROR_LOG(m_logger) << "Tryed to send unhandled TrainingAreaBase::TetraIcd::OpaquePayloadDataBase::Type " << static_cast<int>(data.payloadType);
     return false;
   }
   }
@@ -483,22 +482,22 @@ void CanagHandler::handleSfmTelegram(const LtsUtils::SfmMessage &message)
 {
   if (message.id() == 0)
   {
-    ERROR_LOG() << "Error while receiving data from sfm.";
+    ERROR_LOG(m_logger) << "Error while receiving data from sfm.";
     return;
   }
 
-  DEBUG_LOG() << "Received new CAN-Message with ID: " << message.id() << " RTR: " << message.rtr() << " data: " << message.payload().toHex(' ');
+  DEBUG_LOG(m_logger) << "Received new CAN-Message with ID: " << message.id() << " RTR: " << message.rtr() << " data: " << message.payload().toHex(' ');
   switch (message.id())
   {
   case CanId::DemandDeviceId:
   {
-    INFO_LOG() << "Received CanId::DemandDeviceId";
+    INFO_LOG(m_logger) << "Received CanId::DemandDeviceId";
     m_deviceMessageTimer->start();
     break;
   }
   case CanId::Time:
   {
-    DEBUG_LOG() << "Received CanId::Time";
+    DEBUG_LOG(m_logger) << "Received CanId::Time";
     QByteArray data = message.payload();
     OcTelegrams::TimeSync outData;
 
@@ -506,7 +505,7 @@ void CanagHandler::handleSfmTelegram(const LtsUtils::SfmMessage &message)
     LtsUtils::get4Byte(data, gpsTime);
     outData.gpsTimeMsec = gpsTime * 1000ULL;
     outData.timezone = data[4];
-    DEBUG_LOG() << "Received " << gpsTime;
+    DEBUG_LOG(m_logger) << "Received " << gpsTime;
     sendSyncTime(gpsTime);
 
     m_rxHandler->rxData(outData);
@@ -514,7 +513,7 @@ void CanagHandler::handleSfmTelegram(const LtsUtils::SfmMessage &message)
   }
   case CanId::EnterLeaveAes:
   {
-    INFO_LOG() << "Received CanId::EnterLeaveAes";
+    INFO_LOG(m_logger) << "Received CanId::EnterLeaveAes";
     QByteArray data = message.payload();
     OcTelegrams::EnterLeaveAes outData;
 
@@ -535,13 +534,13 @@ void CanagHandler::handleSfmTelegram(const LtsUtils::SfmMessage &message)
   }
   case CanId::ParameterOcRx:
   {
-    INFO_LOG() << "Received CanId::ParameterOcRx";
+    INFO_LOG(m_logger) << "Received CanId::ParameterOcRx";
     send(*m_messages[CanId::ParameterOcTx]);
     break;
   }
   case CanId::TechnicalStateSfm:
   {
-    INFO_LOG() << "Received CanId::TechnicalStateSfm";
+    INFO_LOG(m_logger) << "Received CanId::TechnicalStateSfm";
     QByteArray data = message.payload();
     OcTelegrams::TechnicalStateSfm outData;
 
@@ -566,7 +565,7 @@ void CanagHandler::handleSfmTelegram(const LtsUtils::SfmMessage &message)
   }
   case CanId::TechnicalStateOc:
   {
-    INFO_LOG() << "Received CanId::TechnicalStateOc";
+    INFO_LOG(m_logger) << "Received CanId::TechnicalStateOc";
     
     if (message.rtr())
       send(*m_messages[CanId::TechnicalStateOc]);
@@ -574,42 +573,42 @@ void CanagHandler::handleSfmTelegram(const LtsUtils::SfmMessage &message)
   }
   case CanId::ExconOcDataRx:
   {
-    INFO_LOG() << "Received CanId::ExconOcDataRx";
+    INFO_LOG(m_logger) << "Received CanId::ExconOcDataRx";
     QByteArray data = message.payload();
     m_rxDdlHandler[CanId::ExconOcDataTx]->process(data);
     break;
   }
   case CanId::OcExconDataRx:
   {
-    INFO_LOG() << "Received CanId::OcExconDataRx";
+    INFO_LOG(m_logger) << "Received CanId::OcExconDataRx";
     QByteArray data = message.payload();
     m_txDdlHandler[CanId::OcExconDataTx]->process(data);
     break;
   }
   case CanId::ExconFireSmokeMarkerDataRx:
   {
-    INFO_LOG() << "Received CanId::ExconFireSmokeMarkerDataRx";
+    INFO_LOG(m_logger) << "Received CanId::ExconFireSmokeMarkerDataRx";
     QByteArray data = message.payload();
     m_rxDdlHandler[CanId::ExconFireSmokeMarkerDataTx]->process(data);
     break;
   }
   case CanId::FireSmokeMarkerExconDataRx:
   {
-    INFO_LOG() << "Received CanId::FireSmokeMarkerExconDataRx";
+    INFO_LOG(m_logger) << "Received CanId::FireSmokeMarkerExconDataRx";
     QByteArray data = message.payload();
     m_txDdlHandler[CanId::FireSmokeMarkerExconDataTx]->process(data);
     break;
   }
   case CanId::AwesDataRx:
   {
-    INFO_LOG() << "Received CanId::AwesDataRx";
+    INFO_LOG(m_logger) << "Received CanId::AwesDataRx";
     QByteArray data = message.payload();
     m_rxDdlHandler[CanId::AwesDataTx]->process(data);
     break;
   }
   case CanId::Position:
   {
-    INFO_LOG() << "Received CanId::Position";
+    INFO_LOG(m_logger) << "Received CanId::Position";
     QByteArray data = message.payload();
     OcTelegrams::OwnPosition outData;
 
@@ -626,7 +625,7 @@ void CanagHandler::handleSfmTelegram(const LtsUtils::SfmMessage &message)
   }
   case CanId::DisplayMessage:
   {
-    INFO_LOG() << "Received CanId::DisplayMessage";
+    INFO_LOG(m_logger) << "Received CanId::DisplayMessage";
 
     handleDisplayMessage(message);
 
@@ -634,7 +633,7 @@ void CanagHandler::handleSfmTelegram(const LtsUtils::SfmMessage &message)
   }
   case CanId::SpecificsExercise:
   {
-    INFO_LOG() << "Received CanId::SpecificsExercise";
+    INFO_LOG(m_logger) << "Received CanId::SpecificsExercise";
     QByteArray data = message.payload();
     OcTelegrams::SpecificsExercise outData;
     
@@ -662,7 +661,7 @@ void CanagHandler::handleSfmTelegram(const LtsUtils::SfmMessage &message)
   }
   case CanId::SpecificsOc:
   {
-    INFO_LOG() << "Received CanId::SpecificsOc";
+    INFO_LOG(m_logger) << "Received CanId::SpecificsOc";
     
     if (message.rtr())
       send(*m_messages[CanId::SpecificsOc]);
@@ -670,7 +669,7 @@ void CanagHandler::handleSfmTelegram(const LtsUtils::SfmMessage &message)
   }
   case CanId::SpecificsEquipment:
   {
-    INFO_LOG() << "Received CanId::SpecificsEquipment";
+    INFO_LOG(m_logger) << "Received CanId::SpecificsEquipment";
     QByteArray data = message.payload();
     OcTelegrams::SpecificsEquipment outData;
 
@@ -695,13 +694,13 @@ void CanagHandler::handleSfmTelegram(const LtsUtils::SfmMessage &message)
   }
   case CanId::ParameterSfmRx:
   {
-    INFO_LOG() << "Received CanId::ParameterSfmRx";
+    INFO_LOG(m_logger) << "Received CanId::ParameterSfmRx";
     
     break;
   }
   case CanId::ConnectionTestSfmReply:
   {
-    INFO_LOG() << "Received CanId::TestConnectionSfmReply";
+    INFO_LOG(m_logger) << "Received CanId::TestConnectionSfmReply";
     if (!m_sfmConnectionEstablished)
       sendDemandDeviceId();
     else
@@ -710,21 +709,21 @@ void CanagHandler::handleSfmTelegram(const LtsUtils::SfmMessage &message)
     break;
   }
   default:
-    DEBUG_LOG() << "message id " << message.id() << " is not handled!";
+    DEBUG_LOG(m_logger) << "message id " << message.id() << " is not handled!";
     break;
   }
 }
 
 void CanagHandler::sendDemandDeviceId()
 {
-  INFO_LOG() << "Requesting Device ID.";
+  INFO_LOG(m_logger) << "Requesting Device ID.";
   send(*m_messages[CanId::DemandDeviceId]);
   m_deviceMessageTimer->start();
 }
 
 void CanagHandler::sendDeviceMessage()
 {
-  INFO_LOG() << "Sending Device ID.";
+  INFO_LOG(m_logger) << "Sending Device ID.";
   send(*m_messages[CanId::DeviceId]);
   if (!m_technicalStateSfm.sfmConnected)
     demandInitialSfmData();
@@ -816,12 +815,12 @@ void CanagHandler::sendFreeText()
 
 void CanagHandler::sendSyncTime(uint32_t syncTimeSec)
 {
-  INFO_LOG() << "sendSyncTime " << syncTimeSec;
+  INFO_LOG(m_logger) << "sendSyncTime " << syncTimeSec;
 
   if (syncTimeSec > QDateTime::currentSecsSinceEpoch() - 3 &&
       syncTimeSec < QDateTime::currentSecsSinceEpoch() + 3)
   {
-    DEBUG_LOG() << "PartitionTime is Still valid";
+    DEBUG_LOG(m_logger) << "PartitionTime is Still valid";
     return;
   }
   if (!m_syncSocket->isOpen())
@@ -831,7 +830,7 @@ void CanagHandler::sendSyncTime(uint32_t syncTimeSec)
   {
     m_syncSocket->write(QByteArray::number(syncTimeSec));
     m_syncSocket->flush();
-    DEBUG_LOG() << "Send: " << syncTimeSec << " " << QByteArray::number(syncTimeSec);
+    DEBUG_LOG(m_logger) << "Send: " << syncTimeSec << " " << QByteArray::number(syncTimeSec);
   }
 }
 
@@ -839,13 +838,13 @@ void CanagHandler::send(const LtsUtils::SfmMessage &message)
 {
   
 
-  DEBUG_LOG() << "send message - " << message.id() << " RTR: " << message.rtr();
+  DEBUG_LOG(m_logger) << "send message - " << message.id() << " RTR: " << message.rtr();
   if (!message.payload().isEmpty())
-    DEBUG_LOG() << " size: " << message.payload().size() << " data: " <<  message.payload().toHex(' ');
+    DEBUG_LOG(m_logger) << " size: " << message.payload().size() << " data: " <<  message.payload().toHex(' ');
 
 
   if (!m_connectionHandler->send(message))
-    ERROR_LOG() << "Could not send message!";
+    ERROR_LOG(m_logger) << "Could not send message!";
   else
     emit sendMessage(message);
 }
@@ -865,15 +864,15 @@ void CanagHandler::openSocket()
 
   m_syncSocket->connectToHost(Settings::hostName(), 13777);
   if (!m_syncSocket->waitForConnected())
-    WARNING_LOG() << "Could not (re)open tcp destination " << m_syncSocket->peerName() << ":" << m_syncSocket->peerPort() << ", error: " << m_syncSocket->errorString();
+    WARNING_LOG(m_logger) << "Could not (re)open tcp destination " << m_syncSocket->peerName() << ":" << m_syncSocket->peerPort() << ", error: " << m_syncSocket->errorString();
   else
   {
     connect(m_syncSocket, &QTcpSocket::disconnected, this, [this]
     {
-      DEBUG_LOG() << "Disconnected from Host";
+      DEBUG_LOG(m_logger) << "Disconnected from Host";
       m_syncSocket->close();
     });
-    DEBUG_LOG() << "(re)open tcp destination " << m_syncSocket->peerName() << ":" << m_syncSocket->peerPort();
+    DEBUG_LOG(m_logger) << "(re)open tcp destination " << m_syncSocket->peerName() << ":" << m_syncSocket->peerPort();
   }
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.h
index fc63de1ef..7f7e2d29a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.h
@@ -53,6 +53,8 @@ private slots:
   void sendAbortOrRestartTimeout();
 
 private:
+
+NGL::INGLLogger &m_logger;
   const qint32 s_maxResendCnt = 5;
 
   struct DdlData
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler.h
index 693cff9d2..00a2aa5db 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler.h
@@ -21,6 +21,7 @@ class ConnectionHandler : public ConnectionHandlerTcpTtci
 
 public:
   explicit ConnectionHandler();
+NGL::INGLLogger &m_logger;
 };
 
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_serial.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_serial.cpp
index a66353226..24f0a7aca 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_serial.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_serial.cpp
@@ -10,10 +10,9 @@
 namespace TrainingAreaBaseOC
 {
 
-ConnectionHandlerSerial::ConnectionHandlerSerial()
-  : m_spQuerry(new LtsSerialPortQuerry::LtsSerialPortQuerry(this))
-  , m_receiveTimeoutTimer(new QTimer(this))
-{
+ConnectionHandlerSerial::ConnectionHandlerSerial() : m_spQuerry(new LtsSerialPortQuerry::LtsSerialPortQuerry(this))
+  , m_receiveTimeoutTimer(new QTimer(this)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   connect(m_spQuerry, &LtsSerialPortQuerry::LtsSerialPortQuerry::connectionEstablished, this, &ConnectionHandlerSerial::open);
   m_spQuerry->restartQuerry();
   m_receiveTimeoutTimer->setInterval(5000);
@@ -34,25 +33,25 @@ bool ConnectionHandlerSerial::send(const LtsUtils::SfmMessage &message)
 
   if (!m_serialPort->isOpen())
   {
-    ERROR_LOG() << "Port is not opened!";
+    ERROR_LOG(m_logger) << "Port is not opened!";
     return false;
   }
 
   QByteArray data = LtsUtils::byteStreamFromSfmMessage(message);
 
-  DEBUG_LOG() << "Sending frame: " << data.toHex(' ');
+  DEBUG_LOG(m_logger) << "Sending frame: " << data.toHex(' ');
 
   const qint64 byteswritten = m_serialPort->write(data);
   m_serialPort->flush();
   
   if (byteswritten == -1)
   {
-    ERROR_LOG() << "Failed to write data to port " << m_serialPort->portName() << " error: " << m_serialPort->errorString();
+    ERROR_LOG(m_logger) << "Failed to write data to port " << m_serialPort->portName() << " error: " << m_serialPort->errorString();
     return false;
   }
   else if (byteswritten != data.size())
   {
-    ERROR_LOG() << "Failed to write all data to port " << m_serialPort->portName() << " error: " << m_serialPort->errorString();
+    ERROR_LOG(m_logger) << "Failed to write all data to port " << m_serialPort->portName() << " error: " << m_serialPort->errorString();
     return false;
   }
 
@@ -83,7 +82,7 @@ void ConnectionHandlerSerial::read()
   const QByteArray ba = m_serialPort->readAll();
   m_currentDataRead.append(ba);
 
-  DEBUG_LOG() << "Binary data from sfm: " << ba.toHex(' ');
+  DEBUG_LOG(m_logger) << "Binary data from sfm: " << ba.toHex(' ');
 
   int idxStart = -1;
   int idxEnd = -1;
@@ -94,21 +93,21 @@ void ConnectionHandlerSerial::read()
     QByteArray message = m_currentDataRead.mid(idxStart, (idxEnd - idxStart) + 1);
 
     LtsUtils::SfmMessage sfmMsg;
-    DEBUG_LOG() << "Frame from sfm as binary " << message.toHex();
+    DEBUG_LOG(m_logger) << "Frame from sfm as binary " << message.toHex();
     try
     {
       sfmMsg = LtsUtils::byteStreamToSfmMessage(message);
     }
     catch (const LtsUtils::ConversionError &ex)
     {
-      ERROR_LOG() << "Error converting QByteArray into LtsUtils::SfmMessage: " << ex.what();
-      ERROR_LOG() << "Faulty Data from sfm as binary " << message.toHex();
+      ERROR_LOG(m_logger) << "Error converting QByteArray into LtsUtils::SfmMessage: " << ex.what();
+      ERROR_LOG(m_logger) << "Faulty Data from sfm as binary " << message.toHex();
       m_currentDataRead = m_currentDataRead.mid(idxEnd + 1);
       
       continue;
     }
     
-    INFO_LOG() << "Decoded message from sfm Id: " << sfmMsg.id() << " RTR: " << sfmMsg.rtr() << " Data: " << sfmMsg.payload().toHex();
+    INFO_LOG(m_logger) << "Decoded message from sfm Id: " << sfmMsg.id() << " RTR: " << sfmMsg.rtr() << " Data: " << sfmMsg.payload().toHex();
     
     m_receiveTimeoutTimer->start();
 
@@ -118,7 +117,7 @@ void ConnectionHandlerSerial::read()
   }
 
   if (m_serialPort->bytesAvailable() > 0)
-    DEBUG_LOG() << "Still " << m_serialPort->bytesAvailable() << " available to be read";
+    DEBUG_LOG(m_logger) << "Still " << m_serialPort->bytesAvailable() << " available to be read";
 }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_serial.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_serial.h
index 1b3486567..b69f63224 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_serial.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_serial.h
@@ -37,6 +37,7 @@ private slots:
   void read();
 
 private:
+  NGL::INGLLogger &m_logger;
   LtsSerialPortQuerry::LtsSerialPortQuerry *m_spQuerry = nullptr;
   QSerialPort *m_serialPort = nullptr;
   QTimer      *m_receiveTimeoutTimer = nullptr;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp.cpp
index 9f792baf4..f2ffe2aed 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp.cpp
@@ -10,9 +10,8 @@
 namespace TrainingAreaBaseOC
 {
 
-ConnectionHandlerTcp::ConnectionHandlerTcp()
-  : m_timer(new QTimer(this))
-{
+ConnectionHandlerTcp::ConnectionHandlerTcp() : m_timer(new QTimer(this)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_timer->setInterval(5000);
   connect(m_timer, &QTimer::timeout, this, &ConnectionHandlerTcp::open);
 }
@@ -44,25 +43,25 @@ bool ConnectionHandlerTcp::send(const LtsUtils::SfmMessage &message)
 
   if (!m_socket->isOpen())
   {
-    ERROR_LOG() << "Port is not opened!";
+    ERROR_LOG(m_logger) << "Port is not opened!";
     return false;
   }
 
   QByteArray data = LtsUtils::byteStreamFromSfmMessage(message);
 
-  DEBUG_LOG() << "Sending frame: " << data.toHex(' ');
+  DEBUG_LOG(m_logger) << "Sending frame: " << data.toHex(' ');
 
   const qint64 byteswritten = m_socket->write(data);
 
   if (byteswritten == -1)
   {
-    ERROR_LOG() << "Failed to write data to port " << m_socket->peerPort() << " error: " << m_socket->errorString();
+    ERROR_LOG(m_logger) << "Failed to write data to port " << m_socket->peerPort() << " error: " << m_socket->errorString();
     m_timer->start();
     return false;
   }
   else if (byteswritten != data.size())
   {
-    ERROR_LOG() << "Failed to write all data to port " << m_socket->peerPort() << " error: " << m_socket->errorString();
+    ERROR_LOG(m_logger) << "Failed to write all data to port " << m_socket->peerPort() << " error: " << m_socket->errorString();
     return false;
   }
 
@@ -75,10 +74,10 @@ bool ConnectionHandlerTcp::open()
   m_socket->connectToHost(Settings::hostName(), Settings::port());
   if (!m_socket->waitForConnected())
   {
-    ERROR_LOG() << "Could not (re)open tcp destination " << m_socket->peerName() << ":" << m_socket->peerPort() << ", error: " << m_socket->errorString();
+    ERROR_LOG(m_logger) << "Could not (re)open tcp destination " << m_socket->peerName() << ":" << m_socket->peerPort() << ", error: " << m_socket->errorString();
     return false;
   }
-  INFO_LOG() << "(Re)openend tcp destination " << m_socket->peerName() << ":" <<  Settings::port();
+  INFO_LOG(m_logger) << "(Re)openend tcp destination " << m_socket->peerName() << ":" <<  Settings::port();
   return true;
 }
 
@@ -97,7 +96,7 @@ void ConnectionHandlerTcp::read()
   const QByteArray ba = m_socket->readAll();
   m_currentDataRead.append(ba);
 
-  DEBUG_LOG() << "Binary data from sfm: " << ba.toHex(' ');
+  DEBUG_LOG(m_logger) << "Binary data from sfm: " << ba.toHex(' ');
 
   int idxStart = -1;
   int idxEnd = -1;
@@ -107,7 +106,7 @@ void ConnectionHandlerTcp::read()
     QByteArray message = m_currentDataRead.mid(idxStart, (idxEnd - idxStart) + 1);
 
     LtsUtils::SfmMessage sfmMsg;
-    DEBUG_LOG() << "Frame from sfm as binary " << message.toHex();
+    DEBUG_LOG(m_logger) << "Frame from sfm as binary " << message.toHex();
 
     try
     {
@@ -115,11 +114,11 @@ void ConnectionHandlerTcp::read()
     }
     catch (const LtsUtils::ConversionError &ex)
     {
-      ERROR_LOG() << "Error converting QByteArray into LtsUtils::SfmMessage: " << ex.what();
-      ERROR_LOG() << "Faulty Data from sfm as binary " << message.toHex();
+      ERROR_LOG(m_logger) << "Error converting QByteArray into LtsUtils::SfmMessage: " << ex.what();
+      ERROR_LOG(m_logger) << "Faulty Data from sfm as binary " << message.toHex();
     }
 
-    INFO_LOG() << "Decoded message from sfm Id: " << sfmMsg.id() << " RTR: " << sfmMsg.rtr() << " Data: " << sfmMsg.payload().toHex();
+    INFO_LOG(m_logger) << "Decoded message from sfm Id: " << sfmMsg.id() << " RTR: " << sfmMsg.rtr() << " Data: " << sfmMsg.payload().toHex();
 
     m_currentDataRead = m_currentDataRead.mid(idxEnd + 1);
 
@@ -127,12 +126,12 @@ void ConnectionHandlerTcp::read()
   }
 
   if (m_socket->bytesAvailable() > 0)
-    DEBUG_LOG() << "Still " << m_socket->bytesAvailable() << " available to be read";
+    DEBUG_LOG(m_logger) << "Still " << m_socket->bytesAvailable() << " available to be read";
 }
 
 void ConnectionHandlerTcp::handleError(QAbstractSocket::SocketError error)
 {
-  DEBUG_LOG() << "Spontaneous error " << error << " doesn't have to be an error ...";
+  DEBUG_LOG(m_logger) << "Spontaneous error " << error << " doesn't have to be an error ...";
 
   const QString errStr(QStringLiteral("QTcpSocket::SocketError ") + QString::number(error) +
                        QStringLiteral(" from tcp port ") + QString::number(m_socket->peerPort()) +
@@ -144,20 +143,20 @@ void ConnectionHandlerTcp::handleError(QAbstractSocket::SocketError error)
   case QTcpSocket::SocketError::SocketAccessError:
   case QTcpSocket::SocketError::SocketResourceError:
   {
-    ERROR_LOG() << "Closing port trying to reopen it.";
+    ERROR_LOG(m_logger) << "Closing port trying to reopen it.";
     close();
     m_timer->start();
     Q_FALLTHROUGH();
   }
   case QTcpSocket::SocketError::RemoteHostClosedError:
   {
-    ERROR_LOG() << "Host closed trying to reopen.";
+    ERROR_LOG(m_logger) << "Host closed trying to reopen.";
     m_timer->start();
     break;
   }
   default:
   {
-    ERROR_LOG() << errStr;
+    ERROR_LOG(m_logger) << errStr;
     close();
     m_timer->start();
     break;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp.h
index 93534619a..1d42e8658 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp.h
@@ -38,6 +38,7 @@ private slots:
   void handleError(QAbstractSocket::SocketError error);
 
 private:
+  NGL::INGLLogger &m_logger;
   QTcpSocket *m_socket = nullptr;
   QTimer     *m_timer = nullptr;
   QByteArray  m_currentDataRead;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp_ttci.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp_ttci.cpp
index 1113425d9..27fa46c70 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp_ttci.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp_ttci.cpp
@@ -13,15 +13,14 @@ using namespace NGL;
 
 namespace TrainingAreaBaseOC
 {
-ConnectionHandlerTcpTtci::ConnectionHandlerTcpTtci()
-  : m_messageDataStart(true)
+ConnectionHandlerTcpTtci::ConnectionHandlerTcpTtci() : m_messageDataStart(true)
   , m_wirkfeldDataStart(true)
   , m_wirkfeldMultiplex(0)
   , m_sendingData(false)
   , m_segmentToggle(0)
   , m_canDevice(new Device(this))
-  , m_canChannel(new Channel(QLatin1Char('@'), true, this))
-{
+  , m_canChannel(new Channel(QLatin1Char('@'), true, this)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   connect(m_canChannel, &Channel::dataAvailable, this, &ConnectionHandlerTcpTtci::slotReadCanFrame);
   connect(m_canChannel, &Channel::disconnectedFromEq, this, &ConnectionHandlerTcpTtci::disconnectedFromEq);
 }
@@ -42,7 +41,7 @@ bool ConnectionHandlerTcpTtci::init()
 
 void ConnectionHandlerTcpTtci::initCanSocket()
 {
-  ERROR_LOG() << "InitCantSOcket";
+  ERROR_LOG(m_logger) << "InitCantSOcket";
 
   m_canChannel->setDevice(m_canDevice);
   m_canDevice->open();
@@ -53,10 +52,10 @@ bool ConnectionHandlerTcpTtci::findNextSyncByte(int &iCurReadPos) const
 {
   if (iCurReadPos == m_buffer.size())
   {
-    DEBUG_LOG() << "No more data available";
+    DEBUG_LOG(m_logger) << "No more data available";
     return false;
   }
-  DEBUG_LOG() << "Searching for next sync byte, start at: " << iCurReadPos;
+  DEBUG_LOG(m_logger) << "Searching for next sync byte, start at: " << iCurReadPos;
   NGL::NGLLoggerHelper::hexDumpHelper(m_logger, NGL::LogLevel::Debug, m_buffer);
 
   while (iCurReadPos < m_buffer.size())
@@ -70,7 +69,7 @@ bool ConnectionHandlerTcpTtci::findNextSyncByte(int &iCurReadPos) const
   
   if (m_buffer.size() < 4 + iCurReadPos)
   {
-    DEBUG_LOG() << "Could not find sync byte in stream";
+    DEBUG_LOG(m_logger) << "Could not find sync byte in stream";
     return false;
   }
   return true;
@@ -83,11 +82,11 @@ void ConnectionHandlerTcpTtci::slotReadCanFrame(const QByteArray &data)
   int iCurReadPos = 0;
   while (findNextSyncByte(iCurReadPos))
   {
-    DEBUG_LOG() << "Found Sync byte at " << iCurReadPos;
+    DEBUG_LOG(m_logger) << "Found Sync byte at " << iCurReadPos;
 
     
     unsigned int len = (m_buffer.at(iCurReadPos + 1) & 0xF0) >> 4;
-    DEBUG_LOG() << "Payload size: " << len;
+    DEBUG_LOG(m_logger) << "Payload size: " << len;
 
     if (len > 8)
     {
@@ -96,22 +95,22 @@ void ConnectionHandlerTcpTtci::slotReadCanFrame(const QByteArray &data)
       {
       case 9:
         
-        DEBUG_LOG() << "Read status data - skipping ";
+        DEBUG_LOG(m_logger) << "Read status data - skipping ";
         iCurReadPos += 4;
         break;
       case 11:
         
-        DEBUG_LOG() << "Read communication SFM - PAN - skipping ";
+        DEBUG_LOG(m_logger) << "Read communication SFM - PAN - skipping ";
         iCurReadPos += 5;
         break;
       case 12:
         
-        DEBUG_LOG() << "Read parameter request - skipping ";
+        DEBUG_LOG(m_logger) << "Read parameter request - skipping ";
         iCurReadPos += 5;
         break;
       default:
         
-        WARNING_LOG() << "Invalid payload size (" << len << " - skipping";
+        WARNING_LOG(m_logger) << "Invalid payload size (" << len << " - skipping";
         ++iCurReadPos;
         break;
       }
@@ -124,7 +123,7 @@ void ConnectionHandlerTcpTtci::slotReadCanFrame(const QByteArray &data)
     int neededBytes = 4 + len + iCurReadPos;
     if (m_buffer.size() < neededBytes)
     {
-      INFO_LOG() << "To few bytes in buffer - waiting for more (want: "
+      INFO_LOG(m_logger) << "To few bytes in buffer - waiting for more (want: "
                          << neededBytes << " have: " << m_buffer.size() << ")";
       
       break;
@@ -134,7 +133,7 @@ void ConnectionHandlerTcpTtci::slotReadCanFrame(const QByteArray &data)
     unsigned char id2 = m_buffer.at(iCurReadPos + 2);
     id = ((id << 8) + id2);
     bool rtr = ((m_buffer.at(iCurReadPos + 1) & 0x08) == 0x08);
-    DEBUG_LOG() << "CAN ID: " << id << " rtr: " << rtr;
+    DEBUG_LOG(m_logger) << "CAN ID: " << id << " rtr: " << rtr;
 
     
     unsigned char crc = 0;
@@ -146,7 +145,7 @@ void ConnectionHandlerTcpTtci::slotReadCanFrame(const QByteArray &data)
     if (crc != crcSent)
     {
       
-      WARNING_LOG() << "CRC checksum missmatch (is: " << crcSent
+      WARNING_LOG(m_logger) << "CRC checksum missmatch (is: " << crcSent
                             << " - calculated: " <<  crc << ") - skipping";
       iCurReadPos++;
       continue;
@@ -179,7 +178,7 @@ bool ConnectionHandlerTcpTtci::send(const LtsUtils::SfmMessage &message)
   if (message.payload().size() > 8)
     return false;
 
-  INFO_LOG() << "start write";
+  INFO_LOG(m_logger) << "start write";
   NGL::NGLLoggerHelper::hexDumpHelper(m_logger, NGL::LogLevel::Debug, message.payload());
 
   QByteArray data(message.payload().size() + 4, Qt::Uninitialized);
@@ -196,10 +195,10 @@ bool ConnectionHandlerTcpTtci::send(const LtsUtils::SfmMessage &message)
     crc += data.at(i);
   crc = ~crc;
   data[message.payload().size() + 3] = crc;
-  INFO_LOG() << "end  write ";
+  INFO_LOG(m_logger) << "end  write ";
 
   if (!m_canChannel->writeData(data))
-    ERROR_LOG() << "Error writing data to can channel";
+    ERROR_LOG(m_logger) << "Error writing data to can channel";
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp_ttci.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp_ttci.h
index 60cfce89b..943dd0c9c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp_ttci.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/connection_handler_tcp_ttci.h
@@ -40,6 +40,7 @@ signals:
   void disconnectedFromEq();
 
 private:
+  NGL::INGLLogger &m_logger;
   void initCanSocket();
   void newDataAvailable(const QByteArray &);
   bool findNextSyncByte(int &iCurReadPos) const;
@@ -49,6 +50,7 @@ private slots:
 
 
 private:
+  NGL::INGLLogger &m_logger;
   QByteArray m_messageData;
   bool m_messageDataStart;
   QByteArray m_wirkfeldData;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/dds_handler.cpp
index 185e7cc86..a75a15563 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/dds_handler.cpp
@@ -8,17 +8,16 @@
 namespace TrainingAreaBaseOC
 {
 
-DdsHandler::DdsHandler(int domainId, int exerciseId)
-  : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId))
-{
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+DdsHandler::DdsHandler(int domainId, int exerciseId) : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -33,23 +32,23 @@ bool DdsHandler::init(const QStringList &qosFileList)
 
   m_dtsTaboc = Interface::Dts::create(m_ddsConnector);
   bRet &= m_dtsTaboc->enableAll();
-  INFO_LOG() << "Dts TrainingAreaBaseOc initialised";
+  INFO_LOG(m_logger) << "Dts TrainingAreaBaseOc initialised";
 
   m_dtcTaboc = Interface::Dtc::create(m_ddsConnector);
   bRet &= m_dtsTaboc->enableSpecificsEquipment();
-  INFO_LOG() << "Dtc TrainingAreaBaseOc initialised";
+  INFO_LOG(m_logger) << "Dtc TrainingAreaBaseOc initialised";
 
   m_ftsTaboc = Interface::Fts::create(m_ddsConnector);
   bRet &= m_ftsTaboc->enableAll();
-  INFO_LOG() << "Fts TrainingAreaBaseOc initialised";
+  INFO_LOG(m_logger) << "Fts TrainingAreaBaseOc initialised";
 
   m_dtsTab = TrainingAreaBase::Interface::Dts::create(m_ddsConnector);
   bRet &= (m_dtsTab->enableOcData() && m_dtsTab->enableFireSmokeMarkerData());
-  INFO_LOG() << "Dts TrainingAreaBase initialised";
+  INFO_LOG(m_logger) << "Dts TrainingAreaBase initialised";
 
   m_ftsTab = TrainingAreaBase::Interface::Fts::create(m_ddsConnector);
   bRet &= (m_ftsTab->enableSendOcData() && m_ftsTab->enableSendFireSmokeMarkerData());
-  INFO_LOG() << "Fts TrainingAreaBase initialised";
+  INFO_LOG(m_logger) << "Fts TrainingAreaBase initialised";
 
   return bRet;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/dds_handler.h
index a2d1c877f..4409890e3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/dds_handler.h
@@ -68,6 +68,7 @@ public:
   qint64 currentPartitionTime() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector>       m_ddsConnector;
   std::shared_ptr<Core::Pacemaker>                  m_pacemaker;
   std::shared_ptr<Core::Interface::Dtc>             m_dtcCore;
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 2a30ba541..a28d403f0 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
@@ -41,7 +41,7 @@ bool HandlerAesData::init()
   if (!m_aesDtc->enableBCContamination() || !m_aesDtc->enableExplosionArea() || !m_aesDtc->enableExplosionSingle() || !m_aesDtc->enableFunctionalArea()
       || !m_aesDtc->enableNContamination() || !m_aesDtc->enableMineArea() || !m_aesDtc->enableExplosionCluster())
   {
-    ERROR_LOG() << "Error enabling AES Data-Topics.";
+    ERROR_LOG(m_logger) << "Error enabling AES Data-Topics.";
     return false;
   }
 
@@ -53,7 +53,7 @@ bool HandlerAesData::init()
       || !m_aesFtc->enableMineAreaRemove() || !m_aesFtc->enableExplosionClusterRemove() || !m_aesFtc->enableExplosionAreaPauseResume()
       || !m_aesFtc->enableMineAreaReferenceModify())
   {
-    ERROR_LOG() << "Error enabling AES Function-Topics.";
+    ERROR_LOG(m_logger) << "Error enabling AES Function-Topics.";
     return false;
   }
 
@@ -61,7 +61,7 @@ bool HandlerAesData::init()
 
   if (!m_pdmDtc->enableChargeType() || !m_pdmDtc->enableGearTypeChargeType() || !m_pdmDtc->enableGearType())
   {
-    ERROR_LOG() << "Error enabling PDM Data-Topic.";
+    ERROR_LOG(m_logger) << "Error enabling PDM Data-Topic.";
     return false;
   }
 
@@ -70,11 +70,11 @@ bool HandlerAesData::init()
       || !m_aesDtc->waitForHistoricalDataNContamination(10000) || !m_aesDtc->waitForHistoricalDataMineArea(10000)
       || !m_aesDtc->waitForHistoricalDataExplosionCluster(10000))
   {
-    ERROR_LOG() << "Error waiting for historical data AES.";
+    ERROR_LOG(m_logger) << "Error waiting for historical data AES.";
     return false;
   }
 
-  DEBUG_LOG() << "Initialisation successful";
+  DEBUG_LOG(m_logger) << "Initialisation successful";
   return true;
 }
 
@@ -125,7 +125,7 @@ void HandlerAesData::process(const QByteArray &data, int multiplexer)
       break;
     }
     default:
-      WARNING_LOG() << "Got unknown multiplexer.";
+      WARNING_LOG(m_logger) << "Got unknown multiplexer.";
   }
 }
 
@@ -139,121 +139,121 @@ void HandlerAesData::specificsExercise(const OcTelegrams::SpecificsExercise &dat
 void HandlerAesData::onMineAreaModifyFromCtaDataReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "Mine area modify failed: " << reply.translated();
+    ERROR_LOG(m_logger) << "Mine area modify failed: " << reply.translated();
   else
-    DEBUG_LOG() << "Mine area modify successfull. Id: " << reply.id();
+    DEBUG_LOG(m_logger) << "Mine area modify successfull. Id: " << reply.id();
 }
 
 void HandlerAesData::onNContaminationModifyReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "N contamination modify failed: " << reply.translated();
+    ERROR_LOG(m_logger) << "N contamination modify failed: " << reply.translated();
   else
-    DEBUG_LOG() << "N contamination modify successfull. Id: " << reply.id();
+    DEBUG_LOG(m_logger) << "N contamination modify successfull. Id: " << reply.id();
 }
 
 void HandlerAesData::onFunctionalAreaModifyReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "Functional area modify failed: " << reply.translated();
+    ERROR_LOG(m_logger) << "Functional area modify failed: " << reply.translated();
   else
-    DEBUG_LOG() << "Functional area modify successfull. Id: " << reply.id();
+    DEBUG_LOG(m_logger) << "Functional area modify successfull. Id: " << reply.id();
 }
 
 void HandlerAesData::onExplosionSingleModifyReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "Explosion single modify failed: " << reply.translated();
+    ERROR_LOG(m_logger) << "Explosion single modify failed: " << reply.translated();
   else
-    DEBUG_LOG() << "Explosion single modify successfull. Id: " << reply.id();
+    DEBUG_LOG(m_logger) << "Explosion single modify successfull. Id: " << reply.id();
 }
 
 void HandlerAesData::onExplosionAreaModifyReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "Explosion area modify failed: " << reply.translated();
+    ERROR_LOG(m_logger) << "Explosion area modify failed: " << reply.translated();
   else
-    DEBUG_LOG() << "Explosion area modify successfull. Id: " << reply.id();
+    DEBUG_LOG(m_logger) << "Explosion area modify successfull. Id: " << reply.id();
 }
 
 void HandlerAesData::onBCContaminationModifyReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "BC contamination modify failed: " << reply.translated();
+    ERROR_LOG(m_logger) << "BC contamination modify failed: " << reply.translated();
   else
-    DEBUG_LOG() << "BC contamination modify successfull. Id: " << reply.id();
+    DEBUG_LOG(m_logger) << "BC contamination modify successfull. Id: " << reply.id();
 }
 
 void HandlerAesData::onExplosionClusterOcModifyReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "ExplosionCluster modify failed: " << reply.translated();
+    ERROR_LOG(m_logger) << "ExplosionCluster modify failed: " << reply.translated();
   else
-    DEBUG_LOG() << "ExplosionCluster successfull. Id: " << reply.id();
+    DEBUG_LOG(m_logger) << "ExplosionCluster successfull. Id: " << reply.id();
 }
 
 void HandlerAesData::onMineAreaRemoveReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "Mine area remove failed: " << reply.translated();
+    ERROR_LOG(m_logger) << "Mine area remove failed: " << reply.translated();
   else
-    DEBUG_LOG() << "Mine area remove successfull. Id: " << reply.id();
+    DEBUG_LOG(m_logger) << "Mine area remove successfull. Id: " << reply.id();
 }
 
 void HandlerAesData::onNContaminationRemoveReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "N contamination remove failed: " << reply.translated();
+    ERROR_LOG(m_logger) << "N contamination remove failed: " << reply.translated();
   else
-    DEBUG_LOG() << "N contamination remove successfull. Id: " << reply.id();
+    DEBUG_LOG(m_logger) << "N contamination remove successfull. Id: " << reply.id();
 }
 
 void HandlerAesData::onFunctionalAreaRemoveReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "Functional area remove failed: " << reply.translated();
+    ERROR_LOG(m_logger) << "Functional area remove failed: " << reply.translated();
   else
-    DEBUG_LOG() << "Functional area remove successfull. Id: " << reply.id();
+    DEBUG_LOG(m_logger) << "Functional area remove successfull. Id: " << reply.id();
 }
 
 void HandlerAesData::onExplosionSingleRemoveReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "Explosion single remove failed: " << reply.translated();
+    ERROR_LOG(m_logger) << "Explosion single remove failed: " << reply.translated();
   else
-    DEBUG_LOG() << "Explosion single remove successfull. Id: " << reply.id();
+    DEBUG_LOG(m_logger) << "Explosion single remove successfull. Id: " << reply.id();
 }
 
 void HandlerAesData::onExplosionAreaRemoveReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "Explosion area remove failed: " << reply.translated();
+    ERROR_LOG(m_logger) << "Explosion area remove failed: " << reply.translated();
   else
-    DEBUG_LOG() << "Explosion area remove successfull. Id: " << reply.id();
+    DEBUG_LOG(m_logger) << "Explosion area remove successfull. Id: " << reply.id();
 }
 
 void HandlerAesData::onBCContaminationRemoveReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "BC contamination remove failed: " << reply.translated();
+    ERROR_LOG(m_logger) << "BC contamination remove failed: " << reply.translated();
   else
-    DEBUG_LOG() << "BC contamination remove successfull. Id: " << reply.id();
+    DEBUG_LOG(m_logger) << "BC contamination remove successfull. Id: " << reply.id();
 }
 
 void HandlerAesData::onExplosionClusterRemoveReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "ExplosionCluster remove failed: " << reply.translated();
+    ERROR_LOG(m_logger) << "ExplosionCluster remove failed: " << reply.translated();
   else
-    DEBUG_LOG() << "ExplosionCluster remove successfull. Id: " << reply.id();
+    DEBUG_LOG(m_logger) << "ExplosionCluster remove successfull. Id: " << reply.id();
 }
 
 void HandlerAesData::onExplosionAreaPauseResumeReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "Explosion area pause/resume failed: " << reply.translated();
+    ERROR_LOG(m_logger) << "Explosion area pause/resume failed: " << reply.translated();
   else
-    DEBUG_LOG() << "Explosion area pause/resume successfull. Id: " << reply.id();
+    DEBUG_LOG(m_logger) << "Explosion area pause/resume successfull. Id: " << reply.id();
 }
 
 template <typename T> static inline void getBasicData(const QByteArray &data, size_t &pos, T &req, bool withoutEffectStart = false)
@@ -300,8 +300,8 @@ static inline double mathToCompassAngle(int mathDegree)
 
 void HandlerAesData::bcContaminations(const QByteArray &data)
 {
-  INFO_LOG() << "Got new BC contamination data";
-  DEBUG_LOG() << "Binary data: " << data.toHex(' ');
+  INFO_LOG(m_logger) << "Got new BC contamination data";
+  DEBUG_LOG(m_logger) << "Binary data: " << data.toHex(' ');
 
   QList<int> aesToBeDeleted = m_aesDtc->bCContaminations().keys();
 
@@ -340,7 +340,7 @@ void HandlerAesData::bcContaminations(const QByteArray &data)
       req.chargeTypeId(chargeTypeIdFromChargeTasCode(ProjectDataManagement::GearClass_def::Biological, tmp));
     LtsUtils::get1Byte(data, pos, tmp); 
 
-    DEBUG_LOG() << (aesToBeDeleted.contains(req.id()) ? "Modifying " : "Creating ") << "BC contamination: " << req;
+    DEBUG_LOG(m_logger) << (aesToBeDeleted.contains(req.id()) ? "Modifying " : "Creating ") << "BC contamination: " << req;
 
     aesToBeDeleted.removeAll(req.id()); 
     req.id(req.id() * -1);              
@@ -354,7 +354,7 @@ void HandlerAesData::bcContaminations(const QByteArray &data)
       continue;
     if (m_aesDtc->bCContamination(id).effectStateId().underlying() > AreaEffectSimulation::AesEffectState::EsRemoved)
     {
-      DEBUG_LOG() << "Removing BC contamination id: " << id;
+      DEBUG_LOG(m_logger) << "Removing BC contamination id: " << id;
       m_aesFtc->bCContaminationRemoveRequest(Core::RemoveElementRequest(id), this);
     }
   }
@@ -362,8 +362,8 @@ void HandlerAesData::bcContaminations(const QByteArray &data)
 
 void HandlerAesData::explosionAreas(const QByteArray &data)
 {
-  INFO_LOG() << "Got new explosion cluster data";
-  DEBUG_LOG() << "Binary data: " << data.toHex(' ');
+  INFO_LOG(m_logger) << "Got new explosion cluster data";
+  DEBUG_LOG(m_logger) << "Binary data: " << data.toHex(' ');
 
   QList<int> aesToBeDeleted = m_aesDtc->explosionClusters().keys();
 
@@ -441,12 +441,12 @@ void HandlerAesData::explosionAreas(const QByteArray &data)
       LtsUtils::get3Byte(data, pos, tmp);
     }
 
-    DEBUG_LOG() << "New ExplosionClusterOcModifyRequest: "
+    DEBUG_LOG(m_logger) << "New ExplosionClusterOcModifyRequest: "
                         << "\nid:" << req.id() << "\nname:" << req.name() << "\neffectStart:" << req.effectStart() << "\neffectDuration:" << req.effectDuration()
                         << "\narea:" << req.area() << "\nmhpCount:" << req.mhpCount() << "\nmhpRotation:" << req.mhpRotation() << "\nimpactCount:" << req.impactCount()
                         << "\nchargeTypeId:" << req.chargeStruct().chargeTypeId() << "\npartyId:" << req.partyId();
 
-    DEBUG_LOG() << (aesToBeDeleted.contains(req.id()) ? "Modifying " : "Creating ") << "explosion cluster: " << req;
+    DEBUG_LOG(m_logger) << (aesToBeDeleted.contains(req.id()) ? "Modifying " : "Creating ") << "explosion cluster: " << req;
     aesToBeDeleted.removeOne(req.id()); 
     req.id(req.id() * -1);              
 
@@ -466,7 +466,7 @@ void HandlerAesData::explosionAreas(const QByteArray &data)
                 ||                                                                                      
                 (exp.effectStateId().underlying() == AreaEffectSimulation::AesEffectState::EsPaused)))) 
     {
-      DEBUG_LOG() << "Removing explosion cluster with id: " << id;
+      DEBUG_LOG(m_logger) << "Removing explosion cluster with id: " << id;
       m_aesFtc->explosionClusterRemoveRequest(Core::RemoveElementRequest(id), this);
     }
   }
@@ -474,8 +474,8 @@ void HandlerAesData::explosionAreas(const QByteArray &data)
 
 void HandlerAesData::explosionSingles(const QByteArray &data)
 {
-  INFO_LOG() << "Got new explosion single data";
-  DEBUG_LOG() << "Binary data: " << data.toHex(' ');
+  INFO_LOG(m_logger) << "Got new explosion single data";
+  DEBUG_LOG(m_logger) << "Binary data: " << data.toHex(' ');
 
   QList<int> aesToBeDeleted = m_aesDtc->explosionSingles().keys();
 
@@ -502,7 +502,7 @@ void HandlerAesData::explosionSingles(const QByteArray &data)
     req.chargeTypeId(chargeTypeIdFromChargeTasCode(ProjectDataManagement::GearClass_def::Artillery, tmp));
     if (req.chargeTypeId() == 0)
       req.chargeTypeId(chargeTypeIdFromChargeTasCode(ProjectDataManagement::GearClass_def::Mortar, tmp));
-    DEBUG_LOG() << (aesToBeDeleted.contains(req.id()) ? "Modifying " : "Creating ") << "explosion single: " << req;
+    DEBUG_LOG(m_logger) << (aesToBeDeleted.contains(req.id()) ? "Modifying " : "Creating ") << "explosion single: " << req;
 
     aesToBeDeleted.removeAll(req.id()); 
     req.id(req.id() * -1);              
@@ -517,7 +517,7 @@ void HandlerAesData::explosionSingles(const QByteArray &data)
     if ((exp.effectStateId().underlying() > AreaEffectSimulation::AesEffectState::EsRemoved)
         && (exp.effectStart().is_set() && (exp.effectStart().get() > (m_dds->currentPartitionTime() + 5000)))) 
     {
-      DEBUG_LOG() << "Removing explosion single id: " << id;
+      DEBUG_LOG(m_logger) << "Removing explosion single id: " << id;
       m_aesFtc->explosionSingleRemoveRequest(Core::RemoveElementRequest(id), this);
     }
   }
@@ -525,8 +525,8 @@ void HandlerAesData::explosionSingles(const QByteArray &data)
 
 void HandlerAesData::functionalAreas(const QByteArray &data)
 {
-  INFO_LOG() << "Got functional area data";
-  DEBUG_LOG() << "Binary data: " << data.toHex(' ');
+  INFO_LOG(m_logger) << "Got functional area data";
+  DEBUG_LOG(m_logger) << "Binary data: " << data.toHex(' ');
 
   QList<int> aesToBeDeleted = m_aesDtc->functionalAreas().keys();
 
@@ -571,7 +571,7 @@ void HandlerAesData::functionalAreas(const QByteArray &data)
     req.medicTime(tmp * 10 * 60 * 1000); 
     req.chargeTypeId(411);               
 
-    DEBUG_LOG() << (aesToBeDeleted.contains(req.id()) ? "Modifying " : "Creating ") << "functional area: " << req;
+    DEBUG_LOG(m_logger) << (aesToBeDeleted.contains(req.id()) ? "Modifying " : "Creating ") << "functional area: " << req;
 
     aesToBeDeleted.removeAll(req.id()); 
     req.id(req.id() * -1);              
@@ -585,7 +585,7 @@ void HandlerAesData::functionalAreas(const QByteArray &data)
       continue;
     if (m_aesDtc->functionalArea(id).effectStateId().underlying() > AreaEffectSimulation::AesEffectState::EsRemoved)
     {
-      DEBUG_LOG() << "Removing functional area id: " << id;
+      DEBUG_LOG(m_logger) << "Removing functional area id: " << id;
       m_aesFtc->functionalAreaRemoveRequest(Core::RemoveElementRequest(id), this);
     }
   }
@@ -593,8 +593,8 @@ void HandlerAesData::functionalAreas(const QByteArray &data)
 
 void HandlerAesData::nContaminations(const QByteArray &data)
 {
-  INFO_LOG() << "Got new N contamination data";
-  DEBUG_LOG() << "Binary data: " << data.toHex(' ');
+  INFO_LOG(m_logger) << "Got new N contamination data";
+  DEBUG_LOG(m_logger) << "Binary data: " << data.toHex(' ');
 
   QList<int> aesToBeDeleted = m_aesDtc->nContaminations().keys();
 
@@ -628,7 +628,7 @@ void HandlerAesData::nContaminations(const QByteArray &data)
 
     req.chargeTypeId(chargeTypeIdFromChargeTasCode(ProjectDataManagement::GearClass_def::Nuclear, 1));
 
-    DEBUG_LOG() << (aesToBeDeleted.contains(req.id()) ? "Modifying " : "Creating ") << "N contamination: " << req;
+    DEBUG_LOG(m_logger) << (aesToBeDeleted.contains(req.id()) ? "Modifying " : "Creating ") << "N contamination: " << req;
 
     aesToBeDeleted.removeAll(req.id()); 
     req.id(req.id() * -1);              
@@ -642,7 +642,7 @@ void HandlerAesData::nContaminations(const QByteArray &data)
       continue;
     if (m_aesDtc->nContamination(id).effectStateId().underlying() > AreaEffectSimulation::AesEffectState::EsRemoved)
     {
-      DEBUG_LOG() << "Removing N contamination id: " << id;
+      DEBUG_LOG(m_logger) << "Removing N contamination id: " << id;
       m_aesFtc->nContaminationRemoveRequest(Core::RemoveElementRequest(id), this);
     }
   }
@@ -650,8 +650,8 @@ void HandlerAesData::nContaminations(const QByteArray &data)
 
 void HandlerAesData::mineAreas(const QByteArray &data)
 {
-  INFO_LOG() << "Got new mine area data";
-  DEBUG_LOG() << "Binary data: " << data.toHex(' ');
+  INFO_LOG(m_logger) << "Got new mine area data";
+  DEBUG_LOG(m_logger) << "Binary data: " << data.toHex(' ');
 
   QList<int> aesToBeDeleted = m_aesDtc->mineAreas().keys();
 
@@ -700,7 +700,7 @@ void HandlerAesData::mineAreas(const QByteArray &data)
 
     req.isCenterLine(true);
 
-    DEBUG_LOG() << (aesToBeDeleted.contains(req.id()) ? "Modifying " : "Creating ") << "mine area: " << req;
+    DEBUG_LOG(m_logger) << (aesToBeDeleted.contains(req.id()) ? "Modifying " : "Creating ") << "mine area: " << req;
 
     aesToBeDeleted.removeAll(req.id()); 
     req.id(req.id() * -1);              
@@ -715,7 +715,7 @@ void HandlerAesData::mineAreas(const QByteArray &data)
       continue;
     if (m_aesDtc->mineArea(id).effectStateId().underlying() > AreaEffectSimulation::AesEffectState::EsRemoved)
     {
-      DEBUG_LOG() << "Removing mine area id: " << id;
+      DEBUG_LOG(m_logger) << "Removing mine area id: " << id;
       m_aesFtc->mineAreaRemoveRequest(Core::RemoveElementRequest(id), this);
     }
   }
@@ -723,8 +723,8 @@ void HandlerAesData::mineAreas(const QByteArray &data)
 
 void HandlerAesData::explosionAreasPause(const QByteArray &data)
 {
-  INFO_LOG() << "Got new explosion area pause data";
-  DEBUG_LOG() << "Binary data: " << data.toHex(' ');
+  INFO_LOG(m_logger) << "Got new explosion area pause data";
+  DEBUG_LOG(m_logger) << "Binary data: " << data.toHex(' ');
 
   size_t pos = 0;
   int cnt;
@@ -734,7 +734,7 @@ void HandlerAesData::explosionAreasPause(const QByteArray &data)
   for (int i = 0; i < cnt; ++i)
   {
     LtsUtils::get2Byte(data, pos, id);
-    DEBUG_LOG() << "Pausing ID: " << id;
+    DEBUG_LOG(m_logger) << "Pausing ID: " << id;
     m_aesFtc->explosionAreaPauseResumeRequest(AreaEffectSimulation::ExplosionAreaPauseResumeRequest(id,
                                                                                                     false,
                                                                                                     dds::core::optional<rti::core::int64>(),
@@ -746,8 +746,8 @@ void HandlerAesData::explosionAreasPause(const QByteArray &data)
 
 void HandlerAesData::explosionAreasResume(const QByteArray &data)
 {
-  INFO_LOG() << "Got new explosion area resume data";
-  DEBUG_LOG() << "Binary data: " << data.toHex(' ');
+  INFO_LOG(m_logger) << "Got new explosion area resume data";
+  DEBUG_LOG(m_logger) << "Binary data: " << data.toHex(' ');
 
   size_t pos = 0;
   int cnt;
@@ -766,7 +766,7 @@ void HandlerAesData::explosionAreasResume(const QByteArray &data)
     req.timeToResume(dds::core::optional<rti::core::int64>(tmp * 1000));
     LtsUtils::get2Byte(data, pos, tmp);
     req.remainingDuration(dds::core::optional<int32_t>(tmp));
-    DEBUG_LOG() << "Resuming: " << req;
+    DEBUG_LOG(m_logger) << "Resuming: " << req;
     m_aesFtc->explosionAreaPauseResumeRequest(req, this);
   }
 }
@@ -779,7 +779,7 @@ int HandlerAesData::chargeTypeIdFromChargeTasCode(ProjectDataManagement::GearCla
   {
     if (!m_pdmDtc->waitForHistoricalDataChargeType(20000)) 
     {
-      ERROR_LOG() << "Can not read charge types from PDM";
+      ERROR_LOG(m_logger) << "Can not read charge types from PDM";
       QCoreApplication::exit(-1);
       return -1;
     }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/main_handler.cpp
index 0d5582255..2a68effdb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/main_handler.cpp
@@ -9,8 +9,7 @@
 namespace TrainingAreaBaseOC
 {
 
-MainHandler::MainHandler(QObject *parent)
-  : QObject(parent)
+MainHandler::MainHandler(QObject *parent) : QObject(parent)
   , m_aesDtc(nullptr)
   , m_aesFtc(nullptr)
   , m_pdmDtc(nullptr)
@@ -19,8 +18,8 @@ MainHandler::MainHandler(QObject *parent)
   , m_ddsHandler(nullptr)
   , m_rxHandler(nullptr)
   , m_ftsHandler(nullptr)
-  , m_websocketHandler(nullptr)
-{}
+  , m_websocketHandler(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 MainHandler::~MainHandler()
 {
@@ -40,28 +39,28 @@ bool MainHandler::init(int domainId, int exerciseId)
   m_ddsHandler = std::make_shared<DdsHandler>(domainId, exerciseId);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Could not initialise DdsHandler.";
+    ERROR_LOG(m_logger) << "Could not initialise DdsHandler.";
     return false;
   }
 
   
   m_aesDtc = AreaEffectSimulation::Interface::Dtc::create(m_ddsHandler->ddsConnector());
-  DEBUG_LOG() << "Created AES Dtc";
+  DEBUG_LOG(m_logger) << "Created AES Dtc";
 
   
   m_aesFtc = AreaEffectSimulation::Interface::Ftc::create(m_ddsHandler->ddsConnector());
-  DEBUG_LOG() << "Created AES Ftc";
+  DEBUG_LOG(m_logger) << "Created AES Ftc";
 
   
   m_pdmDtc = ProjectDataManagement::Interface::Dtc::create(m_ddsHandler->ddsConnector());
-  DEBUG_LOG() << "Created PDM Dtc";
+  DEBUG_LOG(m_logger) << "Created PDM Dtc";
 
   
   m_connectionHandler = std::make_shared<ConnectionHandler>();
 
   if (!m_connectionHandler->init())
   {
-    ERROR_LOG() << "Could not initialise ConnectionHandler.";
+    ERROR_LOG(m_logger) << "Could not initialise ConnectionHandler.";
     return false;
   }
 
@@ -73,7 +72,7 @@ bool MainHandler::init(int domainId, int exerciseId)
 
   if (!m_canagHandler->init())
   {
-    ERROR_LOG() << "Could not initialise CanagHandler.";
+    ERROR_LOG(m_logger) << "Could not initialise CanagHandler.";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/main_handler.h
index 58b4aae0b..e54d3680f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/main_handler.h
@@ -45,6 +45,7 @@ public:
   int exerciseId() const { return m_ddsHandler->ddsConnector()->getPartitionId(); }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<AreaEffectSimulation::Interface::Dtc> m_aesDtc;
   std::shared_ptr<AreaEffectSimulation::Interface::Ftc> m_aesFtc;
   std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_pdmDtc;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/recv_from_dds_fts.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/recv_from_dds_fts.h
index 719d780d5..1204990c3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/recv_from_dds_fts.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/recv_from_dds_fts.h
@@ -28,6 +28,8 @@ public:
   void onSendFireSmokeMarkerDataRequest(const rti::core::SampleIdentity &cookie, const TrainingAreaBase::SendFireSmokeMarkerDataRequest &request) override;
 
 private:
+
+NGL::INGLLogger &m_logger;
   static Core::FunctionReplyObject fillFro(bool bSuccess);
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/send_to_dds.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/send_to_dds.cpp
index e8d989fc4..1bef33174 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/send_to_dds.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/send_to_dds.cpp
@@ -10,12 +10,11 @@
 namespace TrainingAreaBaseOC
 {
 
-SendToDds::SendToDds(MainHandler *mainHandler)
-  : m_dtsTaboc(mainHandler->dds()->dtsTaboc())
+SendToDds::SendToDds(MainHandler *mainHandler) : m_dtsTaboc(mainHandler->dds()->dtsTaboc())
   , m_dtsTab(mainHandler->dds()->dtsTab())
   , m_utmCoord(LtsCoordTrans::UtmCoordinate())
-  , m_idToSend(1)
-{}
+  , m_idToSend(1),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 void SendToDds::rxData(const OcTelegrams::Display &inData)
 {
@@ -162,7 +161,7 @@ void SendToDds::rxData(const TrainingAreaBase::TetraIcd::OpaquePayloadDataBase &
   }
   default:
   {
-    ERROR_LOG() << "Received unhandled TrainingAreaBase::TetraIcd::OpaquePayloadDataBase::Type " << static_cast<int>(inData.payloadType);
+    ERROR_LOG(m_logger) << "Received unhandled TrainingAreaBase::TetraIcd::OpaquePayloadDataBase::Type " << static_cast<int>(inData.payloadType);
     break;
   }
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/send_to_dds.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/send_to_dds.h
index 9776ddf28..e7a4fcd54 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/send_to_dds.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/send_to_dds.h
@@ -28,6 +28,7 @@ public:
   void rxData(const TrainingAreaBase::TetraIcd::OpaquePayloadDataBase &inData);
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<Interface::Dts> m_dtsTaboc;
   std::shared_ptr<TrainingAreaBase::Interface::Dts> m_dtsTab;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_channel.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_channel.cpp
index 6ba339645..7afd58d7e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_channel.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_channel.cpp
@@ -9,13 +9,12 @@
 namespace TrainingAreaBaseOC
 {
 
-Channel::Channel(QChar channel, bool bIsBinary, QObject *parent)
-  : QObject(parent)
+Channel::Channel(QChar channel, bool bIsBinary, QObject *parent) : QObject(parent)
   , m_channel(channel)
   , m_bIsBinary(bIsBinary)
   , m_device(nullptr)
-  .getNGLLogger("SCTT.Channel"))
-{}
+  .getNGLLogger("SCTT.Channel")),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 void Channel::setDevice(Device *dev)
 {
@@ -34,7 +33,7 @@ bool Channel::writeData(const QByteArray &data)
 {
   if (!m_device || !m_device->isOpen())
   {
-    WARNING_LOG() << "Error writing data - device is not open" ;
+    WARNING_LOG(m_logger) << "Error writing data - device is not open" ;
     return false;
   }
   
@@ -61,7 +60,7 @@ void Channel::onDeviceDestroyed()
 
 void Channel::onDataAvailable(const QByteArray &data)
 {
-  TRACE_LOG() << "Data available from "
+  TRACE_LOG(m_logger) << "Data available from "
                       << ", we are: " << m_channel
                       << ", data: '" << data << "'" ;
   emit dataAvailable(data);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_channel.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_channel.h
index ed5080007..6a4d894a1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_channel.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_channel.h
@@ -36,6 +36,8 @@ protected slots:
   void onDataAvailable(const QByteArray &data);
 
 protected:
+
+NGL::INGLLogger &m_logger;
   QChar m_channel;
   bool m_bIsBinary;
   Device *m_device;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_device.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_device.cpp
index 79ee5c708..bdac57429 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_device.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_device.cpp
@@ -10,15 +10,14 @@
 
 namespace TrainingAreaBaseOC
 {
-Device::Device(QObject *parent, bool tcpMode)
-  : QObject(parent)
+Device::Device(QObject *parent, bool tcpMode) : QObject(parent)
   , m_spQuerry(new LtsSerialPortQuerry::LtsSerialPortQuerry(this))
   , m_socket(new QTcpSocket(this))
   , m_restartTimer(new QTimer(this))
   , m_receiveTimeoutTimer(new QTimer(this))
   , m_tcpMode(tcpMode)
-  .getNGLLogger("TTCI.Device"))
-{
+  .getNGLLogger("TTCI.Device")),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   connect(m_spQuerry, &LtsSerialPortQuerry::LtsSerialPortQuerry::connectionEstablished, this, &Device::open);
   m_spQuerry->restartQuerry();
 
@@ -36,7 +35,7 @@ Device::~Device()
 
 void Device::reOpen()
 {
-  DEBUG_LOG() << "ConnectionHandlerSerial::reOpen";
+  DEBUG_LOG(m_logger) << "ConnectionHandlerSerial::reOpen";
   close();
   QTimer::singleShot(2000, this, &Device::open);
 }
@@ -52,19 +51,19 @@ bool Device::open()
     m_socket->connectToHost(Settings::hostName(), Settings::portTtci());
     if (!m_socket->waitForConnected())
     {
-      ERROR_LOG() << "Could not (re)open tcp destination " << m_socket->peerName() << ":" << m_socket->peerPort() << ", error: " << m_socket->errorString();
+      ERROR_LOG(m_logger) << "Could not (re)open tcp destination " << m_socket->peerName() << ":" << m_socket->peerPort() << ", error: " << m_socket->errorString();
       return false;
     }
     connect(m_socket, &QTcpSocket::readyRead, this, &Device::onDataAvailable);
     connect(m_socket, QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error), this, &Device::handleError);
     connect(m_socket, &QTcpSocket::disconnected, this, &Device::open);
-    DEBUG_LOG() << "(Re)openend tcp destination " << m_socket->peerName() << ":" <<  Settings::portTtci();
+    DEBUG_LOG(m_logger) << "(Re)openend tcp destination " << m_socket->peerName() << ":" <<  Settings::portTtci();
   }
   else
   {
     
     m_serialPort = m_spQuerry->currentSerialPort();
-    DEBUG_LOG() << "(Re)openend serial destination " << m_serialPort->portName() << ":";
+    DEBUG_LOG(m_logger) << "(Re)openend serial destination " << m_serialPort->portName() << ":";
 
     connect(m_serialPort, &QSerialPort::readyRead, this, &Device::onDataAvailable);
 
@@ -79,7 +78,7 @@ bool Device::close()
   {
     if (m_socket->isOpen())
       m_socket->close();
-    DEBUG_LOG() << "Closing TCP Port";
+    DEBUG_LOG(m_logger) << "Closing TCP Port";
     delete m_socket;
     m_socket = nullptr;
     m_receiveTimeoutTimer->stop();
@@ -110,7 +109,7 @@ void Device::onDataAvailable()
 
 void Device::parseBuffer()
 {
-  DEBUG_LOG() << "Buffer - size: " << m_buffer.size()
+  DEBUG_LOG(m_logger) << "Buffer - size: " << m_buffer.size()
                       << ", data: " << m_buffer.toHex() ;
   
   
@@ -118,21 +117,21 @@ void Device::parseBuffer()
   int idxStart = -1;
   while ((idxStart = m_buffer.indexOf(0x02)) >= 0)
   {
-    TRACE_LOG() << "idxStart: " << idxStart ;
+    TRACE_LOG(m_logger) << "idxStart: " << idxStart ;
     
     int idxLen = idxStart + 1;
     if (idxLen >= m_buffer.size())
       return;
 
     unsigned char len = static_cast<unsigned char>(m_buffer.at(idxLen));
-    TRACE_LOG() << "idxLen: " << idxLen
+    TRACE_LOG(m_logger) << "idxLen: " << idxLen
                         << ", len: " << len
                         << " = 0x" << QByteArray::number(len, 16);
     int idxCrc = idxLen + len + 1;
     int idxEnd = idxCrc + 1;
     if (idxEnd >= m_buffer.size())
       return;
-    TRACE_LOG() << "idxCrc: " << idxCrc
+    TRACE_LOG(m_logger) << "idxCrc: " << idxCrc
                         << ", idxEnd: " << idxEnd ;
     if (idxEnd >= m_buffer.size())
       return;
@@ -141,7 +140,7 @@ void Device::parseBuffer()
     if (m_buffer.at(idxEnd) != 0x03)
     {
       
-      WARNING_LOG() << "Could not find valid end marker - searching new start marker"
+      WARNING_LOG(m_logger) << "Could not find valid end marker - searching new start marker"
                                ;
       m_buffer = m_buffer.mid(1);
       continue;
@@ -149,12 +148,12 @@ void Device::parseBuffer()
 
     unsigned char crc = static_cast<unsigned char>(m_buffer.at(idxCrc));
     unsigned char crcCalc = calcChecksum(m_buffer.mid(idxStart, idxCrc - idxStart));
-    TRACE_LOG() << "crc: " << crc
+    TRACE_LOG(m_logger) << "crc: " << crc
                         << ", calculated: " << crcCalc
                            ;
     if (crc != crcCalc)
     {
-      WARNING_LOG() << "Invalid checksum - is: " << crcCalc
+      WARNING_LOG(m_logger) << "Invalid checksum - is: " << crcCalc
                             << " - should be: " << crc ;
     }
 
@@ -163,15 +162,15 @@ void Device::parseBuffer()
 
     if (len == 255 || !m_payload.isEmpty())
     {
-      DEBUG_LOG() << "telegram with more than 254 bytes ..." ;
+      DEBUG_LOG(m_logger) << "telegram with more than 254 bytes ..." ;
       
       if (len == 255 && m_payload.isEmpty())
-        DEBUG_LOG() << "Remember the payload destination: " << destination ;
+        DEBUG_LOG(m_logger) << "Remember the payload destination: " << destination ;
       m_payload += payload;
       if (len != 255)
       {
         
-        DEBUG_LOG() << "destination: " << destination
+        DEBUG_LOG(m_logger) << "destination: " << destination
                             << ", data: " << m_payload.toHex() ;
         emit dataAvailable(m_payload);
         m_payload.clear();
@@ -180,7 +179,7 @@ void Device::parseBuffer()
     else
     {
       
-      DEBUG_LOG() << "destination: " << destination
+      DEBUG_LOG(m_logger) << "destination: " << destination
                           << ", data: " << payload.toHex() ;
       emit dataAvailable(payload);
     }
@@ -197,7 +196,7 @@ bool Device::writeData(const QChar destination, const QByteArray &payload)
   if ((m_tcpMode && !m_socket->isOpen()) || (!m_tcpMode && !m_serialPort->isOpen()))
     return false;
 
-  DEBUG_LOG() << "Writing " << payload.size()
+  DEBUG_LOG(m_logger) << "Writing " << payload.size()
                       << " Bytes to channel " << destination ;
   
   QByteArray data = payload;
@@ -215,7 +214,7 @@ bool Device::writeData(const QChar destination, const QByteArray &payload)
     buf.append(calcChecksum(buf));
     buf.append(0x03);
 
-    DEBUG_LOG() << "Writing: " << buf.toHex() ;
+    DEBUG_LOG(m_logger) << "Writing: " << buf.toHex() ;
     if (m_tcpMode)
       m_socket->write(buf);
     else
@@ -245,7 +244,7 @@ unsigned char Device::calcChecksum(const QByteArray &checksumData)
 
 void Device::handleError(QAbstractSocket::SocketError error)
 {
-  DEBUG_LOG() << "Spontaneous error " << error << " doesn't have to be an error ...";
+  DEBUG_LOG(m_logger) << "Spontaneous error " << error << " doesn't have to be an error ...";
 
   const QString errStr(QStringLiteral("QTcpSocket::SocketError ") + QString::number(error) +
                        QStringLiteral(" from tcp port ") + QString::number(m_socket->peerPort()) +
@@ -257,20 +256,20 @@ void Device::handleError(QAbstractSocket::SocketError error)
   case QTcpSocket::SocketError::SocketAccessError:
   case QTcpSocket::SocketError::SocketResourceError:
   {
-    ERROR_LOG() << "Closing port trying to reopen it.";
+    ERROR_LOG(m_logger) << "Closing port trying to reopen it.";
     close();
     m_restartTimer->start();
     Q_FALLTHROUGH();
   }
   case QTcpSocket::SocketError::RemoteHostClosedError:
   {
-    ERROR_LOG() << "Host closed trying to reopen.";
+    ERROR_LOG(m_logger) << "Host closed trying to reopen.";
     m_restartTimer->start();
     break;
   }
   default:
   {
-    ERROR_LOG() << errStr;
+    ERROR_LOG(m_logger) << errStr;
     close();
     m_restartTimer->start();
     break;
@@ -280,7 +279,7 @@ void Device::handleError(QAbstractSocket::SocketError error)
 
 void Device::handleSerialError(QSerialPort::SerialPortError error)
 {
-  DEBUG_LOG() << "Spontaneous error " << error << " doesn't have to be an error ...";
+  DEBUG_LOG(m_logger) << "Spontaneous error " << error << " doesn't have to be an error ...";
 
   const QString errStr(QStringLiteral("QSerialPort::SerialPortError ") + QString::number(error) +
                        QStringLiteral(" error: ") + m_serialPort->errorString());
@@ -293,13 +292,13 @@ void Device::handleSerialError(QSerialPort::SerialPortError error)
   case QSerialPort::SerialPortError::PermissionError:
   case QSerialPort::SerialPortError::WriteError:
   {
-    WARNING_LOG() << "Closing port trying to reopen it.";
+    WARNING_LOG(m_logger) << "Closing port trying to reopen it.";
     m_restartTimer->start();
     Q_FALLTHROUGH();
   }
   default:
   {
-    WARNING_LOG() << errStr;
+    WARNING_LOG(m_logger) << errStr;
     m_restartTimer->start();
     break;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_device.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_device.h
index 37f534591..967c713cc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_device.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/ttci_device.h
@@ -44,6 +44,8 @@ public slots:
   void handleSerialError(QSerialPort::SerialPortError error);
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void parseBuffer();
   static unsigned char calcChecksum(const QByteArray &checksumData);
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/websocket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/websocket_handler.cpp
index 54130564e..de95ac2d5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/websocket_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/websocket_handler.cpp
@@ -12,12 +12,11 @@
 namespace TrainingAreaBaseOC {
 
 WebsocketHandler::WebsocketHandler(QObject *parent, int exerciseId,
-                                   const std::shared_ptr<Interface::Dts> dtsTabOc, const std::shared_ptr<Interface::Dtc> dtcTabOc)
-  : QObject(parent)
+                                   const std::shared_ptr<Interface::Dts> dtsTabOc, const std::shared_ptr<Interface::Dtc> dtcTabOc) : QObject(parent)
   , m_exerciseId(exerciseId)
   , m_dtsTaboc(dtsTabOc)
-  , m_dtcTaboc(dtcTabOc)
-{
+  , m_dtcTaboc(dtcTabOc),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_tryConnectionTimer = new QTimer(this);
   connect(m_tryConnectionTimer, &QTimer::timeout, this, &WebsocketHandler::onTryConnectionTimerTimeout);
   m_tryConnectionTimer->start(10 * 1000);
@@ -131,12 +130,12 @@ void WebsocketHandler::onSendOwnPosition(const QString &message)
   QJsonDocument doc = QJsonDocument::fromJson(message.toUtf8());
   if (!doc.isObject())
   {
-    WARNING_LOG() << "No Valid Object in " << message;
+    WARNING_LOG(m_logger) << "No Valid Object in " << message;
     return;
   }
   if (doc.object().value(QStringLiteral("data")).toObject().isEmpty())
   {
-    WARNING_LOG() << "No Data Array in" << message;
+    WARNING_LOG(m_logger) << "No Data Array in" << message;
     return;
   }
 
@@ -149,7 +148,7 @@ void WebsocketHandler::onSendOwnPosition(const QString &message)
   
   if (obj.contains(QStringLiteral("lon")) && obj.contains(QStringLiteral("lat")))
   {
-    DEBUG_LOG() << "Got message with position";
+    DEBUG_LOG(m_logger) << "Got message with position";
     outData.position(Core::GeoPosition(obj.value(QStringLiteral("lon")).toDouble(),obj.value(QStringLiteral("lat")).toDouble(),obj.value(QStringLiteral("height")).toDouble()));
     outData.timeStamp(QDateTime::currentMSecsSinceEpoch());
     if (obj.contains(QStringLiteral("buildingId")) && obj.contains(QStringLiteral("roomId")) )
@@ -168,32 +167,32 @@ void WebsocketHandler::onSendOwnPosition(const QString &message)
 void WebsocketHandler::connectToServer()
 {
   
-  DEBUG_LOG() << "Try connect to servicemanagement " << QUrl(QStringLiteral("ws://")+Settings::remoteServerHostname()+QStringLiteral(":")+ QString::number(7300)).toString();
+  DEBUG_LOG(m_logger) << "Try connect to servicemanagement " << QUrl(QStringLiteral("ws://")+Settings::remoteServerHostname()+QStringLiteral(":")+ QString::number(7300)).toString();
   m_socket->open(QUrl(QStringLiteral("ws://")+Settings::remoteServerHostname()+QStringLiteral(":")+ QString::number(7300)));
 }
 
 void WebsocketHandler::sendServicePortRequest()
 {
   m_socket->sendTextMessage(QStringLiteral("{\"type\": \"servicePortsInformationRequest\",\"uuid\": \"7777\"}"));
-  DEBUG_LOG() << "Wait For Services Reply";
+  DEBUG_LOG(m_logger) << "Wait For Services Reply";
 }
 
 void WebsocketHandler::parseServices(const QString &message)
 {
   m_tryConnectionTimer->stop();
 
-  DEBUG_LOG() << "Received SERVICES MESSAGE: " << message;
+  DEBUG_LOG(m_logger) << "Received SERVICES MESSAGE: " << message;
   m_socket->close();
   int exPort = -1;
   QJsonDocument doc = QJsonDocument::fromJson(message.toUtf8());
   if (!doc.isObject())
   {
-    WARNING_LOG() << "No Valid Object in " << message;
+    WARNING_LOG(m_logger) << "No Valid Object in " << message;
     return;
   }
   if (!doc.object().value(QStringLiteral("data")).isArray())
   {
-    WARNING_LOG() << "No Data Array in" << message;
+    WARNING_LOG(m_logger) << "No Data Array in" << message;
     return;
   }
 
@@ -227,7 +226,7 @@ void WebsocketHandler::parseServices(const QString &message)
 
   if (exPort > 0)
   {
-    DEBUG_LOG() << "Connect To ppm ON: " << exPort;
+    DEBUG_LOG(m_logger) << "Connect To ppm ON: " << exPort;
     connectToExPPM(exPort);
     m_state = WebSocketState::CONNECTTOPPM;
    }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/data_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/data_manager.cpp
index a6be7f814..c437f92c9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/data_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/data_manager.cpp
@@ -28,7 +28,7 @@ LtsWebSocket::AbstractClientMessage *ClientMessageFactory::createMessage(LtsWebS
 
   if (m_type == LtsWebSocket::JsonKeys::ERROR_())
   {
-    ERROR_LOG() << "Error in message: " << message;
+    ERROR_LOG(m_logger) << "Error in message: " << message;
     return nullptr;
   }
 
@@ -46,7 +46,7 @@ LtsWebSocket::AbstractClientMessage *ClientMessageFactory::createMessage(LtsWebS
 
   if (!result)
   {
-    ERROR_LOG() << "message: " << message;
+    ERROR_LOG(m_logger) << "message: " << message;
     Q_ASSERT(result);
   }
 
@@ -114,7 +114,7 @@ DataManager::DataManager(const std::shared_ptr<IWMS2ECC_Impl> &wms2ecc, const st
           this, &DataManager::openWebSocket);
 
   m_messageFactory = new ClientMessageFactory(this);
-  DEBUG_LOG() << "WarehouseManagement/WmsServer = " << Settings::wmsServerName();
+  DEBUG_LOG(m_logger) << "WarehouseManagement/WmsServer = " << Settings::wmsServerName();
 }
 
 DataManager::~DataManager()
@@ -154,7 +154,7 @@ void DataManager::openWebSocket()
   int port = NGL::Connections::port(NGL::Connections::eConnection::ZSLV);
   QString url = QStringLiteral("ws://") + Settings::wmsServerName() + QStringLiteral(":") +  QString::number(port);
   wsSocket->open(QUrl::fromEncoded(url.toLocal8Bit()));
-  INFO_LOG() << "Trying to listen on " << url;
+  INFO_LOG(m_logger) << "Trying to listen on " << url;
 
   m_wsReconnectTimer->start(5000);
 }
@@ -272,7 +272,7 @@ void DataManager::handleEquipmentTypes(const ::EquipmentTypes &eTypes)
 {
   const IWMS2ECC::equipTypeMap equipTypeMap = eTypes.getEquipmentTypes();
 
-  INFO_LOG() << "equipTypeMap size: " << equipTypeMap.size();
+  INFO_LOG(m_logger) << "equipTypeMap size: " << equipTypeMap.size();
   ParticipantManagement::ModifyEquipmentTypeDataRequest request;
   request.deleteAll(true);
   auto &dataVec = request.data();
@@ -292,7 +292,7 @@ void DataManager::handleEquipmentTypes(const ::EquipmentTypes &eTypes)
     dataVec.push_back(std::move(pEt));
   }
 
-  INFO_LOG() << "dataVec size: " << dataVec.size() << ", " << request;
+  INFO_LOG(m_logger) << "dataVec size: " << dataVec.size() << ", " << request;
 
   m_ddsHandler->ppmFtc()->modifyEquipmentTypeDataRequest(request, this);
 }
@@ -300,9 +300,9 @@ void DataManager::handleEquipmentTypes(const ::EquipmentTypes &eTypes)
 void DataManager::onModifyEquipmentTypeDataReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    ERROR_LOG() << "Error while modifying equipmentType: " << replyObject.str();
+    ERROR_LOG(m_logger) << "Error while modifying equipmentType: " << replyObject.str();
   else
-    INFO_LOG() << "onModifyEquipmentTypeDataReply ok";
+    INFO_LOG(m_logger) << "onModifyEquipmentTypeDataReply ok";
 }
 
 void DataManager::newTextMessageFromClient(LtsWebSocket::ClientConnection *client, const QString &message)
@@ -313,7 +313,7 @@ void DataManager::newTextMessageFromClient(LtsWebSocket::ClientConnection *clien
     clientMessage = m_messageFactory->createMessage(client, message);
   else
   {
-    WARNING_LOG() << "Could not parse incoming message: '" << message << "', error: " << result.errorString();
+    WARNING_LOG(m_logger) << "Could not parse incoming message: '" << message << "', error: " << result.errorString();
     clientMessage = new LtsWebSocket::InvalidMessage(client, QString(), QStringLiteral("Got message which is not JSON conform"));
   }
 
@@ -330,7 +330,7 @@ void DataManager::onParticipantChanged(const ParticipantManagement::Participant
   if (!m_clientConnection || !m_wms2ecc)
     return;
 
-  DEBUG_LOG() << "partyId: " << data.partyId() << "participantId: " << data.id();
+  DEBUG_LOG(m_logger) << "partyId: " << data.partyId() << "participantId: " << data.id();
   IWMS2ECC::PlayerInfo pl = m_wms2ecc->convert(data, exerciseId);
   pl.playerId = (exerciseId* 1000000) + pl.playerId;
   m_clientConnection->addReply(new ParticipantUpdate(pl, modType));
@@ -341,7 +341,7 @@ void DataManager::onExerciseChanged(const ExerciseManagement::Exercise &data, Da
   if (!m_clientConnection)
     return;
 
-  INFO_LOG() << "IN onExerciseChanged: ExerciseUpdate: id = " << data.id();
+  INFO_LOG(m_logger) << "IN onExerciseChanged: ExerciseUpdate: id = " << data.id();
   IWMS2ECC::Exercise exeData = IWMS2ECC_Impl::convert(data);
 
   m_clientConnection->addReply(new ExerciseUpdate(exeData, modType));
@@ -355,9 +355,9 @@ void DataManager::onRegistrationReturnValue(int exerciseId, qint32 participantId
 void DataManager::registerParticipant(const Registration &reg)
 {
   ParticipantManagement::ParticipantAssignState state = IWMS2ECC_Impl::convert(reg.getAssignment());
-  INFO_LOG() << "ParticipantAssignState: " << state;
+  INFO_LOG(m_logger) << "ParticipantAssignState: " << state;
 
-  INFO_LOG() << "Registration: participant: " << reg.getPlayerId() << ", exerciseId: " << reg.getExerciseId();
+  INFO_LOG(m_logger) << "Registration: participant: " << reg.getPlayerId() << ", exerciseId: " << reg.getExerciseId();
 
   dds::core::optional<int> equipNo;
   dds::core::optional<QString> identification;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/data_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/data_manager.h
index 363b46526..257719147 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/data_manager.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/data_manager.h
@@ -36,6 +36,8 @@ public:
                                                      const QString &message);
 
 private:
+
+NGL::INGLLogger &m_logger;
   DataManager *m_dataManager;
 
 }; 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler.cpp
index 1ce88c099..144aa8d8f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler.cpp
@@ -8,17 +8,16 @@
 namespace WarehouseManagement
 {
 
-DdsHandler::DdsHandler(int domainId)
-  : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Global, 0))
-{
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+DdsHandler::DdsHandler(int domainId) : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Global, 0)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -30,7 +29,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
 
   m_exmDtc = ExerciseManagement::Interface::Dtc::create(m_ddsConnector);
   bool bRet = m_exmDtc->enableExercise();
-  INFO_LOG() << "Exm dtc initialised";
+  INFO_LOG(m_logger) << "Exm dtc initialised";
 
   m_ppmDtc = ParticipantManagement::Interface::Dtc::create(m_ddsConnector);
   bRet &= m_ppmDtc->enableType();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler.h
index 43ae0f61e..56be48c7a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler.h
@@ -37,6 +37,7 @@ public:
   dds::domain::DomainParticipant getDomainParticipant() const { return m_ddsConnector->getDomainParticipant(); }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<Core::Pacemaker>            m_pacemaker;
   std::shared_ptr<ExerciseManagement::Interface::Dtc> m_exmDtc;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler_exercise.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler_exercise.cpp
index e04257473..5009b6d12 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler_exercise.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler_exercise.cpp
@@ -9,18 +9,17 @@
 namespace WarehouseManagement
 {
 
-DdsHandlerExercise::DdsHandlerExercise(const dds::domain::DomainParticipant &dp, int exerciseId)
-  : m_ddsConnector(new DDSConnector::DdsConnector(dp, IDL::PartitionType::Exercise, exerciseId))
-{
+DdsHandlerExercise::DdsHandlerExercise(const dds::domain::DomainParticipant &dp, int exerciseId) : m_ddsConnector(new DDSConnector::DdsConnector(dp, IDL::PartitionType::Exercise, exerciseId)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_ddsConnector->setDomainParticipant(dp);
-  DEBUG_LOG() << "DdsHandlerExercise for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandlerExercise for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandlerExercise::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler_exercise.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler_exercise.h
index c6bad1c45..798966fed 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler_exercise.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler_exercise.h
@@ -38,6 +38,7 @@ public:
   }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   PpmDtc                                      m_ppmDtc;
   PpmFtc                                      m_ppmFtc;
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 c21d2da33..f1173cb3e 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
@@ -97,7 +97,7 @@ void ExerciseParticipantHandler::registerParticipant(qint32 participantId,
   }
   req.participantId(participantId);
 
-  INFO_LOG() << "IN ::registerParticipant, ParticipantId: " << participantId
+  INFO_LOG(m_logger) << "IN ::registerParticipant, ParticipantId: " << participantId
                      << ", equipNo: " << equipNo << ", assignState: " << assignState;
 
   m_ddsHandlerExercise->ppmFtc()->registerParticipantRequest(req, this);
@@ -105,7 +105,7 @@ void ExerciseParticipantHandler::registerParticipant(qint32 participantId,
 
 void ExerciseParticipantHandler::onRegisterParticipantReply(const ParticipantManagement::RegisterReply &reply)
 {
-  INFO_LOG() << "RegisterReply id " << reply.id()
+  INFO_LOG(m_logger) << "RegisterReply id " << reply.id()
                      << " - registerReturnValue: " << reply.registerReturnValue()
                      << " for exercise " << reply.exerciseId();
 
@@ -119,7 +119,7 @@ void ExerciseParticipantHandler::onRegisterParticipantReply(const ParticipantMan
   emit registrationReturnValue(reply.exerciseId(), reply.id(), reply.registerReturnValue());
 
   if (fro.error())
-    ERROR_LOG() << "Error: " << fro();
+    ERROR_LOG(m_logger) << "Error: " << fro();
 }
 
 void ExerciseParticipantHandler::participantAdded(const ParticipantManagement::Participant &participant)
@@ -128,7 +128,7 @@ void ExerciseParticipantHandler::participantAdded(const ParticipantManagement::P
   if (!participant.equipmentNumber().is_set() || participant.equipmentNumber().get() == 0)
   {
     
-    INFO_LOG() << "New participant but no equipment number - ignoring";
+    INFO_LOG(m_logger) << "New participant but no equipment number - ignoring";
     return;
   }
   addParticipant(participant.id(), participant.equipmentNumber().get());
@@ -168,7 +168,7 @@ void ExerciseParticipantHandler::participantModified(const ParticipantManagement
   }
   if (participant.equipmentNumber().is_set())
   {
-    INFO_LOG() << "Participant with id " << participant.id() << " changed its equipment number from "
+    INFO_LOG(m_logger) << "Participant with id " << participant.id() << " changed its equipment number from "
                        << itEquipNumber.value() << " to " << participant.equipmentNumber().get();
   }
 
@@ -192,7 +192,7 @@ void ExerciseParticipantHandler::participantRemoved(const ParticipantManagement:
   if (itEquipNumber == m_participantId2EquipmentNumber.end())
   {
     
-    INFO_LOG() << "Participant was removed but has no equipment number - ignoring";
+    INFO_LOG(m_logger) << "Participant was removed but has no equipment number - ignoring";
     return;
   }
   removeParticipant(itEquipNumber.key(), itEquipNumber.value());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercise_participant_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercise_participant_handler.h
index 8959ddb9b..faca2158c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercise_participant_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercise_participant_handler.h
@@ -39,6 +39,7 @@ Q_SIGNALS:
   void participantChanged(const ParticipantManagement::Participant&, DataModification modType, int exerciseId);
 
 private:
+  NGL::INGLLogger &m_logger;
   void participantAdded(const ParticipantManagement::Participant &participant);
   void participantModified(const ParticipantManagement::Participant &participant);
   void participantRemoved(const ParticipantManagement::Participant &participant);
@@ -53,6 +54,7 @@ private Q_SLOTS:
   void onRegisterParticipantReply(const ParticipantManagement::RegisterReply &reply) override final;
 
 private:
+  NGL::INGLLogger &m_logger;
   int m_exerciseId;
   std::shared_ptr<DdsHandlerExercise> m_ddsHandlerExercise; 
   ExercisesHandler *m_exercisesHandler;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercises_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercises_handler.cpp
index ac42db03a..559c309e5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercises_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercises_handler.cpp
@@ -32,7 +32,7 @@ bool ExercisesHandler::init()
 
 QMap<qint32, ExerciseManagement::Exercise> ExercisesHandler::getExercises() const
 {
-  INFO_LOG() << "IN getExercises";
+  INFO_LOG(m_logger) << "IN getExercises";
   m_ddsHandler->exmDtc()->waitForHistoricalDataExercise();
   return m_ddsHandler->exmDtc()->exercises();
 }
@@ -62,7 +62,7 @@ ParticipantManagement::TypeClass ExercisesHandler::typeClassIdFromEquipmentTypeI
 
 ParticipantManagement::Party ExercisesHandler::getParty(int partyId, int exerciseId) const
 {
-  DEBUG_LOG() << "getParty: " << partyId << ", exId: " << exerciseId;
+  DEBUG_LOG(m_logger) << "getParty: " << partyId << ", exId: " << exerciseId;
   auto it = m_exerciseHandler.find(exerciseId);
   if (it == m_exerciseHandler.end())
     return ParticipantManagement::Party();
@@ -150,7 +150,7 @@ bool ExercisesHandler::modifyEquipmentTypes(const std::vector<ParticipantManagem
 void ExercisesHandler::onModifyEquipmentTypeDataReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    ERROR_LOG() << replyObject();
+    ERROR_LOG(m_logger) << replyObject();
 }
 
 bool ExercisesHandler::addParticipant(const ParticipantInfoStruct &pis)
@@ -164,7 +164,7 @@ bool ExercisesHandler::modifyParticipant(const ParticipantInfoStruct &pis)
   auto it = findParticipant(pis);
   if (it == m_participants.end())
   {
-    ERROR_LOG() << "Trying to modify a participant which is not in our map. mod: "
+    ERROR_LOG(m_logger) << "Trying to modify a participant which is not in our map. mod: "
                         << pis;
     return false;
   }
@@ -177,7 +177,7 @@ bool ExercisesHandler::removeParticipant(const ParticipantInfoStruct &pis)
   auto it = findParticipant(pis);
   if (it == m_participants.end())
   {
-    ERROR_LOG() << "Trying to remove a participant which is not in our map. mod: "
+    ERROR_LOG(m_logger) << "Trying to remove a participant which is not in our map. mod: "
                         << pis;
     return false;
   }
@@ -203,11 +203,11 @@ QVector<ParticipantInfoStruct> ExercisesHandler::infoStructForEquipment(int equi
 
 void ExercisesHandler::exerciseAdded(int exerciseId)
 {
-  INFO_LOG() << "Exercise with id " << exerciseId << " created";
+  INFO_LOG(m_logger) << "Exercise with id " << exerciseId << " created";
   auto it = m_exerciseHandler.find(exerciseId);
   if (it != m_exerciseHandler.end())
   {
-    WARNING_LOG() << "Exercise with id " << exerciseId
+    WARNING_LOG(m_logger) << "Exercise with id " << exerciseId
                           << " added but it was already in our list - recreating handler";
     delete it.value();
     m_exerciseHandler.erase(it);
@@ -215,7 +215,7 @@ void ExercisesHandler::exerciseAdded(int exerciseId)
   ExerciseParticipantHandler *exH = new ExerciseParticipantHandler(m_ddsHandler->getDomainParticipant(), exerciseId, this);
   if (!exH->init())
   {
-    ERROR_LOG() << "Error initializing ExerciseHandler for exercise " << exerciseId;
+    ERROR_LOG(m_logger) << "Error initializing ExerciseHandler for exercise " << exerciseId;
     delete exH;
     return;
   }
@@ -223,17 +223,17 @@ void ExercisesHandler::exerciseAdded(int exerciseId)
           this, &ExercisesHandler::registrationReturnValue);
   connect(exH, &ExerciseParticipantHandler::participantChanged,
           this, &ExercisesHandler::participantChanged);
-  INFO_LOG() << "Successfully created exercise handler for exercise " << exerciseId;
+  INFO_LOG(m_logger) << "Successfully created exercise handler for exercise " << exerciseId;
   m_exerciseHandler[exerciseId] = exH;
 }
 
 void ExercisesHandler::exerciseRemoved(int exerciseId)
 {
-  INFO_LOG() << "Exercise with id " << exerciseId << " removed";
+  INFO_LOG(m_logger) << "Exercise with id " << exerciseId << " removed";
   auto it = m_exerciseHandler.find(exerciseId);
   if (it == m_exerciseHandler.end())
   {
-    WARNING_LOG() << "Exercise removed but it was not found in our internal map";
+    WARNING_LOG(m_logger) << "Exercise removed but it was not found in our internal map";
     return;
   }
   delete it.value();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercises_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercises_handler.h
index 1a6dbd932..31760ff2b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercises_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercises_handler.h
@@ -70,6 +70,7 @@ Q_SIGNALS:
   void exerciseChanged(const ExerciseManagement::Exercise &data, DataModification modType);
 
 private:
+  NGL::INGLLogger &m_logger;
   void exerciseAdded(int exerciseId);
   void exerciseRemoved(int exerciseId);
   QMultiHash<int, ParticipantInfoStruct>::iterator findParticipant(const ParticipantInfoStruct &pis);
@@ -78,6 +79,7 @@ private Q_SLOTS:
   void onModifyEquipmentTypeDataReply(const Core::FunctionReplyObject &replyObject) override;
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler> m_ddsHandler;
 
   QHash<int, ExerciseParticipantHandler *> m_exerciseHandler;
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 24107207e..162f4fbaa 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
@@ -54,7 +54,7 @@ IWMS2ECC::PlayerInfo IWMS2ECC_Impl::convert(const ParticipantManagement::Partici
   pi.exerciseId     = exerciseId;
   pi.forceId        = part.partyId();
 
-  DEBUG_LOG() << "Force Id = " << pi.forceId;
+  DEBUG_LOG(m_logger) << "Force Id = " << pi.forceId;
 
   pi.info           = QString::fromStdString(part.info());
   pi.parentPlayerId = part.superiorId();
@@ -67,10 +67,10 @@ IWMS2ECC::PlayerInfo IWMS2ECC_Impl::convert(const ParticipantManagement::Partici
   {
     pi.equipTypeId = partType.equipmentTypeId();
     pi.typeClassId = convert(partType.typeClass());
-    TRACE_LOG() << "Found participant type with id " << part.typeId() << ", " << pi.typeClassId << ", " << pi.equipTypeId;
+    TRACE_LOG(m_logger) << "Found participant type with id " << part.typeId() << ", " << pi.typeClassId << ", " << pi.equipTypeId;
   }
   else
-    WARNING_LOG() << "Can not find participant type with id " << part.typeId();
+    WARNING_LOG(m_logger) << "Can not find participant type with id " << part.typeId();
   pi.typeId = part.typeId();
   pi.isDeleted = part.isDeleted();
 
@@ -80,8 +80,8 @@ IWMS2ECC::PlayerInfo IWMS2ECC_Impl::convert(const ParticipantManagement::Partici
 
   pi.symbolColor = party.color();
 
-  DEBUG_LOG() << "party.name: " << pi.forceName;
-  DEBUG_LOG() << "symbolColor: " << pi.symbolColor << ", playerId: " << pi.playerId << ", exerciseId: " << exerciseId;
+  DEBUG_LOG(m_logger) << "party.name: " << pi.forceName;
+  DEBUG_LOG(m_logger) << "symbolColor: " << pi.symbolColor << ", playerId: " << pi.playerId << ", exerciseId: " << exerciseId;
   
   
   return pi;
@@ -97,7 +97,7 @@ IWMS2ECC::exerciseMap IWMS2ECC_Impl::getExercises() const
       retMap.insert(ex.id(), convert(ex));
   }
 
-  INFO_LOG() << "IN getExercises, exMap.size(): " << exMap.size()
+  INFO_LOG(m_logger) << "IN getExercises, exMap.size(): " << exMap.size()
                      << ", retMap.size: " << retMap.size();
   return retMap;
 }
@@ -131,12 +131,12 @@ QMap<int, IWMS2ECC::PlayerInfo> IWMS2ECC_Impl::getAllPlayers(int exerciseId) con
 
 QMap<int, IWMS2ECC::PlayerInfo> IWMS2ECC_Impl::getAllParticipants(int exerciseId) const
 {
-  INFO_LOG() << "IN getAllParticipants";
+  INFO_LOG(m_logger) << "IN getAllParticipants";
   QMap<int, IWMS2ECC::PlayerInfo> retMap;
 
   const QMap<qint32, ParticipantManagement::Participant> map = m_exercisesHandler->getParticipants(exerciseId);
 
-  INFO_LOG() << "getAllPlayers map.size() : " << map.size();
+  INFO_LOG(m_logger) << "getAllPlayers map.size() : " << map.size();
 
   for (const ParticipantManagement::Participant &exePart : map)
   {
@@ -171,8 +171,8 @@ IWMS2ECC::RegisterReturnValue IWMS2ECC_Impl::registerPlayer(int playerId, int eq
 
 void IWMS2ECC_Impl::onRegistrationReturnValue(int exerciseId, qint32 participantId, ParticipantManagement::RegisterReturnValue retValue)
 {
-  INFO_LOG() << "IN onRegistrationReturnValue ";
-  INFO_LOG() << "exerciseId: "  << exerciseId << ", participantId: " << participantId << ", retValue: " << retValue;
+  INFO_LOG(m_logger) << "IN onRegistrationReturnValue ";
+  INFO_LOG(m_logger) << "exerciseId: "  << exerciseId << ", participantId: " << participantId << ", retValue: " << retValue;
   emit registrationReturnValue(exerciseId, participantId, convert(retValue));
 }
 
@@ -187,12 +187,12 @@ IWMS2ECC::UnregisterReturnValue IWMS2ECC_Impl::unregister(int equipNo, int exerc
 IWMS2ECC::PlayerInfo IWMS2ECC_Impl::getPlayerInfo(int playerId, int exerciseId)
 {
 
-  DEBUG_LOG() << "IN getPlayerInfo: "
+  DEBUG_LOG(m_logger) << "IN getPlayerInfo: "
                       << " playerId = " << playerId << ", exerciseId = " << exerciseId;
 
   if (playerId <= 0 || exerciseId <= 0)
   {
-    WARNING_LOG() << "Invalid Player (0,0)";
+    WARNING_LOG(m_logger) << "Invalid Player (0,0)";
     IWMS2ECC::PlayerInfo pi;
     pi.playerState = NOT_FOUND;
     return pi;
@@ -217,7 +217,7 @@ IWMS2ECC::PlayerInfo IWMS2ECC_Impl::getPlayerInfo(int playerId, int exerciseId)
 
   pi.playerState = FOUND;
 
-  INFO_LOG() << "Player (" << pi.playerId << "," << exerciseId << ") found: "
+  INFO_LOG(m_logger) << "Player (" << pi.playerId << "," << exerciseId << ") found: "
                      << "AssignState: " << pi.assignState << ", forceName: " << pi.forceName;
 
   return pi;
@@ -230,7 +230,7 @@ QMap<int, int> IWMS2ECC_Impl::getEquipRequirements(int exerciseId) const
 
   const QMap<qint32, ParticipantManagement::Participant> map = m_exercisesHandler->getParticipants(exerciseId);
 
-  INFO_LOG() << "getAllPlayers map.size() : " << map.size();
+  INFO_LOG(m_logger) << "getAllPlayers map.size() : " << map.size();
 
   QMap<int, int> reqPartTypes;
 
@@ -250,17 +250,17 @@ QMap<int, int> IWMS2ECC_Impl::getEquipRequirements(int exerciseId) const
     const ParticipantManagement::Type partType = m_exercisesHandler->participantType(typeId);
     if (partType.id() == typeId)
     {
-      DEBUG_LOG() << "Key: " << typeId;
+      DEBUG_LOG(m_logger) << "Key: " << typeId;
       ParticipantManagement::TypeClass typeClass = partType.typeClass();
       int equipTypeId = partType.equipmentTypeId();
       if (typeClass != ParticipantManagement::TypeClass_def::Unit && typeClass != ParticipantManagement::TypeClass_def::SupportUnit)
       {
         reqEquipTypes[equipTypeId] = cIt.value();
-        DEBUG_LOG() << "equipTypeId: " << equipTypeId << ", amount: " << cIt.value();
+        DEBUG_LOG(m_logger) << "equipTypeId: " << equipTypeId << ", amount: " << cIt.value();
       }
     }
     else
-      WARNING_LOG() << "Can not find participant type with id " << typeId;
+      WARNING_LOG(m_logger) << "Can not find participant type with id " << typeId;
   }
   return reqEquipTypes;
 }
@@ -408,7 +408,7 @@ bool IWMS2ECC_Impl::setEquipmentType(const EquipmentType &et)
 
 bool IWMS2ECC_Impl::setEquipmentTypes(const equipTypeMap &map)
 {
-  INFO_LOG() << "IN setEquipmentTypes: equipMap.size: " << map.size();
+  INFO_LOG(m_logger) << "IN setEquipmentTypes: equipMap.size: " << map.size();
 
   std::vector<ParticipantManagement::EquipmentType> vEquipTypes;
   vEquipTypes.reserve(map.size());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/interface_wms2ecc_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/interface_wms2ecc_impl.h
index 939a5d547..8bf8a9110 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/interface_wms2ecc_impl.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/interface_wms2ecc_impl.h
@@ -54,6 +54,8 @@ Q_SIGNALS:
   void registrationReturnValue(int exerciseId, qint32 participantId, IWMS2ECC::RegisterReturnValue retValue);
 
 protected:
+
+NGL::INGLLogger &m_logger;
   QMap<int, IWMS2ECC::PlayerInfo> getAllParticipants(int exerciseId) const;
 
   QByteArray getSymbol(int symbolId, int exerciseId, const QColor &color, int role) const;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/main_handler.cpp
index 23995173b..5d9352f92 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/main_handler.cpp
@@ -6,9 +6,8 @@
 namespace WarehouseManagement
 {
 
-MainHandler::MainHandler()
-  : QObject()
-{}
+MainHandler::MainHandler() : QObject(),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 MainHandler::~MainHandler()
 { 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/main_handler.h
index 7a0104468..f9d13e211 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/main_handler.h
@@ -28,6 +28,8 @@ public:
   bool init(int domainId);
 
 private:
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>       m_ddsHandler;
   std::shared_ptr<ExercisesHandler> m_exercisesHandler;
   std::shared_ptr<IWMS2ECC_Impl>    m_wms2ecc;  
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/dds_handler.cpp
index 476ffcce9..f1b8df246 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/dds_handler.cpp
@@ -8,17 +8,16 @@
 namespace WirelessLocationSystem
 {
 
-DdsHandler::DdsHandler(int domainId, int exerciseId)
-  : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Global, exerciseId))
-{
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+DdsHandler::DdsHandler(int domainId, int exerciseId) : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Global, exerciseId)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/dds_handler.h
index 5c04804c2..b15637c53 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/dds_handler.h
@@ -31,6 +31,7 @@ public:
   }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector>       m_ddsConnector;
   std::shared_ptr<Core::Pacemaker>                  m_pacemaker;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/ism_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/ism_handler.cpp
index c7aab99b9..9dd977bd3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/ism_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/ism_handler.cpp
@@ -6,9 +6,8 @@
 
 namespace WirelessLocationSystem
 {
-IsmHandler::IsmHandler(QObject *parent)
-  : QObject(parent)
-{}
+IsmHandler::IsmHandler(QObject *parent) : QObject(parent),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 bool IsmHandler::init(MainHandler *mainHandler)
 {
@@ -21,7 +20,7 @@ bool IsmHandler::init(MainHandler *mainHandler)
 
   if (!m_dtcIsm->enableMainStructureElement())
   {
-    ERROR_LOG() << "Can not read data from ISM";
+    ERROR_LOG(m_logger) << "Can not read data from ISM";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/ism_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/ism_handler.h
index 42c412c9e..08b8dc72d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/ism_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/ism_handler.h
@@ -31,6 +31,7 @@ private Q_SLOTS:
 
 private:
   
+  NGL::INGLLogger &m_logger;
   QHash<int, InfrastructureManagement::MainStructureElement> m_mainStructureElements;
   
   QHash<int, int> m_externalWlsId2MseId;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main_handler.cpp
index 6ec328404..845e518f1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main_handler.cpp
@@ -8,10 +8,9 @@
 namespace WirelessLocationSystem
 {
 
-MainHandler::MainHandler(QObject *parent)
-  : QObject(parent)
-  , m_ddsHandler(nullptr)
-{}
+MainHandler::MainHandler(QObject *parent) : QObject(parent)
+  , m_ddsHandler(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 MainHandler::~MainHandler()
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main_handler.h
index 8433097b8..58d99c19e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main_handler.h
@@ -46,6 +46,8 @@ public:
   }
 
 private:
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler> m_ddsHandler;
   std::shared_ptr<WlsParticipantHandler> m_wlsParticipantHandler;
   std::shared_ptr<WlsHandler> m_wlsHandler;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/web_socket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/web_socket_handler.cpp
index e49d77552..497338571 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/web_socket_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/web_socket_handler.cpp
@@ -21,11 +21,10 @@ namespace WirelessLocationSystem
 
 const char *exerciseIdProperty = "exerciseId";
 
-WebSocketHandler::WebSocketHandler(QObject *parent)
-  : QObject(parent)
+WebSocketHandler::WebSocketHandler(QObject *parent) : QObject(parent)
   , m_webSocketServer(new QWebSocketServer(QStringLiteral("WLS"), QWebSocketServer::NonSecureMode, this))
-  , m_basePoint(LtsCoordTrans::UtmCoordinate::fromMgrs(Settings::wlsMgrsBasePoint()))
-{}
+  , m_basePoint(LtsCoordTrans::UtmCoordinate::fromMgrs(Settings::wlsMgrsBasePoint())),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 WebSocketHandler::~WebSocketHandler()
 {}
@@ -37,7 +36,7 @@ bool WebSocketHandler::init(std::shared_ptr<WlsHandler> wlsHandler,
 {
   if (!m_webSocketServer->listen(QHostAddress::Any, listenPort))
   {
-    WARNING_LOG() << "Can not listen on port " << listenPort << " - aborting" << m_webSocketServer->errorString();
+    WARNING_LOG(m_logger) << "Can not listen on port " << listenPort << " - aborting" << m_webSocketServer->errorString();
     return false;
   }
 
@@ -58,7 +57,7 @@ void WebSocketHandler::onNewConnection()
   if (ws == nullptr)
     return;
 
-  DEBUG_LOG() << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
+  DEBUG_LOG(m_logger) << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
 
   connect(ws, &QWebSocket::textMessageReceived,
           this, &WebSocketHandler::onTextMessageReceived);
@@ -68,14 +67,14 @@ void WebSocketHandler::onNewConnection()
   connect(this, &WebSocketHandler::signalBroadcastMessage,
           ws, [this, ws](const QString &msg, int exerciseId)
   {
-    DEBUG_LOG() << "broadcast: exercise property is valid? " << ws->property(exerciseIdProperty).isValid() << " for " << ws->peerPort();
+    DEBUG_LOG(m_logger) << "broadcast: exercise property is valid? " << ws->property(exerciseIdProperty).isValid() << " for " << ws->peerPort();
 
     bool exerciseIdAvailable = false;
     int wsExerciseId = ws->property(exerciseIdProperty).toInt(&exerciseIdAvailable);
 
     if (exerciseIdAvailable && wsExerciseId != exerciseId) 
     {
-      DEBUG_LOG() << "broadcast: websocket has " << wsExerciseId << ", but " << exerciseId << " was requested";
+      DEBUG_LOG(m_logger) << "broadcast: websocket has " << wsExerciseId << ", but " << exerciseId << " was requested";
       return;
     }
 
@@ -102,7 +101,7 @@ void WebSocketHandler::sendTelegramInternal(const TrainingAreaBase::TetraIcd::Tr
 
 
   const QString jsonStr(QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact)));
-  DEBUG_LOG() << "jsonStr: " << jsonStr;
+  DEBUG_LOG(m_logger) << "jsonStr: " << jsonStr;
 
   emit signalBroadcastMessage(jsonStr, exerciseId);
 }
@@ -139,7 +138,7 @@ void WebSocketHandler::onTextMessageReceived(const QString &baJson)
 {
   using namespace TrainingAreaBase::TetraIcd;
 
-  TRACE_LOG() << "WebSocketHandler::onTextMessageReceived: " << baJson;
+  TRACE_LOG(m_logger) << "WebSocketHandler::onTextMessageReceived: " << baJson;
   QWebSocket *ws = qobject_cast<QWebSocket*>(sender());
 
   if (ws == nullptr)
@@ -153,7 +152,7 @@ void WebSocketHandler::onTextMessageReceived(const QString &baJson)
 
   if (err.error != QJsonParseError::NoError)
   {
-    ERROR_LOG() << "received invalid json from websocket at " << err.offset << ": " << err.errorString();
+    ERROR_LOG(m_logger) << "received invalid json from websocket at " << err.offset << ": " << err.errorString();
     return;
   }
 
@@ -172,7 +171,7 @@ void WebSocketHandler::onTextMessageReceived(const QString &baJson)
   const QJsonValue typeId(obj.value(QStringLiteral("typeId")));
   if (!typeId.isDouble())
   {
-    ERROR_LOG() << "Can not read type id: " << baJson;
+    ERROR_LOG(m_logger) << "Can not read type id: " << baJson;
     return;
   }
 
@@ -191,7 +190,7 @@ void WebSocketHandler::onTextMessageReceived(const QString &baJson)
       {
         int exerciseId = ExerciseStateData::fromJson(data).exerciseId;
         ws->setProperty(exerciseIdProperty, exerciseId);
-        DEBUG_LOG() << "set exercise id " << exerciseId << " for ws with peer port " << ws->peerPort();
+        DEBUG_LOG(m_logger) << "set exercise id " << exerciseId << " for ws with peer port " << ws->peerPort();
         sendParticipantConnectionStates(exerciseId);
         break;
       }
@@ -202,14 +201,14 @@ void WebSocketHandler::onTextMessageReceived(const QString &baJson)
         m_participantHandler->handleWlsBinarySfmData(WlsBinarySfmData::fromJson(data));
         break;
       default:
-        WARNING_LOG() << "Handler for telegram Id " << typeId.toInt()
+        WARNING_LOG(m_logger) << "Handler for telegram Id " << typeId.toInt()
                               << " not yet implemented (" << baJson << ")";
         return;
     }
   }
   catch (const std::exception &e)
   {
-    WARNING_LOG() << "Could not parse json: " << e.what() << " (" << baJson << ")";
+    WARNING_LOG(m_logger) << "Could not parse json: " << e.what() << " (" << baJson << ")";
     return;
   }
 }
@@ -271,16 +270,16 @@ void WebSocketHandler::setPosition(T &tele, const WlsParticipant *participant)
 
 void WebSocketHandler::sendPosition(const WlsParticipant *participant)
 {
-  INFO_LOG() << "sendPosition equipmentNumber=" << participant->equipmentNumber();
+  INFO_LOG(m_logger) << "sendPosition equipmentNumber=" << participant->equipmentNumber();
   if (!participant || !participant->positionIsValid() || participant->equipmentNumber() == 0)
   {
-    INFO_LOG() << "not send - participant is not yet fully initialized";
+    INFO_LOG(m_logger) << "not send - participant is not yet fully initialized";
     return;
   }
 
   if (participant->isGpsMode())
   {
-    INFO_LOG() << "not send - participant is in gps mode";
+    INFO_LOG(m_logger) << "not send - participant is in gps mode";
     return;
   }
   TrainingAreaBase::TetraIcd::PositionReport posValue;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/web_socket_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/web_socket_handler.h
index 0b323e729..45f3b6b69 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/web_socket_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/web_socket_handler.h
@@ -62,6 +62,7 @@ signals:
   void signalBroadcastMessage(const QString &msg, int exerciseId);
 
 private:
+  NGL::INGLLogger &m_logger;
   template <typename T>
   void setPosition(T &tele, const WlsParticipant *participant);
   void sendTelegramInternal(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data,
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_handler.cpp
index 1ea726e43..b562530a3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_handler.cpp
@@ -32,11 +32,10 @@ static inline QByteArray escapeData(const QByteArray &bufferData)
   return ret;
 }
 
-WlsHandler::WlsHandler(QObject *parent)
-  : QObject(parent)
-{
+WlsHandler::WlsHandler(QObject *parent) : QObject(parent),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   if (Settings::wlsMgrsBasePoint().size() <= 15)
-    WARNING_LOG() << "WLS basepoint is not defined precise enough: " << Settings::wlsMgrsBasePoint();
+    WARNING_LOG(m_logger) << "WLS basepoint is not defined precise enough: " << Settings::wlsMgrsBasePoint();
 }
 
 WlsHandler::~WlsHandler()
@@ -50,14 +49,14 @@ bool WlsHandler::init(WlsParticipantHandler *participantHandler,
 {
   m_participantHandler = participantHandler;
   m_wsHandler = wsHandler;
-  INFO_LOG() << "WlsHandler::init";
+  INFO_LOG(m_logger) << "WlsHandler::init";
   delete m_tcpServer;
   m_tcpServer = new QTcpServer(this);
   connect(m_tcpServer, &QTcpServer::newConnection,
           this, &WlsHandler::onIncomingConnection);
   if (!m_tcpServer->listen(QHostAddress::Any, listenPort))
   {
-    WARNING_LOG() << "Error listening on port " << listenPort;
+    WARNING_LOG(m_logger) << "Error listening on port " << listenPort;
     return false;
   }
 
@@ -87,7 +86,7 @@ bool WlsHandler::sendWlsMessage(const QByteArray &tagId, WlsTelegramId telId, co
   auto itSocket = m_tcpSocketByTagId.constFind(tagId);
   if (itSocket == m_tcpSocketByTagId.constEnd())
   {
-    ERROR_LOG() << "Can't find a TCP-socket for tag id: " << tagId;
+    ERROR_LOG(m_logger) << "Can't find a TCP-socket for tag id: " << tagId;
     return false;
   }
 
@@ -112,7 +111,7 @@ bool WlsHandler::sendWlsMessage(const QByteArray &tagId, WlsTelegramId telId, co
     data.append(s_endMark);                                             
 
     (*itSocket)->write(data);
-    DEBUG_LOG() << "Sending telegram to wls: " << escapeData(data);
+    DEBUG_LOG(m_logger) << "Sending telegram to wls: " << escapeData(data);
   }
   (*itSocket)->flush();
   return true;
@@ -120,7 +119,7 @@ bool WlsHandler::sendWlsMessage(const QByteArray &tagId, WlsTelegramId telId, co
 
 void WlsHandler::onIncomingConnection()
 {
-  INFO_LOG() << "WlsHandler::onIncomingConnection";
+  INFO_LOG(m_logger) << "WlsHandler::onIncomingConnection";
   QTcpSocket *tcpSocket = m_tcpServer->nextPendingConnection();
   if (!tcpSocket)
     return;
@@ -145,7 +144,7 @@ void WlsHandler::onIncomingData()
     return;
   auto &tcpBuffer = m_tcpSockets[s];
   const QByteArray bufferData = tcpBuffer + s->readAll();
-  TRACE_LOG() << "WlsHandler::onIncomingData bufferData='" << escapeData(bufferData) << "'";
+  TRACE_LOG(m_logger) << "WlsHandler::onIncomingData bufferData='" << escapeData(bufferData) << "'";
   
   tcpBuffer = parseBuffer(bufferData, s);
 
@@ -156,7 +155,7 @@ void WlsHandler::onSocketDisconnected()
   QTcpSocket *s = qobject_cast<QTcpSocket *>(sender());
   if (!s)
     return;
-  INFO_LOG() << "Socket disconnected";
+  INFO_LOG(m_logger) << "Socket disconnected";
   m_tcpSockets.remove(s);
 
   
@@ -202,7 +201,7 @@ void WlsHandler::parseWlsTelegram(const QByteArray &baTele, QTcpSocket *socket)
   const WlsTelegramId telegramId = static_cast<WlsTelegramId>(parts.at(0).toInt());
   const QDateTime timestamp = QDateTime::fromString(QString::fromUtf8(parts.at(1)), QStringLiteral("yyyy-MM-dd hh:mm:ss.zzz"));
   if (telegramId != WlsTelegramId::PlayerPosition)
-    DEBUG_LOG() << "Handling " << telegramId
+    DEBUG_LOG(m_logger) << "Handling " << telegramId
                         << ", data: '" << escapeData(baTele) << "'";
   bool bOk = true;
   switch (telegramId)
@@ -220,11 +219,11 @@ void WlsHandler::parseWlsTelegram(const QByteArray &baTele, QTcpSocket *socket)
     bOk = handleDataPayloadMobileToHost(parts);
     break;
   case WlsTelegramId::PayloadHostToMobile:
-    WARNING_LOG() << "Protocol error - got a message which should not be sent from Wls (PayloadHostToMobile)";
+    WARNING_LOG(m_logger) << "Protocol error - got a message which should not be sent from Wls (PayloadHostToMobile)";
     break;
   }
   if (!bOk)
-    WARNING_LOG() << "Error handling telegram: '" << baTele << "'";
+    WARNING_LOG(m_logger) << "Error handling telegram: '" << baTele << "'";
 }
 
 bool WlsHandler::findNextSyncStartByte(const QByteArray &buffer, int &iCurReadPos)
@@ -257,7 +256,7 @@ bool WlsHandler::handleVersionsinformation(const QList<QByteArray> &data)
 {
   if (data.size() < 4)
     return false;
-  DEBUG_LOG() << "TX(WLS): Version = " << data.at(3);
+  DEBUG_LOG(m_logger) << "TX(WLS): Version = " << data.at(3);
   return true;
 }
 
@@ -290,7 +289,7 @@ bool WlsHandler::handlePlayerPosition(const QList<QByteArray> &data, const QDate
   pos.z += m_wlsZOffset;
   p->setPosition(pos, timestamp.toMSecsSinceEpoch());
 
-  INFO_LOG() << p->getPlayerIdStr() << ": handlePlayerPosition"
+  INFO_LOG(m_logger) << p->getPlayerIdStr() << ": handlePlayerPosition"
                      << " x=" << pos.x << ", y=" << pos.y << ", z=" << pos.z
                      << ", wlsAreaId=" << pos.wlsAreaId
                      << ", wlsBuildingId=" << pos.wlsBuildingId
@@ -324,7 +323,7 @@ bool WlsHandler::handlePlayerState(const QList<QByteArray> &data)
 
   p->voltage = voltage / 10.; 
 
-  INFO_LOG() << p->getPlayerIdStr() << ": handlePlayerState"
+  INFO_LOG(m_logger) << p->getPlayerIdStr() << ": handlePlayerState"
                      << " timeout=" << timeout
                      << " ,tacticalState=" << tacticalState
                      << " ,voltage=" << p->voltage;
@@ -340,7 +339,7 @@ bool WlsHandler::checkPayloadIsHex(const QByteArray &payload) const
         (c < 'a' || c > 'f') &&
         (c < 'A' || c > 'F'))
     {
-      WARNING_LOG() << "Payload data is not hex coded ...";
+      WARNING_LOG(m_logger) << "Payload data is not hex coded ...";
       return false;
     }
   }
@@ -360,7 +359,7 @@ bool WlsHandler::handleDataPayloadMobileToHost(const QList<QByteArray> &data)
   QSharedPointer<SfmMessage_rx> msg = SfmMessageConverter::generateRxMessage(payload);
   if (!msg)
   {
-    WARNING_LOG() << "Can not convert payload to SfmMessage ... ";
+    WARNING_LOG(m_logger) << "Can not convert payload to SfmMessage ... ";
     return false;
   }
 
@@ -387,7 +386,7 @@ bool WlsHandler::handleDataPayloadMobileToHost(const QList<QByteArray> &data)
   case SfmMessage::MsgId::LicenseState:
   case SfmMessage::MsgId::TacticalState:
   default:
-    WARNING_LOG() << "RX(WLS): MessageID(" << static_cast<int>(msg->getId()) << ")";
+    WARNING_LOG(m_logger) << "RX(WLS): MessageID(" << static_cast<int>(msg->getId()) << ")";
     break;
   }
   return true;
@@ -397,7 +396,7 @@ bool WlsHandler::handleDataPayloadMobileToHost(const QList<QByteArray> &data)
 void WlsHandler::handlePayload(WlsParticipant *participant, const SfmMsgEquipmentId *sfmTele)
 {
   const int equipmentNumber = sfmTele->getEquipmentNumber();
-  INFO_LOG() << participant->getPlayerIdStr() << ": handlePayload"
+  INFO_LOG(m_logger) << participant->getPlayerIdStr() << ": handlePayload"
                      << " - new equipmentNumber = " << equipmentNumber;
   if (participant->equipmentNumber() == 0 ||
       participant->equipmentNumber() != equipmentNumber)
@@ -414,7 +413,7 @@ void WlsHandler::handlePayload(WlsParticipant *participant, const SfmMsgRequestG
 
 void WlsHandler::handlePayload(WlsParticipant *participant, const SfmMsgSfmRestart_rx *sfmTele)
 {
-  WARNING_LOG() << "Restart notification ... " << participant->tagId();
+  WARNING_LOG(m_logger) << "Restart notification ... " << participant->tagId();
   Q_UNUSED(sfmTele)
 
   participant->setWlsZone(-1);
@@ -441,7 +440,7 @@ void WlsHandler::sendGpsMode(WlsParticipant *participant)
     return;
   SfmMsgGpsControl_tx msg;
   msg.setGpsOn(participant->isGpsMode());
-  INFO_LOG() << participant->getPlayerIdStr() << ": sendGpsMode"
+  INFO_LOG(m_logger) << participant->getPlayerIdStr() << ": sendGpsMode"
                      << " GpsMode = "  << participant->isGpsMode();
   sendWlsMessage(participant->tagId(), msg);
 }
@@ -452,7 +451,7 @@ bool WlsHandler::parseDoubleCm(const QByteArray &data, double &num) const
   num = data.toDouble(&bOk);
   if (!bOk)
   {
-    WARNING_LOG() << "Error parsing floating point number '" << data << "'";
+    WARNING_LOG(m_logger) << "Error parsing floating point number '" << data << "'";
     return false;
   }
   num /= 100; 
@@ -465,7 +464,7 @@ bool WlsHandler::parseInteger(const QByteArray &data, int &num) const
   num = data.toInt(&bOk);
   if (!bOk)
   {
-    WARNING_LOG() << "Error parsing number '" << data << "'";
+    WARNING_LOG(m_logger) << "Error parsing number '" << data << "'";
     return false;
   }
   return true;
@@ -493,7 +492,7 @@ WlsParticipant *WlsHandler::participantFromTagId(const QByteArray &tagId, bool b
     
     
     SfmMsgRequestEquipmentId_tx getEqId;
-    INFO_LOG() << "Requesting Equipment number for tag " << tagId;
+    INFO_LOG(m_logger) << "Requesting Equipment number for tag " << tagId;
     sendWlsMessage(tagId, getEqId);
     p->lastEquipmentNumberRequest = tNow;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_handler.h
index 24b16388b..b48d3cf0b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_handler.h
@@ -17,6 +17,7 @@ class WlsHandler : public QObject
 {
   Q_OBJECT
 private:
+  NGL::INGLLogger &m_logger;
   enum class WlsTelegramId
   {
     VersionInformation  = 0,
@@ -53,6 +54,7 @@ private Q_SLOTS:
   void onIncomingData();
   void onSocketDisconnected();
 private:
+  NGL::INGLLogger &m_logger;
   QByteArray parseBuffer(const QByteArray &buffer, QTcpSocket *socket);
   void parseWlsTelegram(const QByteArray &baTele, QTcpSocket *socket);
   static bool findNextSyncStartByte(const QByteArray &buffer, int &iCurReadPos);
@@ -74,6 +76,7 @@ private:
   WlsParticipant *participantFromTagId(const QByteArray &tagId, bool bAskForEqIdIfNew = true);
 
 private:
+  NGL::INGLLogger &m_logger;
   QTcpServer *m_tcpServer = nullptr;
   WlsParticipantHandler *m_participantHandler = nullptr;
   WebSocketHandler *m_wsHandler = nullptr;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant.cpp
index 592a0e534..4370ee9d5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant.cpp
@@ -14,10 +14,9 @@ static constexpr int s_maxWlsRetryCount = 3;
 
 namespace WirelessLocationSystem
 {
-WlsParticipant::WlsParticipant(QObject *parent)
-  : QObject(parent)
-  , m_wlsTeleTimeoutTimer(new QTimer(this))
-{
+WlsParticipant::WlsParticipant(QObject *parent) : QObject(parent)
+  , m_wlsTeleTimeoutTimer(new QTimer(this)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_wlsTeleTimeoutTimer->setSingleShot(true);
   m_wlsTeleTimeoutTimer->setTimerType(Qt::VeryCoarseTimer);
   m_wlsTeleTimeoutTimer->setInterval(s_dataCommunicationAliveTimeout);
@@ -54,12 +53,12 @@ void WlsParticipant::setPosition(const RelativePosition &newPosition,
   if (tsCurrentPos == m_lastSeenPosition ||
       (((tsCurrentPos - m_lastSeenPosition) <= Settings::deadPosTimeout())  && comparePos(m_relativePosition, newPosition)))
   {
-    DEBUG_LOG() << "Check for pos Update";
-    DEBUG_LOG() << "Is Outdated= " <<((tsCurrentPos - m_lastSeenPosition) <= Settings::deadPosTimeout());
+    DEBUG_LOG(m_logger) << "Check for pos Update";
+    DEBUG_LOG(m_logger) << "Is Outdated= " <<((tsCurrentPos - m_lastSeenPosition) <= Settings::deadPosTimeout());
 
     if (((tsCurrentPos - m_lastSeenPosition) <= Settings::deadPosTimeout())  && comparePos(m_relativePosition, newPosition))
     {
-      DEBUG_LOG() << "Same Position or not older than 5000msecs " << tsCurrentPos - m_lastSeenPosition;
+      DEBUG_LOG(m_logger) << "Same Position or not older than 5000msecs " << tsCurrentPos - m_lastSeenPosition;
       return;
     }
     const qint64 tsNow = QDateTime::currentMSecsSinceEpoch();
@@ -99,7 +98,7 @@ void WlsParticipant::checkGpsOnOffTimeoutTimer(qint64 tNow)
   if (m_lastSeenDataCommunication > tNow - s_maxWlsRetryCount * s_dataCommunicationAliveTimeout)
     return;
 
-  DEBUG_LOG() << getPlayerIdStr() << ": lastSeenDataCommunication: "
+  DEBUG_LOG(m_logger) << getPlayerIdStr() << ": lastSeenDataCommunication: "
                       << m_lastSeenDataCommunication << ", now: "
                       << (tNow - s_maxWlsRetryCount * s_dataCommunicationAliveTimeout)
                       << " (" << tNow << "), "
@@ -141,14 +140,14 @@ void WlsParticipant::setWlsZone(int newWlsZone)
     m_dataCommunication = (newWlsZone > 3)
                           ? DataCommunication::On
                           : DataCommunication::Off;
-    INFO_LOG() << getPlayerIdStr() << ": wlsZone old: " << m_wlsZone << ", new: " << newWlsZone
+    INFO_LOG(m_logger) << getPlayerIdStr() << ": wlsZone old: " << m_wlsZone << ", new: " << newWlsZone
                        << ", new gps mode: " << m_gpsMode
                        << ", new data comm mode: " << m_dataCommunication
                        << ", " << this;
   }
   else
   {
-    INFO_LOG() << getPlayerIdStr() << ": Reset zone/data comunication status - sfm was restarted";
+    INFO_LOG(m_logger) << getPlayerIdStr() << ": Reset zone/data comunication status - sfm was restarted";
     m_gpsMode = GpsMode::On;
     m_dataCommunication = DataCommunication::Unknown;
     m_lastSeenPosition = -1;
@@ -169,7 +168,7 @@ bool WlsParticipant::handleSfmRxData(const SfmMsgTetra_rx *sfmTele)
 {
   if (!isRecvCounterCorrect(sfmTele->sendCounter()))
   {
-    WARNING_LOG() << "Got data telegram with counter " << int(sfmTele->sendCounter())
+    WARNING_LOG(m_logger) << "Got data telegram with counter " << int(sfmTele->sendCounter())
                           << " last one was " << int(m_lastRecvCounter) << " - ignoring";
     return false;
   }
@@ -179,7 +178,7 @@ bool WlsParticipant::handleSfmRxData(const SfmMsgTetra_rx *sfmTele)
   {
     if (m_sfmRxPayloadFragmentNumber + 1 != sfmTele->fragmentNumber())
     {
-      WARNING_LOG() << getPlayerIdStr() << ": Missing a fragment (waiting for "
+      WARNING_LOG(m_logger) << getPlayerIdStr() << ": Missing a fragment (waiting for "
                             << (m_sfmRxPayloadFragmentNumber + 1)
                             << ", got " << sfmTele->fragmentNumber() << ")";
       if (sfmTele->fragmentNumber() != 1)
@@ -200,7 +199,7 @@ bool WlsParticipant::handleSfmRxData(const SfmMsgTetra_rx *sfmTele)
   {
     
     if (m_sfmRxPayloadFragmentNumber != 0)
-      WARNING_LOG() << getPlayerIdStr()
+      WARNING_LOG(m_logger) << getPlayerIdStr()
                             << ": Got unfragmented telegram but currently waiting for next fragment of a fragmented telegram";
     m_sfmRxPayloadFragmentNumber = 0; 
     m_sfmRxPayloadData = sfmTele->payload();
@@ -265,7 +264,7 @@ void WlsParticipant::sendBinarySfmData(const std::vector<unsigned char> &data)
   const QByteArray ba = LtsUtils::toQByteArray(data);
   if (!calcChunkCountAndLen(ba, chunkCount, chunkLen))
   {
-    WARNING_LOG() << getPlayerIdStr()
+    WARNING_LOG(m_logger) << getPlayerIdStr()
                           << ": Internal error calculating chunk size for payload size " << data.size();
     return;
   }
@@ -290,7 +289,7 @@ void WlsParticipant::handleWlsAck(const Acknowledge_rx *ack)
   
   if (ack->recvCounter() != m_nextSendCounter)
   {
-    WARNING_LOG() << "Got ack for telegram with counter " << int(ack->recvCounter())
+    WARNING_LOG(m_logger) << "Got ack for telegram with counter " << int(ack->recvCounter())
                           << " but expected " << int(m_nextSendCounter) << " - ignoring";
     return;
   }
@@ -298,7 +297,7 @@ void WlsParticipant::handleWlsAck(const Acknowledge_rx *ack)
   {
     if (m_wlsQueue.isEmpty())
     {
-      ERROR_LOG() << "got an ack but nothing was sent - something went terribly wrong - resetting send/recv counter";
+      ERROR_LOG(m_logger) << "got an ack but nothing was sent - something went terribly wrong - resetting send/recv counter";
       m_nextSendCounter = 0;
       m_lastRecvCounter = 0;
       return;
@@ -343,7 +342,7 @@ void WlsParticipant::sendNextWlsTelegram(bool bIsResend)
       m_wlsQueue.clear();
       return;
     }
-    WARNING_LOG() << getPlayerIdStr()
+    WARNING_LOG(m_logger) << getPlayerIdStr()
                           << ": Trying to send a wls telegram but no data communication possible";
     
     Q_ASSERT(false);
@@ -364,14 +363,14 @@ void WlsParticipant::sendNextWlsTelegram(bool bIsResend)
 void WlsParticipant::onWlsTeleTimeout()
 {
   ++m_wlsTeleTimeoutCounter;
-  DEBUG_LOG() << getPlayerIdStr()
+  DEBUG_LOG(m_logger) << getPlayerIdStr()
                       << ": Resend WLS connection to participant " << m_equipmentNumber
                       << "(" << m_tagId << ")"
                       << " m_wlsTeleTimeoutCounter =" << m_wlsTeleTimeoutCounter
                       << " s_maxWlsRetryCount=" << s_maxWlsRetryCount;
   if (m_wlsTeleTimeoutCounter == s_maxWlsRetryCount)
   {
-    WARNING_LOG() << getPlayerIdStr()
+    WARNING_LOG(m_logger) << getPlayerIdStr()
                           << ": Lost WLS connection to participant " << m_equipmentNumber
                           << "(" << m_tagId << ")";
     m_lastSeenDataCommunication = -1;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant.h
index 33c81764e..e353e9b94 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant.h
@@ -102,6 +102,7 @@ public:
     return ret;
   }
 protected:
+  NGL::INGLLogger &m_logger;
   explicit WlsParticipant(QObject *parent = nullptr);
 public:
   void setPosition(const RelativePosition &newPosition, qint64 tsCurrentPos);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant_handler.cpp
index 633ae42d5..039895ede 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant_handler.cpp
@@ -10,10 +10,9 @@
 
 namespace WirelessLocationSystem
 {
-WlsParticipantHandler::WlsParticipantHandler(QObject *parent)
-  : QObject(parent)
-  , m_gpsOnOffTimeoutTimer(new QTimer(this))
-{
+WlsParticipantHandler::WlsParticipantHandler(QObject *parent) : QObject(parent)
+  , m_gpsOnOffTimeoutTimer(new QTimer(this)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   connect(m_gpsOnOffTimeoutTimer, &QTimer::timeout, this, &WlsParticipantHandler::onGpsOnOffTimeoutTimer);
   m_gpsOnOffTimeoutTimer->setSingleShot(false);
   m_gpsOnOffTimeoutTimer->start(1000);
@@ -94,7 +93,7 @@ void WlsParticipantHandler::handleWlsBinarySfmData(const TrainingAreaBase::Tetra
   WlsParticipant *p = m_participantsByEqId.value(data.header.equipmentNumber);
   if (!p)
   {
-    WARNING_LOG() << "Got binary sfm data for participant with eqId " << data.header.equipmentNumber
+    WARNING_LOG(m_logger) << "Got binary sfm data for participant with eqId " << data.header.equipmentNumber
                           << " but could not find this participant!";
     return;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant_handler.h
index 8f2da483a..b557deb88 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant_handler.h
@@ -39,6 +39,7 @@ public:
 private Q_SLOTS:
   void onGpsOnOffTimeoutTimer();
 private:
+  NGL::INGLLogger &m_logger;
   WebSocketHandler *m_wsHandler = nullptr;
   WlsHandler *m_wlsHandler = nullptr;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/ModuleTests/alm_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/ModuleTests/alm_tests.cpp
index f05e97de3..b474774bc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/ModuleTests/alm_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/ModuleTests/alm_tests.cpp
@@ -44,7 +44,7 @@ AlmTests::~AlmTests()
 // ------------------------------------------------------------------
 bool AlmTests::init(int domainId, int testId, int operatorId)
 {
-  INFO_LOG() << "init begin";
+  INFO_LOG(m_logger) << "init begin";
 
   m_testId = testId;
   m_operatorId = operatorId;
@@ -73,7 +73,7 @@ bool AlmTests::init(int domainId, int testId, int operatorId)
 // ------------------------------------------------------------------
 void AlmTests::startTest()
 {
-  INFO_LOG() << "startTest m_testId=" << m_testId;
+  INFO_LOG(m_logger) << "startTest m_testId=" << m_testId;
   if (m_testId <= 1) // Send FTC ConfigureAlarms and EEM Event
   {
     QTimer::singleShot(0, this, &AlmTests::tryConfigureAlarms);
@@ -102,7 +102,7 @@ void AlmTests::startTest()
 // ------------------------------------------------------------------
 void AlmTests::tryConfigureAlarms()
 {
-  INFO_LOG() << "trying to send createRequest Operator Message";
+  INFO_LOG(m_logger) << "trying to send createRequest Operator Message";
 
   std::vector<AlarmManagement::AlarmAction> alarms;
   alarms.resize(2);
@@ -124,7 +124,7 @@ void AlmTests::tryConfigureAlarms()
 
   if (!m_ftcAlm->configureAlarmsRequest(ConfigureAlarmsRequest(alarms, m_operatorId, participantIds, globalEvent, remove), this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
 } // tryConfigureAlarms
@@ -132,7 +132,7 @@ void AlmTests::tryConfigureAlarms()
 // ------------------------------------------------------------------
 void AlmTests::tryCreateParticipant()
 {
-  INFO_LOG() << "trying to create Participant index = " << m_participantIndex;
+  INFO_LOG(m_logger) << "trying to create Participant index = " << m_participantIndex;
   ParticipantManagement::Participant participant;
   switch (m_participantIndex)
   {
@@ -153,10 +153,10 @@ void AlmTests::tryCreateParticipant()
     participant.partyId(5);
     break;
   }
-  DEBUG_LOG() << "Publishing Participant";
+  DEBUG_LOG(m_logger) << "Publishing Participant";
   if (!m_dtsPpm->publish(participant))
   {
-    ERROR_LOG() << "Error publish Participant";
+    ERROR_LOG(m_logger) << "Error publish Participant";
     failExit();
   }
   m_participantIndex++;
@@ -165,7 +165,7 @@ void AlmTests::tryCreateParticipant()
 // ------------------------------------------------------------------
 void AlmTests::tryConfigureAlarmsList()
 {
-  INFO_LOG() << "trying to send createRequest Operator Message";
+  INFO_LOG(m_logger) << "trying to send createRequest Operator Message";
 
   std::vector<AlarmManagement::AlarmAction> alarms;
   alarms.resize(2);
@@ -188,7 +188,7 @@ void AlmTests::tryConfigureAlarmsList()
 
   if (!m_ftcAlm->configureAlarmsRequest(ConfigureAlarmsRequest(alarms, m_operatorId, participantIds, globalEvent, remove), this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
 } // tryConfigureAlarmsList
@@ -196,7 +196,7 @@ void AlmTests::tryConfigureAlarmsList()
 // ------------------------------------------------------------------
 void AlmTests::trySendEvent()
 {
-  INFO_LOG() << "trying to send ParticipantEvent";
+  INFO_LOG(m_logger) << "trying to send ParticipantEvent";
 
   ExerciseEventManagement::Event pe;
 
@@ -215,10 +215,10 @@ void AlmTests::trySendEvent()
 
   QString properties = QString::fromUtf8(QJsonDocument(obj).toJson());
   pe.properties(properties.toStdString());
-  DEBUG_LOG() << "Publishing EEM Event";
+  DEBUG_LOG(m_logger) << "Publishing EEM Event";
   if (!m_dtsEem->publish(pe))
   {
-    ERROR_LOG() << "Error publish EEM Event";
+    ERROR_LOG(m_logger) << "Error publish EEM Event";
     failExit();
   }
 }
@@ -226,10 +226,10 @@ void AlmTests::trySendEvent()
 // ------------------------------------------------------------------
 void AlmTests::onConfigureAlarmsReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "onConfigureAlarmsReply, error = " << replyObject.error();
+  INFO_LOG(m_logger) << "onConfigureAlarmsReply, error = " << replyObject.error();
   if (replyObject.error())
   {
-    ERROR_LOG() << "Error ConfigureAlarms - aborting";
+    ERROR_LOG(m_logger) << "Error ConfigureAlarms - aborting";
     failExit();
   }
 } // onConfigureAlarmsReply
@@ -237,11 +237,11 @@ void AlmTests::onConfigureAlarmsReply(const Core::FunctionReplyObject &replyObje
 // ------------------------------------------------------------------
 void AlmTests::checkAlarm()
 {
-  INFO_LOG() << "checkAlarm";
+  INFO_LOG(m_logger) << "checkAlarm";
   m_dtcAlm->waitForHistoricalDataNotification();
   qint32 id = 0;
   AlarmManagement::Notification notification = m_dtcAlm->notification(id);
-  INFO_LOG() << "Recived AlarmManagement::Notification: " << notification
+  INFO_LOG(m_logger) << "Recived AlarmManagement::Notification: " << notification
                      << " testId: " << m_testId;
 
   switch (m_testId)
@@ -249,12 +249,12 @@ void AlmTests::checkAlarm()
   case 1:
   case 2:
   case 3:
-    INFO_LOG() << "ExitSuccess";
+    INFO_LOG(m_logger) << "ExitSuccess";
     ExitSuccess();
     break;
   default:
     // nothing
-    INFO_LOG() << "failExit";
+    INFO_LOG(m_logger) << "failExit";
     failExit();
     break;
   }
@@ -270,7 +270,7 @@ void AlmTests::failExit()
 // ------------------------------------------------------------------
 void AlmTests::ExitSuccess()
 {
-  DEBUG_LOG() << "SUCCESS";
+  DEBUG_LOG(m_logger) << "SUCCESS";
   m_bTestsSuccessful = true;
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 } // ExitSuccess
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/ModuleTests/alm_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/ModuleTests/alm_tests.h
index 8274e16a0..df00cd96b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/ModuleTests/alm_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/ModuleTests/alm_tests.h
@@ -46,6 +46,7 @@ protected Q_SLOTS:
   void ExitSuccess();
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onConfigureAlarmsReply(const Core::FunctionReplyObject &replyObject) override final;
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/dds_handler.cpp
index 44c084a53..03a81bb64 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/dds_handler.cpp
@@ -16,14 +16,14 @@ namespace AlarmManagement
 DdsHandler::DdsHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
   : m_ddsConnector(ddsConnector)
 {
-  DEBUG_LOG() << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -40,34 +40,34 @@ bool DdsHandler::init(const QStringList &qosFileList)
 
   m_dtsAlm = AlarmManagement::Interface::Dts::create(m_ddsConnector);
   bool bRet = m_dtsAlm->enableAll();
-  INFO_LOG() << "Dts initialised";
+  INFO_LOG(m_logger) << "Dts initialised";
 
   m_dtcAlm = AlarmManagement::Interface::Dtc::create(m_ddsConnector);
   bRet &= m_dtcAlm->enableAcknowledgeSOSInAllExercises();
-  INFO_LOG() << "Dts initialised";
+  INFO_LOG(m_logger) << "Dts initialised";
 
   m_ftsAlm = AlarmManagement::Interface::Fts::create(m_ddsConnector);
   bRet &= m_ftsAlm->enableAll();
-  INFO_LOG() << "Fts initialised";
+  INFO_LOG(m_logger) << "Fts initialised";
 
   m_dtcEem = ExerciseEventManagement::Interface::Dtc::create(m_ddsConnector);
   bRet &= m_dtcEem->enableEvent();
-  INFO_LOG() << "Dtc EEM initialised";
+  INFO_LOG(m_logger) << "Dtc EEM initialised";
 
   m_ftcMrk = MarkerManagement::Interface::Ftc::create(m_ddsConnector);
   bRet &= m_ftcMrk->enableMarkerModify();
-  INFO_LOG() << "Ftc MRK initialised";
+  INFO_LOG(m_logger) << "Ftc MRK initialised";
 
   m_dtcPpm = ParticipantManagement::Interface::Dtc::create(m_ddsConnector);
   bRet &= m_dtcPpm->enableParticipant();
-  INFO_LOG() << "Dtc PPM initialised";
+  INFO_LOG(m_logger) << "Dtc PPM initialised";
 
   m_exmDtc = ExerciseManagement::Interface::Dtc::create(m_ddsConnector);
   bRet &= m_exmDtc->enableExercise();
 
   m_dtcTab = TrainingAreaBase::Interface::Dtc::create(m_ddsConnector);
   bRet &= m_dtcTab->enableEmergencyCall();
-  INFO_LOG() << "Dtc TAB initialised";
+  INFO_LOG(m_logger) << "Dtc TAB initialised";
 
 
   m_dtsEmergencyCallPublisher = std::make_shared<DDSConnector::Publisher>(m_ddsConnector->getDomainParticipant(),
@@ -77,7 +77,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
                                                                 m_dtsEmergencyCallPublisher->getDdsPublisher(),
                                                                 DDS::Helper::getShortTopicName(DDS::topic_type_name<AlarmManagement::AcknowledgeSOSInAllExercises>::value()));
 
-  INFO_LOG() << "Dtc TAB initialised";
+  INFO_LOG(m_logger) << "Dtc TAB initialised";
 
   return bRet;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/dds_handler.h
index 036a033fe..c730377a6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/dds_handler.h
@@ -49,6 +49,7 @@ public:
   qint64 currentPartitionTime() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<Core::Interface::Dtc>       m_dtcCore;
   std::shared_ptr<Core::TopicLockMaster>      m_topicLockMaster;
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 616a18af9..7b25b8e57 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
@@ -51,7 +51,7 @@ HandlerConfigureAlarms::~HandlerConfigureAlarms()
 
 bool HandlerConfigureAlarms::init()
 {
-  INFO_LOG() << "Start HandlerConfigureAlarms.";
+  INFO_LOG(m_logger) << "Start HandlerConfigureAlarms.";
 
   auto dtcEem = m_mainHandler->dds()->dtcEem();
 
@@ -61,7 +61,7 @@ bool HandlerConfigureAlarms::init()
   // publish data from db-table 'alm_config'
   auto cb = [this](const Database::AlmConfig & data)
   {
-    DEBUG_LOG() << "restore AlarmConfig from DB data: id=" << data.id
+    DEBUG_LOG(m_logger) << "restore AlarmConfig from DB data: id=" << data.id
                         << " operatorId=" << data.operatorId
                         << " participantId=" << data.participantId.toInt()
                         << " global=" << data.global
@@ -75,7 +75,7 @@ bool HandlerConfigureAlarms::init()
   };
   if (!m_mainHandler->db()->select(cb))
   {
-    ERROR_LOG() << "Error reading data from database 'alm_config'!";
+    ERROR_LOG(m_logger) << "Error reading data from database 'alm_config'!";
     return false;
   }
 
@@ -87,7 +87,7 @@ void HandlerConfigureAlarms::removeAlarmConfig(int operatorId,
                                                int participantId,
                                                int eventTypeId)
 {
-  DEBUG_LOG() << "removeAlarmConfig m_alarms.size=" << m_alarms.size()
+  DEBUG_LOG(m_logger) << "removeAlarmConfig m_alarms.size=" << m_alarms.size()
                       << " operatorId="  << operatorId
                       << " participantId=" << participantId
                       << " eventTypeId=" << eventTypeId;
@@ -97,7 +97,7 @@ void HandlerConfigureAlarms::removeAlarmConfig(int operatorId,
   while (i.hasNext())
   {
     i.next();
-    DEBUG_LOG() << "key= " << i.key() << ": "
+    DEBUG_LOG(m_logger) << "key= " << i.key() << ": "
                         << " operatorId=" << i.value().operatorId
                         << " participantId=" << i.value().participantId.toInt()
                         << " eventTypeId=" << i.value().eventTypeId.underlying();
@@ -106,7 +106,7 @@ void HandlerConfigureAlarms::removeAlarmConfig(int operatorId,
         && (eventTypeId == ProjectDataManagement::EventType_def::Unknown || eventTypeId == i.value().eventTypeId.underlying()))
     {
       const int key = i.key();
-      DEBUG_LOG() << "found alarm to remove: " << key << ", eventTypeId: " << eventTypeId;
+      DEBUG_LOG(m_logger) << "found alarm to remove: " << key << ", eventTypeId: " << eventTypeId;
       m_mainHandler->db()->removeAlmConfig(key);
       m_mainHandler->dds()->dtsAlm()->removeAlarmConfigByKey(key);
       m_alarms.remove(key); // is ok, QMapIterator work on a copy
@@ -116,20 +116,20 @@ void HandlerConfigureAlarms::removeAlarmConfig(int operatorId,
 
 void HandlerConfigureAlarms::removeGlobalAlarmConfig(int operatorId)
 {
-  DEBUG_LOG() << "removeAlarmConfig m_alarms.size=" << m_alarms.size();
+  DEBUG_LOG(m_logger) << "removeAlarmConfig m_alarms.size=" << m_alarms.size();
 
   // Find Key
   QMapIterator<int, Database::AlmConfig> i(m_alarms);
   while (i.hasNext())
   {
     i.next();
-    DEBUG_LOG() << "key= " << i.key()
+    DEBUG_LOG(m_logger) << "key= " << i.key()
                         << " participantId=" << i.value().participantId.toInt();
     if ((operatorId == i.value().operatorId)
         && (i.value().participantId.toInt()) == 0)
     {
       const int key = i.key();
-      DEBUG_LOG() << "found alarm to remove: " << key;
+      DEBUG_LOG(m_logger) << "found alarm to remove: " << key;
       m_mainHandler->db()->removeAlmConfig(key);
       m_mainHandler->dds()->dtsAlm()->removeAlarmConfigByKey(key);
       m_alarms.remove(key); // is ok, QMapIterator work on a copy
@@ -141,7 +141,7 @@ void HandlerConfigureAlarms::removeGlobalAlarmConfig(int operatorId)
 void HandlerConfigureAlarms::onConfigureAlarmsRequest(const rti::core::SampleIdentity &cookie,
                                                       const ConfigureAlarmsRequest &request)
 {
-  DEBUG_LOG() << "onConfigureAlarmsRequest " << request;
+  DEBUG_LOG(m_logger) << "onConfigureAlarmsRequest " << request;
   if (request.participantIds().size() == 0)
   {
     Core::FunctionReplyObject ret(0, tr_lts("dds", "Error adding ConfigureAlarms to database. There were no participants given."));
@@ -154,13 +154,13 @@ void HandlerConfigureAlarms::onConfigureAlarmsRequest(const rti::core::SampleIde
     // remove only this one Alarm, not all types of the participant for operator
     // in DB,
     // from DDS
-    DEBUG_LOG() << "request.remove()";
+    DEBUG_LOG(m_logger) << "request.remove()";
     if (request.participantIds().size() > 0 &&
         request.alarms().size() > 0)
     {
       int participantId = request.participantIds()[0];
       int eventTypeId = request.alarms()[0].eventTypeId().underlying();
-      DEBUG_LOG() << "removeAlarmConfig(request.operatorId()=" << request.operatorId()
+      DEBUG_LOG(m_logger) << "removeAlarmConfig(request.operatorId()=" << request.operatorId()
                           << " participantId=" << participantId
                           << " eventTypeId=" << eventTypeId;
       removeAlarmConfig(request.operatorId(), participantId, eventTypeId);
@@ -171,7 +171,7 @@ void HandlerConfigureAlarms::onConfigureAlarmsRequest(const rti::core::SampleIde
     // remove old configuration
     for (int participantId : request.participantIds())
     {
-      DEBUG_LOG() << "remove old configuration participantId=" << participantId;
+      DEBUG_LOG(m_logger) << "remove old configuration participantId=" << participantId;
       removeAlarmConfig(request.operatorId(), participantId, 0);
     }
     if ( request.global())
@@ -181,10 +181,10 @@ void HandlerConfigureAlarms::onConfigureAlarmsRequest(const rti::core::SampleIde
 
     for (int participantId : request.participantIds())
     {
-      DEBUG_LOG() << "participantId: " << participantId;
+      DEBUG_LOG(m_logger) << "participantId: " << participantId;
       for (const AlarmManagement::AlarmAction &action : request.alarms())
       {
-        DEBUG_LOG() << "action: " << action;
+        DEBUG_LOG(m_logger) << "action: " << action;
 
         AlarmManagement::AlarmConfig almConfig;
         almConfig.operatorId(request.operatorId());
@@ -210,7 +210,7 @@ void HandlerConfigureAlarms::onConfigureAlarmsRequest(const rti::core::SampleIde
           Core::FunctionReplyObject ret(0, tr_lts("dds", "Error adding ConfigureAlarms to database."));
           m_mainHandler->dds()->ftsAlm()->configureAlarmsReply(cookie, ret);
         }
-        DEBUG_LOG() << "m_dbAlmConfig.insert id=" << newConfig.id;
+        DEBUG_LOG(m_logger) << "m_dbAlmConfig.insert id=" << newConfig.id;
 
         almConfig.id(newConfig.id);
         m_alarms.insert(newConfig.id, newConfig);
@@ -224,11 +224,11 @@ void HandlerConfigureAlarms::onConfigureAlarmsRequest(const rti::core::SampleIde
 //-----------------------------------------------------------------------------
 void HandlerConfigureAlarms::onEventChanged(const ExerciseEventManagement::Event &eventData, DataModification modType)
 {
-  DEBUG_LOG() << "onParticipantEventChanged participantId=" << eventData.participantId();
+  DEBUG_LOG(m_logger) << "onParticipantEventChanged participantId=" << eventData.participantId();
   if (modType == DataModification::eRemoved ||
       modType == DataModification::eModified)
     return;
-  DEBUG_LOG() << "onParticipantEventChanged verarbeiten m_alarms.size =" << m_alarms.size();
+  DEBUG_LOG(m_logger) << "onParticipantEventChanged verarbeiten m_alarms.size =" << m_alarms.size();
 
   ExerciseEventManagement::Event eventDatalocal = eventData;
 
@@ -248,7 +248,7 @@ void HandlerConfigureAlarms::onEventChanged(const ExerciseEventManagement::Event
   for (const Database::AlmConfig &alarm : std::as_const(m_alarms))
   {
     {
-      /*DEBUG_LOG() << " alarmConfigItem.id=" << alarm.id
+      /*DEBUG_LOG(m_logger) << " alarmConfigItem.id=" << alarm.id
                           << " alarmConfigItem.participantId=" << alarm.participantId
                           << " alarmConfigItem.eventTypeId=" << alarm.eventTypeId
                           << " eventDatalocal.eventTypeId()=" << eventDatalocal.eventTypeId().underlying()
@@ -272,7 +272,7 @@ void HandlerConfigureAlarms::onEventChanged(const ExerciseEventManagement::Event
           bool allVulnerabilityStates = alarm.vulnerabilityState == -1;
           bool vulnerabilityCheck = vulnerabilityState == alarm.vulnerabilityState;
           bool globalAlarm = participantId == 0;
-          DEBUG_LOG() << " allVulnerabilityStates=" << allVulnerabilityStates
+          DEBUG_LOG(m_logger) << " allVulnerabilityStates=" << allVulnerabilityStates
                               << " vulnerabilityCheck=" << vulnerabilityCheck
                               << " participantId=" << participantId
                               << " eventDatalocal.participantId()=" << eventDatalocal.participantId();
@@ -281,19 +281,19 @@ void HandlerConfigureAlarms::onEventChanged(const ExerciseEventManagement::Event
           {
             if (sentEventToOperator.contains(alarm.operatorId))
             {
-              DEBUG_LOG() << "Event " << eventDatalocal.eventTypeId() << " already handled for Operator:" << alarm.operatorId;
+              DEBUG_LOG(m_logger) << "Event " << eventDatalocal.eventTypeId() << " already handled for Operator:" << alarm.operatorId;
               continue;
             }
 
             sentEventToOperator += alarm.operatorId;
             if (alarm.messageWindow)
             {
-              DEBUG_LOG() << "send Window to Operator:" << alarm.operatorId;
+              DEBUG_LOG(m_logger) << "send Window to Operator:" << alarm.operatorId;
               sendWindow(eventDatalocal, alarm);
             }
             if (alarm.setMarker)
             {
-              DEBUG_LOG() << "set Marker to Operator:" << alarm.operatorId;
+              DEBUG_LOG(m_logger) << "set Marker to Operator:" << alarm.operatorId;
               sendMarker(eventDatalocal, alarm);
             }
           }
@@ -359,7 +359,7 @@ void HandlerConfigureAlarms::sendMarker(const ExerciseEventManagement::Event &ev
 {
   int defaultOffset = 10000;
 
-  DEBUG_LOG() << "eventProperties =" << eventData.properties();
+  DEBUG_LOG(m_logger) << "eventProperties =" << eventData.properties();
 
   QString contentStr;
   contentStr =  QStringLiteral("Equip No.: ");
@@ -376,7 +376,7 @@ void HandlerConfigureAlarms::sendMarker(const ExerciseEventManagement::Event &ev
     contentStr += eventObject.value(QStringLiteral("AesName")).toString();
     contentStr += QStringLiteral(")");
   }
-  DEBUG_LOG() << "contentStr=" << contentStr;
+  DEBUG_LOG(m_logger) << "contentStr=" << contentStr;
 
   const QByteArray contentArr = contentStr.toUtf8();
 
@@ -399,6 +399,6 @@ void HandlerConfigureAlarms::sendMarker(const ExerciseEventManagement::Event &ev
 void HandlerConfigureAlarms::onMarkerModifyReply(const Core::FunctionReplyObject &replyObject)
 {
   Q_UNUSED(replyObject);
-  INFO_LOG() << "************** onMarkerCreateReply";
+  INFO_LOG(m_logger) << "************** onMarkerCreateReply";
 } // end onMarkerCreateReply
 } // namespace AlarmManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_configure_alarms.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_configure_alarms.h
index 6ce7ad227..5a1d070bc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_configure_alarms.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_configure_alarms.h
@@ -48,6 +48,8 @@ private Q_SLOTS:
   void onEventChanged(const ExerciseEventManagement::Event &eventData, DataModification modType);
 
 private: // methods
+
+NGL::INGLLogger &m_logger;
   void onConfigureAlarmsRequest(const rti::core::SampleIdentity &cookie,
                                 const ConfigureAlarmsRequest &request) override;
   void sendWindow(const ExerciseEventManagement::Event &eventData,
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_emergency_call.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_emergency_call.cpp
index 9c82ac41d..accaaf815 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_emergency_call.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_emergency_call.cpp
@@ -34,7 +34,7 @@ HandlerEmergencyCall::~HandlerEmergencyCall()
 
 bool HandlerEmergencyCall::init()
 {
-  INFO_LOG() << "Start HandlerEmergencyCall.";
+  INFO_LOG(m_logger) << "Start HandlerEmergencyCall.";
 
   auto dtcTab = m_mainHandler->dds()->dtcTab();
 
@@ -48,7 +48,7 @@ bool HandlerEmergencyCall::init()
   bool bRet = true;
   auto cbEmergencyCall = [this, &bRet](const Database::AlmEmergencyCall &data)
   {
-    WARNING_LOG()<<" ALM_EMERGENCY " << "Reading from DB AlmEmergencyCall with id = " << data.id;
+    WARNING_LOG(m_logger)<<" ALM_EMERGENCY " << "Reading from DB AlmEmergencyCall with id = " << data.id;
     if (!this->isExerciseValidForEmergencyCall() && !data.expired)
       return;
 
@@ -57,7 +57,7 @@ bool HandlerEmergencyCall::init()
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       bRet = false;
       return;
     }
@@ -67,7 +67,7 @@ bool HandlerEmergencyCall::init()
 
   if (!m_mainHandler->db()->select(cbEmergencyCall) || !bRet)
   {
-    ERROR_LOG() <<"Error reading data from database 'alm_emergency_call!";
+    ERROR_LOG(m_logger) <<"Error reading data from database 'alm_emergency_call!";
     return false;
   }
 
@@ -95,21 +95,21 @@ bool HandlerEmergencyCall::createEmergencyCallObject(const AlarmManagement::AlmE
   if (ret.error())
   {
     delete ifs;
-    ERROR_LOG()<< ret();
+    ERROR_LOG(m_logger)<< ret();
     return false;
   }
 
-  WARNING_LOG()<< "Entry createEmergencyCallObject in the DB id: "<<ifs->getData().id<<" issi: "<<ifs->getData().issi<<" expired: "<<ifs->getData().expired;
+  WARNING_LOG(m_logger)<< "Entry createEmergencyCallObject in the DB id: "<<ifs->getData().id<<" issi: "<<ifs->getData().issi<<" expired: "<<ifs->getData().expired;
   m_emergencyObjMap.insert(ifs->getId(), ifs);
   return true;
 }
 
 void HandlerEmergencyCall::onEmergencyCallAcknowledgeRequest(const rti::core::SampleIdentity &cookie, const EmergencyCallAcknowledgeRequest &request)
 {
-  WARNING_LOG() << "[onEmergencyCallAcknowledgeRequest] request: " << request;
+  WARNING_LOG(m_logger) << "[onEmergencyCallAcknowledgeRequest] request: " << request;
   Core::FunctionReplyObject ret = emergencyCallAcknowledgeRequest(request);
   if (ret.error())
-    WARNING_LOG()<< ret();
+    WARNING_LOG(m_logger)<< ret();
 
   if (request.expired())
   {
@@ -122,7 +122,7 @@ void HandlerEmergencyCall::onEmergencyCallAcknowledgeRequest(const rti::core::Sa
     ackInEx.operatorId(request.operatorId());
     ackInEx.comment(request.comment());
     ackInEx.expired(request.expired());
-    WARNING_LOG() << "onEmergencyCallAcknowledgeRequest: issi: "<<ackInEx.issi();
+    WARNING_LOG(m_logger) << "onEmergencyCallAcknowledgeRequest: issi: "<<ackInEx.issi();
     m_mainHandler->dds()->publishSOS()->write(ackInEx);
   }
   m_mainHandler->dds()->ftsAlm()->emergencyCallAcknowledgeReply(cookie,ret);
@@ -145,17 +145,17 @@ Core::FunctionReplyObject HandlerEmergencyCall::emergencyCallAcknowledgeRequest(
 
   if (ifs == nullptr)
   {
-    WARNING_LOG()<<" Couldn't acknowledge SOS with issi: " <<request.issi()<< ": already acknowledged or issi doesn't exist.";
+    WARNING_LOG(m_logger)<<" Couldn't acknowledge SOS with issi: " <<request.issi()<< ": already acknowledged or issi doesn't exist.";
     return Core::FunctionReplyObject(request.id(), tr_lts("dds", "already acknowledged or issi(%1) couldn't be found")).arg(request.issi());
   }
 
   if (ifs->getData().expired) // if already expired do nothing
   {
-    WARNING_LOG() << "SOS Already expired do nothing";
+    WARNING_LOG(m_logger) << "SOS Already expired do nothing";
     return Core::FunctionReplyObject(ifs->getData().id);
   }
 
-  WARNING_LOG() << "emergencyCallAcknowledgeRequest: issi found!: "<<request.issi()<<" ifs->state: "<<ifs->getData().expired;
+  WARNING_LOG(m_logger) << "emergencyCallAcknowledgeRequest: issi found!: "<<request.issi()<<" ifs->state: "<<ifs->getData().expired;
   Database::AlmEmergencyCall newData(ifs->getData());
   newData.expired     = true;
   newData.issi        = request.issi();
@@ -189,7 +189,7 @@ bool HandlerEmergencyCall::isNewEmergencyCall(const AlmEmergencyCall &newdata)
         && data.incomingTime == newdata.incomingTime()
         && !data.expired)
     {
-      WARNING_LOG()<<" SOS EXISTS and not yet quit! issi: "<<data.issi<<" incomingTime: "<<data.incomingTime<<" expired: "<<data.expired;
+      WARNING_LOG(m_logger)<<" SOS EXISTS and not yet quit! issi: "<<data.issi<<" incomingTime: "<<data.incomingTime<<" expired: "<<data.expired;
       return false;
     }
   }
@@ -218,7 +218,7 @@ void HandlerEmergencyCall::onEmergencyCallChanged(const TrainingAreaBase::Emerge
 
 void HandlerEmergencyCall::onAcknowledgeSOSInExercises(const AcknowledgeSOSInAllExercises &data, DataModification modType)
 {
-  DEBUG_LOG()<< "onAcknowledgeSOSInExercises START ";
+  DEBUG_LOG(m_logger)<< "onAcknowledgeSOSInExercises START ";
   Q_UNUSED(modType)
 
   EmergencyCallAcknowledgeRequest request;
@@ -232,7 +232,7 @@ void HandlerEmergencyCall::onAcknowledgeSOSInExercises(const AcknowledgeSOSInAll
   request.operatorId(data.operatorId());
   emergencyCallAcknowledgeRequest(request);
 
-  DEBUG_LOG()<< "onAcknowledgeEmergencyInExercises END ";
+  DEBUG_LOG(m_logger)<< "onAcknowledgeEmergencyInExercises END ";
 }
 
 } // namespace AlarmManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_emergency_call.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_emergency_call.h
index 65d152452..fb8df9cdc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_emergency_call.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_emergency_call.h
@@ -33,6 +33,7 @@ public:
   bool init();
 
 private:
+  NGL::INGLLogger &m_logger;
   bool createEmergencyCallObject(const AlmEmergencyCall &data);
   void onEmergencyCallAcknowledgeRequest(const rti::core::SampleIdentity &cookie,
                                          const EmergencyCallAcknowledgeRequest &request) override final;
@@ -45,6 +46,7 @@ private slots:
   void onAcknowledgeSOSInExercises(const AlarmManagement::AcknowledgeSOSInAllExercises &data, DataModification modType);
 
 private:
+  NGL::INGLLogger &m_logger;
   Initialization                          *m_mainHandler;
   std::shared_ptr<HandlerConfigureAlarms>  m_configAlarmHandler;
   QMap<int, ObjectEmergencyCall *>  m_emergencyObjMap; // Key = DangerAreaId
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 ab084fcc5..b7ca7c4cc 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
@@ -11,10 +11,9 @@
 
 using namespace AlarmManagement;
 
-HandlerParticipant::HandlerParticipant(const std::shared_ptr<DdsHandler> &ddsHandler)
-  : QObject()
-  , m_ddsHandler(ddsHandler)
-{
+HandlerParticipant::HandlerParticipant(const std::shared_ptr<DdsHandler> &ddsHandler) : QObject()
+  , m_ddsHandler(ddsHandler),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 } // end of ctor()
 //-----------------------------------------------------------------------------
 
@@ -44,13 +43,13 @@ bool HandlerParticipant::init()
 
   if (!dtcPpm->enableParticipant())
   {
-    ERROR_LOG() << "Could not initialize ParticipantManagement enableParticipant data topic client";
+    ERROR_LOG(m_logger) << "Could not initialize ParticipantManagement enableParticipant data topic client";
     return false;
   }
 
   if (!dtcPpm->enableDynamicParticipantData())
   {
-    ERROR_LOG() << "Could not initialize ParticipantManagement enableDynamicParticipant data topic client";
+    ERROR_LOG(m_logger) << "Could not initialize ParticipantManagement enableDynamicParticipant data topic client";
     return false;
   }
 
@@ -66,7 +65,7 @@ bool HandlerParticipant::init()
     if (participant.equipmentNumber().is_set())
     {
       m_partId2EquipNoMap.insert(participant.id(), participant.equipmentNumber().get());
-      DEBUG_LOG() << "m_partId2EquipNoMap.insert participantId=" << participant.id() << "EquimentNo=" << participant.equipmentNumber().get();
+      DEBUG_LOG(m_logger) << "m_partId2EquipNoMap.insert participantId=" << participant.id() << "EquimentNo=" << participant.equipmentNumber().get();
     }
     else
       m_partId2EquipNoMap.insert(participant.id(), 0);
@@ -86,13 +85,13 @@ bool HandlerParticipant::init()
       ParticipantManagement::StateInformation state = states[0];
       int vulnerability = state.vulnerabilityState().underlying();
       m_partId2VulnerabilityMap.insert(i.value().participantId(), vulnerability);
-      DEBUG_LOG() << "m_partId2EquipNoMap.insert participantId=" << i.value().participantId() << "vulnerability=" << vulnerability;
+      DEBUG_LOG(m_logger) << "m_partId2EquipNoMap.insert participantId=" << i.value().participantId() << "vulnerability=" << vulnerability;
     }
     else
       m_partId2VulnerabilityMap.insert(i.value().participantId(), -1);
   }
 
-  INFO_LOG() << "HandlerParticipant::init() finished. ";
+  INFO_LOG(m_logger) << "HandlerParticipant::init() finished. ";
   return true;
 } // end of init()
 //-----------------------------------------------------------------------------
@@ -101,12 +100,12 @@ void HandlerParticipant::onParticipantChanged(const ParticipantManagement::Parti
 {
   if (modType == DataModification::eRemoved)
   {
-    DEBUG_LOG() << "onParticipantChanged - remove: " << data.id();
+    DEBUG_LOG(m_logger) << "onParticipantChanged - remove: " << data.id();
     m_participantHierarchy.remove(data.id());
   }
   else
   {
-    DEBUG_LOG() << "onParticipantChanged:" << data;
+    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;
@@ -117,13 +116,13 @@ void HandlerParticipant::onParticipantChanged(const ParticipantManagement::Parti
 
 void HandlerParticipant::onDynamicParticipantChanged(const ParticipantManagement::DynamicParticipantData &data, DataModification modType)
 {
-  DEBUG_LOG() << "onDynamicParticipant participantId=" << data.participantId();
+  DEBUG_LOG(m_logger) << "onDynamicParticipant participantId=" << data.participantId();
   if (modType == DataModification::eRemoved)
   {
   }
   else
   {
-    INFO_LOG() << "onDynamicParticipant()"
+    INFO_LOG(m_logger) << "onDynamicParticipant()"
                        << " participantId: " << data.participantId();
     if (data.stateHistory().size() > 0)
     {
@@ -131,7 +130,7 @@ void HandlerParticipant::onDynamicParticipantChanged(const ParticipantManagement
       ParticipantManagement::StateInformation state = states[0];
       int vulnerability = state.vulnerabilityState().underlying();
       m_partId2VulnerabilityMap.insert(data.participantId(), vulnerability);
-      DEBUG_LOG() << "m_partId2EquipNoMap.insert participantId=" << data.participantId()
+      DEBUG_LOG(m_logger) << "m_partId2EquipNoMap.insert participantId=" << data.participantId()
                           << " vulnerability=" << vulnerability;
     }
     else
@@ -178,7 +177,7 @@ QVector<int> HandlerParticipant::getRecursiveInferiorIds(const int participantId
 int HandlerParticipant::participantId2EquipNo(const int participantId) const
 {
   int ret = m_partId2EquipNoMap.value(participantId, 0);
-  INFO_LOG() << "participantId2EquipNo participantId=" << participantId
+  INFO_LOG(m_logger) << "participantId2EquipNo participantId=" << participantId
                      << " EquipmentNumber=" << ret;
   return ret;
 } // end of participantId2EquipNo()
@@ -186,7 +185,7 @@ int HandlerParticipant::participantId2EquipNo(const int participantId) const
 int HandlerParticipant::participantId2Vulnerability(const int participantId) const
 {
   int ret = m_partId2VulnerabilityMap.value(participantId, 0);
-  INFO_LOG() << "m_partId2VulnerabilityMap participantId=" << participantId
+  INFO_LOG(m_logger) << "m_partId2VulnerabilityMap participantId=" << participantId
                      << " Vulnerability=" << ret;
   return ret;
 } // end of participantId2Vulnerability()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_participant.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_participant.h
index b317a37d4..9140ea27b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_participant.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_participant.h
@@ -78,6 +78,8 @@ private Q_SLOTS:
   void onDynamicParticipantChanged(const ParticipantManagement::DynamicParticipantData &data, DataModification modType);
 
 private: // methoden
+
+NGL::INGLLogger &m_logger;
   QVector<AlarmManagement::HandlerParticipant::ParticipantHierarchy> getInferiorParts(int participantId) const;
 
 private: // attributes
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/initialization.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/initialization.cpp
index d3bd42f60..c5629db49 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/initialization.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/initialization.cpp
@@ -19,7 +19,7 @@ using namespace AlarmManagement;
 Initialization::Initialization()
   : m_logger(getLogger("Initialization"))
 {
-  INFO_LOG() << "Initialization::Initialization";
+  INFO_LOG(m_logger) << "Initialization::Initialization";
 } // end of ctor()
 //-----------------------------------------------------------------------------
 
@@ -32,32 +32,32 @@ Initialization::~Initialization()
   m_dbHandler = nullptr;
   m_ddsHandler = nullptr;
 
-  INFO_LOG() << "Initialization::~Initialization";
+  INFO_LOG(m_logger) << "Initialization::~Initialization";
 } // end of dtor()
 //-----------------------------------------------------------------------------
 
 bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector, const QSqlDatabase &sqlDb)
 {
-  INFO_LOG() << "Start AlarmManagement Initialization. domainId =" << ddsConnector->getDomainId()
+  INFO_LOG(m_logger) << "Start AlarmManagement Initialization. domainId =" << ddsConnector->getDomainId()
                      << " exerciseId=" << ddsConnector->getPartitionId();
 
   // initialize DDS
   m_ddsHandler = std::make_shared<DdsHandler>(ddsConnector);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation DdsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
     return false;
   }
-  INFO_LOG() << "m_ddsHandler initialized. ";
+  INFO_LOG(m_logger) << "m_ddsHandler initialized. ";
 
   // initialize database
   m_dbHandler = std::make_shared<DbHandler>();
   if (!m_dbHandler->init(ddsConnector->getPartitionId(), sqlDb))
   {
-    ERROR_LOG() << "Initialisation DbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation DbHandler failed.";
     return false;
   }
-  INFO_LOG() << "DbHandler initialized. ";
+  INFO_LOG(m_logger) << "DbHandler initialized. ";
 
 
   // create handlers
@@ -65,7 +65,7 @@ bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector
   m_handlerConfigureAlarms = std::make_shared<HandlerConfigureAlarms>(this);
   m_handlerEmergencyCall = std::make_shared<HandlerEmergencyCall>(m_handlerConfigureAlarms, this);
 
-  DEBUG_LOG() << "initialize successfully finished";
+  DEBUG_LOG(m_logger) << "initialize successfully finished";
 
   return true;
 } // end of init()
@@ -76,20 +76,20 @@ bool Initialization::loadFromDatabase()
   // initialize handlers
   if (!m_handlerParticipant || !m_handlerParticipant->init())
   {
-    ERROR_LOG() << "Can not initialize Participant handler";
+    ERROR_LOG(m_logger) << "Can not initialize Participant handler";
     return false;
   }
   if (!m_handlerConfigureAlarms || !m_handlerConfigureAlarms->init())
   {
-    ERROR_LOG() << "Can not initialize Alarm handler";
+    ERROR_LOG(m_logger) << "Can not initialize Alarm handler";
     return false;
   }
   if (!m_handlerEmergencyCall || !m_handlerEmergencyCall->init())
   {
-    ERROR_LOG() << "Can not initialize EmergencyCall handler";
+    ERROR_LOG(m_logger) << "Can not initialize EmergencyCall handler";
     return false;
   }
-  DEBUG_LOG() << "loadFromDatabase successfully finished";
+  DEBUG_LOG(m_logger) << "loadFromDatabase successfully finished";
   return true;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/initialization.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/initialization.h
index 6a17cc6b6..5250fec96 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/initialization.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/initialization.h
@@ -45,6 +45,8 @@ public:
   std::shared_ptr<HandlerParticipant> hdlParticipant() const { return m_handlerParticipant; }
 
 private: // attributes
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>                        m_ddsHandler;
   std::shared_ptr<DbHandler>                         m_dbHandler;                 ///< Pointer to DB handler
   std::shared_ptr<HandlerConfigureAlarms>            m_handlerConfigureAlarms;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/object_emergency_call.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/object_emergency_call.cpp
index 3ecad7801..c78bcb2ed 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/object_emergency_call.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/object_emergency_call.cpp
@@ -4,10 +4,9 @@
 
 namespace AlarmManagement{
 
-ObjectEmergencyCall::ObjectEmergencyCall(Initialization *mainHandler, QObject *parent)
-  : QObject(parent)
-  , m_mainHandler(mainHandler)
-{
+ObjectEmergencyCall::ObjectEmergencyCall(Initialization *mainHandler, QObject *parent) : QObject(parent)
+  , m_mainHandler(mainHandler),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 ObjectEmergencyCall::~ObjectEmergencyCall()
@@ -23,7 +22,7 @@ Core::FunctionReplyObject ObjectEmergencyCall::createObject(const Database::AlmE
   {
     if (!m_mainHandler->db()->insert(m_data))
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting Order into database."));
-    WARNING_LOG() << "New EmergencyCall created Id: " << m_data.id;
+    WARNING_LOG(m_logger) << "New EmergencyCall created Id: " << m_data.id;
   }
   // Publish Data via DTS
   onPublishData();
@@ -40,7 +39,7 @@ Core::FunctionReplyObject ObjectEmergencyCall::updateObject(const Database::AlmE
   if (!m_mainHandler->db()->update(m_data))
     return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error updating EmergencyCall into database"));
 
-  DEBUG_LOG() << "Data changed for Changed Id: " << m_data.id;
+  DEBUG_LOG(m_logger) << "Data changed for Changed Id: " << m_data.id;
 
   // Publish Data via DTS
   onPublishData();
@@ -71,10 +70,10 @@ void ObjectEmergencyCall::onPublishData()
   ddsData.operatorId(m_data.operatorId);
   ddsData.comment(m_data.comment.toStdString());
 
-  INFO_LOG() << "Publish AlmEmergencyCall-data to dds (" << m_data.id << ") ...";
+  INFO_LOG(m_logger) << "Publish AlmEmergencyCall-data to dds (" << m_data.id << ") ...";
 
   if (!m_mainHandler->dds()->dtsAlm()->publish(ddsData))
-    ERROR_LOG() << "Error publishing AlmEmergencyCall-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing AlmEmergencyCall-data to dds";
 }
 
 }// namespace AlarmManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/object_emergency_call.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/object_emergency_call.h
index dc1e3ea45..ac4d1956c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/object_emergency_call.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/object_emergency_call.h
@@ -32,6 +32,7 @@ protected Q_SLOTS:
   void onPublishData();
 
 private:
+  NGL::INGLLogger &m_logger;
   Initialization            *m_mainHandler;
   Database::AlmEmergencyCall m_data;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/abstract_firing_strategy.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/abstract_firing_strategy.cpp
index 72a882dd8..357eb4db2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/abstract_firing_strategy.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/abstract_firing_strategy.cpp
@@ -26,23 +26,22 @@ namespace AreaEffectSimulation
 
 
 
-AbstractFiringStrategy::AbstractFiringStrategy(ObjectEffector *parent)
-  : QObject(parent)
-  , m_effector(parent)
-{
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+AbstractFiringStrategy::AbstractFiringStrategy(ObjectEffector *parent) : QObject(parent)
+  , m_effector(parent),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 AbstractFiringStrategy::~AbstractFiringStrategy()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void AbstractFiringStrategy::calculateDispersionTrajectory()
 {
-  DEBUG_LOG() << "calculateDispersionTrajectory";
+  DEBUG_LOG(m_logger) << "calculateDispersionTrajectory";
   // 1. Neuen Zielpunkt berechnen
 
   const auto &intendendTrajectory = m_effector->intendendTrajectory();
@@ -50,7 +49,7 @@ void AbstractFiringStrategy::calculateDispersionTrajectory()
   // sanity check:
   if (intendendTrajectory.size() < 2)
   {
-    ERROR_LOG() << Q_FUNC_INFO
+    ERROR_LOG(m_logger) << Q_FUNC_INFO
                         << " size of intendendTrajectory not sufficiant, size=" << intendendTrajectory.size();
     return;
   }
@@ -73,7 +72,7 @@ std::vector<Core::GeoPositionRelativeTime> AbstractFiringStrategy::buildTrajecto
   // sanity check:
   if (relativeTrajectory.size() < 2)
   {
-    ERROR_LOG() << Q_FUNC_INFO
+    ERROR_LOG(m_logger) << Q_FUNC_INFO
                         << " size of relativeTrajectory not sufficiant, size=" << relativeTrajectory.size();
     return {};
   }
@@ -89,7 +88,7 @@ std::vector<Core::GeoPositionRelativeTime> AbstractFiringStrategy::buildTrajecto
   // Aehnlich wie Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.cpp Zeile 365
   for (const TrajectoryPoint &trajPntRelPos : std::as_const(relativeTrajectory))
   {
-    DEBUG_LOG() << "Flugbahnpunkt: trajPntRelPos :" << trajPntRelPos;    // benefit from operator<<:
+    DEBUG_LOG(m_logger) << "Flugbahnpunkt: trajPntRelPos :" << trajPntRelPos;    // benefit from operator<<:
 
     // // geographic offers nice feature to add an offset:
     // const QPointF &trajectoryAbsGeo = launchUtm.geographic(trajPntRelPos);
@@ -104,7 +103,7 @@ std::vector<Core::GeoPositionRelativeTime> AbstractFiringStrategy::buildTrajecto
     // Position des Participants mit der m_participantId
     const double zValue = effectorPositionGeo.z() + trajPntRelPos.position.z(); // trajPntRelPos.position.z() ist die Hoehe
 
-    DEBUG_LOG() << "trajPntAbsUtm :" << trajPntAbsUtm << ", trajPntAbsGeo :" << trajPntAbsGeo;
+    DEBUG_LOG(m_logger) << "trajPntAbsUtm :" << trajPntAbsUtm << ", trajPntAbsGeo :" << trajPntAbsGeo;
     geometry.emplace_back(Core::GeoPositionRelativeTime(trajPntAbsGeo.x(), trajPntAbsGeo.y(), zValue, trajPntRelPos.time));
   }
   return geometry;
@@ -115,7 +114,7 @@ TrajectoryTimeAware AbstractFiringStrategy::buildTrajectoryTimeAware(const std::
   // sanity check:
   if (trajectoryGeometry.size() < 2)
   {
-    ERROR_LOG() << Q_FUNC_INFO
+    ERROR_LOG(m_logger) << Q_FUNC_INFO
                         << " size of trajectoryGeometry not sufficiant, size=" << trajectoryGeometry.size();
     return {};
   }
@@ -133,14 +132,14 @@ TrajectoryTimeAware AbstractFiringStrategy::buildTrajectoryTimeAware(const std::
 
 int AbstractFiringStrategy::sendChargeEffect(const TrajectoryTimeAware &trajectoryTimeAware, const QJsonObject &properties)
 {
-  DEBUG_LOG() << "sendChargeEffect";
+  DEBUG_LOG(m_logger) << "sendChargeEffect";
 
   const auto &trajGeometry = trajectoryTimeAware.geometry();
 
   // sanity check:
   if (trajGeometry.size() < 2)
   {
-    ERROR_LOG() << Q_FUNC_INFO
+    ERROR_LOG(m_logger) << Q_FUNC_INFO
                         << " size of trajectoryTimeAware.geometry not sufficiant, size=" << trajGeometry.size();
     return -1;
   }
@@ -165,7 +164,7 @@ int AbstractFiringStrategy::sendChargeEffect(const TrajectoryTimeAware &trajecto
   chargeEffect.trajectoryTimeAware(trajectoryTimeAware);
 
   const auto &reply = m_effector->mainHandler()->chargeEffectHandler()->createChargeEffect(chargeEffect);
-  DEBUG_LOG() << "reply.id=" << reply.id() << ", str:" << reply.str() << ", uniqueId:" << reply.uniqueId();
+  DEBUG_LOG(m_logger) << "reply.id=" << reply.id() << ", str:" << reply.str() << ", uniqueId:" << reply.uniqueId();
   return reply.id();
 }
 
@@ -178,21 +177,21 @@ Core::GeoPosition AbstractFiringStrategy::participantPosition(int participantId)
 
 int32_t AbstractFiringStrategy::gearTypeId(int chargeTypeId, int participantId)
 {
-  DEBUG_LOG() << "getGearTypeId"
+  DEBUG_LOG(m_logger) << "getGearTypeId"
                       << ", chargeTypeId:" << chargeTypeId << ", participantId:" << participantId;
 
   m_effector->mainHandler()->dds()->ppmDtc()->enableDynamicParticipantData(true);
   m_effector->mainHandler()->dds()->ppmDtc()->waitForHistoricalDataDynamicParticipantData(1000);
   const ParticipantManagement::DynamicParticipantData &dynamicParticipantData = m_effector->mainHandler()->dds()->ppmDtc()->dynamicParticipantData(participantId);
-  DEBUG_LOG() << "gearSize " << dynamicParticipantData.gear().size();
+  DEBUG_LOG(m_logger) << "gearSize " << dynamicParticipantData.gear().size();
 
   const auto& participantData_gear = dynamicParticipantData.gear();
   for (const auto &gear : std::as_const(participantData_gear))
   {
-    DEBUG_LOG() << "gear.chargeTypeId(): " << gear.chargeTypeId() << ", chargeTypeId:" << chargeTypeId;
+    DEBUG_LOG(m_logger) << "gear.chargeTypeId(): " << gear.chargeTypeId() << ", chargeTypeId:" << chargeTypeId;
     if (gear.chargeTypeId() == chargeTypeId)
     {
-      DEBUG_LOG() << "getGearTypeId return: " << gear.gearTypeId();
+      DEBUG_LOG(m_logger) << "getGearTypeId return: " << gear.gearTypeId();
       if (gear.gearTypeId() != 0)
         return gear.gearTypeId();
       else
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 6852da00e..19ede9026 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
@@ -83,7 +83,7 @@ ModuleTestEffectCluster::ModuleTestEffectCluster(int domainId, int exerciseId)
           this,
           [this]()
           {
-            DEBUG_LOG() << "Wirkfeldplanung";
+            DEBUG_LOG(m_logger) << "Wirkfeldplanung";
             doEffectClusterModifyRequest();
           });
 }
@@ -91,28 +91,28 @@ ModuleTestEffectCluster::ModuleTestEffectCluster(int domainId, int exerciseId)
 void ModuleTestEffectCluster::onEffectClusterModifyReply(const Core::FunctionReplyObject &replyObject)
 {
   m_replyError = replyObject.error();
-  DEBUG_LOG() << " got reply - onEffectClusterModifyReply: " << m_replyError << ", aesItemId=" << replyObject.id();
+  DEBUG_LOG(m_logger) << " got reply - onEffectClusterModifyReply: " << m_replyError << ", aesItemId=" << replyObject.id();
   m_aesItemId = replyObject.id();
   if (!replyObject.str().empty())
-    ERROR_LOG() << " got reply - onEffectClusterModifyReply: " << replyObject.translated();
+    ERROR_LOG(m_logger) << " got reply - onEffectClusterModifyReply: " << replyObject.translated();
 }
 
 void ModuleTestEffectCluster::onAcknowledgeExternalAesItemReply(const Core::FunctionReplyObject &replyObject)
 {
   m_replyError = replyObject.error();
-  DEBUG_LOG() << " got reply - onAcknowledgeExternalAesItemReply: " << m_replyError;
+  DEBUG_LOG(m_logger) << " got reply - onAcknowledgeExternalAesItemReply: " << m_replyError;
   sendTabExFire();
   // AES::EffectState von ES_Received -> ES_Created
   if (!replyObject.str().empty())
-    ERROR_LOG() << " got reply - onAcknowledgeExternalAesItemReply: " << replyObject.translated();
+    ERROR_LOG(m_logger) << " got reply - onAcknowledgeExternalAesItemReply: " << replyObject.translated();
 }
 
 void ModuleTestEffectCluster::onModifyPartyDataReply(const Core::FunctionReplyObject &replyObject)
 {
   m_replyError = replyObject.error();
-  DEBUG_LOG() << " got reply - onModifyPartyDataReply: " << m_replyError << " " << replyObject.additionalInfo();
+  DEBUG_LOG(m_logger) << " got reply - onModifyPartyDataReply: " << m_replyError << " " << replyObject.additionalInfo();
   if (!replyObject.str().empty())
-    ERROR_LOG() << " got reply - onModifyPartyDataReply: " << replyObject.translated();
+    ERROR_LOG(m_logger) << " got reply - onModifyPartyDataReply: " << replyObject.translated();
   if (!m_participantChangeRequestDone)
   {
     participantChangeRequest();
@@ -123,24 +123,24 @@ void ModuleTestEffectCluster::onModifyPartyDataReply(const Core::FunctionReplyOb
 void ModuleTestEffectCluster::onModifyParticipantDataReply(const Core::FunctionReplyObject &replyObject)
 {
   m_replyError = replyObject.error();
-  DEBUG_LOG() << " \n\ngot reply - onModifyParticipantDataReply error: " << m_replyError << ", additionalInfo: " << replyObject.additionalInfo();
+  DEBUG_LOG(m_logger) << " \n\ngot reply - onModifyParticipantDataReply error: " << m_replyError << ", additionalInfo: " << replyObject.additionalInfo();
   if (!replyObject.str().empty())
-    ERROR_LOG() << " got reply - onModifyParticipantDataReply: " << replyObject.translated();
-  DEBUG_LOG() << "onModifyParticipantDataReply => Set Participant Pos";
+    ERROR_LOG(m_logger) << " got reply - onModifyParticipantDataReply: " << replyObject.translated();
+  DEBUG_LOG(m_logger) << "onModifyParticipantDataReply => Set Participant Pos";
   QJsonArray jsonArray = QJsonDocument::fromJson(QByteArray::fromStdString(replyObject.additionalInfo())).object().value(QLatin1String("participants")).toArray();
-  DEBUG_LOG() << "available_in_exercise jsonDocument.size()=" << jsonArray.size();
+  DEBUG_LOG(m_logger) << "available_in_exercise jsonDocument.size()=" << jsonArray.size();
   // ParticipantId aus dem Result bestimmen, keine Unit
   // Dieser einfache Test arbeitet mit einem Participant
   for (auto it = jsonArray.constBegin(); it != jsonArray.constEnd(); ++it)
   {
     int participantId = it->toInt();
-    DEBUG_LOG() << "participantId=" << participantId;
+    DEBUG_LOG(m_logger) << "participantId=" << participantId;
     ParticipantManagement::Participant participant = m_ppmDtc->participant(participantId);
     if (m_ppmDtc->type(participant.typeId()).typeClass().underlying() != ParticipantManagement::TypeClass::Unit)
     {
-      DEBUG_LOG() << "m_participant1.id=" << participantId;
+      DEBUG_LOG(m_logger) << "m_participant1.id=" << participantId;
       m_participant1.id(participantId); // wichtig zum loeschen
-      DEBUG_LOG() << "m_participantId keine Unit=" << participantId;
+      DEBUG_LOG(m_logger) << "m_participantId keine Unit=" << participantId;
       setParticipantPos(participantId);
       setEquipmentGearCharge(participantId);
 
@@ -150,7 +150,7 @@ void ModuleTestEffectCluster::onModifyParticipantDataReply(const Core::FunctionR
     }
     else
     {
-      DEBUG_LOG() << "m_participant0.id=" << participantId;
+      DEBUG_LOG(m_logger) << "m_participant0.id=" << participantId;
       m_participant0.id(participantId); // wichtig zum loeschen
     }
   }
@@ -168,7 +168,7 @@ void ModuleTestEffectCluster::onAesItemViewChanged(const AesItemView &aesItemVie
   if (aesItemView.aesItemId() != m_aesItemId)
     return;
 
-  DEBUG_LOG() << " got onAesItemViewChanged: "
+  DEBUG_LOG(m_logger) << " got onAesItemViewChanged: "
                       << ", aesItemId=" << aesItemView.aesItemId() << ", aesType=" << aesType << ", effectStateId=" << aesItemView.effectStateId();
 
   QCOMPARE(aesItemView.effectStateId(), m_effectStates[m_effectStateCounter]);
@@ -176,14 +176,14 @@ void ModuleTestEffectCluster::onAesItemViewChanged(const AesItemView &aesItemVie
 
   if (aesItemView.effectStateId() == AreaEffectSimulation::AesEffectState::EsReceived)
   {
-    DEBUG_LOG() << "sendAcknowledgeExternalAesItemRequest aesItemId=" << aesItemView.aesItemId();
+    DEBUG_LOG(m_logger) << "sendAcknowledgeExternalAesItemRequest aesItemId=" << aesItemView.aesItemId();
     sendAcknowledgeExternalAesItemRequest(aesItemView.aesItemId());
   }
 }
 
 void ModuleTestEffectCluster::sendTabExFire()
 {
-  DEBUG_LOG() << "sendTabExFire";
+  DEBUG_LOG(m_logger) << "sendTabExFire";
   TrainingAreaBase::EX_Fire exFire;
   exFire.effectorId(m_effectorId);               // Kenner z.B B1
   exFire.identifier(m_identifier.toStdString()); // Verein z.B 451100
@@ -199,16 +199,16 @@ void ModuleTestEffectCluster::onEffectsChanged(const Effects &effects, DataModif
   if (modType == DataModification::eRemoved)
     return;
   AreaEffectSimulation::AesType_def::type aesType = effects.aesTypeId().underlying();
-  DEBUG_LOG() << " got onEffectsChanged - m_data: " << m_data.id() << ", aesType=" << aesType;
+  DEBUG_LOG(m_logger) << " got onEffectsChanged - m_data: " << m_data.id() << ", aesType=" << aesType;
   ++m_counterDds.cntEffectClusterEffects;
 
   m_effects = effects;
-  DEBUG_LOG() << " got onEffectsChanged - m_effects: " << m_effects;
+  DEBUG_LOG(m_logger) << " got onEffectsChanged - m_effects: " << m_effects;
 }
 
 void ModuleTestEffectCluster::onChargeEffectChanged(const ChargeEffect &chargeEffect, DataModification modType)
 {
-  DEBUG_LOG() << "onChargeEffectChanged state=" << chargeEffect.state();
+  DEBUG_LOG(m_logger) << "onChargeEffectChanged state=" << chargeEffect.state();
   if (modType == DataModification::eRemoved)
     return;
   if (chargeEffect.state() == AreaEffectSimulation::AesEffectState::EsActivated)
@@ -225,7 +225,7 @@ void ModuleTestEffectCluster::onChargeEffectChanged(const ChargeEffect &chargeEf
   }
   else if (chargeEffect.state() == AreaEffectSimulation::AesEffectState::EsExpired)
     participantDeleteRequest();
-  DEBUG_LOG() << " got onEffectsChanged - m_effects: " << m_effects;
+  DEBUG_LOG(m_logger) << " got onEffectsChanged - m_effects: " << m_effects;
 }
 
 void ModuleTestEffectCluster::onTrajectoryTimeAwareChanged(const TrajectoryTimeAware &data, DataModification modType)
@@ -236,12 +236,12 @@ void ModuleTestEffectCluster::onTrajectoryTimeAwareChanged(const TrajectoryTimeA
 
   ++m_counterDds.cntTrajectory;
 
-  DEBUG_LOG() << " got TrajectoryTimeAwareChanged - data: " << data.id() << ", cntTrajectory=" << m_counterDds.cntTrajectory;
+  DEBUG_LOG(m_logger) << " got TrajectoryTimeAwareChanged - data: " << data.id() << ", cntTrajectory=" << m_counterDds.cntTrajectory;
 }
 
 void ModuleTestEffectCluster::dumpCnt()
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " Counter: "
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " Counter: "
                       << " cntEffectCluster = " << m_counterDds.cntEffectCluster << ",  cntAtEffectCluster = " << m_counterDds.cntAtEffectCluster
                       << ",  cntGunToTargetLine = " << m_counterDds.cntAtEffectClusterGunToTargetLine << ",  cntClusterEffects = " << m_counterDds.cntEffectClusterEffects
                       << ",  cntTrajectory = " << m_counterDds.cntTrajectory;
@@ -258,7 +258,7 @@ bool ModuleTestEffectCluster::waitForData(const std::function<bool()> &func, int
 
   for (int i = 0; i < retryCount; ++i)
   {
-    TRACE_LOG() << " waitForData - i: " << i;
+    TRACE_LOG(m_logger) << " waitForData - i: " << i;
     if (func())
       return true;
     QTest::qWait(1000);
@@ -299,7 +299,7 @@ EffectCluster ModuleTestEffectCluster::getEcForTneVerification(const QString &ea
 
   QPointF bottomLeft(Polygons::centerPoint2BottomLeft(cp.geographic(), width, height, rot));
 
-  DEBUG_LOG() << " bottomLeft" << bottomLeft;
+  DEBUG_LOG(m_logger) << " bottomLeft" << bottomLeft;
 
   eaData.area().cornerBottomLeft(Core::GeoPosition(bottomLeft.x(), bottomLeft.y(), 0.0));
   eaData.area().height(height);
@@ -359,23 +359,23 @@ std::vector<Core::RelativePositionRelativeTime> ModuleTestEffectCluster::parseTr
         }
       }
       points.push_back(p);
-      DEBUG_LOG() << "Punkt gelesen: offsetY" << p.offsetX() << ", offsetY" << p.offsetY() << ", offsetZ" << p.offsetZ() << ", time=" << p.relativeTime();
+      DEBUG_LOG(m_logger) << "Punkt gelesen: offsetY" << p.offsetX() << ", offsetY" << p.offsetY() << ", offsetZ" << p.offsetZ() << ", time=" << p.relativeTime();
     }
   }
 
   if (xml.hasError())
   {
-    DEBUG_LOG() << "XML Fehler:" << xml.errorString();
+    DEBUG_LOG(m_logger) << "XML Fehler:" << xml.errorString();
   }
-  DEBUG_LOG() << "file.close()";
+  DEBUG_LOG(m_logger) << "file.close()";
   file.close();
-  DEBUG_LOG() << "return points";
+  DEBUG_LOG(m_logger) << "return points";
   return points;
 }
 
 int ModuleTestEffectCluster::sendAcknowledgeExternalAesItemRequest(int aesItemId)
 {
-  DEBUG_LOG() << "sendAcknowledgeExternalAesItemRequest aesItemId=" << aesItemId;
+  DEBUG_LOG(m_logger) << "sendAcknowledgeExternalAesItemRequest aesItemId=" << aesItemId;
   int ret = m_aesFtc->acknowledgeExternalAesItemRequest(AcknowledgeExternalAesItemRequest(aesItemId), this);
   return ret;
 }
@@ -387,9 +387,9 @@ int ModuleTestEffectCluster::doEffectClusterModifyRequest()
   m_reference = dateTimeString;
 
   if (eaData.effectStart().is_set())
-    INFO_LOG() << "  effectClusterModifyRequest with effectStart: " << QDateTime::fromMSecsSinceEpoch(eaData.effectStart().get()).toString();
+    INFO_LOG(m_logger) << "  effectClusterModifyRequest with effectStart: " << QDateTime::fromMSecsSinceEpoch(eaData.effectStart().get()).toString();
   else
-    INFO_LOG() << "  effectClusterModifyRequest with effectStart: not set ";
+    INFO_LOG(m_logger) << "  effectClusterModifyRequest with effectStart: not set ";
 
   FlightCurve fc;
   //  if (eaData.flightCurve().is_set())
@@ -439,7 +439,7 @@ int ModuleTestEffectCluster::doEffectClusterModifyRequest()
   AreaEffectSimulation::EffectorData effector;
   effector.angleOfFall(0);
   effector.participantId(m_participant1.id()); // Participant
-  DEBUG_LOG() << "effector.participantId(m_participant1.id()=" << m_participant1.id();
+  DEBUG_LOG(m_logger) << "effector.participantId(m_participant1.id()=" << m_participant1.id();
 
   effector.flightTime(39526.3);
   effector.peakHeight(2002.0);
@@ -454,26 +454,26 @@ int ModuleTestEffectCluster::doEffectClusterModifyRequest()
   effector.mhpPosition(mhpPosition);
   effector.trajectoryRelative(trajectory);
 
-  DEBUG_LOG() << "effector";
+  DEBUG_LOG(m_logger) << "effector";
 
   std::vector<AreaEffectSimulation::EffectorData> effectors;
   effectors.push_back(effector);
 
-  DEBUG_LOG() << "Nach effector";
+  DEBUG_LOG(m_logger) << "Nach effector";
 
   eaData.id(0);
   eaData.effectSourceId(ProjectDataManagement::EffectSource::ES_ADLER);
   eaData.firePurposeId(2);
   eaData.partyId(4);
   eaData.participantId(m_participant0.id()); // Unit
-  DEBUG_LOG() << "eaData.participantId(m_participant0.id()=" << m_participant0.id();
+  DEBUG_LOG(m_logger) << "eaData.participantId(m_participant0.id()=" << m_participant0.id();
   eaData.externalId(7);
   eaData.effectMarkingInTa(1);
 
   eaData.name(dateTimeString.toStdString());
   eaData.element(dateTimeString.toStdString());
 
-  DEBUG_LOG() << "Vor send effectClusterModifyRequest";
+  DEBUG_LOG(m_logger) << "Vor send effectClusterModifyRequest";
 
   int ret = m_aesFtc->effectClusterModifyRequest(EffectClusterModifyRequest(eaData.id(),
                                                                             eaData.name(),
@@ -493,7 +493,7 @@ int ModuleTestEffectCluster::doEffectClusterModifyRequest()
                                                                             eaData.effectMarkingInTa(),
                                                                             eaData.properties()),
                                                  this);
-  DEBUG_LOG() << "send effectClusterModifyRequest ret=" << ret;
+  DEBUG_LOG(m_logger) << "send effectClusterModifyRequest ret=" << ret;
   return ret;
 }
 
@@ -502,31 +502,31 @@ void ModuleTestEffectCluster::waitForEffectStates(int lineNumber, int durPrep, i
   // expected condition:
   if (!waitForData([this]() { return m_replyError == false; }, 1))
   {
-    ERROR_LOG() << "Error on request"
+    ERROR_LOG(m_logger) << "Error on request"
                         << ", lineNumber = " << lineNumber;
     return;
   }
 
-  INFO_LOG() << Q_FUNC_INFO << "  waiting for EsPrepared...";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << "  waiting for EsPrepared...";
   if (!waitForData([this]() { return m_data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsPrepared; }, durPrep))
   {
-    ERROR_LOG() << "Timeout waiting for EsPrepared of explosion cluster with id " << m_data.id() << ", lineNumber = " << lineNumber;
+    ERROR_LOG(m_logger) << "Timeout waiting for EsPrepared of explosion cluster with id " << m_data.id() << ", lineNumber = " << lineNumber;
     QVERIFY2(false, "ERROR, exit");
     return;
   }
 
-  INFO_LOG() << Q_FUNC_INFO << "  waiting for EsActivated...";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << "  waiting for EsActivated...";
   if (!waitForData([this]() { return m_data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated; }, durAct))
   {
-    ERROR_LOG() << "Timeout waiting for EsActivated of explosion cluster with id " << m_data.id() << ", lineNumber = " << lineNumber;
+    ERROR_LOG(m_logger) << "Timeout waiting for EsActivated of explosion cluster with id " << m_data.id() << ", lineNumber = " << lineNumber;
     QVERIFY2(false, "ERROR, exit");
     return;
   }
 
-  INFO_LOG() << Q_FUNC_INFO << "  waiting for EsExpired...";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << "  waiting for EsExpired...";
   if (!waitForData([this]() { return m_data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired; }, durExp))
   {
-    ERROR_LOG() << "Timeout waiting for EsExpired of explosion cluster with id " << m_data.id() << ", lineNumber = " << lineNumber;
+    ERROR_LOG(m_logger) << "Timeout waiting for EsExpired of explosion cluster with id " << m_data.id() << ", lineNumber = " << lineNumber;
     QVERIFY2(false, "ERROR, exit");
     return;
   }
@@ -534,7 +534,7 @@ void ModuleTestEffectCluster::waitForEffectStates(int lineNumber, int durPrep, i
 
 void ModuleTestEffectCluster::disconnectFromParty()
 {
-  DEBUG_LOG() << "PPM::ModifyPartyDataRequest";
+  DEBUG_LOG(m_logger) << "PPM::ModifyPartyDataRequest";
 
   ParticipantManagement::Party party;
 
@@ -559,14 +559,14 @@ void ModuleTestEffectCluster::disconnectFromParty()
 
   if (!m_ppmFtc->modifyPartyDataRequest(req, this))
   {
-    ERROR_LOG() << "Error creating party data";
+    ERROR_LOG(m_logger) << "Error creating party data";
     // failExit();
   }
 }
 
 void ModuleTestEffectCluster::connectToParty()
 {
-  DEBUG_LOG() << "PPM::ModifyPartyDataRequest";
+  DEBUG_LOG(m_logger) << "PPM::ModifyPartyDataRequest";
 
   ParticipantManagement::Party party;
 
@@ -592,14 +592,14 @@ void ModuleTestEffectCluster::connectToParty()
 
   if (!m_ppmFtc->modifyPartyDataRequest(req, this))
   {
-    ERROR_LOG() << "Error creating party data";
+    ERROR_LOG(m_logger) << "Error creating party data";
     // failExit();
   }
 }
 
 void ModuleTestEffectCluster::participantChangeRequest()
 {
-  DEBUG_LOG() << "PPM::participantChangerequest";
+  DEBUG_LOG(m_logger) << "PPM::participantChangerequest";
 
   m_participant0.id(0);
   m_participant0.partyId(4);
@@ -643,14 +643,14 @@ void ModuleTestEffectCluster::participantChangeRequest()
   req.data(data);
   if (!m_ppmFtc->modifyParticipantDataRequest(req, this))
   {
-    ERROR_LOG() << "Error creating party data";
+    ERROR_LOG(m_logger) << "Error creating party data";
     // failExit();
   }
 }
 
 void ModuleTestEffectCluster::participantDeleteRequest()
 {
-  DEBUG_LOG() << "PPM::participantDeleteRequest";
+  DEBUG_LOG(m_logger) << "PPM::participantDeleteRequest";
 
   m_participant0.isDeleted(true);
 
@@ -664,14 +664,14 @@ void ModuleTestEffectCluster::participantDeleteRequest()
   req.data(data);
   if (!m_ppmFtc->modifyParticipantDataRequest(req, this))
   {
-    ERROR_LOG() << "Error creating party data";
+    ERROR_LOG(m_logger) << "Error creating party data";
     // failExit();
   }
 }
 
 void ModuleTestEffectCluster::setParticipantPos(int participantId)
 {
-  DEBUG_LOG() << "setupParticipants";
+  DEBUG_LOG(m_logger) << "setupParticipants";
   TrainingAreaBase::TabPosition position;
   Core::GeoPosition geoPos;
   TrainingAreaBase::EquipmentPosition pos;
@@ -680,7 +680,7 @@ void ModuleTestEffectCluster::setParticipantPos(int participantId)
   geoPos.lat(0.91579597);
   geoPos.z(0.0);
 
-  DEBUG_LOG() << " initTestCase_data1 ...";
+  DEBUG_LOG(m_logger) << " initTestCase_data1 ...";
   pos.equipmentNumber(participantId * -1); // ParticipantId
   pos.sampleTime(QDateTime::currentMSecsSinceEpoch());
   position.reportingSource(Core::PositionReportingSource::SetByOperator);
@@ -691,7 +691,7 @@ void ModuleTestEffectCluster::setParticipantPos(int participantId)
 
 void ModuleTestEffectCluster::setEquipmentGearCharge(int participantId)
 {
-  DEBUG_LOG() << "setupEquipmentGearCharge";
+  DEBUG_LOG(m_logger) << "setupEquipmentGearCharge";
   TrainingAreaBase::EquipmentGearChargeState egs;
   TrainingAreaBase::GearCharge charge;
   std::vector<TrainingAreaBase::GearCharge> charges;
@@ -729,7 +729,7 @@ void ModuleTestEffectCluster::setEquipmentGearCharge(int participantId)
 
 void ModuleTestEffectCluster::onPartyChanged(const ParticipantManagement::Party &data, DataModification modType)
 {
-  DEBUG_LOG() << "onPartyChanged:" << data;
+  DEBUG_LOG(m_logger) << "onPartyChanged:" << data;
   // Remove Participant:
   if (modType == DataModification::eRemoved)
   {
@@ -741,14 +741,14 @@ void ModuleTestEffectCluster::onPartyChanged(const ParticipantManagement::Party
     return;
   }
 
-  DEBUG_LOG() << "onPartyChanged id= " << data.id();
+  DEBUG_LOG(m_logger) << "onPartyChanged id= " << data.id();
   if (m_ppmDtc->saaConnectedState(data.id()) == ParticipantManagement::ConnectState::Connected)
   {
-    DEBUG_LOG() << "onPartyChanged saaConnectedState == connected";
+    DEBUG_LOG(m_logger) << "onPartyChanged saaConnectedState == connected";
   }
   else if (m_ppmDtc->saaConnectedState(data.id()) == ParticipantManagement::ConnectState::Disconnected)
   {
-    DEBUG_LOG() << "onPartyChanged saaConnectedState == disconnected => connectToParty";
+    DEBUG_LOG(m_logger) << "onPartyChanged saaConnectedState == disconnected => connectToParty";
     connectToParty();
   }
 }
@@ -762,7 +762,7 @@ void ModuleTestEffectCluster::initTestCase()
   // DdsConnector
   //
 
-  DEBUG_LOG() << "DDSConnector: m_domainId " << m_domainId << ", m_exerciseId " << m_exerciseId;
+  DEBUG_LOG(m_logger) << "DDSConnector: m_domainId " << m_domainId << ", m_exerciseId " << m_exerciseId;
 
   QFile file(s_REQUEST_SPL_FILE);
   const bool bFileExists = file.exists();
@@ -774,14 +774,14 @@ void ModuleTestEffectCluster::initTestCase()
   QVERIFY2(bInit, "ERROR, ddsConnector.init failed!!");
   if (!bInit)
   {
-    ERROR_LOG() << " ERROR, ddsConnector.init failed!!";
+    ERROR_LOG(m_logger) << " ERROR, ddsConnector.init failed!!";
     return;
   }
-  INFO_LOG() << " ddsConnector.init successfull";
+  INFO_LOG(m_logger) << " ddsConnector.init successfull";
 
   // cmd
   m_ddsConnector->initPublisherSubscriber();
-  INFO_LOG() << " ddsConnector.initPublisherSubscriber done";
+  INFO_LOG(m_logger) << " ddsConnector.initPublisherSubscriber done";
 
   //
   // Aes
@@ -802,12 +802,12 @@ void ModuleTestEffectCluster::initTestCase()
 
   m_aesDtc->enableAesItemView();
   m_aesDtc->enableChargeEffect();
-  DEBUG_LOG() << "  waitForHistoricalDataAesItemView... ";
+  DEBUG_LOG(m_logger) << "  waitForHistoricalDataAesItemView... ";
   m_aesDtc->waitForHistoricalDataAesItemView(2000);
-  DEBUG_LOG() << "  waitForHistoricalDataAesItemView... Done";
+  DEBUG_LOG(m_logger) << "  waitForHistoricalDataAesItemView... Done";
 
   QMap<qint32, AreaEffectSimulation::AesItemView> aesItemViewsCont = m_aesDtc->aesItemViews();
-  DEBUG_LOG() << "  aesItemViewsCont.size() " << aesItemViewsCont.size();
+  DEBUG_LOG(m_logger) << "  aesItemViewsCont.size() " << aesItemViewsCont.size();
 
   //
   // PDM
@@ -832,13 +832,13 @@ void ModuleTestEffectCluster::initTestCase()
   QVERIFY2(bRet, "ERROR, enableAll m_exmDtc failed!!");
 
   m_exmDtc->waitForHistoricalDataExercise(2000);
-  DEBUG_LOG() << "  waitForHistoricalDataExercise... Done";
+  DEBUG_LOG(m_logger) << "  waitForHistoricalDataExercise... Done";
 
   const ExerciseManagement::Exercise &exercise = m_exmDtc->exercise(m_exerciseId);
   QVERIFY2(exercise.id() == m_exerciseId, "ERROR, exercise failed!!");
   m_traingAreaId = exercise.trainingAreaId();
 
-  DEBUG_LOG() << "  ExerciseManagement"
+  DEBUG_LOG(m_logger) << "  ExerciseManagement"
                       << ", m_traingAreaId = " << m_traingAreaId;
   //
   // PPM ParticipantManagement
@@ -861,7 +861,7 @@ void ModuleTestEffectCluster::initTestCase()
   bRet = bRet && m_tabDts->enableAll();
   QVERIFY2(bRet, "ERROR, m_tabDts enableAll failed!!");
 
-  DEBUG_LOG() << "disconnectFromParty";
+  DEBUG_LOG(m_logger) << "disconnectFromParty";
   disconnectFromParty();
   // connectToParty();
 
@@ -896,9 +896,9 @@ void ModuleTestEffectCluster::cleanupTestCase()
   // finish last (dds) calls:
   waitForData([]() { return false; }, 10);
 
-  INFO_LOG() << " ddsConnector destroy...";
+  INFO_LOG(m_logger) << " ddsConnector destroy...";
   m_ddsConnector.reset();
-  INFO_LOG() << " ddsConnector destroy...DONE";
+  INFO_LOG(m_logger) << " ddsConnector destroy...DONE";
 }
 
 int main(int argc, char *argv[])
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_EffectCluster/effect_cluster_module_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_EffectCluster/effect_cluster_module_test.h
index 7f0950acb..f47e98626 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_EffectCluster/effect_cluster_module_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_EffectCluster/effect_cluster_module_test.h
@@ -61,6 +61,8 @@ public:
   ModuleTestEffectCluster(int domainId, int exerciseId);
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void onEffectClusterModifyReply(const Core::FunctionReplyObject &replyObject) override;
   void onAcknowledgeExternalAesItemReply(const Core::FunctionReplyObject &replyObject) override;
   void onModifyPartyDataReply(const Core::FunctionReplyObject &replyObject) override;
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 d0041e94f..9b52c4061 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
@@ -102,65 +102,65 @@ ModuleTestExplosionCluster::ModuleTestExplosionCluster(int domainId, int exercis
 void ModuleTestExplosionCluster::onSetSimulatedPositionReply(const Core::FunctionReplyObject &replyObject)
 {
   m_replyError = replyObject.error();
-  DEBUG_LOG() << " got reply - onSetSimulatedPositionReply : " << m_replyError;
+  DEBUG_LOG(m_logger) << " got reply - onSetSimulatedPositionReply : " << m_replyError;
   if (!replyObject.str().empty())
-    ERROR_LOG() << " got reply - onExplosionClusterModifyReply: " << replyObject.translated();
+    ERROR_LOG(m_logger) << " got reply - onExplosionClusterModifyReply: " << replyObject.translated();
 }
 
 void ModuleTestExplosionCluster::onSetSimulatedParticipantFormationReply(const Core::FunctionReplyObject &replyObject)
 {
   m_replyError = replyObject.error();
-  DEBUG_LOG() << " got reply - onSetSimulatedParticipantFormationReply : " << m_replyError;
+  DEBUG_LOG(m_logger) << " got reply - onSetSimulatedParticipantFormationReply : " << m_replyError;
   if (!replyObject.str().empty())
-    ERROR_LOG() << " got reply - onSetSimulatedParticipantFormationReply: " << replyObject.translated();
+    ERROR_LOG(m_logger) << " got reply - onSetSimulatedParticipantFormationReply: " << replyObject.translated();
 }
 
 void ModuleTestExplosionCluster::onExplosionClusterModifyReply(const Core::FunctionReplyObject &replyObject)
 {
   m_replyError = replyObject.error();
-  DEBUG_LOG() << " got reply - onExplosionClusterModifyReply: " << m_replyError;
+  DEBUG_LOG(m_logger) << " got reply - onExplosionClusterModifyReply: " << m_replyError;
   if (!replyObject.str().empty())
-    ERROR_LOG() << " got reply - onExplosionClusterModifyReply: " << replyObject.translated();
+    ERROR_LOG(m_logger) << " got reply - onExplosionClusterModifyReply: " << replyObject.translated();
 }
 
 void ModuleTestExplosionCluster::onExplosionClusterSingleEffectOnlyModifyReply(const Core::FunctionReplyObject &replyObject)
 {
   m_replyError = replyObject.error();
-  DEBUG_LOG() << " got reply - onExplosionClusterSingleEffectOnlyModifyReply: " << m_replyError;
+  DEBUG_LOG(m_logger) << " got reply - onExplosionClusterSingleEffectOnlyModifyReply: " << m_replyError;
   if (!replyObject.str().empty())
-    ERROR_LOG() << " got reply - onExplosionClusterSingleEffectOnlyModifyReply: " << replyObject.translated();
+    ERROR_LOG(m_logger) << " got reply - onExplosionClusterSingleEffectOnlyModifyReply: " << replyObject.translated();
 }
 
 void ModuleTestExplosionCluster::onExplosionClusterOcModifyReply(const Core::FunctionReplyObject &replyObject)
 {
   m_replyError = replyObject.error();
-  DEBUG_LOG() << " got reply - onExplosionClusterOcModifyReply: " << m_replyError;
+  DEBUG_LOG(m_logger) << " got reply - onExplosionClusterOcModifyReply: " << m_replyError;
   if (!replyObject.str().empty())
-    ERROR_LOG() << " got reply - onExplosionClusterOcModifyReply: " << replyObject.translated();
+    ERROR_LOG(m_logger) << " got reply - onExplosionClusterOcModifyReply: " << replyObject.translated();
 }
 
 void ModuleTestExplosionCluster::onExplosionClusterPauseResumeReply(const Core::FunctionReplyObject &replyObject)
 {
   m_replyError = replyObject.error();
-  DEBUG_LOG() << " got reply - onExplosionClusterPauseResumeReply: " << m_replyError;
+  DEBUG_LOG(m_logger) << " got reply - onExplosionClusterPauseResumeReply: " << m_replyError;
   if (!replyObject.str().empty())
-    ERROR_LOG() << " got reply - onExplosionClusterModifyReply: " << replyObject.translated();
+    ERROR_LOG(m_logger) << " got reply - onExplosionClusterModifyReply: " << replyObject.translated();
 }
 
 void ModuleTestExplosionCluster::onTargetPositionsModifyReply(const Core::FunctionReplyObject &replyObject)
 {
   m_replyError = replyObject.error();
-  DEBUG_LOG() << " got reply - onTargetPositionsModifyReply: " << m_replyError;
+  DEBUG_LOG(m_logger) << " got reply - onTargetPositionsModifyReply: " << m_replyError;
   if (!replyObject.str().empty())
-    ERROR_LOG() << " got reply - onTargetPositionsModifyReply: " << replyObject.translated();
+    ERROR_LOG(m_logger) << " got reply - onTargetPositionsModifyReply: " << replyObject.translated();
 }
 
 void ModuleTestExplosionCluster::onSetBuildingStatesReply(const Core::FunctionReplyObject &replyObject)
 {
   m_replyError = replyObject.error();
-  DEBUG_LOG() << " got reply - onSetBuildingStatesReply: " << m_replyError;
+  DEBUG_LOG(m_logger) << " got reply - onSetBuildingStatesReply: " << m_replyError;
   if (!replyObject.str().empty())
-    ERROR_LOG() << " got reply - onSetBuildingStatesReply: " << replyObject.translated();
+    ERROR_LOG(m_logger) << " got reply - onSetBuildingStatesReply: " << replyObject.translated();
 }
 
 void ModuleTestExplosionCluster::onExplosionClusterChanged(const ExplosionCluster &data, DataModification modType)
@@ -177,7 +177,7 @@ void ModuleTestExplosionCluster::onExplosionClusterChanged(const ExplosionCluste
   {
     long now = time(nullptr) * 1000;
     long diff =  now - m_objectRequestedTimePointMsec;
-    DEBUG_LOG() << " got changed - m_data: " << m_data.id() << ", state=" << m_data.effectStateId()
+    DEBUG_LOG(m_logger) << " got changed - m_data: " << m_data.id() << ", state=" << m_data.effectStateId()
                         << ", OBJECT IS NOT Modifiable ANYMORE"
                         << " ((diff = " << diff << ")";
   }
@@ -187,10 +187,10 @@ void ModuleTestExplosionCluster::onExplosionClusterChanged(const ExplosionCluste
   if (m_data.effectStart().is_set())
     startTimeMsec = m_data.effectStart().get();
 
-  DEBUG_LOG() << " got changed - m_data: " << m_data.id() << ", state=" << m_data.effectStateId()
+  DEBUG_LOG(m_logger) << " got changed - m_data: " << m_data.id() << ", state=" << m_data.effectStateId()
                       << ", startTimeMsec=" << startTimeMsec
                       << ", cntExplosionCluster=" << m_counterDds.cntExplosionCluster;
-  TRACE_LOG() << " got changed - m_data: " << m_data;
+  TRACE_LOG(m_logger) << " got changed - m_data: " << m_data;
 }
 
 void ModuleTestExplosionCluster::onBuildingStateChanged(const Buildings::BuildingState &bldgState, DataModification modType)
@@ -198,7 +198,7 @@ void ModuleTestExplosionCluster::onBuildingStateChanged(const Buildings::Buildin
   if (modType == DataModification::eRemoved)
     return;
 
-//  DEBUG_LOG() << " got changed - BuildingState.id: " << bldgState.id() << ", data.damagePerc " << bldgState.damagePercent() << "m_bldgIdToFilter " << m_bldgIdToFilter;
+//  DEBUG_LOG(m_logger) << " got changed - BuildingState.id: " << bldgState.id() << ", data.damagePerc " << bldgState.damagePercent() << "m_bldgIdToFilter " << m_bldgIdToFilter;
 
   if (m_bldgIdToFilter == bldgState.id())
     m_buildingStateVec.push_back(bldgState);
@@ -210,7 +210,7 @@ void ModuleTestExplosionCluster::onAesItemViewChanged(const AesItemView &aesItem
     return;
 
   AreaEffectSimulation::AesType_def::type aesType = aesItemView.aesTypeId().underlying();
-  DEBUG_LOG() << " got onAesItemViewChanged - m_data: " << m_data.id() << ", aesType=" << aesType;
+  DEBUG_LOG(m_logger) << " got onAesItemViewChanged - m_data: " << m_data.id() << ", aesType=" << aesType;
 
   switch (aesType) {
   case AreaEffectSimulation::AesType_def::AtExplosionCluster:
@@ -233,11 +233,11 @@ void ModuleTestExplosionCluster::onEffectsChanged(const Effects &effects, DataMo
   if (modType == DataModification::eRemoved)
     return;
   AreaEffectSimulation::AesType_def::type aesType = effects.aesTypeId().underlying();
-  DEBUG_LOG() << " got onEffectsChanged - m_data: " << m_data.id() << ", aesType=" << aesType;
+  DEBUG_LOG(m_logger) << " got onEffectsChanged - m_data: " << m_data.id() << ", aesType=" << aesType;
   ++m_counterDds.cntExplosionClusterEffects;
 
   m_effects = effects;
-  DEBUG_LOG() << " got onEffectsChanged - m_effects: " << m_effects;
+  DEBUG_LOG(m_logger) << " got onEffectsChanged - m_effects: " << m_effects;
 }
 
 void ModuleTestExplosionCluster::onTrajectoryTimeAwareChanged(const TrajectoryTimeAware &data, DataModification modType)
@@ -248,7 +248,7 @@ void ModuleTestExplosionCluster::onTrajectoryTimeAwareChanged(const TrajectoryTi
 
   ++m_counterDds.cntTrajectory;
 
-  DEBUG_LOG() << " got TrajectoryTimeAwareChanged - data: " << data.id() << ", cntTrajectory=" << m_counterDds.cntTrajectory;
+  DEBUG_LOG(m_logger) << " got TrajectoryTimeAwareChanged - data: " << data.id() << ", cntTrajectory=" << m_counterDds.cntTrajectory;
 }
 
 void ModuleTestExplosionCluster::dumpCnt()
@@ -278,11 +278,11 @@ bool ModuleTestExplosionCluster::setFilterForBldgState(const QString &bldgName)
   const int bldgId = getBldgId(bldgName);
   if (bldgId<=0)
   {
-    ERROR_LOG() << " getBldgId failed for '" << bldgName << "'";
+    ERROR_LOG(m_logger) << " getBldgId failed for '" << bldgName << "'";
     return false;
   }
   m_bldgIdToFilter = bldgId;
-  INFO_LOG() << " setFilterForBldgState for '" << bldgName << "' to " << m_bldgIdToFilter;
+  INFO_LOG(m_logger) << " setFilterForBldgState for '" << bldgName << "' to " << m_bldgIdToFilter;
   return true;
 }
 
@@ -307,13 +307,13 @@ bool ModuleTestExplosionCluster::checkSingleEffects(uint idx, const LtsCoordTran
 
   if (se.singleEffectTime() < 1000)
   {
-    ERROR_LOG() << " bldg: " << context << ", idx = " << idx << ": singleEffectTime failed, SingleEffect = " << se;
+    ERROR_LOG(m_logger) << " bldg: " << context << ", idx = " << idx << ": singleEffectTime failed, SingleEffect = " << se;
     return false;
   }
 
   if (se.zPlacement() != zPlace)
   {
-    ERROR_LOG() << " bldg: " << context << ", idx = " << idx << ": zPlacement failed, SingleEffect = " << se;
+    ERROR_LOG(m_logger) << " bldg: " << context << ", idx = " << idx << ": zPlacement failed, SingleEffect = " << se;
     return false;
   }
 
@@ -322,9 +322,9 @@ bool ModuleTestExplosionCluster::checkSingleEffects(uint idx, const LtsCoordTran
 
   if (dist3D > maxDist3D)
   {
-    ERROR_LOG() << " bldg: " << context << ", idx = " << idx << ": position failed, dist3D = " << dist3D;
-    ERROR_LOG() << " idx = " << idx << ", Impact IST = " << ltsPos;
-    ERROR_LOG() << " idx = " << idx << ", Impact SHD = " << coord;
+    ERROR_LOG(m_logger) << " bldg: " << context << ", idx = " << idx << ": position failed, dist3D = " << dist3D;
+    ERROR_LOG(m_logger) << " idx = " << idx << ", Impact IST = " << ltsPos;
+    ERROR_LOG(m_logger) << " idx = " << idx << ", Impact SHD = " << coord;
     return false;
   }
 
@@ -361,7 +361,7 @@ bool ModuleTestExplosionCluster::waitForData(const std::function<bool ()> &func,
 
   for (int i = 0; i < retryCount; ++i)
   {
-    TRACE_LOG() << " waitForData - i: " << i;
+    TRACE_LOG(m_logger) << " waitForData - i: " << i;
     if (func())
       return true;
     QTest::qWait(100);
@@ -636,9 +636,9 @@ ExplosionCluster ModuleTestExplosionCluster::getEcFor3101(const QString &eaName)
 int ModuleTestExplosionCluster::doExplosionClusterModifyRequest(const ExplosionCluster &eaData)
 {
   if (eaData.effectStart().is_set())
-    INFO_LOG() << "  explosionClusterModifyRequest with effectStart: " << QDateTime::fromMSecsSinceEpoch(eaData.effectStart().get()).toString();
+    INFO_LOG(m_logger) << "  explosionClusterModifyRequest with effectStart: " << QDateTime::fromMSecsSinceEpoch(eaData.effectStart().get()).toString();
   else
-    INFO_LOG() << "  explosionClusterModifyRequest with effectStart: not set ";
+    INFO_LOG(m_logger) << "  explosionClusterModifyRequest with effectStart: not set ";
 
   FlightCurve fc;
   if (eaData.flightCurve().is_set())
@@ -686,9 +686,9 @@ int ModuleTestExplosionCluster::doExplosionClusterModifyRequest(const ExplosionC
 int ModuleTestExplosionCluster::doExplosionClusterSingleEffectOnlyModifyRequest(const ExplosionClusterSingleEffectOnlyRequest &request)
 {
   if (request.effectStart().is_set())
-    INFO_LOG() << "  explosionClusterModifyRequest with effectStart: " << QDateTime::fromMSecsSinceEpoch(request.effectStart().get()).toString();
+    INFO_LOG(m_logger) << "  explosionClusterModifyRequest with effectStart: " << QDateTime::fromMSecsSinceEpoch(request.effectStart().get()).toString();
   else
-    INFO_LOG() << "  explosionClusterModifyRequest with effectStart: not set ";
+    INFO_LOG(m_logger) << "  explosionClusterModifyRequest with effectStart: not set ";
 
   int ret = m_aesFtc->explosionClusterSingleEffectOnlyModifyRequest(request, this);
   return ret;
@@ -711,32 +711,32 @@ void ModuleTestExplosionCluster::waitForEffectStates(int lineNumber, int durPrep
   // expected condition:
   if (!waitForData([this]() { return m_replyError == false; }, 1))
   {
-    ERROR_LOG() << "Error on request" << ", lineNumber = " << lineNumber;
+    ERROR_LOG(m_logger) << "Error on request" << ", lineNumber = " << lineNumber;
     return;
   }
 
-  INFO_LOG() << Q_FUNC_INFO << "  waiting for EsPrepared...";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << "  waiting for EsPrepared...";
   if (!waitForData([this]() { return m_data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsPrepared;}, durPrep))
   {
-    ERROR_LOG() << "Timeout waiting for EsPrepared of explosion cluster with id " << m_data.id()
+    ERROR_LOG(m_logger) << "Timeout waiting for EsPrepared of explosion cluster with id " << m_data.id()
                         << ", lineNumber = " << lineNumber;
     QVERIFY2(false, "ERROR, exit");
     return;
   }
 
-  INFO_LOG() << Q_FUNC_INFO << "  waiting for EsActivated...";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << "  waiting for EsActivated...";
   if (!waitForData([this]() { return m_data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated;}, durAct))
   {
-    ERROR_LOG() << "Timeout waiting for EsActivated of explosion cluster with id " << m_data.id()
+    ERROR_LOG(m_logger) << "Timeout waiting for EsActivated of explosion cluster with id " << m_data.id()
                         << ", lineNumber = " << lineNumber;
     QVERIFY2(false, "ERROR, exit");
     return;
   }
 
-  INFO_LOG() << Q_FUNC_INFO << "  waiting for EsExpired...";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << "  waiting for EsExpired...";
   if (!waitForData([this]() { return m_data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired;}, durExp))
   {
-    ERROR_LOG() << "Timeout waiting for EsExpired of explosion cluster with id " << m_data.id()
+    ERROR_LOG(m_logger) << "Timeout waiting for EsExpired of explosion cluster with id " << m_data.id()
                         << ", lineNumber = " << lineNumber;
     QVERIFY2(false, "ERROR, exit");
     return;
@@ -762,14 +762,14 @@ void ModuleTestExplosionCluster::setupParticipants()
       QPointF pos = utmPos.geographic();
       req.position(Core::GeoPosition(pos.x(), pos.y(), 0.0));
 
-      INFO_LOG() << " setSimulatedPositionRequest ...";
+      INFO_LOG(m_logger) << " setSimulatedPositionRequest ...";
       m_replyError = true;
       m_ppmFtc->setSimulatedPositionRequest(req, this);
 
       // expected condition:
       if (!waitForData([this]() { return m_replyError == false; }))
       {
-        ERROR_LOG() << "Error on request";
+        ERROR_LOG(m_logger) << "Error on request";
       }
     }
 
@@ -782,14 +782,14 @@ void ModuleTestExplosionCluster::setupParticipants()
       QPointF pos = utmPos.geographic();
       req.position(Core::GeoPosition(pos.x(), pos.y(), 0.0));
 
-      INFO_LOG() << " setSimulatedPositionRequest ...";
+      INFO_LOG(m_logger) << " setSimulatedPositionRequest ...";
       m_replyError = true;
       m_ppmFtc->setSimulatedPositionRequest(req, this);
 
       // expected condition:
       if (!waitForData([this]() { return m_replyError == false; }))
       {
-        ERROR_LOG() << "Error on request";
+        ERROR_LOG(m_logger) << "Error on request";
       }
     }
 
@@ -808,14 +808,14 @@ void ModuleTestExplosionCluster::setupParticipants()
     QString prop = QString(QStringLiteral("{\"angle\":0,\"distance\":25,\"distanceSets\":{\"Aufgelockert\":50,\"Geschlossen\":25},\"geometry\":\"line\"}"));
     req_SSPF.formation( prop.toStdString() );
 
-    INFO_LOG() << " SetSimulatedParticipantFormation ... req = " << req_SSPF ;
+    INFO_LOG(m_logger) << " SetSimulatedParticipantFormation ... req = " << req_SSPF ;
     m_replyError = true;
     m_ppmFtc->setSimulatedParticipantFormationRequest(req_SSPF, this);
 
     // expected condition:
     if (!waitForData([this]() { return m_replyError == false; }))
     {
-      ERROR_LOG() << "Error on request";
+      ERROR_LOG(m_logger) << "Error on request";
     }
   }
 
@@ -832,18 +832,18 @@ void ModuleTestExplosionCluster::setupParticipants()
     QString prop = QString(QStringLiteral("{\"angle\":0,\"distance\":25,\"distanceSets\":{\"Aufgelockert\":50,\"Geschlossen\":25},\"geometry\":\"line\"}"));
     req_SSPF.formation( prop.toStdString() );
 
-    INFO_LOG() << " SetSimulatedParticipantFormation ... req = " << req_SSPF ;
+    INFO_LOG(m_logger) << " SetSimulatedParticipantFormation ... req = " << req_SSPF ;
     m_replyError = true;
     m_ppmFtc->setSimulatedParticipantFormationRequest(req_SSPF, this);
 
     // expected condition:
     if (!waitForData([this]() { return m_replyError == false; }))
     {
-      ERROR_LOG() << "Error on request";
+      ERROR_LOG(m_logger) << "Error on request";
     }
   }
 
-  INFO_LOG() << " setSimulatedPositionRequest ...DONE";
+  INFO_LOG(m_logger) << " setSimulatedPositionRequest ...DONE";
 }
 
 bool ModuleTestExplosionCluster::checkParticipant_5()
@@ -852,7 +852,7 @@ bool ModuleTestExplosionCluster::checkParticipant_5()
   const int partId = 5;
   const ParticipantManagement::ParticipantPosition &pos = m_ppmDtc->participantPosition(partId);
   QString mgrsStr = LtsCoordTrans::mgrsFromGeographic(pos.pos().lon(), pos.pos().lat());
-  INFO_LOG() << " for partId = '" << partId << "', we got position: " << mgrsStr;
+  INFO_LOG(m_logger) << " for partId = '" << partId << "', we got position: " << mgrsStr;
 
   return mgrsStr == QStringLiteral("32U PD 76900 18000");
 }
@@ -863,7 +863,7 @@ bool ModuleTestExplosionCluster::checkParticipant_6()
   const int partId = 6;
   const ParticipantManagement::ParticipantPosition &pos = m_ppmDtc->participantPosition(partId);
   QString mgrsStr = LtsCoordTrans::mgrsFromGeographic(pos.pos().lon(), pos.pos().lat());
-  INFO_LOG() << " for partId = '" << partId << "', we got position: " << mgrsStr;
+  INFO_LOG(m_logger) << " for partId = '" << partId << "', we got position: " << mgrsStr;
 
   return mgrsStr == QStringLiteral("32U PD 76000 19000");
 }
@@ -877,12 +877,12 @@ bool ModuleTestExplosionCluster::checkParticipant_89()
   const LtsUtils::QPoint3D &centerCoordGeo = Polygons::calculateFiringUnitCenterNonRecursive(m_ppmDtc, partId, singlePositionsOut_unused, m_logger);
   if (centerCoordGeo.isNull() || std::isnan(centerCoordGeo.x()))
   {
-    WARNING_LOG() << Q_FUNC_INFO << " calculateFiringUnitCenterNonRecursive failed, partId = " << partId;
+    WARNING_LOG(m_logger) << Q_FUNC_INFO << " calculateFiringUnitCenterNonRecursive failed, partId = " << partId;
     return false;
   }
 
   QString mgrsStr = LtsCoordTrans::mgrsFromGeographic(centerCoordGeo.x(), centerCoordGeo.y());
-  INFO_LOG() << " for unit with partId = '" << partId << "', we got position: " << mgrsStr;
+  INFO_LOG(m_logger) << " for unit with partId = '" << partId << "', we got position: " << mgrsStr;
 
   return mgrsStr == QStringLiteral("32U PD 50000 18000");
 }
@@ -896,12 +896,12 @@ bool ModuleTestExplosionCluster::checkParticipant_99()
   const LtsUtils::QPoint3D &centerCoordGeo = Polygons::calculateFiringUnitCenterNonRecursive(m_ppmDtc, partId, singlePositionsOut_unused, m_logger);
   if (centerCoordGeo.isNull() || std::isnan(centerCoordGeo.x()))
   {
-    WARNING_LOG() << Q_FUNC_INFO << " calculateFiringUnitCenterNonRecursive failed, partId = " << partId;
+    WARNING_LOG(m_logger) << Q_FUNC_INFO << " calculateFiringUnitCenterNonRecursive failed, partId = " << partId;
     return false;
   }
 
   QString mgrsStr = LtsCoordTrans::mgrsFromGeographic(centerCoordGeo.x(), centerCoordGeo.y());
-  INFO_LOG() << " for unit with partId = '" << partId << "', we got position: " << mgrsStr;
+  INFO_LOG(m_logger) << " for unit with partId = '" << partId << "', we got position: " << mgrsStr;
 
   return mgrsStr == QStringLiteral("32U PD 01000 18000");
 }
@@ -954,7 +954,7 @@ void ModuleTestExplosionCluster::resetBldgs()
   for (int bldgId : std::as_const(bldgIds))
   {
     const ProjectDataManagement::VulnerabilityState& bldgState = m_bldDtc->buildingState(bldgId).vulnerabilityState();
-    INFO_LOG() << "resetBldgs: bldgId "  << bldgId
+    INFO_LOG(m_logger) << "resetBldgs: bldgId "  << bldgId
                          << ", state= " << bldgState
                          << ", bldgName= " << m_bldgIdToName[bldgId];
     QVERIFY2(bldgState.underlying()==ProjectDataManagement::VulnerabilityState_def::CombatReady, "ERROR, bldgState failed!!");
@@ -1016,14 +1016,14 @@ void ModuleTestExplosionCluster::initTestCase()
   QVERIFY2(bInit, "ERROR, ddsConnector.init failed!!");
   if (!bInit)
   {
-    ERROR_LOG() << " ERROR, ddsConnector.init failed!!";
+    ERROR_LOG(m_logger) << " ERROR, ddsConnector.init failed!!";
     return;
   }
-  INFO_LOG() << " ddsConnector.init successfull";
+  INFO_LOG(m_logger) << " ddsConnector.init successfull";
 
   // cmd
   m_ddsConnector->initPublisherSubscriber();
-  INFO_LOG() << " ddsConnector.initPublisherSubscriber done";
+  INFO_LOG(m_logger) << " ddsConnector.initPublisherSubscriber done";
 
   //
   // Aes
@@ -1215,16 +1215,16 @@ void ModuleTestExplosionCluster::test_TneVerificationBremen_00()
 
 
   double rot = 0;
-  INFO_LOG() << " TNE VERIFICATION: CHECK:" << " rot " << rot << ", rotSfmOrg " << compassToMathAngleForSfm(rot) << ", rotSfmPlus90 " << compassToMathAngleForSfm(rot+90);
+  INFO_LOG(m_logger) << " TNE VERIFICATION: CHECK:" << " rot " << rot << ", rotSfmOrg " << compassToMathAngleForSfm(rot) << ", rotSfmPlus90 " << compassToMathAngleForSfm(rot+90);
   rot = 1;
-  INFO_LOG() << " TNE VERIFICATION: CHECK:" << " rot " << rot << ", rotSfmOrg " << compassToMathAngleForSfm(rot) << ", rotSfmPlus90 " << compassToMathAngleForSfm(rot+90);
+  INFO_LOG(m_logger) << " TNE VERIFICATION: CHECK:" << " rot " << rot << ", rotSfmOrg " << compassToMathAngleForSfm(rot) << ", rotSfmPlus90 " << compassToMathAngleForSfm(rot+90);
   rot = 30;
-  INFO_LOG() << " TNE VERIFICATION: CHECK:" << " rot " << rot << ", rotSfmOrg " << compassToMathAngleForSfm(rot) << ", rotSfmPlus90 " << compassToMathAngleForSfm(rot+90);
+  INFO_LOG(m_logger) << " TNE VERIFICATION: CHECK:" << " rot " << rot << ", rotSfmOrg " << compassToMathAngleForSfm(rot) << ", rotSfmPlus90 " << compassToMathAngleForSfm(rot+90);
   rot = 60;
-  INFO_LOG() << " TNE VERIFICATION: CHECK:" << " rot " << rot << ", rotSfmOrg " << compassToMathAngleForSfm(rot) << ", rotSfmPlus90 " << compassToMathAngleForSfm(rot+90);
+  INFO_LOG(m_logger) << " TNE VERIFICATION: CHECK:" << " rot " << rot << ", rotSfmOrg " << compassToMathAngleForSfm(rot) << ", rotSfmPlus90 " << compassToMathAngleForSfm(rot+90);
 
   rot = -30;
-  INFO_LOG() << " TNE VERIFICATION: CHECK:" << " rot " << rot << ", rotSfmOrg " << compassToMathAngleForSfm(rot) << ", rotSfmPlus90 " << compassToMathAngleForSfm(rot+90);
+  INFO_LOG(m_logger) << " TNE VERIFICATION: CHECK:" << " rot " << rot << ", rotSfmOrg " << compassToMathAngleForSfm(rot) << ", rotSfmPlus90 " << compassToMathAngleForSfm(rot+90);
 }
 
 void ModuleTestExplosionCluster::test_TneVerificationBremen_01()
@@ -1259,7 +1259,7 @@ void ModuleTestExplosionCluster::test_TneVerificationBremen_01()
   QVERIFY2(mhPointsRef.size() == 1, "ERROR, mhPoints().size() failed!!");
 
   const LtsCoordTrans::UtmCoordinate &mhpUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(mhPointsRef.front().lon(), mhPointsRef.front().lat());
-  DEBUG_LOG() << " TNE VERIFICATION: mhpUtm = " << mhpUtm.mgrs();
+  DEBUG_LOG(m_logger) << " TNE VERIFICATION: mhpUtm = " << mhpUtm.mgrs();
   QVERIFY2(distanceMeter(mhPointsRef.front(), LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32U MD 97000 78000"))) < 1, "ERROR, mhPointsRef failed!!");
 
   //
@@ -1269,19 +1269,19 @@ void ModuleTestExplosionCluster::test_TneVerificationBremen_01()
   const int simId = m_data.id();
   AreaEffectSimulation::AesItemView itemView;
 
-  DEBUG_LOG() << " TNE VERIFICATION: simId = " << simId;
+  DEBUG_LOG(m_logger) << " TNE VERIFICATION: simId = " << simId;
 
   const bool bFound = m_aesDtc->aesItemViewFromEntityId(simId, AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions, itemView);
 
   QVERIFY2(bFound, "ERROR,aesItemViewFromEntityId failed!!");
   QVERIFY2(itemView.aesItemId() == simId, "ERROR,aesItemViewFromEntityId failed!!");
 
-  INFO_LOG() << " ddsConnector.initPublisherSubscriber done";
+  INFO_LOG(m_logger) << " ddsConnector.initPublisherSubscriber done";
 
   const double rot = m_data.area().rotation();
   const double rotSfmOrg = compassToMathAngleForSfm(rot);
   const double rotSfmPlus90 = compassToMathAngleForSfm(rot+90);
-  INFO_LOG() << " TNE VERIFICATION: CHECK:"
+  INFO_LOG(m_logger) << " TNE VERIFICATION: CHECK:"
                      << " randomNumber = ????????"
                      << ", width=" << m_data.area().width()
                      << ", height=" << m_data.area().height()
@@ -1295,7 +1295,7 @@ void ModuleTestExplosionCluster::test_TneVerificationBremen_01()
   for (const Core::GeoPosition &geoCoord : std::as_const(formRef))
   {
     const LtsCoordTrans::UtmCoordinate &utm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoCoord.lon(), geoCoord.lat());
-    INFO_LOG() << " TNE VERIFICATION: CHECK:" << " utm: " << utm.mgrs() << ", item=" << geoCoord;
+    INFO_LOG(m_logger) << " TNE VERIFICATION: CHECK:" << " utm: " << utm.mgrs() << ", item=" << geoCoord;
   }
 
   size_t i = 0;
@@ -1358,7 +1358,7 @@ void ModuleTestExplosionCluster::test_TneVerificationBremen_02()
   QVERIFY2(mhPointsRef.size() == 1, "ERROR, mhPoints().size() failed!!");
 
   const LtsCoordTrans::UtmCoordinate &mhpUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(mhPointsRef.front().lon(), mhPointsRef.front().lat());
-  DEBUG_LOG() << " TNE VERIFICATION: mhpUtm = " << mhpUtm.mgrs();
+  DEBUG_LOG(m_logger) << " TNE VERIFICATION: mhpUtm = " << mhpUtm.mgrs();
   QVERIFY2(distanceMeter(mhPointsRef.front(), LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32U MD 97000 78000"))) < 1, "ERROR, mhPointsRef failed!!");
 
   //
@@ -1368,19 +1368,19 @@ void ModuleTestExplosionCluster::test_TneVerificationBremen_02()
   const int simId = m_data.id();
   AreaEffectSimulation::AesItemView itemView;
 
-  DEBUG_LOG() << " TNE VERIFICATION: simId = " << simId;
+  DEBUG_LOG(m_logger) << " TNE VERIFICATION: simId = " << simId;
 
   const bool bFound = m_aesDtc->aesItemViewFromEntityId(simId, AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions, itemView);
 
   QVERIFY2(bFound, "ERROR,aesItemViewFromEntityId failed!!");
   QVERIFY2(itemView.aesItemId() == simId, "ERROR,aesItemViewFromEntityId failed!!");
 
-  INFO_LOG() << " ddsConnector.initPublisherSubscriber done";
+  INFO_LOG(m_logger) << " ddsConnector.initPublisherSubscriber done";
 
   const double rot = m_data.area().rotation();
   const double rotSfmOrg = compassToMathAngleForSfm(rot);
   const double rotSfmPlus90 = compassToMathAngleForSfm(rot+90);
-  INFO_LOG() << " TNE VERIFICATION: CHECK:"
+  INFO_LOG(m_logger) << " TNE VERIFICATION: CHECK:"
                      << " randomNumber = ????????"
                      << ", width=" << m_data.area().width()
                      << ", height=" << m_data.area().height()
@@ -1394,7 +1394,7 @@ void ModuleTestExplosionCluster::test_TneVerificationBremen_02()
   for (const Core::GeoPosition &geoCoord : std::as_const(formRef))
   {
     const LtsCoordTrans::UtmCoordinate &utm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoCoord.lon(), geoCoord.lat());
-    INFO_LOG() << " TNE VERIFICATION: CHECK:" << " utm: " << utm.mgrs() << ", item=" << geoCoord;
+    INFO_LOG(m_logger) << " TNE VERIFICATION: CHECK:" << " utm: " << utm.mgrs() << ", item=" << geoCoord;
   }
 
   size_t i = 0;
@@ -1960,14 +1960,14 @@ void ModuleTestExplosionCluster::test_remove_effect_start()
   // expected condition:
   if (!waitForData([this]() { return m_replyError == false; }, 1))
   {
-    ERROR_LOG() << "Error on request";
+    ERROR_LOG(m_logger) << "Error on request";
     return;
   }
 
-  INFO_LOG() << Q_FUNC_INFO << "  waiting for EsPrepared...";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << "  waiting for EsPrepared...";
   if (!waitForData([this]() { return m_data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsPrepared;}, 2))
   {
-    ERROR_LOG() << "Timeout waiting for EsPrepared of explosion cluster with id " << m_data.id();
+    ERROR_LOG(m_logger) << "Timeout waiting for EsPrepared of explosion cluster with id " << m_data.id();
     return;
   }
 
@@ -1991,15 +1991,15 @@ void ModuleTestExplosionCluster::test_remove_effect_start()
 
   }
 
-  INFO_LOG() << Q_FUNC_INFO << "  waiting to make sure, that next step is never reached:";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << "  waiting to make sure, that next step is never reached:";
   if (waitForData([this]() { return m_data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated;}, 60))
   {
-    ERROR_LOG() << "Next step is accidentically reached of explosion cluster with id " << m_data.id();
+    ERROR_LOG(m_logger) << "Next step is accidentically reached of explosion cluster with id " << m_data.id();
     QVERIFY2(false, "ERROR, exit");
     return;
   }
 
-  INFO_LOG() << Q_FUNC_INFO << " object effectState: " << m_data.effectStateId();
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " object effectState: " << m_data.effectStateId();
   QVERIFY2(m_data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsCreated, "ERROR, ExplosionCluster in wrong state");
   dumpCnt();
 
@@ -2298,7 +2298,7 @@ void ModuleTestExplosionCluster:: test_point_geometry_bldg_1104_single_effect_on
 
   const QPointF impactPointF(0.20256382834808495, 0.9161105453111705);
   request.impactPosition(Core::GeoPosition2D(impactPointF.x(), impactPointF.y()));
-  INFO_LOG() << Q_FUNC_INFO << " requested impact position = " << LtsCoordTrans::UtmCoordinate::fromGeographic(impactPointF).mgrs();
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " requested impact position = " << LtsCoordTrans::UtmCoordinate::fromGeographic(impactPointF).mgrs();
 
   request.chargeTypeId(371);
   request.externalId(815);
@@ -2701,9 +2701,9 @@ void ModuleTestExplosionCluster::cleanupTestCase()
   // finish last (dds) calls:
   waitForData([]() { return false; }, 10);
 
-  INFO_LOG() << " ddsConnector destroy...";
+  INFO_LOG(m_logger) << " ddsConnector destroy...";
   m_ddsConnector.reset();
-  INFO_LOG() << " ddsConnector destroy...DONE";
+  INFO_LOG(m_logger) << " ddsConnector destroy...DONE";
 }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_ExplosionCluster/explosion_cluster_module_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_ExplosionCluster/explosion_cluster_module_test.h
index 076b7a6c0..71fcce2d1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_ExplosionCluster/explosion_cluster_module_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_ExplosionCluster/explosion_cluster_module_test.h
@@ -59,6 +59,8 @@ public:
   ModuleTestExplosionCluster(int domainId, int exerciseId);
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void onSetSimulatedPositionReply(const Core::FunctionReplyObject &replyObject) override;
   void onSetSimulatedParticipantFormationReply(const Core::FunctionReplyObject &replyObject) override;
   void onExplosionClusterModifyReply(const Core::FunctionReplyObject &replyObject) override;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.cpp
index 24ff43aa7..85762ca14 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.cpp
@@ -596,7 +596,7 @@ bool ModuleTestLimits::waitForData(const std::function<bool ()> &func, int retry
 
   for (int i = 0; i < retryCount; ++i)
   {
-    TRACE_LOG() << " waitForData - i: " << i;
+    TRACE_LOG(m_logger) << " waitForData - i: " << i;
     if (func())
       return true;
     QTest::qWait(100);
@@ -860,14 +860,14 @@ void ModuleTestLimits::initTestCase()
   QVERIFY2(bInit, "ERROR, ddsConnector.init failed!!");
   if (!bInit)
   {
-    ERROR_LOG() << " ERROR, ddsConnector.init failed!!";
+    ERROR_LOG(m_logger) << " ERROR, ddsConnector.init failed!!";
     return;
   }
-  INFO_LOG() << " ddsConnector.init successfull";
+  INFO_LOG(m_logger) << " ddsConnector.init successfull";
 
   // cmd
   m_ddsConnector->initPublisherSubscriber();
-  INFO_LOG() << " ddsConnector.initPublisherSubscriber done";
+  INFO_LOG(m_logger) << " ddsConnector.initPublisherSubscriber done";
 
   //
   // Aes
@@ -1126,9 +1126,9 @@ void ModuleTestLimits::cleanupTestCase()
   // finish last (dds) calls:
   waitForData([]() { return false; }, 10);
 
-  INFO_LOG() << " ddsConnector destroy...";
+  INFO_LOG(m_logger) << " ddsConnector destroy...";
   m_ddsConnector.reset();
-  INFO_LOG() << " ddsConnector destroy...DONE";
+  INFO_LOG(m_logger) << " ddsConnector destroy...DONE";
 }
 
 /*!
@@ -1147,14 +1147,14 @@ void ModuleTestLimits::setupParticipant()
   req.onlyOutdatedParticipants(false);
   req.position(Core::GeoPosition(m_partPos.lon(), m_partPos.lat(), 0.0));
 
-  INFO_LOG() << " setSimulatedPositionRequest ...";
+  INFO_LOG(m_logger) << " setSimulatedPositionRequest ...";
   m_replyError = true;
   m_ppmFtc->setSimulatedPositionRequest(req, this);
 
   // expected condition:
   if (!waitForData([this]() { return !m_replyError; }))
   {
-    ERROR_LOG() << "Error on request";
+    ERROR_LOG(m_logger) << "Error on request";
   }
 
   QVERIFY2(m_replyError == false, "ERROR, setupParticipant failed");
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.h
index 86eb2a485..7879861ee 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.h
@@ -242,9 +242,9 @@ public:
   void onSetSimulatedPositionReply(const Core::FunctionReplyObject &reply) override
   {
     m_replyError = reply.error();
-    DEBUG_LOG() << " got reply - onSetSimulatedPositionReply : " << m_replyError;
+    DEBUG_LOG(m_logger) << " got reply - onSetSimulatedPositionReply : " << m_replyError;
     if (!reply.str().empty())
-      ERROR_LOG() << " got reply - onExplosionClusterModifyReply: " << reply.translated();
+      ERROR_LOG(m_logger) << " got reply - onExplosionClusterModifyReply: " << reply.translated();
   }
 
   // ChargeAdministrationModifyReplyHandler interface
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 3f617f566..ee2c912a0 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
@@ -79,39 +79,39 @@ ModuleTestAesOthers::ModuleTestAesOthers(int domainId, int exerciseId)
 void ModuleTestAesOthers::onSetSimulatedPositionReply(const Core::FunctionReplyObject &replyObject)
 {
   m_replyError = replyObject.error();
-  DEBUG_LOG() << " got reply - onSetSimulatedPositionReply : " << m_replyError;
+  DEBUG_LOG(m_logger) << " got reply - onSetSimulatedPositionReply : " << m_replyError;
   if (!replyObject.str().empty())
-    ERROR_LOG() << " got reply - onExplosionClusterModifyReply: " << replyObject.translated();
+    ERROR_LOG(m_logger) << " got reply - onExplosionClusterModifyReply: " << replyObject.translated();
 }
 
 void ModuleTestAesOthers::onBoobyTrapModifyReply(const Core::FunctionReplyObject &replyObject)
 {
   m_replyError = replyObject.error();
-  DEBUG_LOG() << " got reply - onBoobyTrapModifyReply : " << m_replyError;
+  DEBUG_LOG(m_logger) << " got reply - onBoobyTrapModifyReply : " << m_replyError;
   if (!replyObject.str().empty())
-    ERROR_LOG() << " got reply - onBoobyTrapModifyReply: " << replyObject.translated();
+    ERROR_LOG(m_logger) << " got reply - onBoobyTrapModifyReply: " << replyObject.translated();
 }
 
 void ModuleTestAesOthers::onBoobyTrapRemoveReply(const Core::FunctionReplyObject &replyObject)
 {
-  DEBUG_LOG() << " got reply - onBoobyTrapRemoveReply : " << m_replyError;
+  DEBUG_LOG(m_logger) << " got reply - onBoobyTrapRemoveReply : " << m_replyError;
   if (!replyObject.str().empty())
-    ERROR_LOG() << " got reply - onBoobyTrapRemoveReply: " << replyObject.translated();
+    ERROR_LOG(m_logger) << " got reply - onBoobyTrapRemoveReply: " << replyObject.translated();
 }
 
 void ModuleTestAesOthers::onOffRouteMineModifyReply(const Core::FunctionReplyObject &replyObject)
 {
   m_replyError = replyObject.error();
-  DEBUG_LOG() << " got reply - onOffRouteMineModifyReply : " << m_replyError;
+  DEBUG_LOG(m_logger) << " got reply - onOffRouteMineModifyReply : " << m_replyError;
   if (!replyObject.str().empty())
-    ERROR_LOG() << " got reply - onOffRouteMineModifyReply: " << replyObject.translated();
+    ERROR_LOG(m_logger) << " got reply - onOffRouteMineModifyReply: " << replyObject.translated();
 }
 
 void ModuleTestAesOthers::onOffRouteMineRemoveReply(const Core::FunctionReplyObject &replyObject)
 {
-  DEBUG_LOG() << " got reply - onOffRouteMineRemoveReply : " << m_replyError;
+  DEBUG_LOG(m_logger) << " got reply - onOffRouteMineRemoveReply : " << m_replyError;
   if (!replyObject.str().empty())
-    ERROR_LOG() << " got reply - onOffRouteMineRemoveReply: " << replyObject.translated();
+    ERROR_LOG(m_logger) << " got reply - onOffRouteMineRemoveReply: " << replyObject.translated();
 }
 
 
@@ -128,10 +128,10 @@ void ModuleTestAesOthers::boobyTrapChanged(const BoobyTrap &data, DataModificati
   if (m_dataBoobyTrap.effectStart().is_set())
     startTimeMsec = m_dataBoobyTrap.effectStart().get();
 
-  DEBUG_LOG() << " got changed - m_dataBoobyTrap: " << m_dataBoobyTrap.id() << ", state=" << m_dataBoobyTrap.effectStateId()
+  DEBUG_LOG(m_logger) << " got changed - m_dataBoobyTrap: " << m_dataBoobyTrap.id() << ", state=" << m_dataBoobyTrap.effectStateId()
                       << ", startTimeMsec=" << startTimeMsec
                       << ", cntBoobyTrap=" << m_counterDds.cntBoobyTrap;
-  TRACE_LOG() << " got changed - m_dataBoobyTrap: " << m_dataBoobyTrap;
+  TRACE_LOG(m_logger) << " got changed - m_dataBoobyTrap: " << m_dataBoobyTrap;
 }
 
 void ModuleTestAesOthers::offRouteMineChanged(const OffRouteMine &data, DataModification modType)
@@ -147,10 +147,10 @@ void ModuleTestAesOthers::offRouteMineChanged(const OffRouteMine &data, DataModi
   if (m_dataOffRouteMine.effectStart().is_set())
     startTimeMsec = m_dataOffRouteMine.effectStart().get();
 
-  DEBUG_LOG() << " got changed - m_dataOffRouteMine: " << m_dataOffRouteMine.id() << ", state=" << m_dataOffRouteMine.effectStateId()
+  DEBUG_LOG(m_logger) << " got changed - m_dataOffRouteMine: " << m_dataOffRouteMine.id() << ", state=" << m_dataOffRouteMine.effectStateId()
                       << ", startTimeMsec=" << startTimeMsec
                       << ", cntOffRouteMine=" << m_counterDds.cntOffRouteMine;
-  TRACE_LOG() << " got changed - m_dataOffRouteMine: " << m_dataOffRouteMine;
+  TRACE_LOG(m_logger) << " got changed - m_dataOffRouteMine: " << m_dataOffRouteMine;
 }
 
 
@@ -160,7 +160,7 @@ void ModuleTestAesOthers::onAesItemViewChanged(const AesItemView &aesItemView, D
     return;
 
   AreaEffectSimulation::AesType_def::type aesType = aesItemView.aesTypeId().underlying();
-  DEBUG_LOG() << " got onAesItemViewChanged, aesType=" << aesType;
+  DEBUG_LOG(m_logger) << " got onAesItemViewChanged, aesType=" << aesType;
 
   switch (aesType)
   {
@@ -197,7 +197,7 @@ bool ModuleTestAesOthers::waitForData(const std::function<bool ()> &func, int re
 
   for (int i = 0; i < retryCount; ++i)
   {
-    DEBUG_LOG() << " waitForData - i: " << i;
+    DEBUG_LOG(m_logger) << " waitForData - i: " << i;
     if (func())
       return true;
     QTest::qWait(100);
@@ -210,23 +210,23 @@ void ModuleTestAesOthers::waitForEffectStatesBT(int lineNumber, int durPrep, int
   // expected condition:
   if (!waitForData([this]() { return m_replyError == false; }, 1))
   {
-    ERROR_LOG() << "Error on request" << ", lineNumber = " << lineNumber;
+    ERROR_LOG(m_logger) << "Error on request" << ", lineNumber = " << lineNumber;
     return;
   }
 
-  INFO_LOG() << Q_FUNC_INFO << "  waiting for EsPrepared...";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << "  waiting for EsPrepared...";
   if (!waitForData([this]() { return m_dataBoobyTrap.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsPrepared;}, durPrep))
   {
-    ERROR_LOG() << "Timeout waiting for EsPrepared of m_dataBoobyTrap with id " << m_dataBoobyTrap.id()
+    ERROR_LOG(m_logger) << "Timeout waiting for EsPrepared of m_dataBoobyTrap with id " << m_dataBoobyTrap.id()
                         << ", lineNumber = " << lineNumber;
     QVERIFY2(false, "ERROR, exit");
     return;
   }
 
-  INFO_LOG() << Q_FUNC_INFO << "  waiting for EsActivated...";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << "  waiting for EsActivated...";
   if (!waitForData([this]() { return m_dataBoobyTrap.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated;}, durAct))
   {
-    ERROR_LOG() << "Timeout waiting for EsActivated of m_dataBoobyTrapr with id " << m_dataBoobyTrap.id()
+    ERROR_LOG(m_logger) << "Timeout waiting for EsActivated of m_dataBoobyTrapr with id " << m_dataBoobyTrap.id()
                         << ", lineNumber = " << lineNumber;
     QVERIFY2(false, "ERROR, exit");
     return;
@@ -234,10 +234,10 @@ void ModuleTestAesOthers::waitForEffectStatesBT(int lineNumber, int durPrep, int
 
   if (durExp > 0)
   {
-    INFO_LOG() << Q_FUNC_INFO << "  waiting for EsExpired...";
+    INFO_LOG(m_logger) << Q_FUNC_INFO << "  waiting for EsExpired...";
     if (!waitForData([this]() { return m_dataBoobyTrap.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired;}, durExp))
     {
-      ERROR_LOG() << "Timeout waiting for EsExpired of m_dataBoobyTrap with id " << m_dataBoobyTrap.id()
+      ERROR_LOG(m_logger) << "Timeout waiting for EsExpired of m_dataBoobyTrap with id " << m_dataBoobyTrap.id()
                           << ", lineNumber = " << lineNumber;
       QVERIFY2(false, "ERROR, exit");
       return;
@@ -250,23 +250,23 @@ void ModuleTestAesOthers::waitForEffectStatesORM(int lineNumber, int durPrep, in
   // expected condition:
   if (!waitForData([this]() { return m_replyError == false; }, 1))
   {
-    ERROR_LOG() << "Error on request" << ", lineNumber = " << lineNumber;
+    ERROR_LOG(m_logger) << "Error on request" << ", lineNumber = " << lineNumber;
     return;
   }
 
-  INFO_LOG() << Q_FUNC_INFO << "  waiting for EsPrepared...";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << "  waiting for EsPrepared...";
   if (!waitForData([this]() { return m_dataOffRouteMine.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsPrepared;}, durPrep))
   {
-    ERROR_LOG() << "Timeout waiting for EsPrepared of m_dataOffRouteMine with id " << m_dataOffRouteMine.id()
+    ERROR_LOG(m_logger) << "Timeout waiting for EsPrepared of m_dataOffRouteMine with id " << m_dataOffRouteMine.id()
                         << ", lineNumber = " << lineNumber;
     QVERIFY2(false, "ERROR, exit");
     return;
   }
 
-  INFO_LOG() << Q_FUNC_INFO << "  waiting for EsActivated...";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << "  waiting for EsActivated...";
   if (!waitForData([this]() { return m_dataOffRouteMine.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated;}, durAct))
   {
-    ERROR_LOG() << "Timeout waiting for EsActivated of m_dataOffRouteMine with id " << m_dataOffRouteMine.id()
+    ERROR_LOG(m_logger) << "Timeout waiting for EsActivated of m_dataOffRouteMine with id " << m_dataOffRouteMine.id()
                         << ", lineNumber = " << lineNumber;
     QVERIFY2(false, "ERROR, exit");
     return;
@@ -274,10 +274,10 @@ void ModuleTestAesOthers::waitForEffectStatesORM(int lineNumber, int durPrep, in
 
   if (durExp > 0)
   {
-    INFO_LOG() << Q_FUNC_INFO << "  waiting for EsExpired...";
+    INFO_LOG(m_logger) << Q_FUNC_INFO << "  waiting for EsExpired...";
     if (!waitForData([this]() { return m_dataOffRouteMine.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired;}, durExp))
     {
-      ERROR_LOG() << "Timeout waiting for EsExpired of m_dataOffRouteMine with id " << m_dataOffRouteMine.id()
+      ERROR_LOG(m_logger) << "Timeout waiting for EsExpired of m_dataOffRouteMine with id " << m_dataOffRouteMine.id()
                           << ", lineNumber = " << lineNumber;
       QVERIFY2(false, "ERROR, exit");
       return;
@@ -288,7 +288,7 @@ void ModuleTestAesOthers::waitForEffectStatesORM(int lineNumber, int durPrep, in
 
 void ModuleTestAesOthers::setupParticipants()
 {
-  INFO_LOG() << " setupParticipant ...";
+  INFO_LOG(m_logger) << " setupParticipant ...";
 
   QVERIFY2(m_ppmFtc, "ERROR, no m_ppmFtc");
 
@@ -304,18 +304,18 @@ void ModuleTestAesOthers::setupParticipants()
       QPointF pos = utmPos.geographic();
       req.position(Core::GeoPosition(pos.x(), pos.y(), 0.0));
 
-      INFO_LOG() << " setSimulatedPositionRequest ...";
+      INFO_LOG(m_logger) << " setSimulatedPositionRequest ...";
       m_replyError = true;
       m_ppmFtc->setSimulatedPositionRequest(req, this);
 
       // expected condition:
       if (!waitForData([this]() { return m_replyError == false; }))
       {
-        ERROR_LOG() << "Error on request";
+        ERROR_LOG(m_logger) << "Error on request";
       }
     }
   }
-  INFO_LOG() << " setSimulatedPositionRequest ...DONE";
+  INFO_LOG(m_logger) << " setSimulatedPositionRequest ...DONE";
 }
 
 bool ModuleTestAesOthers::checkParticipant_18()
@@ -324,7 +324,7 @@ bool ModuleTestAesOthers::checkParticipant_18()
   const int partId = 18;
   const ParticipantManagement::ParticipantPosition &pos = m_ppmDtc->participantPosition(partId);
   QString mgrsStr = LtsCoordTrans::mgrsFromGeographic(pos.pos().lon(), pos.pos().lat());
-  INFO_LOG() << " for partId = '" << partId << "', we got position: " << mgrsStr;
+  INFO_LOG(m_logger) << " for partId = '" << partId << "', we got position: " << mgrsStr;
 
   return mgrsStr == QStringLiteral("32U PD 76900 18100");
 }
@@ -392,17 +392,17 @@ int ModuleTestAesOthers::doMoveParticipant(int participantId, const QString &new
     QPointF pos = utmPos.geographic();
     req.position(Core::GeoPosition(pos.x(), pos.y(), 0.0));
 
-    INFO_LOG() << " setSimulatedPositionRequest ...";
+    INFO_LOG(m_logger) << " setSimulatedPositionRequest ...";
     m_replyError = true;
     m_ppmFtc->setSimulatedPositionRequest(req, this);
 
     // expected condition:
     if (!waitForData([this]() { return m_replyError == false; }))
     {
-      ERROR_LOG() << "Error on request";
+      ERROR_LOG(m_logger) << "Error on request";
     }
   }
-  INFO_LOG() << " doMoveParticipant ...DONE";
+  INFO_LOG(m_logger) << " doMoveParticipant ...DONE";
   return true;
 }
 
@@ -423,14 +423,14 @@ void ModuleTestAesOthers::initTestCase()
   QVERIFY2(bInit, "ERROR, ddsConnector.init failed!!");
   if (!bInit)
   {
-    ERROR_LOG() << " ERROR, ddsConnector.init failed!!";
+    ERROR_LOG(m_logger) << " ERROR, ddsConnector.init failed!!";
     return;
   }
-  INFO_LOG() << " ddsConnector.init successfull";
+  INFO_LOG(m_logger) << " ddsConnector.init successfull";
 
   // cmd
   m_ddsConnector->initPublisherSubscriber();
-  INFO_LOG() << " ddsConnector.initPublisherSubscriber done";
+  INFO_LOG(m_logger) << " ddsConnector.initPublisherSubscriber done";
 
   //
   // Aes
@@ -610,7 +610,7 @@ void ModuleTestAesOthers::test_boobyTrap_02_IMPL(const QString &name,
     return;
   }
 
-  INFO_LOG() << Q_FUNC_INFO << " START, m_traingAreaId = " << m_traingAreaId
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " START, m_traingAreaId = " << m_traingAreaId
                      << ", name =" << name << "'"
                      << ", impactCoord= " << impactCoord.mgrs()
                      << ", rotationAngle = " << rotationAngle
@@ -666,7 +666,7 @@ void ModuleTestAesOthers::test_boobyTrap_02_IMPL(const QString &name,
 
   // wait to let it disappear:
   waitForData([]() { return false; }, 15);
-  INFO_LOG() << Q_FUNC_INFO << " END"
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " END"
                      << ", name =" << name << "'"
                      << ", impactCoord= " << impactCoord.mgrs()
                      << ", rotationAngle = " << rotationAngle
@@ -713,7 +713,7 @@ void ModuleTestAesOthers::test_offRouteMine_02()
     return;
   }
 
-  INFO_LOG() << Q_FUNC_INFO << " START, m_traingAreaId = " << m_traingAreaId;
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " START, m_traingAreaId = " << m_traingAreaId;
 
   QVERIFY2(checkParticipant_18(), "ERROR, checkParticipant_5 failed!!");
 
@@ -767,7 +767,7 @@ void ModuleTestAesOthers::test_offRouteMine_02()
 
   // wait to let it disappear:
   waitForData([]() { return false; }, 15);
-  INFO_LOG() << Q_FUNC_INFO << " END" << ", name =" << orm.name() << "'";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " END" << ", name =" << orm.name() << "'";
 }
 
 void ModuleTestAesOthers::cleanupTestCase()
@@ -775,9 +775,9 @@ void ModuleTestAesOthers::cleanupTestCase()
   // finish last (dds) calls:
   waitForData([]() { return false; }, 10);
 
-  INFO_LOG() << " ddsConnector destroy...";
+  INFO_LOG(m_logger) << " ddsConnector destroy...";
   m_ddsConnector.reset();
-  INFO_LOG() << " ddsConnector destroy...DONE";
+  INFO_LOG(m_logger) << " ddsConnector destroy...DONE";
 }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_others/aes_others_module_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_others/aes_others_module_test.h
index 504ac1af2..e6e95c287 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_others/aes_others_module_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_others/aes_others_module_test.h
@@ -54,6 +54,8 @@ public:
   ModuleTestAesOthers(int domainId, int exerciseId);
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void onSetSimulatedPositionReply(const Core::FunctionReplyObject &replyObject) override;
 
   void onBoobyTrapModifyReply(const Core::FunctionReplyObject &replyObject) override;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_convert_mine_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_convert_mine_area.cpp
index b1ff4c534..e0923ca03 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_convert_mine_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_convert_mine_area.cpp
@@ -54,11 +54,11 @@ bool ConvertMineArea::init(int exerciseId)
 
   if (!ok)
   {
-    ERROR_LOG() << "Error opening db, exiting..";
+    ERROR_LOG(m_logger) << "Error opening db, exiting..";
     return false;
   }
 
-  ERROR_LOG() << "Database open";
+  ERROR_LOG(m_logger) << "Database open";
 
   return true;
 }
@@ -81,15 +81,15 @@ bool ConvertMineArea::initDBInternal()
   QSqlDriver *driver = m_dbConnection.driver();
   if (!driver)
   {
-    WARNING_LOG() << "No SQL driver loaded - no database available!";
+    WARNING_LOG(m_logger) << "No SQL driver loaded - no database available!";
     return false;
   }
   const QString driverName = m_dbConnection.driverName();
-  DEBUG_LOG() << "Connected to database " << m_dbConnection.databaseName() << "@" << m_dbConnection.hostName()
+  DEBUG_LOG(m_logger) << "Connected to database " << m_dbConnection.databaseName() << "@" << m_dbConnection.hostName()
                       << ", schema: " << schemaName() << ", used driver: " << driverName;
   if (!m_dbConnection.isOpen())
   {
-    WARNING_LOG() << "Database connection is no open - can not initialize database interface";
+    WARNING_LOG(m_logger) << "Database connection is no open - can not initialize database interface";
     return false;
   }
   if (driverName == QLatin1String("QSQLITE"))
@@ -189,9 +189,9 @@ bool ConvertMineArea::tryConvertMineArea()
 
      data.endPosition = endPositionUtm.geographic();
 
-     DEBUG_LOG() << "aesId: " << data.mineAreaId << ", id: " << data.id;
-     DEBUG_LOG() << "EndpositionUtm: x: " << endPositionUtm.x << ", y: " << endPositionUtm.y;
-     DEBUG_LOG() << "Geographic: x: " << data.endPosition.x() << " y: " << data.endPosition.y();
+     DEBUG_LOG(m_logger) << "aesId: " << data.mineAreaId << ", id: " << data.id;
+     DEBUG_LOG(m_logger) << "EndpositionUtm: x: " << endPositionUtm.x << ", y: " << endPositionUtm.y;
+     DEBUG_LOG(m_logger) << "Geographic: x: " << data.endPosition.x() << " y: " << data.endPosition.y();
 
      vecMineArea.append(data);
    }
@@ -204,7 +204,7 @@ bool ConvertMineArea::tryConvertMineArea()
    if (!m_query->prepare(stmt3))
    {
      m_lastError = m_query->lastError();
-     ERROR_LOG() <<  "lastError: " << m_lastError.text();
+     ERROR_LOG(m_logger) <<  "lastError: " << m_lastError.text();
      return false;
    }
    for ( const Database::AesMineAreaSegment &mineAreaSegment : vecMineArea)
@@ -216,7 +216,7 @@ bool ConvertMineArea::tryConvertMineArea()
      if (!m_query->exec(m_bEmitMessageOnError))
      {
        m_lastError = m_query->lastError();
-       ERROR_LOG() <<  "lastError: " << m_lastError.text();
+       ERROR_LOG(m_logger) <<  "lastError: " << m_lastError.text();
 
        return false;
      }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_convert_mine_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_convert_mine_area.h
index 18a635fd5..6cf673d17 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_convert_mine_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_convert_mine_area.h
@@ -47,6 +47,8 @@ public:
   QSqlError getLastError() const;
 
 private:
+
+NGL::INGLLogger &m_logger;
   QSqlDatabase m_dbConnection;
   NSqlQuery *m_query;
   QSqlError m_lastError;
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 7db290ffc..2f40badbb 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
@@ -29,7 +29,7 @@ TestBase::TestBase(const char *loggerName, QObject *parent)
 
 bool TestBase::init(int domainId, int exerciseId, int testId)
 {
-  INFO_LOG() << "init begin";
+  INFO_LOG(m_logger) << "init begin";
   m_testId = testId;
 
   // initialize DDS
@@ -38,15 +38,15 @@ bool TestBase::init(int domainId, int exerciseId, int testId)
     return false;
   m_ddsConnector->initPublisherSubscriber();
 
-  INFO_LOG() << "init create ftc";
+  INFO_LOG(m_logger) << "init create ftc";
   m_ftc = AreaEffectSimulation::Interface::Ftc::create(m_ddsConnector);
-  INFO_LOG() << "init init ftc";
+  INFO_LOG(m_logger) << "init init ftc";
   bool bRet = m_ftc->enableAll();
 
   m_dtc = AreaEffectSimulation::Interface::Dtc::create(m_ddsConnector);
   bRet = bRet && m_dtc->enableAll();
 
-  INFO_LOG() << "init end - bRet = " << bRet;
+  INFO_LOG(m_logger) << "init end - bRet = " << bRet;
   return bRet;
 }
 
@@ -67,27 +67,27 @@ bool TestBase::checkAesItem(const AreaEffectSimulation::AesItem &a,
 {
   if (a.name() != b.name())
   {
-    WARNING_LOG() << "name does not match: " << a.name() << " - " << b.name();
+    WARNING_LOG(m_logger) << "name does not match: " << a.name() << " - " << b.name();
     return false;
   }
   if (a.effectStart() != b.effectStart())
   {
-    WARNING_LOG() << "effectStart does not match: " << a.effectStart() << " - " << b.effectStart();
+    WARNING_LOG(m_logger) << "effectStart does not match: " << a.effectStart() << " - " << b.effectStart();
     return false;
   }
   if (a.chargeStruct().chargeTypeId() != b.chargeStruct().chargeTypeId())
   {
-    WARNING_LOG() << "chargeTypeId does not match: " << a.chargeStruct().chargeTypeId() << " - " << b.chargeStruct().chargeTypeId();
+    WARNING_LOG(m_logger) << "chargeTypeId does not match: " << a.chargeStruct().chargeTypeId() << " - " << b.chargeStruct().chargeTypeId();
     return false;
   }
   if (a.partyId() != b.partyId())
   {
-    WARNING_LOG() << "partyId does not match: " << a.partyId() << " - " << b.partyId();
+    WARNING_LOG(m_logger) << "partyId does not match: " << a.partyId() << " - " << b.partyId();
     return false;
   }
   if (a.participantId() != b.participantId())
   {
-    WARNING_LOG() << "participantId does not match: " << a.participantId() << " - " << b.participantId();
+    WARNING_LOG(m_logger) << "participantId does not match: " << a.participantId() << " - " << b.participantId();
     return false;
   }
   return true;
@@ -95,19 +95,19 @@ bool TestBase::checkAesItem(const AreaEffectSimulation::AesItem &a,
 
 void TestBase::failExit()
 {
-  ERROR_LOG() << "fail exit!";
+  ERROR_LOG(m_logger) << "fail exit!";
   m_bTestsSuccessful = false;
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
 
 void TestBase::onAesCreateReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got create " << m_aesTypeName << " reply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got create " << m_aesTypeName << " reply with id " << replyObject.id()
                      << ", error = " << replyObject.error()
                      << " and errorString = '" << replyObject.translated() << "'";
   m_replyError = replyObject.error();
   if (m_replyError && !m_bExpectedFailure)
-      ERROR_LOG() << "Got create " << m_aesTypeName << " reply error: " << replyObject();
+      ERROR_LOG(m_logger) << "Got create " << m_aesTypeName << " reply error: " << replyObject();
   else
     m_expectedAesId = replyObject.id(); // only works as expected because reply is sent before publishing data occours
 }
@@ -116,34 +116,34 @@ void TestBase::onAesModifyReply(const Core::FunctionReplyObject &replyObject)
 {
   if (m_expectedAesId != replyObject.id())
     return;
-  INFO_LOG() << "Got modify " << m_aesTypeName << " reply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got modify " << m_aesTypeName << " reply with id " << replyObject.id()
                      << ", error = " << replyObject.error()
                      << " and errorString = '" << replyObject.translated() << "'";
   m_replyError = replyObject.error();
   if (m_replyError && !m_bExpectedFailure)
-    ERROR_LOG() << "Got modify " << m_aesTypeName << " reply error: " << replyObject();
+    ERROR_LOG(m_logger) << "Got modify " << m_aesTypeName << " reply error: " << replyObject();
   else
     m_expectedAesId = replyObject.id();
 }
 
 void TestBase::onAesRemoveReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got remove " << m_aesTypeName << " reply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got remove " << m_aesTypeName << " reply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
   m_replyError = replyObject.error();
   if (m_replyError && !m_bExpectedFailure)
-    ERROR_LOG() << "Got remove " << m_aesTypeName << " reply error: " << replyObject();
+    ERROR_LOG(m_logger) << "Got remove " << m_aesTypeName << " reply error: " << replyObject();
   else
     m_expectedAesId = replyObject.id();
 }
 
 void TestBase::onAesTriggerReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got trigger " << m_aesTypeName << " reply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got trigger " << m_aesTypeName << " reply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
   m_replyError = replyObject.error();
   if (m_replyError && !m_bExpectedFailure)
-    ERROR_LOG() << "Got remove " << m_aesTypeName << " reply error: " << replyObject();
+    ERROR_LOG(m_logger) << "Got remove " << m_aesTypeName << " reply error: " << replyObject();
   else
     m_expectedAesId = replyObject.id();
 }
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 edfd45d15..29c104f2c 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
@@ -46,17 +46,17 @@ protected:
   template <typename T>
   void onAesChanged(const T &dataIn, DataModification modType, T &dataOut)
   {
-    INFO_LOG() << "Got " << m_aesTypeName << " with mod type " << (int)modType
+    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())
     {
-      DEBUG_LOG() << "Expected aes id - updating data for " << m_aesTypeName;
+      DEBUG_LOG(m_logger) << "Expected aes id - updating data for " << m_aesTypeName;
       dataOut = dataIn;
     }
     if (modType == DataModification::eRemoved && dataOut.id() == dataIn.id())
     {
-      DEBUG_LOG() << "Removed " << m_aesTypeName << " with id " << 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/Trajectory/UnitTest_Trajectory/trajectory_unit_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/UnitTest_Trajectory/trajectory_unit_test.cpp
index 729dcd3e4..559968a52 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
@@ -83,8 +83,8 @@ void UnitTestTrajectory::test_duration()
 
   posEnd = LtsUtils::QPoint3D(10000, 0, 0);
   duration = TrajectoryHelper::flightDurationSec(posStart, posEnd, heightAbs, &betaOut, &vOut);
-  INFO_LOG() << "flightDurationSec with posStart " << posStart << ", posEnd " << posEnd << ", heightAbs " << heightAbs;
-  INFO_LOG() << "  -> duration [sec] " << std::setprecision(16) << duration << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
+  INFO_LOG(m_logger) << "flightDurationSec with posStart " << posStart << ", posEnd " << posEnd << ", heightAbs " << heightAbs;
+  INFO_LOG(m_logger) << "  -> duration [sec] " << std::setprecision(16) << duration << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
   QVERIFY2(qFuzzyCompare(duration, 28.55686245854129), "flightDurationSec failed");
   QVERIFY2(qFuzzyCompare(betaOut * rad2deg(), 21.80338497797008), "beta failed");
   QVERIFY2(qFuzzyCompare(vOut, 377.1213082434484), "v failed");
@@ -93,8 +93,8 @@ void UnitTestTrajectory::test_duration()
   posEnd = LtsUtils::QPoint3D(10000, 0, 10);
   //                                    ^^
   duration = TrajectoryHelper::flightDurationSec(posStart, posEnd, heightAbs, &betaOut, &vOut);
-  INFO_LOG() << "flightDurationSec with posStart " << posStart << ", posEnd " << posEnd << ", heightAbs " << heightAbs;
-  INFO_LOG() << "  -> duration [sec] " << std::setprecision(16) << duration << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
+  INFO_LOG(m_logger) << "flightDurationSec with posStart " << posStart << ", posEnd " << posEnd << ", heightAbs " << heightAbs;
+  INFO_LOG(m_logger) << "  -> duration [sec] " << std::setprecision(16) << duration << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
   QVERIFY2(qFuzzyCompare(duration, 28.48529092398576), "flightDurationSec failed");
   QVERIFY2(qFuzzyCompare(betaOut * rad2deg(), 21.75384726032234), "beta failed");
   QVERIFY2(qFuzzyCompare(vOut, 377.9382777961657), "v failed");
@@ -130,8 +130,8 @@ void UnitTestTrajectory::test_calcDuration()
   double duration;
 
   duration = TrajectoryHelper::flightDurationSec(posStart, endPos, peakHeightAbs, &betaOut, &vOut);
-  INFO_LOG() << "flightDurationSec with posStart " << posStart << ", posEnd " << endPos << ", peakHeightAbs " << peakHeightAbs;
-  INFO_LOG() << "  -> duration [sec] " << std::setprecision(16) << duration << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
+  INFO_LOG(m_logger) << "flightDurationSec with posStart " << posStart << ", posEnd " << endPos << ", peakHeightAbs " << peakHeightAbs;
+  INFO_LOG(m_logger) << "  -> duration [sec] " << std::setprecision(16) << duration << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
 
   QVERIFY2(qFuzzyCompare(duration, 4.515236409857309), "flightDurationSec failed");
   QVERIFY2(qFuzzyCompare(betaOut * rad2deg(), 45), "beta failed");
@@ -149,15 +149,15 @@ void UnitTestTrajectory::test_calcDuration2()
   for (peakHeightAbs = 5; peakHeightAbs < 12; ++peakHeightAbs)
   {
     duration = TrajectoryHelper::flightDurationSec(posStart, endPos, peakHeightAbs, &betaOut, &vOut);
-    INFO_LOG() << "flightDurationSec with posStart " << posStart << ", endPos " << endPos << ", peakHeightAbs " << peakHeightAbs;
-    INFO_LOG() << "  -> duration  [sec] " << std::setprecision(16) << duration << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
+    INFO_LOG(m_logger) << "flightDurationSec with posStart " << posStart << ", endPos " << endPos << ", peakHeightAbs " << peakHeightAbs;
+    INFO_LOG(m_logger) << "  -> duration  [sec] " << std::setprecision(16) << duration << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
   }
 
   { // Low
     peakHeightAbs = 8;
     duration = TrajectoryHelper::flightDurationSec(posStart, endPos, peakHeightAbs, &betaOut, &vOut);
-    INFO_LOG() << "flightDurationSec with posStart " << posStart << ", endPos " << endPos << ", peakHeightAbs " << peakHeightAbs;
-    INFO_LOG() << "  -> duration  [sec] " << std::setprecision(16) << duration << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
+    INFO_LOG(m_logger) << "flightDurationSec with posStart " << posStart << ", endPos " << endPos << ", peakHeightAbs " << peakHeightAbs;
+    INFO_LOG(m_logger) << "  -> duration  [sec] " << std::setprecision(16) << duration << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
 
     QVERIFY2(qFuzzyCompare(duration, 2.554203427256403), "flightDurationSec failed");
     QVERIFY2(qFuzzyCompare(betaOut * rad2deg(), 17.74467162505693), "beta failed");  // 18.9 ??
@@ -167,14 +167,14 @@ void UnitTestTrajectory::test_calcDuration2()
   for (peakHeightAbs = 71; peakHeightAbs < 79; ++peakHeightAbs)
   {
     duration = TrajectoryHelper::flightDurationSec(posStart, endPos, peakHeightAbs, &betaOut, &vOut);
-    INFO_LOG() << "flightDurationSec with posStart " << posStart << ", endPos " << endPos << ", peakHeightAbs " << peakHeightAbs;
-    INFO_LOG() << "  -> duration  [sec] " << std::setprecision(16) << duration << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
+    INFO_LOG(m_logger) << "flightDurationSec with posStart " << posStart << ", endPos " << endPos << ", peakHeightAbs " << peakHeightAbs;
+    INFO_LOG(m_logger) << "  -> duration  [sec] " << std::setprecision(16) << duration << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
   }
   { // High
     peakHeightAbs = 73;
     duration = TrajectoryHelper::flightDurationSec(posStart, endPos, peakHeightAbs, &betaOut, &vOut);
-    INFO_LOG() << "flightDurationSec with posStart " << posStart << ", endPos " << endPos << ", peakHeightAbs " << peakHeightAbs;
-    INFO_LOG() << "  -> duration  [sec] = " << std::setprecision(16) << duration << ",  beta [deg] = " << betaOut * rad2deg() << ",  v = " << vOut;
+    INFO_LOG(m_logger) << "flightDurationSec with posStart " << posStart << ", endPos " << endPos << ", peakHeightAbs " << peakHeightAbs;
+    INFO_LOG(m_logger) << "  -> duration  [sec] = " << std::setprecision(16) << duration << ",  beta [deg] = " << betaOut * rad2deg() << ",  v = " << vOut;
 
     QVERIFY2(qFuzzyCompare(duration, 7.715639359362986), "flightDurationSec failed");
     QVERIFY2(qFuzzyCompare(betaOut * rad2deg(), 71.09542415738834), "beta failed");
@@ -195,8 +195,8 @@ void UnitTestTrajectory::test_calcPeak()
   double peakHeightAbs;
 
   peakHeightAbs = TrajectoryHelper::peakHeightAbs(posStart, endPos, time, &betaOut, &vOut);
-  INFO_LOG() << "peakHeight with posStart " << posStart << ", posEnd " << endPos << ", time " << time << " - LOW";
-  INFO_LOG() << "  -> peakHeightAbs " << peakHeightAbs << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
+  INFO_LOG(m_logger) << "peakHeight with posStart " << posStart << ", posEnd " << endPos << ", time " << time << " - LOW";
+  INFO_LOG(m_logger) << "  -> peakHeightAbs " << peakHeightAbs << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
 
   QVERIFY2(qFuzzyCompare(peakHeightAbs, 25), "peakHeight failed");
   QVERIFY2(qFuzzyCompare(betaOut * rad2deg(), 45), "beta failed");
@@ -215,8 +215,8 @@ void UnitTestTrajectory::test_calcPeak2()
   double peakHeightAbs;
 
   peakHeightAbs = TrajectoryHelper::peakHeightAbs(posStart, endPos, time, &betaOut, &vOut);
-  INFO_LOG() << "peakHeight with posStart " << posStart << ", posEnd " << endPos << ", time " << time << " - LOW";
-  INFO_LOG() << "  -> peakHeightAbs " << std::setprecision(16) << peakHeightAbs << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
+  INFO_LOG(m_logger) << "peakHeight with posStart " << posStart << ", posEnd " << endPos << ", time " << time << " - LOW";
+  INFO_LOG(m_logger) << "  -> peakHeightAbs " << std::setprecision(16) << peakHeightAbs << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
 
   // eightAbs 122.625,  beta [deg] 78.47682271026333,  v 50.0589902015612 (ctory/trajectory_unit_test.cpp:178)
   QVERIFY2(qFuzzyCompare(peakHeightAbs, 122.625), "peakHeight failed");
@@ -241,13 +241,13 @@ void UnitTestTrajectory::test_calcPeak3_continuity()
   const int flightDurationMax       = 50;
   const int flightDurationIncrement = 1;
 
-  INFO_LOG() << "peakHeight with posStart " << posStart << ", posEnd " << endPos;
+  INFO_LOG(m_logger) << "peakHeight with posStart " << posStart << ", posEnd " << endPos;
 
   for (int curFD = flightDurationMin; curFD <= flightDurationMax; curFD += flightDurationIncrement)
   {
     double time = curFD;
     peakHeightAbs = TrajectoryHelper::peakHeightAbs(posStart, endPos, time, &betaOut, &vOut);
-    INFO_LOG() << " time=" << time  << "  -> peakHeightAbs="  << std::setprecision(5) << std::setw(10) << std::setfill(' ')  << peakHeightAbs << ",  beta [deg]=" << betaOut * rad2deg() << ",  v=" << std::setw(5) << vOut;
+    INFO_LOG(m_logger) << " time=" << time  << "  -> peakHeightAbs="  << std::setprecision(5) << std::setw(10) << std::setfill(' ')  << peakHeightAbs << ",  beta [deg]=" << betaOut * rad2deg() << ",  v=" << std::setw(5) << vOut;
   } // for
 }
 
@@ -346,20 +346,20 @@ void UnitTestTrajectory::test_calcDuration_realistic40km()
   double duration;
   int peakHeightAbs;
 
-  INFO_LOG() << "Loop: START";
+  INFO_LOG(m_logger) << "Loop: START";
   for (peakHeightAbs = 500; peakHeightAbs <= 3000; peakHeightAbs+=250)
   {
     duration = TrajectoryHelper::flightDurationSec(posStart, endPos, peakHeightAbs, &betaOut, &vOut);
-    INFO_LOG() << "Loop: flightDurationSec with posStart " << posStart << ", endPos " << endPos << ", peakHeightAbs " << peakHeightAbs;
-    INFO_LOG() << "  -> duration  [sec] " << std::setprecision(16) << duration << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
+    INFO_LOG(m_logger) << "Loop: flightDurationSec with posStart " << posStart << ", endPos " << endPos << ", peakHeightAbs " << peakHeightAbs;
+    INFO_LOG(m_logger) << "  -> duration  [sec] " << std::setprecision(16) << duration << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
   }
-  INFO_LOG() << "Loop: END";
+  INFO_LOG(m_logger) << "Loop: END";
 
   // Als realistisch stugen wir mal eine Geschwindigkeit von 1000m/s ein:
   peakHeightAbs = 2000;
   duration = TrajectoryHelper::flightDurationSec(posStart, endPos, peakHeightAbs, &betaOut, &vOut);
-  INFO_LOG() << "explicit; flightDurationSec with posStart " << posStart << ", endPos " << endPos << ", peakHeightAbs " << peakHeightAbs;
-  INFO_LOG() << "  -> duration  [sec] " << std::setprecision(16) << duration << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
+  INFO_LOG(m_logger) << "explicit; flightDurationSec with posStart " << posStart << ", endPos " << endPos << ", peakHeightAbs " << peakHeightAbs;
+  INFO_LOG(m_logger) << "  -> duration  [sec] " << std::setprecision(16) << duration << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
 
   QVERIFY2(qFuzzyCompare(duration, 40.38550218769218 ), "flightDurationSec failed");
   QVERIFY2(qFuzzyCompare(betaOut * rad2deg(), 11.30993247402021), "beta failed");
@@ -380,8 +380,8 @@ void UnitTestTrajectory::test_calcDuration_differentDistances()
   // 1000m
   {
     duration1 = TrajectoryHelper::flightDurationSec(posStart, endPos1, peakHeightAbs, &betaOut, &vOut);
-    INFO_LOG() << "flightDurationSec with posStart " << posStart << ", endPos " << endPos1 << ", peakHeightAbs " << peakHeightAbs;
-    INFO_LOG() << "  -> duration1  [sec] " << std::setprecision(16) << duration1 << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
+    INFO_LOG(m_logger) << "flightDurationSec with posStart " << posStart << ", endPos " << endPos1 << ", peakHeightAbs " << peakHeightAbs;
+    INFO_LOG(m_logger) << "  -> duration1  [sec] " << std::setprecision(16) << duration1 << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
 
     QVERIFY2(qFuzzyCompare(duration1, 10.01527884771829), "flightDurationSec failed");
     QVERIFY2(qFuzzyCompare(betaOut * rad2deg(), 26.19718605846828), "beta failed");
@@ -391,8 +391,8 @@ void UnitTestTrajectory::test_calcDuration_differentDistances()
   // 2000m
   {
     duration2 = TrajectoryHelper::flightDurationSec(posStart, endPos2, peakHeightAbs, &betaOut, &vOut);
-    INFO_LOG() << "flightDurationSec with posStart " << posStart << ", endPos " << endPos2 << ", peakHeightAbs " << peakHeightAbs;
-    INFO_LOG() << "  -> duration2  [sec] " << std::setprecision(16) << duration2 << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
+    INFO_LOG(m_logger) << "flightDurationSec with posStart " << posStart << ", endPos " << endPos2 << ", peakHeightAbs " << peakHeightAbs;
+    INFO_LOG(m_logger) << "  -> duration2  [sec] " << std::setprecision(16) << duration2 << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
 
     QVERIFY2(qFuzzyCompare(duration2, 10.01527884771829), "flightDurationSec failed");
     QVERIFY2(qFuzzyCompare(betaOut * rad2deg(), 13.82033952701046), "beta failed");
@@ -403,8 +403,8 @@ void UnitTestTrajectory::test_calcDuration_differentDistances()
   // 2000m, 99m
   {
     duration3 = TrajectoryHelper::flightDurationSec(posStart, endPos3, peakHeightAbs, &betaOut, &vOut);
-    INFO_LOG() << "flightDurationSec with posStart " << posStart << ", endPos " << endPos3 << ", peakHeight " << peakHeightAbs;
-    INFO_LOG() << "  -> duration3  [sec] " << std::setprecision(16) << duration3 << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
+    INFO_LOG(m_logger) << "flightDurationSec with posStart " << posStart << ", endPos " << endPos3 << ", peakHeight " << peakHeightAbs;
+    INFO_LOG(m_logger) << "  -> duration3  [sec] " << std::setprecision(16) << duration3 << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
 
     QVERIFY2(qFuzzyCompare(duration3, 7.219644478296471 ), "flightDurationSec failed");
     QVERIFY2(qFuzzyCompare(betaOut * rad2deg(), 10.05585466470648 ), "beta failed");
@@ -438,9 +438,9 @@ void UnitTestTrajectory::test_calcDuration_downToZero()
 
   peakHeightAbs = 123;
   duration = TrajectoryHelper::flightDurationSec(posStart, endPos, peakHeightAbs, &betaOut, &vOut, &reason);
-  INFO_LOG() << "flightDurationSec with posStart " << posStart << ", endPos " << endPos << ", peakHeightAbs " << peakHeightAbs;
-  INFO_LOG() << "  -> reason '" << reason << "'";
-  INFO_LOG() << "  -> duration  [sec] " << std::setprecision(16) << duration << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
+  INFO_LOG(m_logger) << "flightDurationSec with posStart " << posStart << ", endPos " << endPos << ", peakHeightAbs " << peakHeightAbs;
+  INFO_LOG(m_logger) << "  -> reason '" << reason << "'";
+  INFO_LOG(m_logger) << "  -> duration  [sec] " << std::setprecision(16) << duration << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
 
   QVERIFY2(qFuzzyCompare(duration, 7.347880052033394), "flightDurationSec failed");
   QVERIFY2(qFuzzyCompare(betaOut * rad2deg(), 14.18247037775737), "beta failed");  // 18.9 ??
@@ -509,7 +509,7 @@ void UnitTestTrajectory::test_realStartPoint()
 
   LtsUtils::QPoint3D realStartPoint = TrajectoryHelper::realStartPoint(apo, idealHit);
 
-  ERROR_LOG() << "  apo = " << apo << " idealHit = " << idealHit << " ->  = realStartPoint =" << realStartPoint;
+  ERROR_LOG(m_logger) << "  apo = " << apo << " idealHit = " << idealHit << " ->  = realStartPoint =" << realStartPoint;
   QVERIFY2(qFuzzyCompare(realStartPoint, result), "realStartPoint failed");
 
   // next step:
@@ -517,8 +517,8 @@ void UnitTestTrajectory::test_realStartPoint()
   double duration;
   const double heightAbs = apo.z();
   duration = TrajectoryHelper::flightDurationSec(realStartPoint, idealHit, heightAbs, &betaOut, &vOut);
-  ERROR_LOG() << "flightDurationSec with realStartPoint " << realStartPoint << ", idealHit " << idealHit << ", heightAbs " << heightAbs;
-  ERROR_LOG() << "  -> duration [sec] " << std::setprecision(16) << duration << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
+  ERROR_LOG(m_logger) << "flightDurationSec with realStartPoint " << realStartPoint << ", idealHit " << idealHit << ", heightAbs " << heightAbs;
+  ERROR_LOG(m_logger) << "  -> duration [sec] " << std::setprecision(16) << duration << ",  beta [deg] " << betaOut * rad2deg() << ",  v " << vOut;
 
   QVERIFY2(qFuzzyCompare(betaOut * rad2deg(), betaDeg), "flightDurationSec failed");
 }
@@ -581,18 +581,18 @@ void UnitTestTrajectory::test_generateTrajectoryBiedziak()
     // check Scheitelpunkt / Apogaeum
     {
       const auto &item35 = trajectoryOut[35];
-      INFO_LOG() << "iqtem35 = " << item35;
+      INFO_LOG(m_logger) << "iqtem35 = " << item35;
       QVERIFY2(qFuzzyCompare(item35.z(), 148.044675655973), "TrajectoryGenerator::trajectoryOut failed");
     }
     {
       // Hier ist der Scheitelpunkt:
       const auto &item36 = trajectoryOut[36];
-      INFO_LOG() << "item36 = " << item36;
+      INFO_LOG(m_logger) << "item36 = " << item36;
       QVERIFY2(qFuzzyCompare(item36.z(), 148.087567297406), "TrajectoryGenerator::trajectoryOut failed");
     }
     {
       const auto &item37 = trajectoryOut[37];
-      INFO_LOG() << "item37 = " << item37;
+      INFO_LOG(m_logger) << "item37 = " << item37;
       QVERIFY2(qFuzzyCompare(item37.z(), 147.905786767084), "TrajectoryGenerator::trajectoryOut failed");
     }
   }
@@ -611,8 +611,8 @@ void UnitTestTrajectory::test_vulcano_beta_Abschusswinkel()
   const double betaRad = XY::calculateBetaRad(v0, height);
   const double betaDeg = betaRad * LtsCoordTrans::rad2deg();
 
-  INFO_LOG() << "calculateBetaRad with v0 = " << v0 << ", height = " << height;
-  INFO_LOG() << "  -> betaRad = " << betaRad << ", betaDeg = " << betaDeg;
+  INFO_LOG(m_logger) << "calculateBetaRad with v0 = " << v0 << ", height = " << height;
+  INFO_LOG(m_logger) << "  -> betaRad = " << betaRad << ", betaDeg = " << betaDeg;
 
   QVERIFY2(qFuzzyCompare(betaDeg, 29.99727415506499), "calculateBetaRad failed");
 }
@@ -644,13 +644,13 @@ void UnitTestTrajectory::test_vulcano_apogaeumCosmos()
   const double betaRad = XY::calculateBetaRad(v0, height);
   const double betaDeg = betaRad * LtsCoordTrans::rad2deg();
 
-  INFO_LOG() << "calculateBetaRad with v0 = " << v0 << ", height = " << height;
-  INFO_LOG() << "  -> betaRad = " << betaRad << ", betaDeg = " << betaDeg;
+  INFO_LOG(m_logger) << "calculateBetaRad with v0 = " << v0 << ", height = " << height;
+  INFO_LOG(m_logger) << "  -> betaRad = " << betaRad << ", betaDeg = " << betaDeg;
 
   const QPointF &apo = XY::calculateApogaeum(v0, betaRad);
 
-  INFO_LOG() << "calculateApogaeum with v0 = " << v0 << ", betaDeg = " << betaDeg;
-  INFO_LOG() << "  -> apo " << apo;
+  INFO_LOG(m_logger) << "calculateApogaeum with v0 = " << v0 << ", betaDeg = " << betaDeg;
+  INFO_LOG(m_logger) << "  -> apo " << apo;
 
   QVERIFY2(qFuzzyCompare(apo.x(), 50    ), "calculateBetaRad/calculateApogaeum failed");  // 100m / 2.0
   QVERIFY2(qFuzzyCompare(apo.y(), height), "calculateBetaRad/calculateApogaeum failed");
@@ -691,15 +691,15 @@ void UnitTestTrajectory::test_vulcano_apogaeum()
   const QPointF &apo = XY::calculateApogaeum(v0, betaDeg*LtsCoordTrans::deg2rad());
 
   const QVector2D apoDiff(apo - expectedAPO);
-  DEBUG_LOG() << "calculateApogaeum with v0 = " << v0 << ", betaDeg = " << betaDeg;
-  DEBUG_LOG() << "  -> apo " << apo << " diff = "<< apoDiff.length();
+  DEBUG_LOG(m_logger) << "calculateApogaeum with v0 = " << v0 << ", betaDeg = " << betaDeg;
+  DEBUG_LOG(m_logger) << "  -> apo " << apo << " diff = "<< apoDiff.length();
 
   QVERIFY2(apoDiff.length()  < 1, "calculateApogaeum failed");
 
   // und zurück:
   const double calcBetaRad = XY::calculateBetaRad(v0, expectedAPO.y());
   double betaDiff = fabs(calcBetaRad*LtsCoordTrans::rad2deg() - betaDeg);
-  DEBUG_LOG() << " zurück: betaDiff = " << betaDiff;
+  DEBUG_LOG(m_logger) << " zurück: betaDiff = " << betaDiff;
 
   QVERIFY2(betaDiff < 0.001, "calculateBetaRad failed");
 }
@@ -784,15 +784,15 @@ void UnitTestTrajectory::test_vulcano_tap()
 
   const QPointF &tapRelToImpact = XY::calculateTapRelToIdealHit(vFall, alphaDeg*LtsCoordTrans::deg2rad(), tapT);
 
-  INFO_LOG() << "calculateTapRelToIdealHit with vFall = " << vFall
+  INFO_LOG(m_logger) << "calculateTapRelToIdealHit with vFall = " << vFall
                      << ", alphaDeg = " << alphaDeg
                      << ", tapT = " << tapT;
-  INFO_LOG() << "  -> tapRelToImpact " << tapRelToImpact
+  INFO_LOG(m_logger) << "  -> tapRelToImpact " << tapRelToImpact
                       << " , lenght = " << QVector2D(tapRelToImpact).length();
   QVERIFY2((expectedLength - QVector2D(tapRelToImpact).length()) < 1, "calculateTapRelToIdealHit abs failed");
 
   const QVector2D diff(tapRelToImpact - expectedTAP);
-  INFO_LOG() << "  -> diff.QVector2D.length = " << diff.length();
+  INFO_LOG(m_logger) << "  -> diff.QVector2D.length = " << diff.length();
   QVERIFY2(diff.length() < 0.1, "calculateTapRelToIdealHit rel failed");
 }
 
@@ -821,10 +821,10 @@ void UnitTestTrajectory::test_vulcano_ballisticCurve()
   QFETCH(double,  expectedDeltaTime);
 
   const QPointF &apo = XY::calculateApogaeum(v0, betaDeg*LtsCoordTrans::deg2rad());
-  INFO_LOG() << ", apo " << apo;
+  INFO_LOG(m_logger) << ", apo " << apo;
 
   const QVector2D diff(apo - expectedAPO);
-  INFO_LOG() << ", diff " << diff.length();
+  INFO_LOG(m_logger) << ", diff " << diff.length();
   QVERIFY2(diff.length() < 0.1, "calculateApogaeum rel failed");
 
   //
@@ -839,7 +839,7 @@ void UnitTestTrajectory::test_vulcano_ballisticCurve()
   const QVector<QPointF> &phase1_bal = XY::generateBallisticCurveUntil(v0, betaDeg*LtsCoordTrans::deg2rad(),
                                                                                                    x_distancePhase1, secPerIntervall,
                                                                                                    &deltaXperStep_out, &secPerIntervall_out);
-  INFO_LOG() << "generateBallisticCurveUntil: "
+  INFO_LOG(m_logger) << "generateBallisticCurveUntil: "
                      << ", phase1_bal.size() = " << phase1_bal.size()
                      << ", phase1_bal.last() = " << std::setprecision(16) << phase1_bal.last()
                      << ", deltaXperStep_out = " << std::setprecision(16) << deltaXperStep_out
@@ -957,10 +957,10 @@ void UnitTestTrajectory::test_vulcano_trajectory()
                                                            &reasonOut);
 
   if (!reasonOut.isEmpty())
-    ERROR_LOG() << " trajectoryVulcano failed, reasonOut = '" << reasonOut << "'";
+    ERROR_LOG(m_logger) << " trajectoryVulcano failed, reasonOut = '" << reasonOut << "'";
 
 
-  INFO_LOG() << "trajectoryVulcano: "
+  INFO_LOG(m_logger) << "trajectoryVulcano: "
                      << ", ret = " << ret
                      << ", trajectoryOut.size() = " << trajectoryOut.size();
 
@@ -968,7 +968,7 @@ void UnitTestTrajectory::test_vulcano_trajectory()
   QVERIFY2(trajectoryOut.size() == expectedSize, "trajectoryVulcano2 failed");
 
 //  const QPoint3D &apo3D = trajectoryOut[40];  // more or less wellknown
-//  INFO_LOG() << "trajectoryVulcano: "
+//  INFO_LOG(m_logger) << "trajectoryVulcano: "
 //                     << ", ret = " << ret
 //                     << ", trajectoryOut.size() = " << trajectoryOut.size()
 //                     << ", apo3D = " << apo3D;
@@ -976,7 +976,7 @@ void UnitTestTrajectory::test_vulcano_trajectory()
 //  // recalculate to distance between apo and origin (on flat xy)
 //  LtsUtils::QPoint3D apoToOrigin = apo3D - origin;
 //  double xyDist = QVector2D(apoToOrigin.toPointF()).length();
-//  INFO_LOG() << "  -> apoToOrigin.length = " << std::setprecision(16) << xyDist;
+//  INFO_LOG(m_logger) << "  -> apoToOrigin.length = " << std::setprecision(16) << xyDist;
 
 //  QVERIFY2(fabs( 12248.0 - xyDist ) < 1,                 "generateBallisticCurveUntil3 failed");
 //  QVERIFY2(fabs(  8127.0 + origin.z() - apo3D.z() ) < 1, "generateBallisticCurveUntil4 failed");
@@ -993,7 +993,7 @@ void UnitTestTrajectory::test_vulcano_trajectory()
 
   int i=0;
   for (auto &item : std::as_const(trajectoryOut))
-    INFO_LOG() << "i = " << i++ << ", item " << item;
+    INFO_LOG(m_logger) << "i = " << i++ << ", item " << item;
 }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/UnitTest_Trajectory/trajectory_unit_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/UnitTest_Trajectory/trajectory_unit_test.h
index 684dbeef9..4649b13ab 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/UnitTest_Trajectory/trajectory_unit_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/UnitTest_Trajectory/trajectory_unit_test.h
@@ -77,4 +77,6 @@ private Q_SLOTS:
   //  void cleanup();
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator.cpp
index 5111218ba..2e368c544 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator.cpp
@@ -85,22 +85,22 @@ void TrajectoryGenerator::cleanup()
 
 void TrajectoryGenerator::initElevation(LtsElevation::LtsElevationManager *ltsElevationManager)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_ltsElevationManager = ltsElevationManager;
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 LtsElevation::LtsElevationManager *TrajectoryGenerator::getElevationManager()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return m_ltsElevationManager;
 }
 
 bool TrajectoryGenerator::hasElevationManager() const
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return m_ltsElevationManager;
 }
 
@@ -268,14 +268,14 @@ bool TrajectoryGenerator::generateTrajectoryBiedziak(const LtsUtils::QPoint3D &o
                                                      CONT_T &trajectoryOut)
 {
   // use zone of impact:
-  INFO_LOG() << " oPosition geo " << originatorPosition_geo.x() << " - " << originatorPosition_geo.y();
-  INFO_LOG() << " iPosition geo " << impactPosition_geo.x() << " - "     << impactPosition_geo.y();
+  INFO_LOG(m_logger) << " oPosition geo " << originatorPosition_geo.x() << " - " << originatorPosition_geo.y();
+  INFO_LOG(m_logger) << " iPosition geo " << impactPosition_geo.x() << " - "     << impactPosition_geo.y();
 
   const LtsCoordTrans::UtmCoordinate &iPosition = LtsCoordTrans::UtmCoordinate::fromGeographic(impactPosition_geo.toPointF());
   const LtsCoordTrans::UtmCoordinate &oPosition = LtsCoordTrans::UtmCoordinate::fromGeographic(originatorPosition_geo.toPointF(), iPosition.zone);
 
-  INFO_LOG() << " oPosition " << oPosition.mgrs();
-  INFO_LOG() << " iPosition " << iPosition.mgrs();
+  INFO_LOG(m_logger) << " oPosition " << oPosition.mgrs();
+  INFO_LOG(m_logger) << " iPosition " << iPosition.mgrs();
 
   const double distance = sqrt(pow(iPosition.x - oPosition.x, 2.) + pow(iPosition.y - oPosition.y, 2.));
 
@@ -287,18 +287,18 @@ bool TrajectoryGenerator::generateTrajectoryBiedziak(const LtsUtils::QPoint3D &o
     oHeight = m_ltsElevationManager ? m_ltsElevationManager->elevation(originatorPosition_geo.x(), originatorPosition_geo.y()) : 0;
     if (oHeight < 300)
       oHeight = 100;
-    INFO_LOG() << " oPosition " << oPosition << " has no zValue provided (NaN), update via ltsElevationManager...";
+    INFO_LOG(m_logger) << " oPosition " << oPosition << " has no zValue provided (NaN), update via ltsElevationManager...";
   }
   if (std::isnan(iHeight) && m_ltsElevationManager)
   {
     iHeight = m_ltsElevationManager ? m_ltsElevationManager->elevation(impactPosition_geo.x(), impactPosition_geo.y()) : 0;
     if (iHeight < 300)
       iHeight = 100;
-    INFO_LOG() << " iPosition " << iPosition << " has no zValue provided (NaN), update via ltsElevationManager.. ";
+    INFO_LOG(m_logger) << " iPosition " << iPosition << " has no zValue provided (NaN), update via ltsElevationManager.. ";
   }
 
-  INFO_LOG() << " oPosition " << oPosition << " ; oHeight=" << oHeight;
-  INFO_LOG() << " iPosition " << iPosition << " ; iHeight=" << iHeight;
+  INFO_LOG(m_logger) << " oPosition " << oPosition << " ; oHeight=" << oHeight;
+  INFO_LOG(m_logger) << " iPosition " << iPosition << " ; iHeight=" << iHeight;
 
   // z-Values:
   const QVector<double> &zValues = this->trajectoryBiedziak(distance, iHeight - oHeight, elevation_angle_degree);
@@ -324,7 +324,7 @@ bool TrajectoryGenerator::generateTrajectoryBiedziak(const LtsUtils::QPoint3D &o
               p2D.x(), p2D.y(), oHeight + zValues[i]); // x, y, z
   } // for
 
-////  DEBUG_LOG() << string4poly(geo);
+////  DEBUG_LOG(m_logger) << string4poly(geo);
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator.h
index f7064f0c9..143b8d9cc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_generator.h
@@ -89,6 +89,7 @@ class TRAJECTORY_EXPORT TrajectoryGenerator : public QObject
                                         QString *reasonOut);
 
   protected:
+  NGL::INGLLogger &m_logger;
   /*! \name Ideal trajectory */
   template <typename CONT_T>
   bool generateTrajectoryBiedziak(const LtsUtils::QPoint3D &originatorPosition_geo,
@@ -97,6 +98,7 @@ class TRAJECTORY_EXPORT TrajectoryGenerator : public QObject
                                   CONT_T &trajectoryOut);
 
   protected:
+  NGL::INGLLogger &m_logger;
   explicit TrajectoryGenerator();
 
   public:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/fire_automaton.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/fire_automaton.cpp
index e713ed0a7..0d7990464 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/fire_automaton.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/fire_automaton.cpp
@@ -45,31 +45,31 @@ bool FireAutomaton::init(int32_t time, TimeType type, int32_t rounds, const QVec
 {
   if(m_state != State::Stopped && m_state != State::Uninitialized)
   {
-    ERROR_LOG() << " init failed -  fire automaton must be in state unitialized or stopped.";
+    ERROR_LOG(m_logger) << " init failed -  fire automaton must be in state unitialized or stopped.";
     return false;
   }
 
   if(time < 0)
   {
-    ERROR_LOG() << " init failed - time invalid.";
+    ERROR_LOG(m_logger) << " init failed - time invalid.";
     return false;
   }
 
   if(effectorIds.isEmpty())
   {
-    ERROR_LOG() << " init failed - effector Ids invalid.";
+    ERROR_LOG(m_logger) << " init failed - effector Ids invalid.";
     return false;
   }
 
   if(rounds <= 0)
   {
-    ERROR_LOG() << " init failed - number of rounds invalid.";
+    ERROR_LOG(m_logger) << " init failed - number of rounds invalid.";
     return false;
   }
 
   if(pattern.isEmpty())
   {
-    ERROR_LOG() << " init failed - invalid fire pattern.";
+    ERROR_LOG(m_logger) << " init failed - invalid fire pattern.";
     return false;
   }
 
@@ -80,13 +80,13 @@ bool FireAutomaton::init(int32_t time, TimeType type, int32_t rounds, const QVec
 
   if(!readPattern(pattern))
   {
-    ERROR_LOG() << " init failed - firing pattern invalid.";
+    ERROR_LOG(m_logger) << " init failed - firing pattern invalid.";
     return false;
   }
 
   if(!calculateSchedule(rounds))
   {
-    ERROR_LOG() << " init failed - firing schedule invalid.";
+    ERROR_LOG(m_logger) << " init failed - firing schedule invalid.";
     return false;
   }
 
@@ -166,7 +166,7 @@ bool FireAutomaton::start()
 {
   if(m_state != State::Stopped)
   {
-    ERROR_LOG() << " start failed - fire automaton must be in state stopped.";
+    ERROR_LOG(m_logger) << " start failed - fire automaton must be in state stopped.";
     return false;
   }
 
@@ -187,7 +187,7 @@ bool FireAutomaton::resume()
 {
   if(m_state != State::Paused)
   {
-    ERROR_LOG() << " resume failed - fire automaton must be in state paused.";
+    ERROR_LOG(m_logger) << " resume failed - fire automaton must be in state paused.";
     return false;
   }
 
@@ -207,7 +207,7 @@ bool FireAutomaton::pause()
 {
   if(m_state != State::Running)
   {
-    ERROR_LOG() << " pause failed - fire automaton must be in state running.";
+    ERROR_LOG(m_logger) << " pause failed - fire automaton must be in state running.";
     return false;
   }
 
@@ -242,7 +242,7 @@ bool FireAutomaton::performStep()
 {
   if(m_state != State::Stopped && m_state != State::Stepping)
   {
-    ERROR_LOG() << " performStep failed -  fire automaton must be in state stepping or stopped.";
+    ERROR_LOG(m_logger) << " performStep failed -  fire automaton must be in state stepping or stopped.";
     return false;
   }
 
@@ -278,7 +278,7 @@ bool FireAutomaton::readPattern(const QString& pattern)
 
     if(!patternElementFromString(element, patternElement))
     {
-      WARNING_LOG() << " skipped invalid firing pattern elements.";
+      WARNING_LOG(m_logger) << " skipped invalid firing pattern elements.";
       continue;
     }
 
@@ -290,7 +290,7 @@ bool FireAutomaton::readPattern(const QString& pattern)
       }
       else
       {
-        ERROR_LOG() << " a pattern may contain at most one fill element.";
+        ERROR_LOG(m_logger) << " a pattern may contain at most one fill element.";
         return false;
       }
     }
@@ -300,7 +300,7 @@ bool FireAutomaton::readPattern(const QString& pattern)
 
   if(m_pattern.empty())
   {
-    ERROR_LOG() << " error occured reading firing pattern.";
+    ERROR_LOG(m_logger) << " error occured reading firing pattern.";
     return false;
   }
 
@@ -412,7 +412,7 @@ bool FireAutomaton::calculateSchedule(int32_t rounds)
 
   if(rounds > 0)
   {
-    ERROR_LOG() << " scheduling error - fire pattern does not provide sufficient slots to schedule all rounds. " << rounds;
+    ERROR_LOG(m_logger) << " scheduling error - fire pattern does not provide sufficient slots to schedule all rounds. " << rounds;
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/fire_automaton.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/fire_automaton.h
index f5e8e6db0..9e9a36fe3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/fire_automaton.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/fire_automaton.h
@@ -72,6 +72,7 @@ private slots:
   void nextTick();
 
 private:
+  NGL::INGLLogger &m_logger;
   enum class PatternElement {
     All,
     AllFill,
@@ -89,6 +90,7 @@ private:
   QVector<int32_t> getEffectorIds(int32_t tick) const;
 
 private:
+  NGL::INGLLogger &m_logger;
   QVector<int32_t> m_effectorIds;
   QVector<FireAutomaton::PatternElement> m_pattern;
   QVector<QVector<int32_t>> m_schedule;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/firing_timer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/firing_timer.cpp
index 6b97a5ae7..e8b4f4e48 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/firing_timer.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/firing_timer.cpp
@@ -132,18 +132,18 @@ FiringTimer::FiringTimer(const QString &debugInfo)
 {
   ++s_counter;
   d->m_debugInfo = debugInfo;
-  DEBUG_LOG() << MY_Q_FUNC_INFO << " START, s_counter=" << s_counter << " this=" << this;
-  DEBUG_LOG() << MY_Q_FUNC_INFO << " END, s_counter=" << s_counter << " this=" << this;
+  DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " START, s_counter=" << s_counter << " this=" << this;
+  DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " END, s_counter=" << s_counter << " this=" << this;
 }
 
 FiringTimer::~FiringTimer()
 {
   --s_counter;
-  DEBUG_LOG() << MY_Q_FUNC_INFO << " START, s_counter=" << s_counter << " this=" << this;
+  DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " START, s_counter=" << s_counter << " this=" << this;
   QString debugInfoSave = d->m_debugInfo;
   delete d;
-  //DEBUG_LOG() << MY_Q_FUNC_INFO << " END, s_counter=" << s_counter << " this=" << this;
-  DEBUG_LOG() << "debugInfo='" << debugInfoSave << "'"  << Q_FUNC_INFO << " END, s_counter=" << s_counter << " this=" << this;
+  //DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " END, s_counter=" << s_counter << " this=" << this;
+  DEBUG_LOG(m_logger) << "debugInfo='" << debugInfoSave << "'"  << Q_FUNC_INFO << " END, s_counter=" << s_counter << " this=" << this;
 }
 
 void FiringTimer::setDebugInfo(const QString &debugInfo)
@@ -153,14 +153,14 @@ void FiringTimer::setDebugInfo(const QString &debugInfo)
 
 void FiringTimer::reset()
 {
-  TRACE_LOG() << MY_Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " START";
   d->reset();
-  TRACE_LOG() << MY_Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " END";
 }
 
 bool FiringTimer::init(long effectDurationMsec, int ammoCount, long ammoFlightDurationMsec)
 {
-  TRACE_LOG() << MY_Q_FUNC_INFO << " START,"
+  TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " START,"
                       << ", effectDurationMsec=" << effectDurationMsec
                       << ", ammoCount=" << ammoCount
                       << ", ammoFlightDurationMsec=" << ammoFlightDurationMsec;
@@ -170,7 +170,7 @@ bool FiringTimer::init(long effectDurationMsec, int ammoCount, long ammoFlightDu
   d->m_ammoCount              = ammoCount;
   d->m_ammoFlightDurationMsec = ammoFlightDurationMsec;
   d->m_intervallMsec          = static_cast<double>(d->m_effectDurationMsec) / d->m_ammoCount; // ensure float calculation
-  DEBUG_LOG() << MY_Q_FUNC_INFO << " m_intervallMsec " << d->m_intervallMsec;
+  DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " m_intervallMsec " << d->m_intervallMsec;
 
   d->m_firingTimer->stop();
   d->m_firingTimer->setSingleShot(false);
@@ -178,24 +178,24 @@ bool FiringTimer::init(long effectDurationMsec, int ammoCount, long ammoFlightDu
   connect(d->m_firingTimer, &QTimer::timeout,
           this, &FiringTimer::onFiringTimout, Qt::UniqueConnection);
 
-  TRACE_LOG() << MY_Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " END";
   return true;
 }
 
 bool FiringTimer::startFiring()
 {
-  TRACE_LOG() << MY_Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " START";
 
   if ((d->m_currentFiringMode != FiringMode::FM_Undefined) &&
       (d->m_currentFiringMode != FiringMode::FM_Paused))
   {
-    ERROR_LOG() << MY_Q_FUNC_INFO << " wrong firingMode, cur = " << (int)d->m_currentFiringMode;
+    ERROR_LOG(m_logger) << MY_Q_FUNC_INFO << " wrong firingMode, cur = " << (int)d->m_currentFiringMode;
     return false;
   }
 
   if (remainingAmmoCount() <= 0)
   {
-    ERROR_LOG() << MY_Q_FUNC_INFO << " no ammo left"
+    ERROR_LOG(m_logger) << MY_Q_FUNC_INFO << " no ammo left"
                         << " (total ammoCount was: " << d->m_ammoCount
                         << " cur firingMode = " << (int)d->m_currentFiringMode;
     return false;
@@ -213,7 +213,7 @@ bool FiringTimer::startFiring()
 #endif // SUPPORT_STATE_CHANGE_DELAYED
 
 
-  DEBUG_LOG() << MY_Q_FUNC_INFO << " start firing with m_firedAmmoCount = " << d->m_firedAmmoCount;
+  DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " start firing with m_firedAmmoCount = " << d->m_firedAmmoCount;
 
   d->m_firingTimer->start();
   d->m_currentFiringMode = FiringMode::FM_Active;
@@ -227,7 +227,7 @@ bool FiringTimer::startFiring()
     d->m_pausedMsec += pausedElapsedMsec;
     d->m_etPaused->invalidate();
   }
-  DEBUG_LOG() << MY_Q_FUNC_INFO << " start firing after [ms]: " << pausedElapsedMsec
+  DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " start firing after [ms]: " << pausedElapsedMsec
                       << ", m_activeMsec in total = " << d->m_activeMsec
                       << ", m_pausedMsec in total = " << d->m_pausedMsec;
 
@@ -256,7 +256,7 @@ bool FiringTimer::startFiring()
   // to fire at the beginning of the interval:
   onFiringTimout();
 
-  TRACE_LOG() << MY_Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " END";
   return true;
 }
 
@@ -270,17 +270,17 @@ bool FiringTimer::startFiringDelay(qint64 delayMsec)
 
 bool FiringTimer::pauseFiring()
 {
-  TRACE_LOG() << MY_Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " START";
 
   if (d->m_currentFiringMode != FiringMode::FM_Active)
   {
-    ERROR_LOG() << MY_Q_FUNC_INFO << " wrong firingMode";
+    ERROR_LOG(m_logger) << MY_Q_FUNC_INFO << " wrong firingMode";
     return false;
   }
 
   if (remainingAmmoCount() <= 0)
   {
-    ERROR_LOG() << MY_Q_FUNC_INFO << " no ammo left"
+    ERROR_LOG(m_logger) << MY_Q_FUNC_INFO << " no ammo left"
                         << " (total ammoCount was: " << d->m_ammoCount;
     return false;
   }
@@ -293,7 +293,7 @@ bool FiringTimer::pauseFiring()
 #endif // SUPPORT_STATE_CHANGE_DELAYED
 
 
-  DEBUG_LOG() << MY_Q_FUNC_INFO << " stop firing at m_firedAmmoCount = " << d->m_firedAmmoCount;
+  DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " stop firing at m_firedAmmoCount = " << d->m_firedAmmoCount;
   d->m_firingTimer->stop();
   d->m_currentFiringMode = FiringMode::FM_Paused;
   d->m_etPaused->start();
@@ -305,14 +305,14 @@ bool FiringTimer::pauseFiring()
   const qint64 activeElapsedMsec = d->m_etActive->elapsed();
   d->m_activeMsec += activeElapsedMsec;
   d->m_etActive->invalidate();
-  DEBUG_LOG() << MY_Q_FUNC_INFO << " stop firing after [ms]: " << activeElapsedMsec
+  DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " stop firing after [ms]: " << activeElapsedMsec
                       << ", m_activeMsec in total = " << d->m_activeMsec
                       << ", m_pausedMsec in total = " << d->m_pausedMsec;
 
   QString log = QString(QStringLiteral("pauseFiring_at_%1")).arg(QDateTime::currentMSecsSinceEpoch()) ;
   d->m_logHistorie.append(log);
 
-  TRACE_LOG() << MY_Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " END";
   return true;
 }
 
@@ -346,7 +346,7 @@ long FiringTimer::intervallMsec() const
 #ifdef SUPPORT_STATE_CHANGE_DELAYED
 void FiringTimer::emitStateChangeDelayed(AreaEffectSimulation::FiringTimer::CMD cmd, int firedAmmoCount)
 {
-  DEBUG_LOG() << MY_Q_FUNC_INFO << " SUPPORT_STATE_CHANGE_DELAYED: " << cmd
+  DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " SUPPORT_STATE_CHANGE_DELAYED: " << cmd
                        << ", firedAmmoCount = " << firedAmmoCount;
   emit stateChangeDelayedAsInt(static_cast<int>(cmd), firedAmmoCount);
 }
@@ -380,11 +380,11 @@ QString FiringTimer::toString(const CMD cmd)
 
 void FiringTimer::onFiringTimout()
 {
-  TRACE_LOG() << MY_Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " START";
 
   ++d->m_firedAmmoCount;
 
-  INFO_LOG() << MY_Q_FUNC_INFO << " emit firing with: " << d->m_firedAmmoCount
+  INFO_LOG(m_logger) << MY_Q_FUNC_INFO << " emit firing with: " << d->m_firedAmmoCount
                      << " of total ammoCount = " << d->m_ammoCount;
   emit firing(d->m_firedAmmoCount, d->m_ammoCount);
 
@@ -396,7 +396,7 @@ void FiringTimer::onFiringTimout()
     int currentFiringNumber = d->m_firedAmmoCount;
     int totalFiringNumber   = d->m_ammoCount;
 
-    DEBUG_LOG() << MY_Q_FUNC_INFO << " XXXXXXXXX schedule 'emit impact' " << currentFiringNumber;
+    DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " XXXXXXXXX schedule 'emit impact' " << currentFiringNumber;
 
     QTimer::singleShot(d->m_ammoFlightDurationMsec, this, [this, currentFiringNumber, totalFiringNumber]()
     {
@@ -408,7 +408,7 @@ void FiringTimer::onFiringTimout()
       }
 #endif // SUPPORT_STATE_CHANGE_DELAYED
 
-      INFO_LOG() << MY_Q_FUNC_INFO << " emit impact " << currentFiringNumber
+      INFO_LOG(m_logger) << MY_Q_FUNC_INFO << " emit impact " << currentFiringNumber
                          << " of total = " << totalFiringNumber;
       emit impact(currentFiringNumber, totalFiringNumber);
 
@@ -430,7 +430,7 @@ void FiringTimer::onFiringTimout()
 
   if (d->m_firedAmmoCount >= d->m_ammoCount)
   {
-    INFO_LOG() << MY_Q_FUNC_INFO << " no ammo left, finishing firing"
+    INFO_LOG(m_logger) << MY_Q_FUNC_INFO << " no ammo left, finishing firing"
                        << ", " << d->m_firedAmmoCount << " of total ammoCount = " << d->m_ammoCount << " are fired";
     d->m_firingTimer->stop();
 
@@ -440,7 +440,7 @@ void FiringTimer::onFiringTimout()
 
     // !! Attention: do pauseFiring() WITHIN the intervall will reduce amount of time the firing is active !!
 
-    DEBUG_LOG() << MY_Q_FUNC_INFO << " stop firing after [ms]: " << activeElapsedMsec
+    DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " stop firing after [ms]: " << activeElapsedMsec
                         << ", m_activeMsec in total = " << d->m_activeMsec
                         << ", m_pausedMsec in total = " << d->m_pausedMsec
                         << " now FiringTimoutExpiredPlus ...";
@@ -465,12 +465,12 @@ void FiringTimer::onFiringTimout()
     d->m_firingTimer->start();
   }
 
-  TRACE_LOG() << MY_Q_FUNC_INFO << " END" << ", m_firedAmmoCount " << d->m_firedAmmoCount;
+  TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " END" << ", m_firedAmmoCount " << d->m_firedAmmoCount;
 }
 
 void FiringTimer::onFiringTimoutExpiredPlus()
 {
-  TRACE_LOG() << MY_Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " START";
 
   d->m_currentFiringMode = FiringMode::FM_ExpiredPlus;
 
@@ -480,7 +480,7 @@ void FiringTimer::onFiringTimoutExpiredPlus()
 
   // !! Attention: do pauseFiring() WITHIN the intervall will reduce amount of time the firing is active !!
 
-  DEBUG_LOG() << MY_Q_FUNC_INFO << " stop firing2 after [ms]: " << activeElapsedMsec
+  DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " stop firing2 after [ms]: " << activeElapsedMsec
                       << ", m_activeMsec in total = " << d->m_activeMsec
                       << ", m_pausedMsec in total = " << d->m_pausedMsec;
 
@@ -488,7 +488,7 @@ void FiringTimer::onFiringTimoutExpiredPlus()
 
   emit firingFinishedPlus();
 
-  TRACE_LOG() << MY_Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " END";
 }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/dds_handler.cpp
index a56fdea6b..1ac12bb88 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/dds_handler.cpp
@@ -18,12 +18,11 @@
 namespace AreaEffectSimulation
 {
 
-DdsHandler::DdsHandler(int domainId, int exerciseId, QObject *parent)
-  : QObject(parent)
+DdsHandler::DdsHandler(int domainId, int exerciseId, QObject *parent) : QObject(parent)
   , m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise, exerciseId))
-  , m_currentTimeMSec(-1)
-{
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  , m_currentTimeMSec(-1),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 DdsHandler::~DdsHandler()
@@ -45,7 +44,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -84,7 +83,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
   m_ddsDts = AreaEffectSimulation::Interface::Dts::create(m_ddsConnector);
   m_ddsFts = AreaEffectSimulation::Interface::Fts::create(m_ddsConnector);
   bRet &= m_ddsDts->enableAll();
-  DEBUG_LOG() << "initialized Dts: " << bRet;
+  DEBUG_LOG(m_logger) << "initialized Dts: " << bRet;
 
   bRet &= m_ddsFts->enableAll();
   bRet &= m_ddsFts->enableTargetPositionsModify();
@@ -95,7 +94,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
   bRet &= m_ddsFts->enableAcknowledgeExternalAesItem();
   bRet &= m_ddsFts->enableSetAesItemEffectorState();
 
-  DEBUG_LOG() << "initialized Fts: " << bRet;
+  DEBUG_LOG(m_logger) << "initialized Fts: " << bRet;
 
   m_pdmDtc = ProjectDataManagement::Interface::Dtc::create(m_ddsConnector);
   m_pdmDtc->enableChargeType();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/dds_handler.h
index ba0e3e711..fc8cdf106 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/dds_handler.h
@@ -78,6 +78,7 @@ private slots:
   void onPartitionTimeChanged(const Core::PartitionTime &currentTime);
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector>               m_ddsConnector;
   std::shared_ptr<Core::Interface::Dtc>                     m_dtcCore;
   std::shared_ptr<Core::Pacemaker>                          m_pacemaker;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/effector_state_machine.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/effector_state_machine.cpp
index cbda39cc4..3f418e802 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/effector_state_machine.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/effector_state_machine.cpp
@@ -26,31 +26,31 @@ EffectorStateMachine::~EffectorStateMachine() { stopAllTimer(); }
 
 int EffectorStateMachine::intervalFire()
 {
-  DEBUG_LOG() << "intervalFire";
+  DEBUG_LOG(m_logger) << "intervalFire";
   return QRandomGenerator::global()->bounded(Settings::getEffectorIntervalFireMin(), Settings::getEffectorIntervalFireMax() + 1);
 }
 
 int EffectorStateMachine::intervalReportFired()
 {
-  DEBUG_LOG() << "intervalReportFired";
+  DEBUG_LOG(m_logger) << "intervalReportFired";
   return QRandomGenerator::global()->bounded(Settings::getEffectorIntervalReportFiredMin(), Settings::getEffectorIntervalReportFiredMax() + 1);
 }
 
 int EffectorStateMachine::intervalReportFireReadiness()
 {
-  DEBUG_LOG() << "intervalReportFireReadiness";
+  DEBUG_LOG(m_logger) << "intervalReportFireReadiness";
   return QRandomGenerator::global()->bounded(m_intervalReportFireReadinessMin, m_intervalReportFireReadinessMax + 1);
 }
 
 int EffectorStateMachine::intervalInitialFireReadiness()
 {
-  DEBUG_LOG() << "intervalInitialFireReadiness";
+  DEBUG_LOG(m_logger) << "intervalInitialFireReadiness";
   return QRandomGenerator::global()->bounded(Settings::getEffectorInitialReportFireReadinessMin(), Settings::getEffectorInitialReportFireReadinessMax() + 1);
 }
 
 void EffectorStateMachine::init()
 {
-  DEBUG_LOG() << "EffectorStateMachine::init";
+  DEBUG_LOG(m_logger) << "EffectorStateMachine::init";
   emit logMessage(
       QStringLiteral("intervalFire min=%1 max=%2, intervalReportFired min=%3 max=%4, intervalReportFireReadiness min=%5 max=%6 , initialFireReadiness min=%7 max=%8")
           .arg(
@@ -109,7 +109,7 @@ QString EffectorStateMachine::getStateStr(AreaEffectSimulation::AesEffectorState
 
 bool EffectorStateMachine::overrideReportFireReadinessMinMax(int newMin, int newMax)
 {
-  DEBUG_LOG() << "Override ReadinessMinMax min: " << newMin << " max: " << newMax;
+  DEBUG_LOG(m_logger) << "Override ReadinessMinMax min: " << newMin << " max: " << newMax;
 
   m_intervalReportFireReadinessMin = newMin;
   m_intervalReportFireReadinessMax = newMax;
@@ -118,7 +118,7 @@ bool EffectorStateMachine::overrideReportFireReadinessMinMax(int newMin, int new
 
 bool EffectorStateMachine::resetReportFireReadinessMinMax()
 {
-  DEBUG_LOG() << "Reset ReadinessMinMax min:" << Settings::getEffectorIntervalReportFireReadinessMin()
+  DEBUG_LOG(m_logger) << "Reset ReadinessMinMax min:" << Settings::getEffectorIntervalReportFireReadinessMin()
                       << " max: " << Settings::getEffectorIntervalReportFireReadinessMax();
 
   m_intervalReportFireReadinessMin = Settings::getEffectorIntervalReportFireReadinessMin();
@@ -156,7 +156,7 @@ bool EffectorStateMachine::reportNotFireReadiness()
   }
   QString timestamp = QDateTime::currentDateTime().toString(QStringLiteral("hh:mm:ss"));
   emit logMessage(QStringLiteral("[%1] change effect state: %2 -> %3").arg(timestamp, oldStateStr, newStateStr));
-  DEBUG_LOG() << QStringLiteral("[%1] change effect state: %2 -> %3").arg(timestamp, oldStateStr, newStateStr);
+  DEBUG_LOG(m_logger) << QStringLiteral("[%1] change effect state: %2 -> %3").arg(timestamp, oldStateStr, newStateStr);
   emit signalNotReadyToFire();
   return true;
 }
@@ -199,7 +199,7 @@ bool EffectorStateMachine::reportFireReadiness()
 
 bool EffectorStateMachine::fireOrder()
 {
-  DEBUG_LOG() << "fireOrder";
+  DEBUG_LOG(m_logger) << "fireOrder";
 
   AreaEffectSimulation::AesEffectorState newState = AreaEffectSimulation::AesEffectorState::EsReceivedOrder;
 
@@ -209,7 +209,7 @@ bool EffectorStateMachine::fireOrder()
   if (m_currentState == newState)
   {
     emit logMessage(QStringLiteral("Same State from %1 -> %2").arg(oldStateStr, newStateStr));
-    DEBUG_LOG() << QStringLiteral("Same State from %1 -> %2").arg(oldStateStr, newStateStr);
+    DEBUG_LOG(m_logger) << QStringLiteral("Same State from %1 -> %2").arg(oldStateStr, newStateStr);
     return false;
   }
 
@@ -220,7 +220,7 @@ bool EffectorStateMachine::fireOrder()
     if (Settings::getEffectorIntervalFireMin() >= 0)
     {
       emit logMessage(QStringLiteral("m_timerFire.start()"));
-      DEBUG_LOG() << QStringLiteral("m_timerFire.start()");
+      DEBUG_LOG(m_logger) << QStringLiteral("m_timerFire.start()");
       m_timerFire.setInterval(intervalFire());
       m_timerFire.start();
     }
@@ -228,12 +228,12 @@ bool EffectorStateMachine::fireOrder()
   else
   {
     emit logMessage(QStringLiteral("No Statechange possible from %1 -> %2").arg(oldStateStr, newStateStr));
-    DEBUG_LOG() << QStringLiteral("No Statechange possible from %1 -> %2").arg(oldStateStr, newStateStr);
+    DEBUG_LOG(m_logger) << QStringLiteral("No Statechange possible from %1 -> %2").arg(oldStateStr, newStateStr);
     return false;
   }
   QString timestamp = QDateTime::currentDateTime().toString(QStringLiteral("hh:mm:ss"));
   emit logMessage(QStringLiteral("[%1] change effect state: %2 -> %3").arg(timestamp, oldStateStr, newStateStr));
-  DEBUG_LOG() << QStringLiteral("[%1] change effect state: %2 -> %3").arg(timestamp, oldStateStr, newStateStr);
+  DEBUG_LOG(m_logger) << QStringLiteral("[%1] change effect state: %2 -> %3").arg(timestamp, oldStateStr, newStateStr);
   emit signalReceivedOrder();
   return true;
 }
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 4bfaff874..3657d3a30 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
@@ -37,7 +37,7 @@ bool HandlerChargeEffect::init()
 
   if (!m_mainHandler)
   {
-    ERROR_LOG() << QStringLiteral("Not possible to init HandlerChargeEffect --> No MainHandler present.");
+    ERROR_LOG(m_logger) << QStringLiteral("Not possible to init HandlerChargeEffect --> No MainHandler present.");
 
     return false;
   }
@@ -46,7 +46,7 @@ bool HandlerChargeEffect::init()
 
   if (!m_mainHandler->db()->select(chargeEffectDbData))
   {
-    ERROR_LOG() << QStringLiteral("Not possible to init HandlerChargeEffect --> Not possible to get database data.");
+    ERROR_LOG(m_logger) << QStringLiteral("Not possible to init HandlerChargeEffect --> Not possible to get database data.");
 
     return false;
   }
@@ -82,7 +82,7 @@ void HandlerChargeEffect::onChargeEffectModifyRequest(const rti::core::SampleIde
 {
   if (!m_mainHandler)
   {
-    ERROR_LOG() << QStringLiteral("Not possible to process ChargeEffectModifyRequest --> No MainHandler present.");
+    ERROR_LOG(m_logger) << QStringLiteral("Not possible to process ChargeEffectModifyRequest --> No MainHandler present.");
 
     return;
   }
@@ -117,13 +117,13 @@ void HandlerChargeEffect::onChargeEffectFinished(qint32 chargeEffectId)
 
   if (chargeEffect == nullptr)
   {
-    ERROR_LOG() << "onChargeEffectExpired: got invalid chargeEffectId " << chargeEffectId;
+    ERROR_LOG(m_logger) << "onChargeEffectExpired: got invalid chargeEffectId " << chargeEffectId;
     return;
   }
 
   if (!chargeEffect->remove())
   {
-    ERROR_LOG() << "onChargeEffectExpired: failed to remove ChargeEffect with id " << chargeEffectId;
+    ERROR_LOG(m_logger) << "onChargeEffectExpired: failed to remove ChargeEffect with id " << chargeEffectId;
     return;
   }
 
@@ -135,7 +135,7 @@ void HandlerChargeEffect::onChargeEffectFinished(qint32 chargeEffectId)
   const int trajId = m_trajObjIds.value(chargeEffectId, -1);
   if (!m_trajectoryHandler->remove(trajId))
   {
-    ERROR_LOG() << "onChargeEffectExpired: failed to remove trajectory from chargeEffect id " << chargeEffectId;
+    ERROR_LOG(m_logger) << "onChargeEffectExpired: failed to remove trajectory from chargeEffect id " << chargeEffectId;
     return;
   }
   m_trajObjIds.remove(chargeEffectId);
@@ -143,7 +143,7 @@ void HandlerChargeEffect::onChargeEffectFinished(qint32 chargeEffectId)
 
 void HandlerChargeEffect::onChargeEffectStateChanged(const int id, AesEffectState newState)
 {
-  DEBUG_LOG() << " [CHARGE EFFECT STATE] state changed !! id: " << id << " state: " << newState;
+  DEBUG_LOG(m_logger) << " [CHARGE EFFECT STATE] state changed !! id: " << id << " state: " << newState;
 
   if (id <= 0)
     return;
@@ -165,8 +165,8 @@ Core::FunctionReplyObject HandlerChargeEffect::createChargeEffect(const ChargeEf
     m_chargeEffects.insert(newChargeEffect->id(), newChargeEffect);
 
     // Create ChargeAdministration Entry for reports
-    DEBUG_LOG() << "newChargeEffect id: " << newChargeEffect->id();
-    DEBUG_LOG() << "request.originatorTypeId: " << request.originatorTypeId();
+    DEBUG_LOG(m_logger) << "newChargeEffect id: " << newChargeEffect->id();
+    DEBUG_LOG(m_logger) << "request.originatorTypeId: " << request.originatorTypeId();
     if (request.originatorTypeId() == ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation)
     {
       int amount = 1;
@@ -185,7 +185,7 @@ Core::FunctionReplyObject HandlerChargeEffect::createChargeEffect(const ChargeEf
     {
       int trajId = m_trajectoryHandler->create(trajectoryData(newChargeEffect->id(), request.trajectoryTimeAware().get()));
       if (trajId < 0)
-        ERROR_LOG() << " Couldn't create trajectory for chargeEffect id: " << newChargeEffect->id();
+        ERROR_LOG(m_logger) << " Couldn't create trajectory for chargeEffect id: " << newChargeEffect->id();
       else
         m_trajObjIds.insert(newChargeEffect->id(), trajId);
     }
@@ -233,7 +233,7 @@ Core::FunctionReplyObject HandlerChargeEffect::updateChargeEffect(const ChargeEf
   {
     reply.setStr("Not possible to update ChargeEffect --> No MainHandler present.");
 
-    ERROR_LOG() << reply.str();
+    ERROR_LOG(m_logger) << reply.str();
 
     return reply;
   }
@@ -243,7 +243,7 @@ Core::FunctionReplyObject HandlerChargeEffect::updateChargeEffect(const ChargeEf
 
     reply.setStr("Not possible to update ChargeEffect --> Got invalid id.");
 
-    ERROR_LOG() << reply.str();
+    ERROR_LOG(m_logger) << reply.str();
 
     return reply;
   }
@@ -257,7 +257,7 @@ Core::FunctionReplyObject HandlerChargeEffect::updateChargeEffect(const ChargeEf
   {
     // update failed should the trajectory be created again?
     reply.setStr("Not possible to update ChargeEffect --> Got invalid trajectory id.");
-    ERROR_LOG() << " Couldn't update trajectory: unknown chargeEffect id: " << chargeEffetObj->id();
+    ERROR_LOG(m_logger) << " Couldn't update trajectory: unknown chargeEffect id: " << chargeEffetObj->id();
   }
 
   return reply;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_charge_effect.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_charge_effect.h
index 0c2736f1e..54fa3da8d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_charge_effect.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_charge_effect.h
@@ -39,6 +39,8 @@ public:
     void onChargeEffectStateChanged(const int id, AesEffectState newState);
 
 private: // methods
+
+NGL::INGLLogger &m_logger;
   Core::FunctionReplyObject updateChargeEffect(const ChargeEffectModifyRequest &request);
 
 private: // attributes
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effector.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effector.cpp
index 357257c6d..8afb6760f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effector.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effector.cpp
@@ -28,7 +28,7 @@ HandlerEffector::HandlerEffector(AreaEffectSimulation::MainHandler *mainhandler,
 
 bool HandlerEffector::init()
 {
-  DEBUG_LOG() << "HandlerEffector::init";
+  DEBUG_LOG(m_logger) << "HandlerEffector::init";
 
   connect(m_ppmDtc.get(), &ParticipantManagement::Interface::Dtc::participantChanged,
           this, &HandlerEffector::onParticipantChanged);
@@ -48,7 +48,7 @@ void HandlerEffector::createEffector(int participantId)
 {
   if (m_effectors.contains(participantId))
     return;
-  DEBUG_LOG()<<"createEffector participantId:" << participantId;
+  DEBUG_LOG(m_logger)<<"createEffector participantId:" << participantId;
   ObjectEffector* objectEffector = new ObjectEffector(m_mainHandler, this);
   objectEffector->init(participantId);
 
@@ -58,17 +58,17 @@ void HandlerEffector::createEffector(int participantId)
 // TODO Wird aufgerufen, wenn zur Laufzeit ein Effektor geloescht wird. (Topic?)
 void HandlerEffector::deleteEffector(int participantId)
 {
-  DEBUG_LOG()<<"deleteEffector participantId:" << participantId;
+  DEBUG_LOG(m_logger)<<"deleteEffector participantId:" << participantId;
   delete m_effectors[participantId];
   m_effectors.remove(participantId);
 }
 
 void HandlerEffector::onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType)
 {
-  //DEBUG_LOG()<<"onParticipantChanged participantId:" << data.id();
+  //DEBUG_LOG(m_logger)<<"onParticipantChanged participantId:" << data.id();
   if (modType == DataModification::eRemoved)
   {
-    DEBUG_LOG() << "m_participantsOutsideMap.remove participantId: " << data.id();
+    DEBUG_LOG(m_logger) << "m_participantsOutsideMap.remove participantId: " << data.id();
     if (m_effectors.contains(data.id()))
       deleteEffector(data.id());
     return;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effector.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effector.h
index eaaed1df9..7186764ac 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effector.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effector.h
@@ -29,6 +29,8 @@ namespace AreaEffectSimulation
     ObjectEffector* getObjectEffector (int participantId) {return m_effectors.value(participantId);};
 
   private: // methods
+
+  NGL::INGLLogger &m_logger;
     void createEffector(int participantId);
     void deleteEffector(int participantId);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_trajectory.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_trajectory.cpp
index 418501465..166f07efd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_trajectory.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_trajectory.cpp
@@ -36,21 +36,21 @@ HandlerTrajectory::HandlerTrajectory(MainHandler *mainHandler)
 
 HandlerTrajectory::~HandlerTrajectory()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   delete d;
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 int HandlerTrajectory::create(const TrajectoryData &providedData)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   int newId = -1;
 
   auto *ifs = new ObjectTrajectory(d->m_mainHandler);
   if (!ifs)
   {
-    ERROR_LOG()<<" couldn't create ObjectTrajectory!";
-    TRACE_LOG() << Q_FUNC_INFO << " END";
+    ERROR_LOG(m_logger)<<" couldn't create ObjectTrajectory!";
+    TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
     return -1;
   }
 
@@ -66,17 +66,17 @@ int HandlerTrajectory::create(const TrajectoryData &providedData)
     ifs->publish();
   }
 
-  TRACE_LOG() << Q_FUNC_INFO << " END, newId = " << newId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, newId = " << newId;
   return newId;
 }
 
 bool HandlerTrajectory::update(const TrajectoryData &providedData)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, id = " << providedData.id;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, id = " << providedData.id;
   bool success = false;
   if (!providedData.isIdValid())
   {
-    TRACE_LOG() << Q_FUNC_INFO << " END ";
+    TRACE_LOG(m_logger) << Q_FUNC_INFO << " END ";
     return false;
   }
 
@@ -87,25 +87,25 @@ bool HandlerTrajectory::update(const TrajectoryData &providedData)
     success = true;
   }
 
-  TRACE_LOG() << Q_FUNC_INFO << " END, success =  " << success;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, success =  " << success;
   return success;
 }
 
 bool HandlerTrajectory::remove(const int trajId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, id = " << trajId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, id = " << trajId;
 
   if (trajId <= 0)
   {
-    ERROR_LOG() << " remove topic: got Invalid trajectory Id: "<<trajId;
-    TRACE_LOG() << Q_FUNC_INFO << " END ";
+    ERROR_LOG(m_logger) << " remove topic: got Invalid trajectory Id: "<<trajId;
+    TRACE_LOG(m_logger) << Q_FUNC_INFO << " END ";
     return false;
   }
 
   auto *ifs = d->m_objectMap[trajId];
   if (!ifs->removeTopic())
   {
-    ERROR_LOG() << "failed to remove trajectory with id " << trajId;
+    ERROR_LOG(m_logger) << "failed to remove trajectory with id " << trajId;
     return false;
   }
 
@@ -113,13 +113,13 @@ bool HandlerTrajectory::remove(const int trajId)
   delete ifs;
   ifs = nullptr;
 
-  TRACE_LOG() << Q_FUNC_INFO << " END ";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END ";
   return true;
 }
 
 int HandlerTrajectory::createUpdate(const TrajectoryData &providedData)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, id = " << providedData.id;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, id = " << providedData.id;
 
   int ret = -1;
 
@@ -130,7 +130,7 @@ int HandlerTrajectory::createUpdate(const TrajectoryData &providedData)
   } else {
     ret = create(providedData);
   }
-  TRACE_LOG() << Q_FUNC_INFO << " END, id ret " << ret;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, id ret " << ret;
 
   return ret;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_trajectory.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_trajectory.h
index f359266e6..19f35e198 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_trajectory.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_trajectory.h
@@ -35,6 +35,7 @@ public:
   int createUpdate(const TrajectoryData& providedData);
 
 private:
+  NGL::INGLLogger &m_logger;
   int count() const;
 
   class Private;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/main_handler.cpp
index 98a02204a..59b146ee6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/main_handler.cpp
@@ -46,9 +46,8 @@
 
 namespace AreaEffectSimulation
 {
-MainHandler::MainHandler(QObject *parent)
-  : QObject(parent)
-{
+MainHandler::MainHandler(QObject *parent) : QObject(parent),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
   QRandomGenerator(time(nullptr));
 #else
@@ -95,7 +94,7 @@ bool MainHandler::init(int domainId, int exerciseId)
   m_dbHandler = std::make_shared<DbHandler>();
   if(!m_dbHandler->init(exerciseId, Settings::settings()))
   {
-    ERROR_LOG() << "Initialisation DbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation DbHandler failed.";
     return false;
   }
 
@@ -104,7 +103,7 @@ bool MainHandler::init(int domainId, int exerciseId)
     m_dbHandlerEx0 = std::make_shared<DbHandler>();
     if (!m_dbHandlerEx0->init(0, Settings::settings())) // need a second db connection due to username/password
     {
-      ERROR_LOG() << "Could not init DbHandler";
+      ERROR_LOG(m_logger) << "Could not init DbHandler";
       m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError,
                                              QStringLiteral("Could not init DbHandler"));
       return false;
@@ -120,7 +119,7 @@ bool MainHandler::init(int domainId, int exerciseId)
   m_ddsHandler = std::make_shared<DdsHandler>(domainId, exerciseId);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation DdsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
     return false;
   }
 
@@ -158,7 +157,7 @@ bool MainHandler::initAESHandler()
   // prepare some basics for HandlerExplosionCluster
   // - TrajectoryGenerator
   // - LtsElevationManager
-  DEBUG_LOG() << Q_FUNC_INFO << " ****** std::make_shared<HandlerExplosionCluster...";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " ****** std::make_shared<HandlerExplosionCluster...";
   const int exerciseId = dds()->exerciseId();
   LtsElevation::LTS_ELEVATION_MANAGER_TYPE ltsElevationManager = LtsElevation::LtsElevationManager::createInstance(exerciseId,
                                                                                                                    dds()->exmDtc(),
@@ -176,7 +175,7 @@ bool MainHandler::initAESHandler()
 #ifndef Q_OS_WIN   // GUEZE-2195
   if (!ltsElevationManager)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " LtsElevation::createInstance failed.";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " LtsElevation::createInstance failed.";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::inner_enum::StoppedError);
     return false;
   }
@@ -188,7 +187,7 @@ bool MainHandler::initAESHandler()
                                                                               this->dds()->asmDtc());
   if (!trajectoryGenerator)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " TrajectoryGenerator::getInstance failed.";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " TrajectoryGenerator::getInstance failed.";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::inner_enum::StoppedError);
     return false;
   }
@@ -196,7 +195,7 @@ bool MainHandler::initAESHandler()
   m_handlerExplosionCluster = std::make_shared<HandlerExplosionCluster>(this);
   if (!m_handlerExplosionCluster->init())
     return false;
-  DEBUG_LOG() << Q_FUNC_INFO << " ****** std::make_shared<HandlerExplosionCluster... DONE";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " ****** std::make_shared<HandlerExplosionCluster... DONE";
 
   m_handlerFunctionalArea = std::make_shared<HandlerFunctionalArea>(this);
   if (!m_handlerFunctionalArea->init())
@@ -248,7 +247,7 @@ bool MainHandler::initAESHandler()
   m_handlerBorderline = std::make_shared<HandlerBorderline>(this);
   if (!m_handlerBorderline->init())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Initialisation HandlerBorderline failed.";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Initialisation HandlerBorderline failed.";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::inner_enum::StoppedError);
     return false;
   }
@@ -257,7 +256,7 @@ bool MainHandler::initAESHandler()
   m_handlerGasPipe = std::make_shared<HandlerGasPipe>(this);
   if (!m_handlerGasPipe->init())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Initialisation HandlerGasPipe failed.";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Initialisation HandlerGasPipe failed.";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::inner_enum::StoppedError);
     return false;
   }
@@ -266,7 +265,7 @@ bool MainHandler::initAESHandler()
   m_handlerChargeEffect = std::make_shared<HandlerChargeEffect>(this);
   if (!m_handlerChargeEffect->init())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Initialisation HandlerChargeEffect failed.";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Initialisation HandlerChargeEffect failed.";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::inner_enum::StoppedError);
     return false;
   }
@@ -279,7 +278,7 @@ bool MainHandler::initAESHandler()
   m_handlerEffector = std::make_shared<HandlerEffector>(this);
   if (!m_handlerEffector->init())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Initialisation HandlerChargeEffect failed.";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Initialisation HandlerChargeEffect failed.";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::inner_enum::StoppedError);
     return false;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/main_handler.h
index f036d1432..aceb7a201 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/main_handler.h
@@ -115,8 +115,10 @@ public:
 
 
 private:
+  NGL::INGLLogger &m_logger;
     bool initAESHandler();
 private:
+  NGL::INGLLogger &m_logger;
     std::shared_ptr<HandlerAirSupportImpact>       m_handlerAirSupportImpact;
     std::shared_ptr<HandlerExplosionSingle>        m_handlerExplosionSingle;
     std::shared_ptr<HandlerExplosionArea>          m_handlerExplosionArea;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/mine_corridor_creator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/mine_corridor_creator.cpp
index 4e2d3bf21..6189d0d36 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/mine_corridor_creator.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/mine_corridor_creator.cpp
@@ -21,12 +21,11 @@ namespace AreaEffectSimulation
 static const int s_samePointDistance = 10; // 10m
 static const int s_smoothDistance = 10;  // 10m
 static const int s_timeoutInterval = 10 * 60 * 1000;  // 10min
-MineCorridorCreator::MineCorridorCreator(int equipNo, ObjectMineCorridor *omc)
-  : m_timer(new QTimer(this))
+MineCorridorCreator::MineCorridorCreator(int equipNo, ObjectMineCorridor *omc) : m_timer(new QTimer(this))
   , m_timeoutTimer(new QTimer(this))
   , m_omc(omc)
-  , m_equipNo(equipNo)
-{
+  , m_equipNo(equipNo),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_timeoutTimer->setInterval(s_timeoutInterval);
   m_timeoutTimer->setSingleShot(true);
   connect(m_timeoutTimer, &QTimer::timeout, this, &MineCorridorCreator::timeout, Qt::QueuedConnection);
@@ -54,7 +53,7 @@ void MineCorridorCreator::addPosition(const Core::GeoPosition2D &pos, qint64 ts)
     const auto utm = LtsCoordTrans::UtmCoordinate::fromGeographic(pos.lon(), pos.lat(), last.zone);
     if (isSamePoint(last, utm, s_samePointDistance))
     {
-      DEBUG_LOG() << "got duplicated point (" << last.x << "/" << last.y
+      DEBUG_LOG(m_logger) << "got duplicated point (" << last.x << "/" << last.y
                           << " - " << utm.x << "/" << utm.y << " from " << m_equipNo << " - ignoring";
       return;
     }
@@ -69,7 +68,7 @@ void MineCorridorCreator::creationFinished()
 
   if (m_sortedCorridorData.size() < 2)
   {
-    WARNING_LOG() << "To few points to create mine corridor for " << m_equipNo;
+    WARNING_LOG(m_logger) << "To few points to create mine corridor for " << m_equipNo;
     return;
   }
   checkCorridorData(true);
@@ -94,13 +93,13 @@ static void outputCoords(NGL::INGLLogger &logger, NGL::LogLevel level, const std
 
 void MineCorridorCreator::checkCorridorData(bool bFinished)
 {
-  DEBUG_LOG() << "Checking corridor data (finished: " << bFinished << ") for equipment " << m_equipNo;
+  DEBUG_LOG(m_logger) << "Checking corridor data (finished: " << bFinished << ") for equipment " << m_equipNo;
   std::vector<LtsCoordTrans::UtmCoordinate> coords;
   coords.reserve(m_sortedCorridorData.size());
   for (const auto &c : std::as_const(m_sortedCorridorData))
     coords.push_back(c);
   const auto coordsSmoothed = ramerDouglasPeucker(coords, s_smoothDistance);
-  DEBUG_LOG() << "Calculated points:";
+  DEBUG_LOG(m_logger) << "Calculated points:";
   outputCoords(m_logger, NGL::LogLevel::Debug, coordsSmoothed);
   if (coordsSmoothed.size() < 2)
     return;
@@ -108,7 +107,7 @@ void MineCorridorCreator::checkCorridorData(bool bFinished)
   segments.reserve(coordsSmoothed.size());
   for (const LtsCoordTrans::UtmCoordinate &utm : coordsSmoothed)
   {
-    DEBUG_LOG() << "Mine Corridor calculated point: " << qRound(utm.x) << "/" << qRound(utm.y);
+    DEBUG_LOG(m_logger) << "Mine Corridor calculated point: " << qRound(utm.x) << "/" << qRound(utm.y);
     const QPointF geo(utm.geographic());
     segments.emplace_back(Core::GeoPosition2D(geo.x(), geo.y()));
   }
@@ -181,7 +180,7 @@ std::vector<LtsCoordTrans::UtmCoordinate> MineCorridorCreator::ramerDouglasPeuck
   // If max distance is greater than epsilon, recursively simplify
   if (dmax > epsilon)
   {
-    TRACE_LOG() << "Input points, split index = " << index;
+    TRACE_LOG(m_logger) << "Input points, split index = " << index;
     outputCoords(m_logger, NGL::LogLevel::Trace, pointList);
     // Recursive call
     const std::vector<LtsCoordTrans::UtmCoordinate> firstLine(pointList.begin(), pointList.begin() + index + 1);
@@ -191,9 +190,9 @@ std::vector<LtsCoordTrans::UtmCoordinate> MineCorridorCreator::ramerDouglasPeuck
       out.erase(--out.end());
 
     const auto recResults2 = ramerDouglasPeucker(lastLine, epsilon);
-    TRACE_LOG() << "Output points left:";
+    TRACE_LOG(m_logger) << "Output points left:";
     outputCoords(m_logger, NGL::LogLevel::Trace, out);
-    TRACE_LOG() << "Output points right:";
+    TRACE_LOG(m_logger) << "Output points right:";
     outputCoords(m_logger, NGL::LogLevel::Trace, recResults2);
 
     out.insert(out.end(), recResults2.begin(), recResults2.end());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/mine_corridor_creator.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/mine_corridor_creator.h
index 35101c527..d6c01e603 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/mine_corridor_creator.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/mine_corridor_creator.h
@@ -33,6 +33,7 @@ Q_SIGNALS:
 private Q_SLOTS:
   void onCheckCorridorData();
 private:
+  NGL::INGLLogger &m_logger;
   void checkCorridorData(bool bFinished);
   static bool isSamePoint(const LtsCoordTrans::UtmCoordinate &p1, const LtsCoordTrans::UtmCoordinate &p2, double epsilon);
   static double perpendicularDistance(const LtsCoordTrans::UtmCoordinate &pt,
@@ -41,6 +42,7 @@ private:
   std::vector<LtsCoordTrans::UtmCoordinate> ramerDouglasPeucker(const std::vector<LtsCoordTrans::UtmCoordinate> &pointList,
                                                                 double epsilon) const;
 private:
+  NGL::INGLLogger &m_logger;
   QMap<qint64, LtsCoordTrans::UtmCoordinate> m_sortedCorridorData;
   QTimer *m_timer;
   QTimer *m_timeoutTimer;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.cpp
index d82c2be4e..3fe84b313 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.cpp
@@ -44,7 +44,7 @@ void ObjectBase::setEffectState(AesEffectState newState)
   Q_UNUSED(newState)
   m_publishDataTimer->start();
   AesEffectState es = checkEnterNewState();  // can create loop because checkEnterNewState is calling trySwitchFoo() but it's ok
-  DEBUG_LOG() << id() << " New effect state is " << es;
+  DEBUG_LOG(m_logger) << id() << " New effect state is " << es;
   emit effectStateChanged();
 }
 
@@ -91,7 +91,7 @@ bool ObjectBase::isObjectInTrainingArea() const
 
 AesEffectState ObjectBase::checkEnterNewState()
 {
-  DEBUG_LOG() << id() << " checkEnterNewState  - cur effect state is " << effectState();
+  DEBUG_LOG(m_logger) << id() << " checkEnterNewState  - cur effect state is " << effectState();
   bool bNeedToPublishNewData = false;
   switch (effectState().underlying())
   {
@@ -147,13 +147,13 @@ AesEffectState ObjectBase::checkEnterNewState()
       {
         timeToTickMsec = activationTime().toMSecsSinceEpoch() - partitionTimeMSec() - flightDurationMsec();
 
-        DEBUG_LOG() << id() << " timeUntilFiredMSec: " << timeToTickMsec;
+        DEBUG_LOG(m_logger) << id() << " timeUntilFiredMSec: " << timeToTickMsec;
       }
       else // setup EsAvtivated
       {
         timeToTickMsec = activationTime().toMSecsSinceEpoch() - partitionTimeMSec(); // time until activation
 
-        DEBUG_LOG() << id() << " timeUntilActivationMSec: " << timeToTickMsec
+        DEBUG_LOG(m_logger) << id() << " timeUntilActivationMSec: " << timeToTickMsec
                             << " cur: " << partitionTimeMSec()
                             << " activation: " << activationTime().toMSecsSinceEpoch();
       }
@@ -172,7 +172,7 @@ AesEffectState ObjectBase::checkEnterNewState()
       {
         if (!trySwitchToActivated())
         {
-          WARNING_LOG() << id() << " Error switching to active ...";
+          WARNING_LOG(m_logger) << id() << " Error switching to active ...";
           QTimer::singleShot(100, this, &ObjectBase::checkEnterNewState); // maybe some timing
         }
       }
@@ -193,7 +193,7 @@ AesEffectState ObjectBase::checkEnterNewState()
       // start timer for done
       m_aesTriggerTimer->stop();  // if it is called directly by someone
       qint64 timeUntilFinishedMSec = endTime().toMSecsSinceEpoch() - partitionTimeMSec();
-      DEBUG_LOG() << id() << " timeUntilFinishedMSec: " << timeUntilFinishedMSec
+      DEBUG_LOG(m_logger) << id() << " timeUntilFinishedMSec: " << timeUntilFinishedMSec
                           << " cur: " << partitionTimeMSec()
                           << " activation: " << activationTime().toMSecsSinceEpoch();
       if (timeUntilFinishedMSec > 0)
@@ -208,7 +208,7 @@ AesEffectState ObjectBase::checkEnterNewState()
       {
         if (!trySwitchToExpired())
         {
-          WARNING_LOG() << id() << " Error switching from active to expired ...";
+          WARNING_LOG(m_logger) << id() << " Error switching from active to expired ...";
           QTimer::singleShot(100, this, &ObjectBase::checkEnterNewState); // maybe some timing
         }
       }
@@ -220,7 +220,7 @@ AesEffectState ObjectBase::checkEnterNewState()
   case AesEffectState::EsRemoved:
     break;
   default:
-    ERROR_LOG() << id() << " Unknown new state " << effectState();
+    ERROR_LOG(m_logger) << id() << " Unknown new state " << effectState();
     break;
   }
   if (bNeedToPublishNewData)
@@ -239,7 +239,7 @@ bool ObjectBase::trySwitchToReceived()
   if (!isUsingEffectStateReceived())
     return false;
 
-  DEBUG_LOG() << id() << " trySwitchToReceived succeeded";
+  DEBUG_LOG(m_logger) << id() << " trySwitchToReceived succeeded";
   setEffectState(AesEffectState::EsReceived);
   return true;
 }
@@ -261,7 +261,7 @@ bool ObjectBase::trySwitchToCreated()
       isUsingEffectStateReceived())
     return false;
 
-  DEBUG_LOG() << id() << " trySwitchToCreated succeeded";
+  DEBUG_LOG(m_logger) << id() << " trySwitchToCreated succeeded";
   setEffectState(AesEffectState::EsCreated);
   return true;
 }
@@ -280,7 +280,7 @@ bool ObjectBase::trySwitchToPrepared()
   if (!isActivationTimeSet())
     return false;
 
-  DEBUG_LOG() << id() << " trySwitchToPrepared succeeded";
+  DEBUG_LOG(m_logger) << id() << " trySwitchToPrepared succeeded";
   setEffectState(AesEffectState::EsPrepared);
   return true;
 }
@@ -290,29 +290,29 @@ bool ObjectBase::trySwitchToFired()
 {
   if (effectState() != AesEffectState::EsPrepared)
   {
-    DEBUG_LOG() << id() << " trySwitchToFired failed - not prepared: " << effectState();
+    DEBUG_LOG(m_logger) << id() << " trySwitchToFired failed - not prepared: " << effectState();
     return false;
   }
 
   if (aesType() != AesType::AtExplosionArea && aesType() != AesType::AtEffectCluster)
   {
-    DEBUG_LOG() << id() << " trySwitchToFired failed - not AtExplosionArea: " << aesType();
+    DEBUG_LOG(m_logger) << id() << " trySwitchToFired failed - not AtExplosionArea: " << aesType();
     return false;
   }
 
   if (!isFiringTimeReached())
   {
-    DEBUG_LOG() << id() << " trySwitchToFired failed - firing time is not reached";
+    DEBUG_LOG(m_logger) << id() << " trySwitchToFired failed - firing time is not reached";
     return false;
   }
 
   if (isActivationTimeReached())
   {
-    DEBUG_LOG() << id() << " trySwitchToFired failed - activation time already reached!";
+    DEBUG_LOG(m_logger) << id() << " trySwitchToFired failed - activation time already reached!";
     return false;
   }
 
-  DEBUG_LOG() << id() << " trySwitchToFired succeeded";
+  DEBUG_LOG(m_logger) << id() << " trySwitchToFired succeeded";
   setEffectState(AesEffectState::EsFired);
   return true;
 }
@@ -324,17 +324,17 @@ bool ObjectBase::trySwitchToActivated()
       effectState() != AesEffectState::EsPaused &&
       effectState() != AesEffectState::EsFired)
   {
-    DEBUG_LOG() << id() << " trySwitchToActivated failed - not prepared/fired/paused: " << effectState();
+    DEBUG_LOG(m_logger) << id() << " trySwitchToActivated failed - not prepared/fired/paused: " << effectState();
     return false;
   }
   if (!isActivationTimeReached())
   {
-    DEBUG_LOG() << id() << " trySwitchToActivated failed - activation time not reached: "
+    DEBUG_LOG(m_logger) << id() << " trySwitchToActivated failed - activation time not reached: "
                         << isActivationTimeSet() << " - " << time(nullptr) << " - " << activationTime().toSecsSinceEpoch();
     return false;
   }
 
-  DEBUG_LOG() << id() << " trySwitchToActivated succeeded";
+  DEBUG_LOG(m_logger) << id() << " trySwitchToActivated succeeded";
   setEffectState(AesEffectState::EsActivated);
   return true;
 }
@@ -347,7 +347,7 @@ bool ObjectBase::trySwitchToPaused()
   if (!isPausingSupported())
     return false;
 
-  DEBUG_LOG() << id() << " trySwitchToPaused succeeded";
+  DEBUG_LOG(m_logger) << id() << " trySwitchToPaused succeeded";
   setEffectState(AesEffectState::EsPaused);
   return true;
 }
@@ -358,24 +358,24 @@ bool ObjectBase::trySwitchToExpired()
   if (effectState() != AesEffectState::EsActivated &&
       effectState() != AesEffectState::EsPaused)
   {
-    DEBUG_LOG() << id() << " trySwitchToExpired failed - not active or paused: " << effectState();
+    DEBUG_LOG(m_logger) << id() << " trySwitchToExpired failed - not active or paused: " << effectState();
     return false;
   }
   if (!isEndTimeReached())
   {
-    DEBUG_LOG() << id() << " trySwitchToExpired failed - end time not reached: "
+    DEBUG_LOG(m_logger) << id() << " trySwitchToExpired failed - end time not reached: "
                         << isEndTimeSet() << " - " << time(nullptr) << " - " << endTime().toSecsSinceEpoch();
     return false;
   }
 
-  DEBUG_LOG() << id() << " trySwitchToExpired succeeded";
+  DEBUG_LOG(m_logger) << id() << " trySwitchToExpired succeeded";
   setEffectState(AesEffectState::EsExpired);
   return true;
 }
 
 bool ObjectBase::trySwitchToRemoved()
 {
-  DEBUG_LOG() << id() << " trySwitchToRemoved: " << effectState();
+  DEBUG_LOG(m_logger) << id() << " trySwitchToRemoved: " << effectState();
   switch (effectState().underlying())
   {
   case AesEffectState::EsReceived:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.h
index eb0fb7ae6..e1b4556e7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.h
@@ -204,7 +204,7 @@ template <typename T> class ObjectBaseTmpl : public ObjectBase
       // check effect start for new elements if not OC
       if ((0 == m_data.id) && (isActivationTimeSet() && activationTime() < QDateTime::currentDateTimeUtc()) && !ignoreActivationTimeCheck)
       {
-        DEBUG_LOG() << "m_data.id : " << m_data.id << ", isActivationTimeSet :" << isActivationTimeSet()
+        DEBUG_LOG(m_logger) << "m_data.id : " << m_data.id << ", isActivationTimeSet :" << isActivationTimeSet()
                             << ", activationTime :" << activationTime().toMSecsSinceEpoch() << ", ignoreActivationTimeCheck :" << ignoreActivationTimeCheck;
         // << ", QDateTime::currentDateTimeUtc() :" << QDateTime::currentDateTimeUtc().msecsTo();
         return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Effect start is in the past."));
@@ -331,7 +331,7 @@ template <typename T> class ObjectBaseTmpl : public ObjectBase
 
   void onPublishData() override
   {
-    DEBUG_LOG() << id() << " Publishing data for " << m_typeName << " with name '" << m_data.name << "'"
+    DEBUG_LOG(m_logger) << id() << " Publishing data for " << m_typeName << " with name '" << m_data.name << "'"
                         << " isCentral=" << m_data.isCentral;
     ObjectBase::onPublishData();
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_administration.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_administration.cpp
index ff3faaa40..fb6155241 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_administration.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_administration.cpp
@@ -53,7 +53,7 @@ Core::FunctionReplyObject ObjectChargeAdministration::updateObject(const Databas
 
 Core::FunctionReplyObject ObjectChargeAdministration::claimPlannedCharge(int count)
 {
-  DEBUG_LOG() << "claimPlannedCharge for id : " << m_data.chargeTypeId << ", count: " << count;
+  DEBUG_LOG(m_logger) << "claimPlannedCharge for id : " << m_data.chargeTypeId << ", count: " << count;
 
   // Works both directions, can "claim" negative count!
   if (m_data.amount - m_data.planned < count)
@@ -81,11 +81,11 @@ Core::FunctionReplyObject ObjectChargeAdministration::consumeCharge(int count, b
     if (m_data.planned < count)
     {
       // consume what is possible
-      WARNING_LOG() << "Cannot consume " << count << ", consuming instead " << m_data.planned << " planned";
+      WARNING_LOG(m_logger) << "Cannot consume " << count << ", consuming instead " << m_data.planned << " planned";
       count = m_data.planned;
     }
 
-    DEBUG_LOG() << "consumeCharge for id : " << m_data.chargeTypeId << ", count: " << count;
+    DEBUG_LOG(m_logger) << "consumeCharge for id : " << m_data.chargeTypeId << ", count: " << count;
 
     if (wasPlanned && m_data.planned < count)
       return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Wanted to consume %1 planned charges, but only %2 had been planned.")).arg(count).arg(m_data.planned);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_administration.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_administration.h
index 4aae4dbaf..b458f3401 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_administration.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_administration.h
@@ -32,6 +32,7 @@ class ObjectChargeAdministration final : public QObject
   void onPublishData();
 
   protected:
+  NGL::INGLLogger &m_logger;
   private:
   MainHandler *m_mainHandler;
   Database::AesChargeAdministration m_data;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_effect.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_effect.cpp
index 8cc5a222a..d029edf87 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_effect.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_effect.cpp
@@ -58,7 +58,7 @@ Core::FunctionReplyObject ObjectChargeEffect::create(const ChargeEffectModifyReq
   }
 
   if (reply.error())
-    ERROR_LOG() << reply.str();
+    ERROR_LOG(m_logger) << reply.str();
   if (reply.id() == 0)
     reply.setId(m_data.id);
   return reply;
@@ -96,7 +96,7 @@ Core::FunctionReplyObject ObjectChargeEffect::update(const ChargeEffectModifyReq
   }
 
   if (reply.error())
-    ERROR_LOG() << reply.str();
+    ERROR_LOG(m_logger) << reply.str();
 
   return reply;
 }
@@ -111,13 +111,13 @@ Core::FunctionReplyObject ObjectChargeEffect::update(const ChargeEffectModifyReq
 void ObjectChargeEffect::updatedProperties(const Database::AesChargeEffect &dbData)
 {
   // update properties // "used": true/false
-  DEBUG_LOG()<<" !!! update charge effect when not EsPrepared !!! ";
+  DEBUG_LOG(m_logger)<<" !!! update charge effect when not EsPrepared !!! ";
   const QString tmpProps = m_data.properties;
   m_data.properties = dbData.properties; // update properties is allowed!!
   if (!m_mainHandler->db()->update(m_data))
   {
     m_data.properties = tmpProps;
-    ERROR_LOG()<<" Couldn't update charge effect when not EsPrepared!!!";
+    ERROR_LOG(m_logger)<<" Couldn't update charge effect when not EsPrepared!!!";
   }
 }
 
@@ -127,14 +127,14 @@ bool ObjectChargeEffect::remove()
 {
   if (!m_mainHandler)
   {
-    ERROR_LOG() << "Not possible to remove ChargeEffect --> No MainHandler present.";
+    ERROR_LOG(m_logger) << "Not possible to remove ChargeEffect --> No MainHandler present.";
 
     return false;
   }
 
   if (!m_mainHandler->dds()->dts()->removeChargeEffectByKey(m_data.id))
   {
-    ERROR_LOG() << "Not possible to remove ChargeEffect --> Could not remove from DDS.";
+    ERROR_LOG(m_logger) << "Not possible to remove ChargeEffect --> Could not remove from DDS.";
 
     return false;
   }
@@ -198,14 +198,14 @@ void ObjectChargeEffect::publish()
 {
   if (!m_mainHandler)
   {
-    ERROR_LOG() << QStringLiteral("Not possible to publish ChargeEffect --> Could not remove from DDS.");
+    ERROR_LOG(m_logger) << QStringLiteral("Not possible to publish ChargeEffect --> Could not remove from DDS.");
 
     return;
   }
 
   if (!m_mainHandler->dds()->dts()->publish(dataBaseToDataTopic(m_data)))
   {
-    ERROR_LOG() << QStringLiteral("Not possible to publish ChargeEffect --> DDS publish failed.");
+    ERROR_LOG(m_logger) << QStringLiteral("Not possible to publish ChargeEffect --> DDS publish failed.");
 
     return;
   }
@@ -295,7 +295,7 @@ void ObjectChargeEffect::setNextState()
   if (oldState != m_state)
     m_stateChanged = true;
 
-  DEBUG_LOG() << "Switching from " << oldState << "to " << m_state;
+  DEBUG_LOG(m_logger) << "Switching from " << oldState << "to " << m_state;
 }
 
 //-----------------------------------------------------------------------------
@@ -317,7 +317,7 @@ void ObjectChargeEffect::calculateInitEffectState()
 
   if (oldState != m_state)
     m_stateChanged = true;
-  DEBUG_LOG() << "Setting init state: " << m_state;
+  DEBUG_LOG(m_logger) << "Setting init state: " << m_state;
 }
 
 //-----------------------------------------------------------------------------
@@ -330,7 +330,7 @@ void ObjectChargeEffect::startStateTimer()
     {
       qint64 timeToActivatedMsecs = m_data.effectStart.toMSecsSinceEpoch() - QDateTime::currentMSecsSinceEpoch();
 
-      DEBUG_LOG() << "Time to Avtivated [ms]: " << timeToActivatedMsecs;
+      DEBUG_LOG(m_logger) << "Time to Avtivated [ms]: " << timeToActivatedMsecs;
 
       m_stateTimer->start(timeToActivatedMsecs);
 
@@ -340,7 +340,7 @@ void ObjectChargeEffect::startStateTimer()
     {
       qint64 timeToExpiredMsecs = m_data.effectStart.toMSecsSinceEpoch() + m_data.effectDuration - QDateTime::currentMSecsSinceEpoch();
 
-      DEBUG_LOG() << "Time to Expired [ms]: " << timeToExpiredMsecs;
+      DEBUG_LOG(m_logger) << "Time to Expired [ms]: " << timeToExpiredMsecs;
 
       m_stateTimer->start(timeToExpiredMsecs);
 
@@ -350,7 +350,7 @@ void ObjectChargeEffect::startStateTimer()
     {
       qint64 timeToFinishMsecs = m_data.effectStart.toMSecsSinceEpoch() + m_data.effectDuration + s_afterglowMsecs - QDateTime::currentMSecsSinceEpoch();
 
-      DEBUG_LOG() << "Time to finish/deletion [ms]: " << timeToFinishMsecs;
+      DEBUG_LOG(m_logger) << "Time to finish/deletion [ms]: " << timeToFinishMsecs;
 
       m_stateTimer->start(timeToFinishMsecs);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effector.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effector.cpp
index 643533225..13132470a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effector.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effector.cpp
@@ -65,7 +65,7 @@ EffectorData ObjectEffector::effectorData() const
 
 void ObjectEffector::assignAesItemRequest(int aesItemId)
 {
-  DEBUG_LOG() << "assignAesItemRequest aesItemId=" << aesItemId;
+  DEBUG_LOG(m_logger) << "assignAesItemRequest aesItemId=" << aesItemId;
   m_aesItemId = aesItemId;
   // Statemachine mit new anlegen
   if (m_effectorStateMachine)
@@ -101,7 +101,7 @@ void ObjectEffector::assignAesItemRequest(int aesItemId)
 
 void ObjectEffector::deleteAssignmentAesItem()
 {
-  DEBUG_LOG() << "deleteAssignmentAesItem";
+  DEBUG_LOG(m_logger) << "deleteAssignmentAesItem";
   if (m_effectorStateMachine)
   {
     delete m_effectorStateMachine;
@@ -119,7 +119,7 @@ bool ObjectEffector::reportFireReadinessRequest() // Feuerbereitschaft melden
 
 void ObjectEffector::fireOrderRequest() // Feuerbefehl erhalten
 {
-  DEBUG_LOG() << "fireOrderRequest";
+  DEBUG_LOG(m_logger) << "fireOrderRequest";
   if (!m_effectorStateMachine)
     return;
 
@@ -128,7 +128,7 @@ void ObjectEffector::fireOrderRequest() // Feuerbefehl erhalten
 
 void ObjectEffector::fireRequest() // Feuern
 {
-  DEBUG_LOG() << "fireRequest";
+  DEBUG_LOG(m_logger) << "fireRequest";
   if (!m_effectorStateMachine)
     return;
   m_effectorStateMachine->fire();
@@ -136,7 +136,7 @@ void ObjectEffector::fireRequest() // Feuern
 
 bool ObjectEffector::reportFiredRequest() // Abgefeuert melden
 {
-  DEBUG_LOG() << "reportFiredRequest";
+  DEBUG_LOG(m_logger) << "reportFiredRequest";
   if (!m_effectorStateMachine)
     return false;
   return m_effectorStateMachine->reportFired();
@@ -144,7 +144,7 @@ bool ObjectEffector::reportFiredRequest() // Abgefeuert melden
 
 void ObjectEffector::reportEmptyChargeRequest(bool emptyCharge) // Munition leer
 {
-  DEBUG_LOG() << "reportEmptyChargeRequest";
+  DEBUG_LOG(m_logger) << "reportEmptyChargeRequest";
   if (!m_effectorStateMachine)
     return;
   m_effectorStateMachine->setEmptyCharge(emptyCharge);
@@ -166,7 +166,7 @@ void ObjectEffector::resetReadynessTimer()
 void ObjectEffector::sendEffectorToDds()
 {
   // Effector Effector;
-  DEBUG_LOG() << "sendEffectorToDds NewState= " << m_effectorStateMachine->getCurrentStateStr() << ", participantId=" << m_participantId
+  DEBUG_LOG(m_logger) << "sendEffectorToDds NewState= " << m_effectorStateMachine->getCurrentStateStr() << ", participantId=" << m_participantId
                       << ", aesItemId=" << m_aesItemId;
   AreaEffectSimulation::Effector effector;
   effector.id(m_participantId);
@@ -178,11 +178,11 @@ void ObjectEffector::sendEffectorToDds()
 
 void ObjectEffector::onEffectorFired()
 {
-  DEBUG_LOG() << "onEffectorFired";
+  DEBUG_LOG(m_logger) << "onEffectorFired";
 
   if (m_firingStrategy == nullptr)
   {
-    ERROR_LOG() << "Not possible to fire. No firing strategy specified.";
+    ERROR_LOG(m_logger) << "Not possible to fire. No firing strategy specified.";
 
     return;
   }
@@ -195,7 +195,7 @@ void ObjectEffector::onEffectorFired()
 // Input: SAA-Format, relativ zum Geschoss in metern und die Zeit relativ zur Abschusszeit
 void ObjectEffector::setIndendedTrajectory(const std::vector<Core::RelativePositionRelativeTime> &geometryRelativeToLaunchOrigin)
 {
-  DEBUG_LOG() << "setTrajectory #points=" << geometryRelativeToLaunchOrigin.size();
+  DEBUG_LOG(m_logger) << "setTrajectory #points=" << geometryRelativeToLaunchOrigin.size();
   m_intendendTrajectory.clear();
   for (const Core::RelativePositionRelativeTime &geoPosRelTime : geometryRelativeToLaunchOrigin)
   {
@@ -209,7 +209,7 @@ void ObjectEffector::setIndendedTrajectory(const std::vector<Core::RelativePosit
 
 void ObjectEffector::setEffectorData(const EffectorData &effectorData)
 {
-  DEBUG_LOG() << "setEffectorData";
+  DEBUG_LOG(m_logger) << "setEffectorData";
   m_effectorData = effectorData;
   setIndendedTrajectory(effectorData.trajectoryRelative());
   delete m_firingStrategy;
@@ -221,7 +221,7 @@ void ObjectEffector::setEffectorData(const EffectorData &effectorData)
 
 void ObjectEffector::logMessage(QString message)
 {
-  DEBUG_LOG() << "EffectorStateMachine logMessage=" << message << ", aesItemId=" << m_aesItemId << ", m_participantId=" << m_participantId;
+  DEBUG_LOG(m_logger) << "EffectorStateMachine logMessage=" << message << ", aesItemId=" << m_aesItemId << ", m_participantId=" << m_participantId;
 }
 
 } // namespace AreaEffectSimulation
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_corridor.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_corridor.h
index 11b0f6589..1152aabea 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_corridor.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_corridor.h
@@ -41,6 +41,8 @@ protected Q_SLOTS:
 
 private:
 
+
+NGL::INGLLogger &m_logger;
   Core::FunctionReplyObject createObject(const Database::AesMineCorridor &data,
                                          const std::vector<Core::GeoPosition2D> &segmentsDds,
                                          const QVector<Database::AesMineCorridorSegment> &segmentsDb);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/ModuleTests/asm_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/ModuleTests/asm_tests.cpp
index 59a257725..2bd416808 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/ModuleTests/asm_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/ModuleTests/asm_tests.cpp
@@ -43,7 +43,7 @@ AsmTests::~AsmTests()
 // ------------------------------------------------------------------
 bool AsmTests::init(int domainId, int trainingAreaId, int testId)
 {
-  INFO_LOG() << "init begin";
+  INFO_LOG(m_logger) << "init begin";
 
   m_testId = testId;
   m_trainingAreaId = trainingAreaId;  // overwritten when new exercise created
@@ -56,15 +56,15 @@ bool AsmTests::init(int domainId, int trainingAreaId, int testId)
   }
   m_ddsConnector->initPublisherSubscriber();
 
-  DEBUG_LOG() << "create ftc";
+  DEBUG_LOG(m_logger) << "create ftc";
   m_ftc = AssetManagement::Interface::Ftc::create(m_ddsConnector);
-  DEBUG_LOG() << "init ftc";
+  DEBUG_LOG(m_logger) << "init ftc";
   bool bRet = m_ftc->enableAll();
-  DEBUG_LOG() << "init end - bRet = " << bRet;
+  DEBUG_LOG(m_logger) << "init end - bRet = " << bRet;
 
-  DEBUG_LOG() << "Domain Id = " << domainId;
-  DEBUG_LOG() << "Training Area Id = " << trainingAreaId;
-  DEBUG_LOG() << "Test Id = " << testId;
+  DEBUG_LOG(m_logger) << "Domain Id = " << domainId;
+  DEBUG_LOG(m_logger) << "Training Area Id = " << trainingAreaId;
+  DEBUG_LOG(m_logger) << "Test Id = " << testId;
 
   if (!bRet)
     failExit();
@@ -74,7 +74,7 @@ bool AsmTests::init(int domainId, int trainingAreaId, int testId)
 // ------------------------------------------------------------------
 void AsmTests::startTest()
 {
-  INFO_LOG() << "startTest";
+  INFO_LOG(m_logger) << "startTest";
   if (m_testId == 1)
     QTimer::singleShot(0, this, &AsmTests::tryCreate);
   else if (m_testId == 2)
@@ -181,7 +181,7 @@ void AsmTests::setRequestData(AssetManagement::TrainingAreaModifyRequest &reques
 // ------------------------------------------------------------------
 void AsmTests::tryCreate()
 {
-  INFO_LOG() << "trying to send ModifyRequest TrainingArea (create)";
+  INFO_LOG(m_logger) << "trying to send ModifyRequest TrainingArea (create)";
 
   AssetManagement::TrainingAreaModifyRequest request;
 
@@ -189,7 +189,7 @@ void AsmTests::tryCreate()
 
   if (!m_ftc->trainingAreaModifyRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
 
@@ -201,13 +201,13 @@ void AsmTests::tryCreate()
 void AsmTests::tryModify()
 {
   AssetManagement::TrainingAreaModifyRequest request;
-  INFO_LOG() << "trying to send modify request for training Area Id = " << m_trainingAreaId;
+  INFO_LOG(m_logger) << "trying to send modify request for training Area Id = " << m_trainingAreaId;
 
   setRequestData(request, m_trainingAreaId);
 
   if (!m_ftc->trainingAreaModifyRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting modify data";
+    ERROR_LOG(m_logger) << "Error requesting modify data";
     failExit();
   }
 
@@ -218,10 +218,10 @@ void AsmTests::tryModify()
 // ------------------------------------------------------------------
 void AsmTests::tryDelete()
 {
-  INFO_LOG() << "trying to send delete request for exercise Id = " << m_trainingAreaId;
+  INFO_LOG(m_logger) << "trying to send delete request for exercise Id = " << m_trainingAreaId;
   if (!m_ftc->trainingAreaRemoveRequest(TrainingAreaRemoveRequest(m_trainingAreaId), this))
   {
-    ERROR_LOG() << "Error requesting delete data";
+    ERROR_LOG(m_logger) << "Error requesting delete data";
     failExit();
   }
 
@@ -232,7 +232,7 @@ void AsmTests::tryDelete()
 // ------------------------------------------------------------------
 void AsmTests::onTrainingAreaModifyReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got modifyReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got modifyReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   if (replyObject.error())
@@ -246,7 +246,7 @@ void AsmTests::onTrainingAreaModifyReply(const Core::FunctionReplyObject &replyO
 // ------------------------------------------------------------------
 void AsmTests::onTrainingAreaRemoveReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got removeReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   if (replyObject.error())
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/WebSocketInterface/Messages/client_message.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/WebSocketInterface/Messages/client_message.cpp
index 789e06444..3d2f2900a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/WebSocketInterface/Messages/client_message.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/WebSocketInterface/Messages/client_message.cpp
@@ -51,9 +51,8 @@ ClientMessage::ClientMessage(DataManager *dataManager, LtsWebSocket::ReplyHandle
 // ####### ClientMessage end #######
 
 // ####### BaseDlRequest begin #######
-BaseDlRequest::BaseDlRequest(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const int typeId, const QString &uuid)
-  : ClientMessage(dataManager, client, type, typeId, uuid)
-{}
+BaseDlRequest::BaseDlRequest(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const int typeId, const QString &uuid) : ClientMessage(dataManager, client, type, typeId, uuid),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 void BaseDlRequest::process()
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/WebSocketInterface/websocket_interface_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/WebSocketInterface/websocket_interface_handler.cpp
index a09acc3d1..c8840af20 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/WebSocketInterface/websocket_interface_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/WebSocketInterface/websocket_interface_handler.cpp
@@ -36,7 +36,7 @@ bool WebSocketInterfaceHandler::init()
 {
   cleanup();
 
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "... ok";
 
   m_dataManager = new DataManager(m_mainHandler);
 
@@ -44,16 +44,16 @@ bool WebSocketInterfaceHandler::init()
 
   m_webSocketServer = new LtsWebSocket::LtsWebSocketServer(m_messageFactory, this);
 
-  DEBUG_LOG() << "Initialising LtsWebSocketServer";
+  DEBUG_LOG(m_logger) << "Initialising LtsWebSocketServer";
   if (!m_webSocketServer->init(QStringLiteral("ASM"), Settings::getWebSocketServerPortRange(1)))
   {
-    ERROR_LOG() << "Failed to initialise LtsWebSocketServer";
+    ERROR_LOG(m_logger) << "Failed to initialise LtsWebSocketServer";
     return false;
   }
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "... ok";
 
-  DEBUG_LOG() << "Connection signals and slots";
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "Connection signals and slots";
+  DEBUG_LOG(m_logger) << "... ok";
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/dds_handler.cpp
index 5f62e3aaf..0465abc4e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/dds_handler.cpp
@@ -16,14 +16,14 @@ namespace AssetManagement
 DdsHandler::DdsHandler(int domainId)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Any))
 {
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -38,10 +38,10 @@ bool DdsHandler::init(const QStringList &qosFileList)
   m_ddsDts = AssetManagement::Interface::Dts::create(m_ddsConnector);
   m_ddsFts = AssetManagement::Interface::Fts::create(m_ddsConnector);
   bool bRet = m_ddsDts->enableAll();
-  INFO_LOG() << "Dts initialised";
+  INFO_LOG(m_logger) << "Dts initialised";
 
   bRet &= m_ddsFts->enableAll();
-  INFO_LOG() << "Fts initialised";
+  INFO_LOG(m_logger) << "Fts initialised";
 
   return bRet;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/dds_handler.h
index 8c25ebfff..231554c1f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/dds_handler.h
@@ -37,6 +37,7 @@ public:
   std::shared_ptr<AssetManagement::Interface::Fts> fts() const { return m_ddsFts; }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector>      m_ddsConnector;
   std::shared_ptr<Core::Pacemaker>                 m_pacemaker;
   std::shared_ptr<Core::TopicLockMaster>           m_topicLockMaster;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_asset.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_asset.cpp
index a8cd8de32..7a84f741f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_asset.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_asset.cpp
@@ -39,7 +39,7 @@ bool HandlerAsset::init()
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       bRet = false;
       return;
     }
@@ -47,11 +47,11 @@ bool HandlerAsset::init()
   };
   if (!m_mainHandler->db()->select(cb) || !bRet)
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
 
-  DEBUG_LOG() << "m_objectAssetMap.size() = " << m_objectAssetMap.size();
+  DEBUG_LOG(m_logger) << "m_objectAssetMap.size() = " << m_objectAssetMap.size();
 
   return true;
 }
@@ -62,7 +62,7 @@ void HandlerAsset::onAssetModifyRequest(const rti::core::SampleIdentity &cookie,
 {
   const auto ret = assetModifyRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_mainHandler->dds()->fts()->assetModifyReply(cookie, ret);
 }
 
@@ -114,7 +114,7 @@ void HandlerAsset::onAssetRemoveRequest(const rti::core::SampleIdentity &cookie,
   ret = ifs->removeObject();
 
   if (ret.error())
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
   else
   {
     // delete ObjectAsset
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_asset.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_asset.h
index 61c29b779..fe1aa1c99 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_asset.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_asset.h
@@ -30,6 +30,7 @@ public:
   bool init();
 
 private:
+  NGL::INGLLogger &m_logger;
   void onAssetModifyRequest(const rti::core::SampleIdentity &cookie,
                             const Asset &request) override;
   Core::FunctionReplyObject assetModifyRequest(const Asset &request);
@@ -37,6 +38,7 @@ private:
                             const Core::RemoveElementRequest &request) override;
 
 private:
+  NGL::INGLLogger &m_logger;
   QHash<int, ObjectAsset *>         m_objectAssetMap;
   MainHandler                      *m_mainHandler;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_location.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_location.cpp
index aa521760c..1e0cf2ef8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_location.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_location.cpp
@@ -45,11 +45,11 @@ bool HandlerLocation::init()
   };
   if (!m_mainHandler->db()->select(cb))
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
 
-  DEBUG_LOG() << "#Locations published: " << iCnt;
+  DEBUG_LOG(m_logger) << "#Locations published: " << iCnt;
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_location.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_location.h
index 6b704eb9d..85b190944 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_location.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_location.h
@@ -19,6 +19,7 @@ public:
 
   bool init();
 private:
+  NGL::INGLLogger &m_logger;
   MainHandler                      *m_mainHandler;
 };
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_relay_info.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_relay_info.cpp
index eef239171..3813cee11 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_relay_info.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_relay_info.cpp
@@ -39,7 +39,7 @@ bool HandlerRelayInfo::init()
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       bRet = false;
       return;
     }
@@ -47,11 +47,11 @@ bool HandlerRelayInfo::init()
   };
   if (!m_mainHandler->db()->select(cb) || !bRet)
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
 
-  DEBUG_LOG() << "m_objectRelayInfoMap.size() = " << m_objectRelayInfoMap.size();
+  DEBUG_LOG(m_logger) << "m_objectRelayInfoMap.size() = " << m_objectRelayInfoMap.size();
 
   return true;
 }
@@ -62,7 +62,7 @@ void HandlerRelayInfo::onRelayInfoModifyRequest(const rti::core::SampleIdentity
 {
   const auto ret = relayInfoModifyRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_mainHandler->dds()->fts()->relayInfoModifyReply(cookie, ret);
 }
 
@@ -114,7 +114,7 @@ void HandlerRelayInfo::onRelayInfoRemoveRequest(const rti::core::SampleIdentity
   ret = ifs->removeObject();
 
   if (ret.error())
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
   else
   {
     // delete ObjectRelayInfo
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_relay_info.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_relay_info.h
index 6409b2ae2..77466cacd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_relay_info.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_relay_info.h
@@ -30,6 +30,7 @@ public:
   bool init();
 
 private:
+  NGL::INGLLogger &m_logger;
   void onRelayInfoModifyRequest(const rti::core::SampleIdentity &cookie,
                                 const RelayInfo &request) override;
   Core::FunctionReplyObject relayInfoModifyRequest(const RelayInfo &request);
@@ -37,6 +38,7 @@ private:
                             const Core::RemoveElementRequest &request) override;
 
 private:
+  NGL::INGLLogger &m_logger;
   QHash<int, ObjectRelayInfo*>      m_objectRelayInfoMap;
   MainHandler                      *m_mainHandler;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_training_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_training_area.cpp
index 7e09858dc..084382386 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_training_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_training_area.cpp
@@ -42,7 +42,7 @@ bool HandlerTrainingArea::init()
   QVector<Database::AsmMapDescription> dataVecMD;
   if (!m_mainHandler->db()->select(dataVecMD))
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
 
@@ -58,38 +58,38 @@ bool HandlerTrainingArea::init()
     {
     case AssetManagement::MapDescriptionType_def::Map2D:
       mapDescriptionSeq.map2D.insert(data.objOrder, data);
-      INFO_LOG() << "map2D.insert order =" << data.objOrder;
+      INFO_LOG(m_logger) << "map2D.insert order =" << data.objOrder;
       break;
     case AssetManagement::MapDescriptionType_def::Scene3D:
       mapDescriptionSeq.scene3D.insert(data.objOrder, data);
-      INFO_LOG() << "Scene3D.insert order =" << data.objOrder;
+      INFO_LOG(m_logger) << "Scene3D.insert order =" << data.objOrder;
       break;
     case AssetManagement::MapDescriptionType_def::Elevation:
       mapDescriptionSeq.elevation.insert(data.objOrder, data);
-      INFO_LOG() << "Elevation.insert order =" << data.objOrder;
+      INFO_LOG(m_logger) << "Elevation.insert order =" << data.objOrder;
       break;
     case AssetManagement::MapDescriptionType_def::SceneObj:
       mapDescriptionSeq.sceneObj.insert(data.objOrder, data);
-      INFO_LOG() << "sceneObj.insert order =" << data.objOrder;
+      INFO_LOG(m_logger) << "sceneObj.insert order =" << data.objOrder;
       break;
     }
     mapDescriptionSeqences.insert(data.trainingAreaId, mapDescriptionSeq);
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       return false;
     }
     m_objectMapDescriptionMap.insert(ifs->getId(), ifs);
   }
 
-  DEBUG_LOG() << "m_objectMapDescriptionMap.size() = " << m_objectMapDescriptionMap.size();
+  DEBUG_LOG(m_logger) << "m_objectMapDescriptionMap.size() = " << m_objectMapDescriptionMap.size();
 
   QVector<Database::AsmTrainingArea> dataVec;
   // read all training areas from database
   if (!m_mainHandler->db()->select(dataVec))
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
 
@@ -125,13 +125,13 @@ bool HandlerTrainingArea::init()
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       return false;
     }
     m_objectTrainingAreaMap.insert(ifs->getId(), ifs);
   }
 
-  DEBUG_LOG() << "m_objectTrainingAreaMap.size() = " << m_objectTrainingAreaMap.size();
+  DEBUG_LOG(m_logger) << "m_objectTrainingAreaMap.size() = " << m_objectTrainingAreaMap.size();
 
   return true;
 }
@@ -139,16 +139,16 @@ bool HandlerTrainingArea::init()
 //----------------------------------------------------------------------------------------------
 void HandlerTrainingArea::removeMapDescriptions(int trainingAreaId)
 {
-  INFO_LOG() << "removeMapDescriptions trainingAreaId = " << trainingAreaId
+  INFO_LOG(m_logger) << "removeMapDescriptions trainingAreaId = " << trainingAreaId
                      << " m_objectMapDescriptionMap.size = " << m_objectMapDescriptionMap.size();
   QMapIterator< int, ObjectMapDescription *> it(m_objectMapDescriptionMap);
   while ( it.hasNext())
   {
     it.next();
-    INFO_LOG() << "remove map description key = " << it.key();
+    INFO_LOG(m_logger) << "remove map description key = " << it.key();
     if (  it.value()->getData().trainingAreaId() == trainingAreaId)
     {
-      DEBUG_LOG() << "remove id= " <<  it.key();
+      DEBUG_LOG(m_logger) << "remove id= " <<  it.key();
 
       ObjectMapDescription *ifs = m_objectMapDescriptionMap.value(it.key());
 
@@ -165,7 +165,7 @@ void HandlerTrainingArea::onTrainingAreaModifyRequest(const rti::core::SampleIde
 {
   const auto ret = trainingAreaModifyRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_mainHandler->dds()->fts()->trainingAreaModifyReply(cookie, ret);
 }
 
@@ -200,7 +200,7 @@ Core::FunctionReplyObject HandlerTrainingArea::trainingAreaModifyRequest(const T
   }
   if (request.id() > 0) // Modify
   {
-    DEBUG_LOG() << "modify: delete old entries in map_description";
+    DEBUG_LOG(m_logger) << "modify: delete old entries in map_description";
     removeMapDescriptions(ifs->getId());
   }
 
@@ -215,7 +215,7 @@ Core::FunctionReplyObject HandlerTrainingArea::trainingAreaModifyRequest(const T
     mdData.id(0);
     mdData.trainingAreaId(ifs->getId());
     ret = md->createObject(mdData, i);
-    DEBUG_LOG() << "insert topographic entries in map_description"
+    DEBUG_LOG(m_logger) << "insert topographic entries in map_description"
                         << " for training area id " << ifs->getId()
                         << " mapTypeId=" << mdData.mapTypeId()
                         << " mapDescriptionTypeId=" << mdData.mapDescriptionTypeId();
@@ -240,7 +240,7 @@ Core::FunctionReplyObject HandlerTrainingArea::trainingAreaModifyRequest(const T
     mdData.id(0);
     mdData.trainingAreaId(ifs->getId());
     ret = md->createObject(mdData, i);
-    DEBUG_LOG() << "insert elevation entries in map_description"
+    DEBUG_LOG(m_logger) << "insert elevation entries in map_description"
                         << " for training area id " << ifs->getId()
                         << " mapTypeId=" << mdData.mapTypeId()
                         << " mapDescriptionTypeId=" << mdData.mapDescriptionTypeId();
@@ -265,7 +265,7 @@ Core::FunctionReplyObject HandlerTrainingArea::trainingAreaModifyRequest(const T
     mdData.id(0);
     mdData.trainingAreaId(ifs->getId());
     ret = md->createObject(mdData, i);
-    DEBUG_LOG() << "insert scene3D entries in map_description"
+    DEBUG_LOG(m_logger) << "insert scene3D entries in map_description"
                         << " for training area id " << ifs->getId()
                         << " mapTypeId=" << mdData.mapTypeId()
                         << " mapDescriptionTypeId=" << mdData.mapDescriptionTypeId();
@@ -290,7 +290,7 @@ Core::FunctionReplyObject HandlerTrainingArea::trainingAreaModifyRequest(const T
     mdData.id(0);
     mdData.trainingAreaId(ifs->getId());
     ret = md->createObject(mdData, i);
-    DEBUG_LOG() << "insert sceneObjects entries in map_description"
+    DEBUG_LOG(m_logger) << "insert sceneObjects entries in map_description"
                         << " for training area id " << ifs->getId()
                         << " mapTypeId=" << mdData.mapTypeId()
                         << " mapDescriptionTypeId=" << mdData.mapDescriptionTypeId();
@@ -335,7 +335,7 @@ void HandlerTrainingArea::onTrainingAreaRemoveRequest(const rti::core::SampleIde
   ret = ifs->removeObject();
 
   if (ret.error())
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
   else
   {
     // delete ObjectTrainingArea
@@ -356,7 +356,7 @@ void HandlerTrainingArea::onMapDescriptionModifyRequest(const rti::core::SampleI
 {
   const auto ret = mapDescriptionModifyRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_mainHandler->dds()->fts()->mapDescriptionModifyReply(cookie, ret);
 }
 
@@ -393,7 +393,7 @@ void HandlerTrainingArea::onMapDescriptionRemoveRequest(const rti::core::SampleI
   ret = ifs->removeObject();
 
   if (ret.error())
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
   else
   {
     // delete ObjectMapDescription
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_training_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_training_area.h
index 14b3f52c4..a0241f8cc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_training_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_training_area.h
@@ -45,6 +45,7 @@ public:
   bool init();
 
 private:
+  NGL::INGLLogger &m_logger;
   void onTrainingAreaModifyRequest(const rti::core::SampleIdentity &cookie,
                                    const TrainingArea &request) override;
   Core::FunctionReplyObject trainingAreaModifyRequest(const TrainingArea &request);
@@ -58,6 +59,7 @@ private:
                                    const Core::RemoveElementRequest &request) override;
 
 private:
+  NGL::INGLLogger &m_logger;
   QMap<int, ObjectTrainingArea *>          m_objectTrainingAreaMap;
   QMap<int, ObjectMapDescription *>        m_objectMapDescriptionMap;
   MainHandler                             *m_mainHandler;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_workstation_logout.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_workstation_logout.h
index 0fbfabff2..5586f75c0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_workstation_logout.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_workstation_logout.h
@@ -34,6 +34,8 @@ public:
   void onWorkstationLogoutRequest(const rti::core::SampleIdentity &cookie, const WorkstationLogout &request) override final;
 
 private:
+
+NGL::INGLLogger &m_logger;
   MainHandler         *m_mainHandler;
   QMap<int, QTimer*>   m_logoutRequestMap;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/main_handler.cpp
index a920e4ba3..f70fcc6f2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/main_handler.cpp
@@ -21,8 +21,7 @@
 namespace AssetManagement
 {
 
-MainHandler::MainHandler(QObject *parent)
-  : QObject(parent)
+MainHandler::MainHandler(QObject *parent) : QObject(parent)
   , m_handlerTrainingArea(nullptr)
   , m_handlerWorkstationLogout(nullptr)
   , m_handlerAsset(nullptr)
@@ -30,8 +29,8 @@ MainHandler::MainHandler(QObject *parent)
   , m_handlerRelayInfo(nullptr)
   , m_ddsHandler(nullptr)
   , m_dbHandler(nullptr)
-  , m_handlerWebSocket(nullptr)
-{}
+  , m_handlerWebSocket(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 MainHandler::~MainHandler()
 {
@@ -52,29 +51,29 @@ bool MainHandler::init(int domainId)
 
   if (!m_dbHandler->init(0, Settings::settings()))
   {
-    ERROR_LOG() << "Initialisation dbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation dbHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation dbHandler succesful.";
 
   // initialize DDS
   m_ddsHandler = std::make_shared<DdsHandler>(domainId);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation ddsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation ddsHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation ddsHandler succesful.";
 
   // read project specific data from database
   // publish project specific data
   // initialize all handlers
   if (!initAsmHandler())
   {
-    ERROR_LOG() << "Initialisation AsmHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation AsmHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation AsmHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation AsmHandler succesful.";
 
   m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
 
@@ -83,73 +82,73 @@ bool MainHandler::init(int domainId)
 
 bool MainHandler::initAsmHandler()
 {
-  DEBUG_LOG() << "Start Initialisation AsmHandler";
+  DEBUG_LOG(m_logger) << "Start Initialisation AsmHandler";
 
   // TrainingArea
   m_handlerTrainingArea = std::make_shared<HandlerTrainingArea>(this);
-  DEBUG_LOG() << "Reset HandlerTrainingArea succesful.";
+  DEBUG_LOG(m_logger) << "Reset HandlerTrainingArea succesful.";
 
   if (!m_handlerTrainingArea->init())
   {
-    ERROR_LOG() << "Initialisation of HandlerTrainingArea failed.";
+    ERROR_LOG(m_logger) << "Initialisation of HandlerTrainingArea failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation HandlerTrainingArea succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation HandlerTrainingArea succesful.";
 
   // WorkstationLogout
   m_handlerWorkstationLogout = std::make_shared<HandlerWorkstationLogout>(this);
-  DEBUG_LOG() << "Reset HandlerWorkstationLogout succesful.";
+  DEBUG_LOG(m_logger) << "Reset HandlerWorkstationLogout succesful.";
 
   if (!m_handlerWorkstationLogout->init())
   {
-    ERROR_LOG() << "Initialisation of HandlerWorkstationLogout failed.";
+    ERROR_LOG(m_logger) << "Initialisation of HandlerWorkstationLogout failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation HandlerWorkstationLogout succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation HandlerWorkstationLogout succesful.";
 
   // Asset
   m_handlerAsset = std::make_shared<HandlerAsset>(this);
-  DEBUG_LOG() << "Reset HandlerAsset succesful.";
+  DEBUG_LOG(m_logger) << "Reset HandlerAsset succesful.";
 
   if (!m_handlerAsset->init())
   {
-    ERROR_LOG() << "Initialisation of HandlerAsset failed.";
+    ERROR_LOG(m_logger) << "Initialisation of HandlerAsset failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation HandlerAsset succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation HandlerAsset succesful.";
 
   // Location
   m_handlerLocation = std::make_shared<HandlerLocation>(this);
-  DEBUG_LOG() << "Reset HandlerLocation succesful.";
+  DEBUG_LOG(m_logger) << "Reset HandlerLocation succesful.";
 
   if (!m_handlerLocation->init())
   {
-    ERROR_LOG() << "Initialisation of HandlerLocation failed.";
+    ERROR_LOG(m_logger) << "Initialisation of HandlerLocation failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation HandlerLocation succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation HandlerLocation succesful.";
 
   // RelayInfo
   m_handlerRelayInfo = std::make_shared<HandlerRelayInfo>(this);
-  DEBUG_LOG() << "Reset HandlerRelayInfo succesful.";
+  DEBUG_LOG(m_logger) << "Reset HandlerRelayInfo succesful.";
 
   if (!m_handlerRelayInfo->init())
   {
-    ERROR_LOG() << "Initialisation of HandlerRelayInfo failed.";
+    ERROR_LOG(m_logger) << "Initialisation of HandlerRelayInfo failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation HandlerRelayInfo succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation HandlerRelayInfo succesful.";
 
   // WebSocketServer
   m_handlerWebSocket =  std::make_shared<WebSocketInterface::WebSocketInterfaceHandler>(this);
-  DEBUG_LOG() << "Reset WebSocketInterfaceHandler succesful.";
+  DEBUG_LOG(m_logger) << "Reset WebSocketInterfaceHandler succesful.";
   if (!m_handlerWebSocket->init())
   {
-    ERROR_LOG() << "Initialisation WebSocketInterfaceHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler failed.";
     return false;
   }
   m_ddsHandler->pacemaker()->addPort(m_handlerWebSocket->serverWebSocketPort(), Core::PortType::WebSocketServer);
-  DEBUG_LOG() << "Initialisation WebSocketInterfaceHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler succesful.";
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/main_handler.h
index 4b7d72298..2c7a8d243 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/main_handler.h
@@ -44,8 +44,10 @@ public:
   int exerciseId() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   bool initAsmHandler();
 private:
+  NGL::INGLLogger &m_logger;
 //  std::shared_ptr<HandlerMapDescription>    m_handlerMapDesc;
   std::shared_ptr<HandlerTrainingArea>      m_handlerTrainingArea;
   std::shared_ptr<HandlerWorkstationLogout> m_handlerWorkstationLogout;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_asset.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_asset.cpp
index aa947464c..ffed73f8c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_asset.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_asset.cpp
@@ -15,9 +15,8 @@
 //------------------------------------------------------------------------------
 namespace AssetManagement
 {
-ObjectAsset::ObjectAsset(MainHandler *mainHandler)
-  : m_mainHandler(mainHandler)
-{
+ObjectAsset::ObjectAsset(MainHandler *mainHandler) : m_mainHandler(mainHandler),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 //------------------------------------------------------------------------------
@@ -54,7 +53,7 @@ Core::FunctionReplyObject ObjectAsset::createObject(const Asset &data)
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting AsmAsset-data into database"));
 
     m_data.id(dbData.id);
-    DEBUG_LOG() << "New assetId: " << m_data.id();
+    DEBUG_LOG(m_logger) << "New assetId: " << m_data.id();
   }
 
   // Publish Data via DTS
@@ -76,7 +75,7 @@ Core::FunctionReplyObject ObjectAsset::updateObject(const Asset &data)
     return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating AsmAsset-data into database"));
 
   m_data = data;
-  DEBUG_LOG() << "Data changed for assetId: " << m_data.id();
+  DEBUG_LOG(m_logger) << "Data changed for assetId: " << m_data.id();
 
   // Publish Data via DTS
   onPublishData();
@@ -116,10 +115,10 @@ Core::FunctionReplyObject ObjectAsset::removeObject()
 //------------------------------------------------------------------------------
 void ObjectAsset::onPublishData()
 {
-  INFO_LOG() << "Publish AsmAsset-data to dds (" << m_data.id() << ") ...";
+  INFO_LOG(m_logger) << "Publish AsmAsset-data to dds (" << m_data.id() << ") ...";
 
   if (!m_mainHandler->dds()->dts()->publish(m_data))
-    ERROR_LOG() << "Error publishing AsmAsset-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing AsmAsset-data to dds";
 }
 
 // -------------------------------------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_asset.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_asset.h
index d4caf8503..e98f76941 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_asset.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_asset.h
@@ -47,6 +47,7 @@ public:
   static Asset toDdsData(const Database::AsmAsset &dbData);  // db -> dds
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onPublishData();
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_map_description.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_map_description.cpp
index 43ba4905f..114b5c900 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_map_description.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_map_description.cpp
@@ -12,10 +12,9 @@
 
 namespace AssetManagement
 {
-ObjectMapDescription::ObjectMapDescription(MainHandler *mainHandler)
-  : m_mainHandler(mainHandler)
-  , m_order(-1)
-{
+ObjectMapDescription::ObjectMapDescription(MainHandler *mainHandler) : m_mainHandler(mainHandler)
+  , m_order(-1),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 bool ObjectMapDescription::isValid() const
@@ -38,7 +37,7 @@ Core::FunctionReplyObject ObjectMapDescription::createObject(const MapDescriptio
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting AsmMapDescription-data into database"));
 
     m_data.id(dbData.id);
-    DEBUG_LOG() << "New MapDescription Id: " << m_data.id();
+    DEBUG_LOG(m_logger) << "New MapDescription Id: " << m_data.id();
   }
   else if (order != m_order && m_order >= 0)
   {
@@ -64,7 +63,7 @@ Core::FunctionReplyObject ObjectMapDescription::updateObject(const MapDescriptio
     return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating AsmMapDescription-data into database"));
 
   m_data = data;
-  DEBUG_LOG() << "Data changed for MapDescription Id: " << m_data.id();
+  DEBUG_LOG(m_logger) << "Data changed for MapDescription Id: " << m_data.id();
 
   return Core::FunctionReplyObject(m_data.id());
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_map_description.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_map_description.h
index 13f9e98c7..938d3462e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_map_description.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_map_description.h
@@ -38,6 +38,7 @@ public:
   static MapDescription toDdsData(const Database::AsmMapDescription &dbData);  // db -> dds
 
 private:
+  NGL::INGLLogger &m_logger;
   MainHandler     *m_mainHandler;
   MapDescription   m_data;
   int              m_order;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_relay_info.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_relay_info.cpp
index 0c296c75a..64fd48941 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_relay_info.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_relay_info.cpp
@@ -15,9 +15,8 @@
 //------------------------------------------------------------------------------
 namespace AssetManagement
 {
-ObjectRelayInfo::ObjectRelayInfo(MainHandler *mainHandler)
-  : m_mainHandler(mainHandler)
-{
+ObjectRelayInfo::ObjectRelayInfo(MainHandler *mainHandler) : m_mainHandler(mainHandler),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 //------------------------------------------------------------------------------
@@ -54,7 +53,7 @@ Core::FunctionReplyObject ObjectRelayInfo::createObject(const RelayInfo &data)
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting AsmEgcuRelayInfo-data into database"));
 
     m_data.id(dbData.id);
-    DEBUG_LOG() << "New relayInfo Id: " << m_data.id();
+    DEBUG_LOG(m_logger) << "New relayInfo Id: " << m_data.id();
   }
 
   // Publish Data via DTS
@@ -76,7 +75,7 @@ Core::FunctionReplyObject ObjectRelayInfo::updateObject(const RelayInfo &data)
     return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating AsmEgcuRelayInfo-data into database"));
 
   m_data = data;
-  DEBUG_LOG() << "Data changed for relayInfo Id: " << m_data.id();
+  DEBUG_LOG(m_logger) << "Data changed for relayInfo Id: " << m_data.id();
 
   // Publish Data via DTS
   onPublishData();
@@ -116,10 +115,10 @@ Core::FunctionReplyObject ObjectRelayInfo::removeObject()
 //------------------------------------------------------------------------------
 void ObjectRelayInfo::onPublishData()
 {
-  INFO_LOG() << "Publish AsmEgcuRelayInfo-data to dds (" << m_data.id() << ") ...";
+  INFO_LOG(m_logger) << "Publish AsmEgcuRelayInfo-data to dds (" << m_data.id() << ") ...";
 
   if (!m_mainHandler->dds()->dts()->publish(m_data))
-    ERROR_LOG() << "Error publishing AsmEgcuRelayInfo-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing AsmEgcuRelayInfo-data to dds";
 }
 
 // -------------------------------------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_relay_info.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_relay_info.h
index e212bc048..78b53f7d4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_relay_info.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_relay_info.h
@@ -47,6 +47,7 @@ public:
   static RelayInfo toDdsData(const Database::AsmEgcuRelayInfo &dbData);  // db -> dds
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onPublishData();
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_training_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_training_area.cpp
index 5e724cec1..70c853a2c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_training_area.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_training_area.cpp
@@ -14,9 +14,8 @@
 //------------------------------------------------------------------------------
 namespace AssetManagement
 {
-ObjectTrainingArea::ObjectTrainingArea(MainHandler *mainHandler)
-  : m_mainHandler(mainHandler)
-{
+ObjectTrainingArea::ObjectTrainingArea(MainHandler *mainHandler) : m_mainHandler(mainHandler),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 //------------------------------------------------------------------------------
@@ -53,7 +52,7 @@ Core::FunctionReplyObject ObjectTrainingArea::createObject(const TrainingArea &d
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting AsmTrainingArea-data into database"));
 
     m_data.id(dbData.id);
-    DEBUG_LOG() << "New mapId: " << m_data.id();
+    DEBUG_LOG(m_logger) << "New mapId: " << m_data.id();
   }
 
   // Publish Data via DTS
@@ -75,7 +74,7 @@ Core::FunctionReplyObject ObjectTrainingArea::updateObject(const TrainingArea &d
     return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating AsmTrainingArea-data into database"));
 
   m_data = data;
-  DEBUG_LOG() << "Data changed for mapId: " << m_data.id();
+  DEBUG_LOG(m_logger) << "Data changed for mapId: " << m_data.id();
 
   // Publish Data via DTS
   onPublishData();
@@ -115,10 +114,10 @@ Core::FunctionReplyObject ObjectTrainingArea::removeObject()
 //------------------------------------------------------------------------------
 void ObjectTrainingArea::onPublishData()
 {
-  INFO_LOG() << "Publish AsmTrainingArea-data to dds (" << m_data.id() << ") ...";
+  INFO_LOG(m_logger) << "Publish AsmTrainingArea-data to dds (" << m_data.id() << ") ...";
 
   if (!m_mainHandler->dds()->dts()->publish(m_data))
-    ERROR_LOG() << "Error publishing AsmTrainingArea-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing AsmTrainingArea-data to dds";
 }
 
 // -------------------------------------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_training_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_training_area.h
index b98e03520..e6d1c2c59 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_training_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_training_area.h
@@ -46,6 +46,7 @@ public:
   static Database::AsmTrainingArea toDbData(const TrainingArea &ddsData);  // dds -> db
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onPublishData();
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_ft_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_ft_tests.cpp
index 88a323e6f..c3873fa6c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_ft_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_ft_tests.cpp
@@ -36,7 +36,7 @@ AvmFtTests::~AvmFtTests()
 // ------------------------------------------------------------------------------
 bool AvmFtTests::init(int domainId, int testId, int menuId, int mountingPointId)
 {
-  INFO_LOG() << "init begin";
+  INFO_LOG(m_logger) << "init begin";
 
   m_testId = testId;
   m_menuStructId = menuId;
@@ -47,14 +47,14 @@ bool AvmFtTests::init(int domainId, int testId, int menuId, int mountingPointId)
     return false;
   m_ddsConnector->initPublisherSubscriber();
 
-  DEBUG_LOG() << "create ftc AVM";
+  DEBUG_LOG(m_logger) << "create ftc AVM";
   m_ftc = AudioVideoManagement::Interface::Ftc::create(m_ddsConnector);
-  DEBUG_LOG() << "init ftc AVM";
+  DEBUG_LOG(m_logger) << "init ftc AVM";
   bool bRet = m_ftc->enableAll();
-  DEBUG_LOG() << "init end AVM - bRet = " << bRet;
+  DEBUG_LOG(m_logger) << "init end AVM - bRet = " << bRet;
 
-  DEBUG_LOG() << "Domain Id = " << domainId;
-  DEBUG_LOG() << "Test Id = " << testId;
+  DEBUG_LOG(m_logger) << "Domain Id = " << domainId;
+  DEBUG_LOG(m_logger) << "Test Id = " << testId;
 
   return bRet;
 }
@@ -62,7 +62,7 @@ bool AvmFtTests::init(int domainId, int testId, int menuId, int mountingPointId)
 // ------------------------------------------------------------------------------
 void AvmFtTests::startTest()
 {
-  INFO_LOG() << "startTest";
+  INFO_LOG(m_logger) << "startTest";
   if (m_testId <= 1)
     QTimer::singleShot(0, this, &AvmFtTests::tryCreate);
   else if (m_testId == 2)
@@ -74,7 +74,7 @@ void AvmFtTests::startTest()
 // ------------------------------------------------------------------------------
 void AvmFtTests::tryCreate()
 {
-  INFO_LOG() << "trying to send createMenuStructRequest";
+  INFO_LOG(m_logger) << "trying to send createMenuStructRequest";
 
   m_menuStructId = -2;
   ModifyMenuStructRequest request;
@@ -101,7 +101,7 @@ void AvmFtTests::tryCreate()
 
   if (!m_ftc->modifyMenuStructRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
 }
@@ -109,7 +109,7 @@ void AvmFtTests::tryCreate()
 // ------------------------------------------------------------------------------
 void AvmFtTests::tryModify()
 {
-  INFO_LOG() << "trying to send modify request for menuStructId = " << m_menuStructId;
+  INFO_LOG(m_logger) << "trying to send modify request for menuStructId = " << m_menuStructId;
   ModifyMenuStructRequest request;
   request.id(m_menuStructId);
   request.name("TestGlobalMenuModify");
@@ -134,7 +134,7 @@ void AvmFtTests::tryModify()
 
   if (!m_ftc->modifyMenuStructRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting modify data";
+    ERROR_LOG(m_logger) << "Error requesting modify data";
     failExit();
   }
 }
@@ -142,13 +142,13 @@ void AvmFtTests::tryModify()
 // ------------------------------------------------------------------------------
 void AvmFtTests::tryDelete()
 {
-  INFO_LOG() << "trying to send delete request for menuStructId = " << m_menuStructId;
+  INFO_LOG(m_logger) << "trying to send delete request for menuStructId = " << m_menuStructId;
   RemoveMenuStructRequest request;
   request.id(m_menuStructId);
 
   if (!m_ftc->removeMenuStructRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting delete data";
+    ERROR_LOG(m_logger) << "Error requesting delete data";
     failExit();
   }
 }
@@ -167,15 +167,15 @@ void AvmFtTests::createMenuStructReply(const Core::FunctionReplyObject &replyObj
 {
   if (replyObject.error())
   {
-    ERROR_LOG() << "Got onCreateMenuStructReply error: " << replyObject();
+    ERROR_LOG(m_logger) << "Got onCreateMenuStructReply error: " << replyObject();
     failExit();
     return;
   }
-  INFO_LOG() << "Got createReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got createReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
   m_menuStructId = replyObject.id();
 
-  DEBUG_LOG() << "m_testId = " << m_testId;
+  DEBUG_LOG(m_logger) << "m_testId = " << m_testId;
 
   if(m_testId == 0)
     QTimer::singleShot(0, this, &AvmFtTests::tryModify);
@@ -188,11 +188,11 @@ void AvmFtTests::modifyMenuStructReply(const Core::FunctionReplyObject &replyObj
 {
   if (replyObject.error())
   {
-    ERROR_LOG() << "Got onModifyMenuStructReply error: " << replyObject();
+    ERROR_LOG(m_logger) << "Got onModifyMenuStructReply error: " << replyObject();
     failExit();
     return;
   }
-  INFO_LOG() << "Got modifyRequest with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got modifyRequest with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
   if(m_testId == 0)
     QTimer::singleShot(0, this, &AvmFtTests::tryDelete);
@@ -205,11 +205,11 @@ void AvmFtTests::onRemoveMenuStructReply(const Core::FunctionReplyObject &replyO
 {
   if (replyObject.error())
   {
-    ERROR_LOG() << "Got onRemoveMenuStructReply error: " << replyObject();
+    ERROR_LOG(m_logger) << "Got onRemoveMenuStructReply error: " << replyObject();
     failExit();
     return;
   }
-  INFO_LOG() << "Got removeReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_ft_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_ft_tests.h
index fd81a9065..b845ead51 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_ft_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_ft_tests.h
@@ -50,6 +50,7 @@ protected Q_SLOTS:
   void tryModify();
   void tryDelete();
 protected:
+  NGL::INGLLogger &m_logger;
   void onModifyMenuStructReply(const Core::FunctionReplyObject &replyObject) override final;
   void createMenuStructReply(const Core::FunctionReplyObject &replyObject);
   void modifyMenuStructReply(const Core::FunctionReplyObject &replyObject);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_vca_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_vca_tests.h
index 842944e8c..bc7ea2208 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_vca_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_vca_tests.h
@@ -43,6 +43,8 @@ private slots:
   void test();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void create();
   void modify();
   void remove();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/mvs_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/mvs_tests.cpp
index 13d623b16..57ea1a203 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/mvs_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/mvs_tests.cpp
@@ -38,7 +38,7 @@ MvsTests::~MvsTests()
 //----------------------------------------------------------------------------------
 bool MvsTests::init(int domainId, int testId, int teamId, int receiverId, int stationId, int exerciseId)
 {
-  INFO_LOG() << "init begin";
+  INFO_LOG(m_logger) << "init begin";
 
   m_testId = testId;
   m_teamId = teamId;
@@ -52,18 +52,18 @@ bool MvsTests::init(int domainId, int testId, int teamId, int receiverId, int st
     return false;
   m_ddsConnector->initPublisherSubscriber();
 
-  DEBUG_LOG() << "create ftc MVS";
+  DEBUG_LOG(m_logger) << "create ftc MVS";
   m_ftc = AudioVideoManagement::Interface::Ftc::create(m_ddsConnector);
-  DEBUG_LOG() << "init ftc MVS";
+  DEBUG_LOG(m_logger) << "init ftc MVS";
   bool bRet = m_ftc->enableAll();
-  DEBUG_LOG() << "init end MVS - bRet = " << bRet;
+  DEBUG_LOG(m_logger) << "init end MVS - bRet = " << bRet;
 
-  DEBUG_LOG() << "Domain Id = " << domainId;
-  DEBUG_LOG() << "Team Id = " << teamId;
-  DEBUG_LOG() << "Test Id = " << testId;
-  DEBUG_LOG() << "Receiver Id = " << receiverId;
-  DEBUG_LOG() << "Radio Station Id = " << stationId;
-  DEBUG_LOG() << "Exercise Id = " << exerciseId;
+  DEBUG_LOG(m_logger) << "Domain Id = " << domainId;
+  DEBUG_LOG(m_logger) << "Team Id = " << teamId;
+  DEBUG_LOG(m_logger) << "Test Id = " << testId;
+  DEBUG_LOG(m_logger) << "Receiver Id = " << receiverId;
+  DEBUG_LOG(m_logger) << "Radio Station Id = " << stationId;
+  DEBUG_LOG(m_logger) << "Exercise Id = " << exerciseId;
 
   return bRet;
 }
@@ -71,7 +71,7 @@ bool MvsTests::init(int domainId, int testId, int teamId, int receiverId, int st
 //----------------------------------------------------------------------------------
 void MvsTests::startTest()
 {
-  INFO_LOG() << "startTest";
+  INFO_LOG(m_logger) << "startTest";
   switch (m_testId)
   {
 //  case 1:
@@ -99,18 +99,18 @@ void MvsTests::startTest()
     tryModifyAvsVideoReceiver();
     break;
   default:
-    ERROR_LOG() << "Unknown test case !";
+    ERROR_LOG(m_logger) << "Unknown test case !";
     failExit();
     break;
   }
-  INFO_LOG() << "*********  endTest  **************";
+  INFO_LOG(m_logger) << "*********  endTest  **************";
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
 
 //----------------------------------------------------------------------------------
 //void MvsTests::tryCreateVideoTeam()
 //{
-//  INFO_LOG() << "trying to send createRequest VideoTeam";
+//  INFO_LOG(m_logger) << "trying to send createRequest VideoTeam";
 //  VideoTeamModifyRequest request;
 
 //  request.id(0);
@@ -125,7 +125,7 @@ void MvsTests::startTest()
 
 //  if (!m_ftc->videoTeamModifyRequest(request, this))
 //  {
-//    INFO_LOG() << "Error requesting create data, as expected";
+//    INFO_LOG(m_logger) << "Error requesting create data, as expected";
 //    successExit();
 //  }
 
@@ -150,7 +150,7 @@ void MvsTests::tryModifyVideoTeam()
 
   if (!m_ftc->videoTeamModifyRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting modify data";
+    ERROR_LOG(m_logger) << "Error requesting modify data";
     failExit();
   }
 
@@ -166,7 +166,7 @@ void MvsTests::tryModifyVideoTeam()
 
 //  if (!m_ftc->videoTeamRemoveRequest(request, this))
 //  {
-//    ERROR_LOG() << "Error requesting remove data";
+//    ERROR_LOG(m_logger) << "Error requesting remove data";
 //    failExit();
 //  }
 
@@ -176,7 +176,7 @@ void MvsTests::tryModifyVideoTeam()
 //----------------------------------------------------------------------------------
 void MvsTests::tryCreateVideoReceiver()
 {
-  INFO_LOG() << "trying to send createRequest VideoReceiver";
+  INFO_LOG(m_logger) << "trying to send createRequest VideoReceiver";
   VideoReceiverModifyRequest request;
 
   request.id(0);
@@ -189,7 +189,7 @@ void MvsTests::tryCreateVideoReceiver()
 
   if (!m_ftc->videoReceiverModifyRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
 
@@ -211,7 +211,7 @@ void MvsTests::tryModifyVideoReceiver()
 
   if (!m_ftc->videoReceiverModifyRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting modify data";
+    ERROR_LOG(m_logger) << "Error requesting modify data";
     failExit();
   }
 
@@ -229,7 +229,7 @@ void MvsTests::tryModifyAvsVideoReceiver()
 
   if (!m_ftc->videoReceiverModifyAvsRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting modify AVS data";
+    ERROR_LOG(m_logger) << "Error requesting modify AVS data";
     failExit();
   }
 
@@ -246,7 +246,7 @@ void MvsTests::tryModifyActiveVideoReceiver()
 
   if (!m_ftc->videoReceiverModifyActiveRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting modify active data";
+    ERROR_LOG(m_logger) << "Error requesting modify active data";
     failExit();
   }
 
@@ -263,7 +263,7 @@ void MvsTests::tryDeleteVideoReceiver()
 
   if (!m_ftc->videoReceiverRemoveRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting remove data";
+    ERROR_LOG(m_logger) << "Error requesting remove data";
     failExit();
   }
 
@@ -274,7 +274,7 @@ void MvsTests::tryDeleteVideoReceiver()
 //----------------------------------------------------------------------------------
 void MvsTests::failExit()
 {
-  ERROR_LOG() << "FAIL EXIT !";
+  ERROR_LOG(m_logger) << "FAIL EXIT !";
   m_bTestsSuccessful = false;
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
@@ -282,7 +282,7 @@ void MvsTests::failExit()
 //----------------------------------------------------------------------------------
 void MvsTests::successExit()
 {
-  INFO_LOG() << "SUCCES EXIT !";
+  INFO_LOG(m_logger) << "SUCCES EXIT !";
   m_bTestsSuccessful = true;
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
@@ -291,14 +291,14 @@ void MvsTests::successExit()
 //----------------------------------------------------------------------------------
 void MvsTests::onVideoTeamModifyReply(const Core::FunctionReplyObject &replyObject)
 {
-  DEBUG_LOG() << "END (onVideoTeamModifyReply)";
+  DEBUG_LOG(m_logger) << "END (onVideoTeamModifyReply)";
   if (replyObject.error())
   {
-    ERROR_LOG() << "Got onVideoTeamModifyReply error: " << replyObject();
+    ERROR_LOG(m_logger) << "Got onVideoTeamModifyReply error: " << replyObject();
     QTimer::singleShot(0, qApp, SLOT(quit()));
     return;
   }
-  INFO_LOG() << "Got Reply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got Reply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   m_teamId = replyObject.id();
@@ -309,14 +309,14 @@ void MvsTests::onVideoTeamModifyReply(const Core::FunctionReplyObject &replyObje
 //----------------------------------------------------------------------------------
 void MvsTests::onVideoReceiverModifyReply(const Core::FunctionReplyObject &replyObject)
 {
-  DEBUG_LOG() << "END (onVideoReceiverModifyReply)";
+  DEBUG_LOG(m_logger) << "END (onVideoReceiverModifyReply)";
   if (replyObject.error())
   {
-    ERROR_LOG() << "Got onVideoReceiverModifyReply error: " << replyObject();
+    ERROR_LOG(m_logger) << "Got onVideoReceiverModifyReply error: " << replyObject();
     QTimer::singleShot(0, qApp, SLOT(quit()));
     return;
   }
-  INFO_LOG() << "Got Reply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got Reply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   m_receiverId = replyObject.id();
@@ -327,7 +327,7 @@ void MvsTests::onVideoReceiverModifyReply(const Core::FunctionReplyObject &reply
 // ------------------------------------------------------------------------------
 void MvsTests::onError(const QString &reason)
 {
-  ERROR_LOG() << "Got Reply error: " << reason;
+  ERROR_LOG(m_logger) << "Got Reply error: " << reason;
   failExit();
 }
 
@@ -339,7 +339,7 @@ void MvsTests::onReply(const Core::FunctionReplyObject &replyObject)
     onError(replyObject.translated());
     return;
   }
-  INFO_LOG() << "Got Reply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got Reply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 //  QTimer::singleShot(0, qApp, SLOT(quit()));
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/asset_assignment_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/asset_assignment_manager.cpp
index 50c726fdd..f5932e41d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/asset_assignment_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/asset_assignment_manager.cpp
@@ -373,7 +373,7 @@ bool AssetAssignmentManager::hasPendingModifications(int assetId)
 
 void AssetAssignmentManager::logPending()
 {
-  DEBUG_LOG() << "pending Mounts, Modifications (Asset), Unmounts, Removes: "
+  DEBUG_LOG(m_logger) << "pending Mounts, Modifications (Asset), Unmounts, Removes: "
                       << m_pendingMounts.size() << ", "
                       << m_pendingModifications.size() << ", "
                       << m_pendingUnmounts.size() << ", "
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/audio_video_handler_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/audio_video_handler_impl.cpp
index 801607652..966fe5174 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/audio_video_handler_impl.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/audio_video_handler_impl.cpp
@@ -323,7 +323,7 @@ void AudioVideoHandlerImpl::onAssetChanged(Asset *asset)
 {
   Q_ASSERT(m_isActive);
   Q_ASSERT(asset);
-  DEBUG_LOG() << m_exContext << ": Asset changed: " << asset->data().name() << "(" << asset->data().id() << ")";
+  DEBUG_LOG(m_logger) << m_exContext << ": Asset changed: " << asset->data().name() << "(" << asset->data().id() << ")";
 
   updateDeviceConfig(asset);
 }
@@ -332,7 +332,7 @@ void AudioVideoHandlerImpl::onMountingPointChanged(MountingPoint *mountingPoint)
 {
   Q_ASSERT(m_isActive);
   Q_ASSERT(mountingPoint);
-  DEBUG_LOG() << m_exContext << ": MountingPoint changed: " << mountingPoint->data().name() << "(" << mountingPoint->data().id() << ")";
+  DEBUG_LOG(m_logger) << m_exContext << ": MountingPoint changed: " << mountingPoint->data().name() << "(" << mountingPoint->data().id() << ")";
 
   updateDeviceConfig(mountingPoint->asset());
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/av_socket.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/av_socket.cpp
index ddc4b272d..822cfbf40 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/av_socket.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/av_socket.cpp
@@ -69,7 +69,7 @@ AVSocket::~AVSocket()
 
 void AVSocket::onDisconnected()
 {
- // WARNING_LOG() << "Disconnected from A/V system ("
+ // WARNING_LOG(m_logger) << "Disconnected from A/V system ("
  //                       << getConnectionString()
  //                       << ") - trying to reconnect";
   m_bSuccessfullyLoggedIn = false;
@@ -80,7 +80,7 @@ void AVSocket::onError(QAbstractSocket::SocketError error)
 {
   if (!m_bErrorInTcpComWarnedOnce)
   {
-    ERROR_LOG() << "Error in tcp communication with A/V system ("
+    ERROR_LOG(m_logger) << "Error in tcp communication with A/V system ("
                         << getConnectionString()
                         << "): " << QVariant::fromValue(error).toString();
     m_bErrorInTcpComWarnedOnce = true;
@@ -123,7 +123,7 @@ bool AVSocket::sendInternal(const QByteArray &cmd)
 {
   if (!m_avsSocket || !m_avsSocket->isWritable())
   {
-    WARNING_LOG() << "AVS not connected - can not send command '"
+    WARNING_LOG(m_logger) << "AVS not connected - can not send command '"
                           << cmd << "'";
     return false;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_comm.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_comm.cpp
index 77952fa46..da6563aec 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_comm.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_comm.cpp
@@ -602,7 +602,7 @@ void AvaComm::parseResponse(const QByteArray &line)
   }
 
   default:
-    DEBUG_LOG() << "Response not implemented: " << line;
+    DEBUG_LOG(m_logger) << "Response not implemented: " << line;
   }
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_control.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_control.cpp
index 37c84d774..81e3c1b5d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_control.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_control.cpp
@@ -288,13 +288,13 @@ void AvaControl::keepAlive()
 void AvaControl::onConnected()
 {
   m_connected = true;
-  DEBUG_LOG() << "connected";
+  DEBUG_LOG(m_logger) << "connected";
 }
 
 void AvaControl::onDisconnected()
 {
   m_connected = false;
-  DEBUG_LOG() << "disconnected";
+  DEBUG_LOG(m_logger) << "disconnected";
   m_queue.flush();
 }
 
@@ -303,12 +303,12 @@ void AvaControl::onTimeout()
   ICommand *cmd = m_queue.currentCommand();
   if (cmd->canTimeout())
   {
-    INFO_LOG() << "command '" << cmd->debug() << "' failed";
+    INFO_LOG(m_logger) << "command '" << cmd->debug() << "' failed";
     m_queue.done();
     return;
   }
 
-  ERROR_LOG() << "command timed out";
+  ERROR_LOG(m_logger) << "command timed out";
   failed(cmd);
 }
 
@@ -319,7 +319,7 @@ void AvaControl::queue(ICommand *cmd, LtsUtils::IConnection *connection)
 
   if (!m_connected)
   {
-    DEBUG_LOG() << "not connected -> dropping command";
+    DEBUG_LOG(m_logger) << "not connected -> dropping command";
     return;
   }
 
@@ -449,7 +449,7 @@ void AvaControl::failed(AvaCommands::SetScript *cmd)
 
 void AvaControl::failed(ICommand *cmd)
 {
-  ERROR_LOG() << "command '" << cmd->debug() << "' failed";
+  ERROR_LOG(m_logger) << "command '" << cmd->debug() << "' failed";
   Q_ASSERT(cmd == m_queue.currentCommand());
   auto cmdSetScript = dynamic_cast<AvaCommands::SetScript*>(cmd);
   if (cmdSetScript)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_session.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_session.cpp
index 6b8ec55e7..2d6789782 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_session.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_session.cpp
@@ -64,7 +64,7 @@ void AvaSession::onConnected()
   m_established = true;
   if (m_keepAliveEnabled)
     m_keepAliveTimer.start();
-  DEBUG_LOG() << "session established";
+  DEBUG_LOG(m_logger) << "session established";
   emit sessionEstablished();
 }
 
@@ -72,7 +72,7 @@ void AvaSession::onDisconnected()
 {
   m_keepAliveTimer.stop();
   m_established = false;
-  DEBUG_LOG() << "disconnected";
+  DEBUG_LOG(m_logger) << "disconnected";
   emit disconnected();
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_command_queue.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_command_queue.cpp
index 1c125a0ea..dd2c49e03 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_command_queue.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avs_command_queue.cpp
@@ -37,7 +37,7 @@ void AvsCommandQueue::queue(std::unique_ptr<ICommand> cmd, std::unique_ptr<LtsUt
 
   bool   noPendingCommand = m_queue.empty();
   m_queue.push_back(CommandWithConn{std::move(cmd), std::move(connection)});
-  DEBUG_LOG() << "queueing command, queue size: " << m_queue.size();
+  DEBUG_LOG(m_logger) << "queueing command, queue size: " << m_queue.size();
   tryReduce();
   if (noPendingCommand)
     nextCommand();
@@ -48,7 +48,7 @@ void AvsCommandQueue::done()
   Q_ASSERT(!m_queue.empty());
   m_timer.stop();
   m_queue.pop_front();
-  DEBUG_LOG() << "command finished, queue size: " << m_queue.size();
+  DEBUG_LOG(m_logger) << "command finished, queue size: " << m_queue.size();
   if (m_queue.empty())
     emit queueEmpty();
   else
@@ -79,7 +79,7 @@ void AvsCommandQueue::flush()
   if (m_queue.empty())
     return;
 
-  DEBUG_LOG() << "flushing " << m_queue.size() << " commands";
+  DEBUG_LOG(m_logger) << "flushing " << m_queue.size() << " commands";
   m_timer.stop();
   m_queue.clear();
   emit queueEmpty();
@@ -95,7 +95,7 @@ void AvsCommandQueue::nextCommand()
 {
   Q_ASSERT(!m_queue.empty());
 
-  DEBUG_LOG() << "sending next command";
+  DEBUG_LOG(m_logger) << "sending next command";
   ICommand   *cmd = currentCommand();
   m_timer.start();
   cmd->send();
@@ -124,7 +124,7 @@ void AvsCommandQueue::tryReduce()
     if (!lastCommand.cmd->nullifies(current.cmd.get()))
       continue;
 
-    DEBUG_LOG() << "dropping command due to override";
+    DEBUG_LOG(m_logger) << "dropping command due to override";
     m_queue.erase(m_queue.begin() + i);
     return;
   }
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 b817dd2f9..5da39d62a 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
@@ -126,7 +126,7 @@ public:
     Database::AvmDeviceConfig   deviceConfig = m_handler->toDeviceConfig(config);
     bool   status = m_db->insert(deviceConfig);
     if (!status)
-      ERROR_LOG() << "Error while inserting device config";
+      ERROR_LOG(m_logger) << "Error while inserting device config";
 
     m_cache.insert(config.id(), deviceConfig);
     emit m_handler->avDbReloadNeeded();
@@ -142,7 +142,7 @@ public:
     newDeviceConfig.id = oldDeviceConfig.id;
     bool   status = m_db->update(newDeviceConfig);
     if (!status)
-      ERROR_LOG() << "Error while updating device config";
+      ERROR_LOG(m_logger) << "Error while updating device config";
 
     m_cache[config.id()] = newDeviceConfig;
     emit m_handler->avDbReloadNeeded();
@@ -168,7 +168,7 @@ public:
 
     bool   status = m_db->removeAvmDeviceConfig(m_cache.value(configId).id);
     if (!status)
-      ERROR_LOG() << "Error while removing device config";
+      ERROR_LOG(m_logger) << "Error while removing device config";
 
     m_cache.remove(configId);
     emit m_handler->avDbReloadNeeded();
@@ -230,7 +230,7 @@ bool CnrHandler::init()
 
   if (!m_db->select(m_channels))
   {
-    ERROR_LOG() << "Error while selecting cnr channels from db";
+    ERROR_LOG(m_logger) << "Error while selecting cnr channels from db";
     return false;
   }
 
@@ -241,7 +241,7 @@ bool CnrHandler::init()
   QVector<AvmCnrConfig> cnrConfigs;
   if (!m_db->select(cnrConfigs))
   {
-    ERROR_LOG() << "Error while selecting CNR configs from db";
+    ERROR_LOG(m_logger) << "Error while selecting CNR configs from db";
     return false;
   }
 
@@ -275,7 +275,7 @@ void CnrHandler::onRemoveCnrConfigRequest(const rti::core::SampleIdentity &cooki
 {
   auto ret = removeCnrConfig(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_fts->removeCnrConfigReply(cookie, ret);
 }
 
@@ -284,19 +284,19 @@ void CnrHandler::onModifyCnrConfigRequest(const rti::core::SampleIdentity &cooki
 {
   auto ret = (request.id() < 1 ? createCnrConfig(request) : modifyCnrConfig(request));
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_fts->modifyCnrConfigReply(cookie, ret);
 }
 
 void CnrHandler::onRadioStationAdded(int id, const QString &name, const QString &hostname)
 {
-  DEBUG_LOG() << "Adding radio station with id " << id << " (" << name << ") and hostname '" << hostname << "'";
+  DEBUG_LOG(m_logger) << "Adding radio station with id " << id << " (" << name << ") and hostname '" << hostname << "'";
   auto it = m_cnrRadioStations.find(id);
   if (it != m_cnrRadioStations.end() && it.value() == hostname)
     return;
   if (hostname.isEmpty())
   {
-    WARNING_LOG() << "Radio station with id " << id << " (" << name << ") has an empty hostname - ignoring!";
+    WARNING_LOG(m_logger) << "Radio station with id " << id << " (" << name << ") has an empty hostname - ignoring!";
     return;
   }
   m_cnrRadioStations[id] = hostname;
@@ -305,7 +305,7 @@ void CnrHandler::onRadioStationAdded(int id, const QString &name, const QString
 
 void CnrHandler::onRadioStationRemoved(int id)
 {
-  DEBUG_LOG() << "Removing radio station with id " << id;
+  DEBUG_LOG(m_logger) << "Removing radio station with id " << id;
   auto it = m_cnrRadioStations.find(id);
   if (it == m_cnrRadioStations.end())
     return;
@@ -347,7 +347,7 @@ void CnrHandler::onDbDeleteAvmCnrConfig(const QVariant &id)
   if (!m_cache.contains(configId))
     return; // the notification was a result of our own removal of the entry
 
-  DEBUG_LOG() << "DB deleted AvmCnrConfig with id: " << configId;
+  DEBUG_LOG(m_logger) << "DB deleted AvmCnrConfig with id: " << configId;
 
   removeCnrConfig(Core::RemoveElementRequest(configId));
 }
@@ -385,7 +385,7 @@ void CnrHandler::reevalutate()
   {
     auto   reply = modifyCnrConfig(toRequest(cnrConfig));
     if (reply.error())
-      ERROR_LOG() << reply();
+      ERROR_LOG(m_logger) << reply();
   }
 
   trans.commit();
@@ -558,7 +558,7 @@ bool CnrHandler::isNameUnique(const std::string &name, const boost::optional<int
  */
 Core::FunctionReplyObject CnrHandler::createCnrConfig(const ModifyCnrConfigRequest &request, const boost::optional<int32_t> &dbId)
 {
-  DEBUG_LOG() << "CreateCnrConfigRequest: " << request;
+  DEBUG_LOG(m_logger) << "CreateCnrConfigRequest: " << request;
 
   auto   reply = validateRequest(request);
   if (reply.error())
@@ -586,7 +586,7 @@ Core::FunctionReplyObject CnrHandler::createCnrConfig(const ModifyCnrConfigReque
 
 Core::FunctionReplyObject CnrHandler::modifyCnrConfig(const ModifyCnrConfigRequest &request)
 {
-  DEBUG_LOG() << "ModifyCnrConfigRequest: " << request;
+  DEBUG_LOG(m_logger) << "ModifyCnrConfigRequest: " << request;
 
   auto   reply = validateRequest(request);
   if (reply.error())
@@ -630,7 +630,7 @@ Core::FunctionReplyObject CnrHandler::modifyCnrConfig(const ModifyCnrConfigReque
 
 Core::FunctionReplyObject CnrHandler::removeCnrConfig(const Core::RemoveElementRequest &request)
 {
-  DEBUG_LOG() << "RemoveCnrConfigRequest: " << request;
+  DEBUG_LOG(m_logger) << "RemoveCnrConfigRequest: " << request;
 
   int32_t                     configId = request.id();
   Core::FunctionReplyObject   reply(configId);
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 3afa5813e..05f896622 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
@@ -144,7 +144,7 @@ bool CnrTvcProfileHandler::init()
   bool   status = m_db->select(circuitContainersDb);
   if (!status)
   {
-    ERROR_LOG() << "Error reading data from database 'avm.avm_cnr_tvc_profile'";
+    ERROR_LOG(m_logger) << "Error reading data from database 'avm.avm_cnr_tvc_profile'";
     return false;
   }
 
@@ -174,7 +174,7 @@ bool CnrTvcProfileHandler::collectAndPublish(const Database::AvmCnrTvcProfile &c
   bool   status = m_db->selectByContainerId(circuitsContentDb, circuitContainerDb.id);
   if (!status)
   {
-    ERROR_LOG() << "Error reading data from database 'avm.avm_cnr_tvc_profile_data'";
+    ERROR_LOG(m_logger) << "Error reading data from database 'avm.avm_cnr_tvc_profile_data'";
     return false;
   }
 
@@ -185,7 +185,7 @@ bool CnrTvcProfileHandler::collectAndPublish(const Database::AvmCnrTvcProfile &c
   {
     status = m_db->removeAvmCnrTvcProfileData(invalid.id);
     if (!status)
-      ERROR_LOG() << "Failed to remove from 'avm.avm_cnr_tvc_profile_data' with id " << invalid.id;
+      ERROR_LOG(m_logger) << "Failed to remove from 'avm.avm_cnr_tvc_profile_data' with id " << invalid.id;
     auto   newEnd = std::remove_if(circuitsContentDb.begin(), circuitsContentDb.end(), [&invalid] (const Database::AvmCnrTvcProfileData &circuit) { return circuit.id == invalid.id; });
     circuitsContentDb.erase(newEnd, circuitsContentDb.end());
   }
@@ -198,7 +198,7 @@ bool CnrTvcProfileHandler::collectAndPublish(const Database::AvmCnrTvcProfile &c
     status = m_db->removeAvmCnrTvcProfile(circuitContainerDb.id);
     if (!status)
     {
-      ERROR_LOG() <<  "Failed to remove from 'avm.avm_cnr_tvc_profile' with id " << circuitContainerDb.id;
+      ERROR_LOG(m_logger) <<  "Failed to remove from 'avm.avm_cnr_tvc_profile' with id " << circuitContainerDb.id;
       return false;
     }
 
@@ -231,7 +231,7 @@ void CnrTvcProfileHandler::onModifyCnrTvcProfileRequest(const rti::core::SampleI
     rep = modifyProfile(request);
 
   if (rep.error())
-    WARNING_LOG() << rep.str();
+    WARNING_LOG(m_logger) << rep.str();
 
   m_fts->modifyCnrTvcProfileReply(cookie, rep);
 }
@@ -242,7 +242,7 @@ void CnrTvcProfileHandler::onRemoveCnrTvcProfileRequest(const rti::core::SampleI
   Core::FunctionReplyObject rep = removeProfile(request);
 
   if (rep.error())
-    WARNING_LOG() << rep.str();
+    WARNING_LOG(m_logger) << rep.str();
 
   m_fts->removeCnrTvcProfileReply(cookie, rep);
 }
@@ -361,7 +361,7 @@ void CnrTvcProfileHandler::addProfile(const CnrTvcProfile &profile)
 
   bool   status = m_dts->publish(profile);
   if (!status)
-    ERROR_LOG() << QStringLiteral("Failed to publish 'CnrTvcProfile' data with id %1 (create)").arg(profile.id());
+    ERROR_LOG(m_logger) << QStringLiteral("Failed to publish 'CnrTvcProfile' data with id %1 (create)").arg(profile.id());
 }
 
 void CnrTvcProfileHandler::removeProfile(int64_t id)
@@ -375,7 +375,7 @@ void CnrTvcProfileHandler::removeProfile(int64_t id)
 
   bool   status = m_dts->removeCnrTvcProfileByKey(id);
   if (!status)
-    ERROR_LOG() << QStringLiteral("Failed to publish 'CnrTvcProfile' with id %1 (remove)").arg(id);
+    ERROR_LOG(m_logger) << QStringLiteral("Failed to publish 'CnrTvcProfile' with id %1 (remove)").arg(id);
 }
 
 void CnrTvcProfileHandler::updateProfile(const CnrTvcProfile &profile)
@@ -393,7 +393,7 @@ void CnrTvcProfileHandler::updateProfile(const CnrTvcProfile &profile)
 
   bool   status = m_dts->publish(profile);
   if (!status)
-    ERROR_LOG() << QStringLiteral("Failed to publish 'CnrTvcProfile' data with id %1 (modify)").arg(profile.id());
+    ERROR_LOG(m_logger) << QStringLiteral("Failed to publish 'CnrTvcProfile' data with id %1 (modify)").arg(profile.id());
 }
 
 void CnrTvcProfileHandler::onCnrConfigChanged(const CnrConfig &cnrConfig)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/dds_handler.cpp
index accfaa19b..b5bf1937c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/dds_handler.cpp
@@ -27,14 +27,14 @@ namespace AudioVideoManagement
 DdsHandler::DdsHandler(int domainId)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Any))
 {
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
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 59f5e8335..c7e3c8b8e 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
@@ -87,6 +87,7 @@ public:
   std::shared_ptr<DDSConnector::DdsConnector> ddsConnector() const { return m_ddsConnector; }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector>               m_ddsConnector;
   std::shared_ptr<Core::Pacemaker>                          m_pacemaker;
   std::shared_ptr<Core::TopicLockMaster>                    m_topicLockMaster;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/default_av_menus.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/default_av_menus.cpp
index bb683c619..d141b7e3d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/default_av_menus.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/default_av_menus.cpp
@@ -70,14 +70,13 @@ bool isStreamOfInterest(const AudioVideoManagement::Stream &stream, bool isAudio
 namespace AudioVideoManagement
 {
 
-DefaultAvMenus::DefaultAvMenus(const ExerciseContext &context, Interface::Dts *dts, HandlerVideoTeam *handlerVideoTeams, InfrastructureManagement::Interface::Dtc *ismDtc)
-  : m_context(context)
+DefaultAvMenus::DefaultAvMenus(const ExerciseContext &context, Interface::Dts *dts, HandlerVideoTeam *handlerVideoTeams, InfrastructureManagement::Interface::Dtc *ismDtc) : m_context(context)
   , m_dts(dts)
   , m_videoTeamHandler(handlerVideoTeams)
   , m_ismDtc(ismDtc)
   , m_timer(new QTimer)
-  , m_isInitialized(false)
-{
+  , m_isInitialized(false),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   Q_ASSERT(dts);
   Q_ASSERT(ismDtc);
   if(!m_ismDtc->isMainStructureElementEnabled())
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise.h
index f1dbfb1aa..c8ae4a231 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise.h
@@ -69,6 +69,8 @@ signals:
   void assetUnassigned(Asset *asset);
 
 private:
+
+NGL::INGLLogger &m_logger;
   ExerciseContext                                 m_context;
   std::map<int, std::unique_ptr<Asset>>           m_assets;
   std::map<int, std::unique_ptr<MountingPoint>>   m_mountingPoints;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise_handler.cpp
index a9750e731..350c1c2d2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise_handler.cpp
@@ -35,16 +35,15 @@ bool isActive(ExerciseManagement::ExerciseState state)
 namespace AudioVideoManagement
 {
 
-ExerciseHandler::ExerciseHandler(MainHandler *mainHandler, int exerciseId)
-  : QObject()
+ExerciseHandler::ExerciseHandler(MainHandler *mainHandler, int exerciseId) : QObject()
   , m_exContext(exerciseId)
   , m_curExerciseState(ExerciseManagement::ExerciseState::Unknown)
   , m_curAVOperatingMode(AVControl::OperatingMode::Unknown)
   , m_mainHandler(mainHandler)
   , m_updateTimer(new QTimer(this))
   , m_lastSeenTimer(new QTimer(this))
-  , m_bWarnedOnce(false)
-{
+  , m_bWarnedOnce(false),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_updateTimer->setSingleShot(true);
   connect(m_updateTimer, &QTimer::timeout, this, &ExerciseHandler::onUpdateTimerTimeout);
 
@@ -74,7 +73,7 @@ void ExerciseHandler::checkForRecordPlaybackSession()
     m_recordSession.type = avTypeRecordSession();
     if (!db()->insert(m_recordSession))
     {
-      ERROR_LOG()  << m_exContext << " Error adding AvmDeviceConfig - aborting";
+      ERROR_LOG(m_logger)  << m_exContext << " Error adding AvmDeviceConfig - aborting";
       return;
     }
     emit avDbReloadNeeded();
@@ -88,7 +87,7 @@ void ExerciseHandler::checkForRecordPlaybackSession()
     m_replaySession.type = avTypePlaybackSession();
     if (!db()->insert(m_replaySession))
     {
-      ERROR_LOG()  << m_exContext << " Error adding AvmDeviceConfig - aborting";
+      ERROR_LOG(m_logger)  << m_exContext << " Error adding AvmDeviceConfig - aborting";
       return;
     }
     emit avDbReloadNeeded();
@@ -98,7 +97,7 @@ void ExerciseHandler::checkForRecordPlaybackSession()
 void ExerciseHandler::setNewExerciseState(ExerciseManagement::ExerciseState newState)
 {
   Q_ASSERT(newState != ExerciseManagement::ExerciseState::Unknown);
-  INFO_LOG() << m_exContext << ": state change: " << m_curExerciseState << " -> " << newState;
+  INFO_LOG(m_logger) << m_exContext << ": state change: " << m_curExerciseState << " -> " << newState;
 
   if (m_curExerciseState == newState)
     return;
@@ -120,12 +119,12 @@ void ExerciseHandler::setNewExerciseState(ExerciseManagement::ExerciseState newS
   {
     if (newIsActive)
     {
-      DEBUG_LOG() << m_exContext << " activated";
+      DEBUG_LOG(m_logger) << m_exContext << " activated";
       emit contextActivated();
     }
     else
     {
-      DEBUG_LOG() << m_exContext << " deactivated";
+      DEBUG_LOG(m_logger) << m_exContext << " deactivated";
       emit contextDeactivated();
     }
   }
@@ -163,12 +162,12 @@ void ExerciseHandler::onUpdateTimerTimeout()
   if (m_curAVOperatingMode == desiredOperatingMode)
     return;
 
-  DEBUG_LOG() << "Context: " << m_exContext << " Try switching to " << desiredOperatingMode;
+  DEBUG_LOG(m_logger) << "Context: " << m_exContext << " Try switching to " << desiredOperatingMode;
   if (!avControl()->setOperatingModeForContext(m_exContext, desiredOperatingMode))
   {
     if (!m_bWarnedOnce)
     {
-      DEBUG_LOG() << "Context: " << m_exContext
+      DEBUG_LOG(m_logger) << "Context: " << m_exContext
                           << " - could not change operating mode, maybe not yet connected to AVS - trying again in 5 seconds";
       m_bWarnedOnce = true;
     }
@@ -205,7 +204,7 @@ void ExerciseHandler::onLastSeenTimerTimeout()
       m_lastSeen.lastSeen.isNull() ||
       m_lastSeen.lastSeen.addDays(1) < QDateTime::currentDateTimeUtc())
   {
-    INFO_LOG() << "Exercise with id " << m_exContext.id()
+    INFO_LOG(m_logger) << "Exercise with id " << m_exContext.id()
                        << " not seen since more than 1 day -> removing";
     // not seen at all or not since more than 1 day -> remove
     setNewExerciseState(ExerciseManagement::ExerciseState::Terminated);
@@ -224,13 +223,13 @@ void ExerciseHandler::onOperatingModeChanged(const ExerciseContext &context,
 
   if (desiredOperatingMode != om)
   {
-    DEBUG_LOG() << "Context: " << context << " Got " << om
+    DEBUG_LOG(m_logger) << "Context: " << context << " Got " << om
                         << " for " << comp << " but expected " << desiredOperatingMode;
     m_updateTimer->start(100);
   }
   else
   {
-    DEBUG_LOG() << "Context: " << context << " Got " << om
+    DEBUG_LOG(m_logger) << "Context: " << context << " Got " << om
                         << " for " << comp << " which is the expected value";
     m_updateTimer->stop();
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercises_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercises_handler.cpp
index 50d86ad4e..39f003aeb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercises_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercises_handler.cpp
@@ -52,11 +52,10 @@ private:
 };
 
 
-ExercisesHandler::ExercisesHandler(MainHandler *mainHandler)
-  : m_mainHandler(mainHandler)
+ExercisesHandler::ExercisesHandler(MainHandler *mainHandler) : m_mainHandler(mainHandler)
   , m_triggerAvUpdateTimer(new QTimer(this))
-  , m_assetAssignmentManager(AssetAssignmentManager::create(mainHandler->ddsHandler()->ismDtc()))
-{
+  , m_assetAssignmentManager(AssetAssignmentManager::create(mainHandler->ddsHandler()->ismDtc())),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_triggerAvUpdateTimer->setSingleShot(true);
   m_triggerAvUpdateTimer->setInterval(1000);
   connect(m_triggerAvUpdateTimer, &QTimer::timeout,
@@ -98,7 +97,7 @@ bool ExercisesHandler::init()
   connect(exmDtc(), &ExerciseManagement::Interface::Dtc::exerciseChanged,
           this, &ExercisesHandler::onExerciseChanged);
 
-  DEBUG_LOG() << Q_FUNC_INFO << " done";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " done";
 
   return true;
 }
@@ -165,7 +164,7 @@ ExerciseHandler *ExercisesHandler::getOrCreateExerciseHandler(int exerciseId)
 
 ExerciseHandler *ExercisesHandler::createExerciseHandler(int exerciseId)
 {
-  DEBUG_LOG() << "Creating handler for exercise " << exerciseId;
+  DEBUG_LOG(m_logger) << "Creating handler for exercise " << exerciseId;
 
   ExerciseParts        parts(m_mainHandler, m_assetAssignmentManager->exercise(exerciseId));
   ExerciseHandler     *exH = parts.exerciseHandler();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercises_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercises_handler.h
index 8016e1092..48f775153 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercises_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercises_handler.h
@@ -78,6 +78,7 @@ public slots:
   void onAvDbReloadNeeded();
 
 private:
+  NGL::INGLLogger &m_logger;
   void createExerciseHandlerFromLastSeen(const Database::AvmExerciseLastSeen &lastSeen);
   ExerciseHandler *getOrCreateExerciseHandler(int exerciseId);
   ExerciseHandler *createExerciseHandler(int exerciseId);
@@ -92,6 +93,7 @@ private slots:
   void exerciseFinished(int exerciseId);
 
 private:
+  NGL::INGLLogger &m_logger;
   MainHandler                              *m_mainHandler;
   QTimer                                   *m_triggerAvUpdateTimer;
   std::unique_ptr<AssetAssignmentManager>   m_assetAssignmentManager;
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 4bca54202..3ede1b0fa 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
@@ -156,7 +156,7 @@ bool FrequencyPlanningHandler::init()
   QVector<Database::AvmFrequencyPlanning> frequencyPlannings;
   if (!m_db->select(frequencyPlannings))
   {
-    ERROR_LOG() << "Error while selecting frequency plannings from db";
+    ERROR_LOG(m_logger) << "Error while selecting frequency plannings from db";
     return false;
   }
 
@@ -169,11 +169,11 @@ bool FrequencyPlanningHandler::init()
     m_activePlannings.insert(exerciseId, currentDbData);
 
     if (!m_dts->publish(ActiveFrequencyPlanning(exerciseId, currentDbData.frequencyPlanningId)))
-      ERROR_LOG() << "Error while publishing ActiveFrequencyPlanning with ID " << exerciseId;
+      ERROR_LOG(m_logger) << "Error while publishing ActiveFrequencyPlanning with ID " << exerciseId;
   };
   if (!m_db->select(cbAfp))
   {
-    ERROR_LOG() << "Error while selecting AvmActiveFrequencyPlannings from db";
+    ERROR_LOG(m_logger) << "Error while selecting AvmActiveFrequencyPlannings from db";
     return false;
   }
 
@@ -185,7 +185,7 @@ void FrequencyPlanningHandler::onModifyFrequencyPlanningRequest(const rti::core:
 {
   auto ret = request.id() > 0 ? handleModify(request) : handleCreate(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_fts->modifyFrequencyPlanningReply(cookie, ret);
 }
 
@@ -194,7 +194,7 @@ void FrequencyPlanningHandler::onRemoveFrequencyPlanningRequest(const rti::core:
 {
   auto ret = handleRemove(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_fts->removeFrequencyPlanningReply(cookie, ret);
 }
 
@@ -203,7 +203,7 @@ void FrequencyPlanningHandler::onModifyActiveFrequencyPlanningRequest(const rti:
 {
   auto ret = modifyActiveFrequencyPlanningRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_fts->modifyActiveFrequencyPlanningReply(cookie, ret);
 }
 
@@ -212,7 +212,7 @@ void FrequencyPlanningHandler::onRemoveActiveFrequencyPlanningRequest(const rti:
 {
   auto ret = removeActiveFrequencyPlanningRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_fts->removeActiveFrequencyPlanningReply(cookie, ret);
 }
 
@@ -263,7 +263,7 @@ Core::FunctionReplyObject FrequencyPlanningHandler::handleCreate(const ModifyFre
     status = m_db->insert(dbEntry);
     if (!status)
     {
-       WARNING_LOG() << "Failed to insert new FrequencyPlanningData into DB";
+       WARNING_LOG(m_logger) << "Failed to insert new FrequencyPlanningData into DB";
        break;
     }
     dbEntries.push_back(dbEntry);
@@ -307,7 +307,7 @@ Q_ASSERT(request.id() > 0);
     status = m_db->insert(dbEntry);
     if (!status)
     {
-      WARNING_LOG() << "Failed to insert new FrequencyPlanningData into DB";
+      WARNING_LOG(m_logger) << "Failed to insert new FrequencyPlanningData into DB";
       break;
     }
     dbEntries.push_back(dbEntry);
@@ -444,7 +444,7 @@ std::vector<Database::AvmFrequencyPlanningData> FrequencyPlanningHandler::insert
 
 Core::FunctionReplyObject FrequencyPlanningHandler::modifyActiveFrequencyPlanningRequest(const ModifyActiveFrequencyPlanningRequest &request)
 {
-  DEBUG_LOG() << "ModifyActiveFrequencyPlanningRequest: " << request;
+  DEBUG_LOG(m_logger) << "ModifyActiveFrequencyPlanningRequest: " << request;
 
   Core::FunctionReplyObject   reply = validateRequest(request);
   if (reply.error())
@@ -480,7 +480,7 @@ Core::FunctionReplyObject FrequencyPlanningHandler::modifyActiveFrequencyPlannin
 
 Core::FunctionReplyObject FrequencyPlanningHandler::removeActiveFrequencyPlanningRequest(const RemoveActiveFrequencyPlanningRequest &request)
 {
-  DEBUG_LOG() << "RemoveActiveFrequencyPlanningRequest: " << request;
+  DEBUG_LOG(m_logger) << "RemoveActiveFrequencyPlanningRequest: " << request;
 
   Core::FunctionReplyObject   reply(request.exerciseId());
 
@@ -668,7 +668,7 @@ bool FrequencyPlanningHandler::collectAndPublish(const Database::AvmFrequencyPla
   bool   status = m_db->selectByFrequencyPlanningId(dbEntries, planDb.id);
   if (!status)
   {
-    ERROR_LOG() << "Error selecting AvmFrequencyPlanningData from db";
+    ERROR_LOG(m_logger) << "Error selecting AvmFrequencyPlanningData from db";
     return false;
   }
 
@@ -691,7 +691,7 @@ void FrequencyPlanningHandler::addPlan(const FrequencyPlanning &plan)
 
   bool   status = m_dts->publish(plan);
   if (!status)
-    ERROR_LOG() << QStringLiteral("Failed to publish 'FrequencyPlanning' data with id %1 (create)").arg(plan.id());
+    ERROR_LOG(m_logger) << QStringLiteral("Failed to publish 'FrequencyPlanning' data with id %1 (create)").arg(plan.id());
 
   emit planningChanged();
 }
@@ -706,7 +706,7 @@ void FrequencyPlanningHandler::updatePlan(const FrequencyPlanning &plan)
 
   bool   status = m_dts->publish(plan);
   if (!status)
-    ERROR_LOG() << QStringLiteral("Failed to publish 'FrequencyPlanning' data with id %1 (modify)").arg(plan.id());
+    ERROR_LOG(m_logger) << QStringLiteral("Failed to publish 'FrequencyPlanning' data with id %1 (modify)").arg(plan.id());
 
   emit planningChanged();
 }
@@ -720,7 +720,7 @@ void FrequencyPlanningHandler::removePlan(int32_t planId)
 
   bool   status = m_dts->removeFrequencyPlanningByKey(planId);
   if (!status)
-    ERROR_LOG() << QStringLiteral("Failed to publish 'FrequencyPlanning' with id %1 (remove)").arg(planId);
+    ERROR_LOG(m_logger) << QStringLiteral("Failed to publish 'FrequencyPlanning' with id %1 (remove)").arg(planId);
 
   emit planningChanged();
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_set_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_set_handler.cpp
index e54bc63d4..6d4a47d75 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_set_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_set_handler.cpp
@@ -16,26 +16,25 @@
 namespace AudioVideoManagement
 {
 
-FrequencySetHandler::FrequencySetHandler(Interface::Dts *dts, DatabaseInterface *db)
-  : m_dts(dts)
-  , m_db(db)
-{
+FrequencySetHandler::FrequencySetHandler(Interface::Dts *dts, DatabaseInterface *db) : m_dts(dts)
+  , m_db(db),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   Q_ASSERT(dts);
   Q_ASSERT(db);
 }
 
 bool FrequencySetHandler::init()
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
   QVector<Database::AvmFrequencySet> frequencySets;
 
   // Don't use select() with callback here as the callback (body of for-loop below) would use the DB, too.
   if (!m_db->select(frequencySets))
   {
-    ERROR_LOG() << "Error while selecting frequency sets from db";
+    ERROR_LOG(m_logger) << "Error while selecting frequency sets from db";
     return false;
   }
-  DEBUG_LOG() << "Found " << frequencySets.size() << " Frequency Sets";
+  DEBUG_LOG(m_logger) << "Found " << frequencySets.size() << " Frequency Sets";
 
   for (const Database::AvmFrequencySet &currentfrequencySet : std::as_const(frequencySets))
     addFrequencySet(toDdsFrequencySet(currentfrequencySet));
@@ -66,7 +65,7 @@ FrequencySet FrequencySetHandler::toDdsFrequencySet(const Database::AvmFrequency
   };
   m_db->selectByFrequencySetId(cb, result.id());
 
-  DEBUG_LOG() << "Frequency Set with ID " << dbData.id << " has " << result.data().size() << " data entries";
+  DEBUG_LOG(m_logger) << "Frequency Set with ID " << dbData.id << " has " << result.data().size() << " data entries";
 
   return result;
 }
@@ -122,7 +121,7 @@ void FrequencySetHandler::addFrequencySet(const FrequencySet &frequencySet)
   m_frequencySetDatas.insert(frequencySet.id(), dataIds);
 
   if (!m_dts->publish(frequencySet))
-    ERROR_LOG() << "Error while publishing Frequency Set with id " << frequencySet.id();
+    ERROR_LOG(m_logger) << "Error while publishing Frequency Set with id " << frequencySet.id();
 }
 
 } // namespace AudioVideoManagement
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 5bc423fc6..ddda69dd7 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
@@ -76,7 +76,7 @@ bool HandlerFrequencyPlanningStatus::init()
   // read all HandlerFrequencyPlanningStatus Data from database
   if (!m_db->select(dataVec))
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
 
@@ -89,7 +89,7 @@ bool HandlerFrequencyPlanningStatus::init()
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       return false;
     }
     m_data.insert(ifs->getData().client(), ifs);
@@ -101,10 +101,10 @@ bool HandlerFrequencyPlanningStatus::init()
 void HandlerFrequencyPlanningStatus::onModifyFrequencyPlanningStatusRequest(const rti::core::SampleIdentity &cookie,
                                                 const ModifyFrequencyPlanningStatusRequest &request)
 {
-  DEBUG_LOG() << "onModifyFrequencyPlanningStatusRequest: " << request;
+  DEBUG_LOG(m_logger) << "onModifyFrequencyPlanningStatusRequest: " << request;
   auto ret = m_data.contains(request.client()) ? frequencyPlanningStatusModifyRequest(request) : frequencyPlanningStatusCreateRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_fts->modifyFrequencyPlanningStatusReply(cookie, ret);
 }
 
@@ -132,7 +132,7 @@ void HandlerFrequencyPlanningStatus::onRemoveFrequencyPlanningStatusByClientRequ
       int client = ifs->getData().client();
       ret = ifs->removeObject();
       if (ret.error())
-        ERROR_LOG() << ret();
+        ERROR_LOG(m_logger) << ret();
       else
         clients << client;
     }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_menu_struct.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_menu_struct.cpp
index 2228dbc17..9123e394e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_menu_struct.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_menu_struct.cpp
@@ -222,10 +222,10 @@ QList<MenuStruct> HandlerMenuStruct::loadFromDb(bool &status)
 void HandlerMenuStruct::onModifyMenuStructRequest(const rti::core::SampleIdentity &cookie,
                                                   const MenuStruct &request)
 {
-  DEBUG_LOG() << "onModifyMenuStructRequest: " << request;
+  DEBUG_LOG(m_logger) << "onModifyMenuStructRequest: " << request;
   auto ret = request.id() > 0 ? modifyMenuStructRequest(request) : createMenuStructRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_fts->modifyMenuStructReply(cookie, ret);
 }
 
@@ -233,7 +233,7 @@ Core::FunctionReplyObject HandlerMenuStruct::createMenuStructRequest(const MenuS
 {
   ObjectMenuStruct *ifs = new ObjectMenuStruct(m_dts, m_db);
 
-  DEBUG_LOG() << "request.menuEntries.size() : " << request.menuEntries().size();
+  DEBUG_LOG(m_logger) << "request.menuEntries.size() : " << request.menuEntries().size();
   Core::FunctionReplyObject ret = ifs->createFromDds(request);
 
   if (ret.error())
@@ -263,7 +263,7 @@ void HandlerMenuStruct::onRemoveMenuStructRequest(const rti::core::SampleIdentit
 {
   Core::FunctionReplyObject ret;
 
-  INFO_LOG() << "onRemoveMenuStructRequest id = " << request.id();
+  INFO_LOG(m_logger) << "onRemoveMenuStructRequest id = " << request.id();
 
   ObjectMenuStruct *ifs = m_objMap.value(request.id());
   if (ifs == nullptr)
@@ -287,7 +287,7 @@ void HandlerMenuStruct::onRemoveMenuStructRequest(const rti::core::SampleIdentit
 void HandlerMenuStruct::onDbDeletedAvmMenuStruct(const QVariant &id_)
 {
   int   id = id_.toInt();
-  DEBUG_LOG() << "DB deleted AvmMenuStruct with id: " << id;
+  DEBUG_LOG(m_logger) << "DB deleted AvmMenuStruct with id: " << id;
   reload();
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_receiver.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_receiver.cpp
index 15584d520..16aa8d8a7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_receiver.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_receiver.cpp
@@ -63,7 +63,7 @@ bool HandlerVideoReceiver::init()
   // read all VideoReceiver Data from database
   if (!m_db->select(dataVec))
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return true;
   }
 
@@ -76,13 +76,13 @@ bool HandlerVideoReceiver::init()
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       return false;
     }
     m_videoReceiverObjMap.insert(ifs->getId(), ifs);
   }
 
-  DEBUG_LOG() << "m_videoReceiverObjMap.size() = " << m_videoReceiverObjMap.size();
+  DEBUG_LOG(m_logger) << "m_videoReceiverObjMap.size() = " << m_videoReceiverObjMap.size();
 
   m_httpRequestTimer.setInterval(std::chrono::milliseconds(20000).count());
   m_httpRequestTimer.setSingleShot(false);
@@ -99,10 +99,10 @@ bool HandlerVideoReceiver::init()
 void HandlerVideoReceiver::onVideoReceiverModifyRequest(const rti::core::SampleIdentity &cookie,
                                                         const VideoReceiverModifyRequest &request)
 {
-  DEBUG_LOG() << "onVideoReceiverModifyRequest: " << request;
+  DEBUG_LOG(m_logger) << "onVideoReceiverModifyRequest: " << request;
   auto ret = request.id() > 0 ? videoReceiverModifyRequest(request) : videoReceiverCreateRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_fts->videoReceiverModifyReply(cookie, ret);
 }
 
@@ -110,10 +110,10 @@ void HandlerVideoReceiver::onVideoReceiverModifyRequest(const rti::core::SampleI
 void HandlerVideoReceiver::onVideoReceiverModifyActiveRequest(const rti::core::SampleIdentity &cookie,
                                                               const VideoReceiverModifyActiveRequest &request)
 {
-  DEBUG_LOG() << "onVideoReceiverModifyActiveRequest";
+  DEBUG_LOG(m_logger) << "onVideoReceiverModifyActiveRequest";
   auto ret = videoReceiverModifyActiveRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   else
     // activate channel here
     activateChannel(request.id(), request.isActive());
@@ -126,7 +126,7 @@ void HandlerVideoReceiver::onVideoReceiverModifyAvsRequest(const rti::core::Samp
 {
   auto ret = videoReceiverModifyAvsRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_fts->videoReceiverModifyAvsReply(cookie, ret);
 }
 
@@ -176,7 +176,7 @@ VideoReceiver HandlerVideoReceiver::convertActive(const VideoReceiverModifyActiv
 //--------------------------------------------------------------------------------------------------
 Core::FunctionReplyObject HandlerVideoReceiver::videoReceiverModifyRequest(const VideoReceiverModifyRequest &request)
 {
-  DEBUG_LOG() << "videoReceiverModifyRequest";
+  DEBUG_LOG(m_logger) << "videoReceiverModifyRequest";
   ObjectVideoReceiver *ifs = m_videoReceiverObjMap.value(request.id());
   if (ifs == nullptr)
     return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Video Receiver with id %1 not found")).arg(request.id());
@@ -242,7 +242,7 @@ void HandlerVideoReceiver::onVideoReceiverRemoveRequest(const rti::core::SampleI
   ret = ifs->removeObject();
 
   if (ret.error())
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
   else
   {
     // delete ObjectVideoReceiver
@@ -268,13 +268,13 @@ void HandlerVideoReceiver::onGetStatus()
     ObjectVideoReceiver *objectVideoReceiver = i.value();
     QString host = QString::fromStdString(objectVideoReceiver->getData().hostName()).toLower();
 
-    DEBUG_LOG() << " streamName=" << objectVideoReceiver->getData().streamName()
+    DEBUG_LOG(m_logger) << " streamName=" << objectVideoReceiver->getData().streamName()
                         << " hostName=" << host
                         << " teamId=" << objectVideoReceiver->getData().teamId();
     if ((objectVideoReceiver->getData().teamId() ==  1)
         && (!m_receiver.contains(host)))
     {
-      DEBUG_LOG() << " onSendHttpRequest host=" << host << " key=" << i.key()
+      DEBUG_LOG(m_logger) << " onSendHttpRequest host=" << host << " key=" << i.key()
                           << " id=" << objectVideoReceiver->getData().id();
       m_receiver.insert(host, i.key());
       onSendHttpRequest(i.key());
@@ -284,7 +284,7 @@ void HandlerVideoReceiver::onGetStatus()
 
 void HandlerVideoReceiver::onSendHttpRequest(const int key)
 {
-  INFO_LOG() << "onSendHttpRequest key=" << key;
+  INFO_LOG(m_logger) << "onSendHttpRequest key=" << key;
 
   //request = QStringLiteral("http://localhost/set_param?remuxBitrate=90.0");
   //request = QStringLiteral("http://localhost/status.json");
@@ -297,7 +297,7 @@ void HandlerVideoReceiver::onSendHttpRequest(const int key)
 
 void HandlerVideoReceiver::startRequest(const QUrl &requestedUrl)
 {
-  INFO_LOG() << "startRequest:" << requestedUrl.toString();
+  INFO_LOG(m_logger) << "startRequest:" << requestedUrl.toString();
 
   m_httpRequestAborted = false;
 
@@ -317,22 +317,22 @@ void HandlerVideoReceiver::onHttpFinished(QNetworkReply *reply)
 
   const QByteArray replyData = reply->readAll();
 
-  INFO_LOG() << "Answer = " << replyData
+  INFO_LOG(m_logger) << "Answer = " << replyData
                      << " size = " << replyData.size()
                      << " url=" << urlString
                      << " host=" << host;
   m_receiver.remove(host);
   if (reply->error())
   {
-    ERROR_LOG() << "Cannot connect to VideoReceiver";
-    ERROR_LOG() << "reply->error: " << reply->errorString();
+    ERROR_LOG(m_logger) << "Cannot connect to VideoReceiver";
+    ERROR_LOG(m_logger) << "reply->error: " << reply->errorString();
     reply->deleteLater();
     return;
   }
 
 
   // Success
-  INFO_LOG() << "Connected to VideoReceiver ";
+  INFO_LOG(m_logger) << "Connected to VideoReceiver ";
 
   // Keine Antwort vom Receiver
   if (replyData.size() == 0)
@@ -366,10 +366,10 @@ void HandlerVideoReceiver::onHttpFinished(QNetworkReply *reply)
   const QJsonObject jsonObject = doc.object();
   //QJsonDocument doc(jsonObject);
   //QStringList keyList = jsonObject.keys();
-  //DEBUG_LOG() << "keyList.size()" << keyList.size() ;
+  //DEBUG_LOG(m_logger) << "keyList.size()" << keyList.size() ;
   //for (int i = 0; i < keyList.size(); ++i)
-  //  DEBUG_LOG() << keyList.at(i).toLocal8Bit().constData() ;
-  //DEBUG_LOG() << doc.toJson(QJsonDocument::Indented);
+  //  DEBUG_LOG(m_logger) << keyList.at(i).toLocal8Bit().constData() ;
+  //DEBUG_LOG(m_logger) << doc.toJson(QJsonDocument::Indented);
   /////////////////////
   double snrA = 0;
   double snrB = 0;
@@ -382,7 +382,7 @@ void HandlerVideoReceiver::onHttpFinished(QNetworkReply *reply)
   int freqencyB = jsonObject[QStringLiteral("inputFrequency2")].toInt();
   // 0 = Off, 1 = Channel1, 2 = Channel2, 3 = Channel1 + Channel2
   int remuxInputMask = jsonObject[QStringLiteral("remuxInputMask")].toInt();
-  INFO_LOG() << "lockstatusA = " << lockstatusA
+  INFO_LOG(m_logger) << "lockstatusA = " << lockstatusA
                      << " lockstatusB = " << lockstatusB
                      << " freqencyA=" << freqencyA
                      << " freqencyB=" << freqencyB
@@ -463,7 +463,7 @@ void HandlerVideoReceiver::onHttpFinished(QNetworkReply *reply)
       double tmpLevel = ((-40 - powerLevelA) / 60) * 100;
       powerLevelA = 100.0 - tmpLevel;
     }
-    DEBUG_LOG() << "Channel 1: snrA=" << snrA
+    DEBUG_LOG(m_logger) << "Channel 1: snrA=" << snrA
                         << " powerLevelA " << powerLevelA;
 
     // send Topic LTS_VideoReceiver
@@ -531,7 +531,7 @@ void HandlerVideoReceiver::onHttpFinished(QNetworkReply *reply)
       double tmpLevel = ((-40 - powerLevelB) / 60) * 100;
       powerLevelB = 100.0 - tmpLevel;
     }
-    DEBUG_LOG() << "Channel 2: snrB=" << snrB
+    DEBUG_LOG(m_logger) << "Channel 2: snrB=" << snrB
                         << " powerLevelB " << powerLevelB;
     // Der Key von Receiver2 folgt immer dem von Receiver 1
     updateObject(key + 1, powerLevelB, snrB, lockstatusB, freqencyB);
@@ -545,7 +545,7 @@ void HandlerVideoReceiver::onHttpFinished(QNetworkReply *reply)
   {
     i.next();
     ObjectVideoReceiver *objectVideoReceiver = i.value();
-    DEBUG_LOG() << "key=" << i.key()
+    DEBUG_LOG(m_logger) << "key=" << i.key()
                         << " : value.Id=" << objectVideoReceiver->getId()
                         << " mse=" << objectVideoReceiver->getData().mainStructureElementId()
                         << " streamName=" << objectVideoReceiver->getData().streamName()
@@ -589,7 +589,7 @@ void HandlerVideoReceiver::activateChannel(const int channelId, const bool activ
   int active2 = 0;
   int active = 0;
   int id = 0;
-  DEBUG_LOG() << "activateChannel channelId=" << channelId
+  DEBUG_LOG(m_logger) << "activateChannel channelId=" << channelId
                       << " activate = " << activate
                       << " hostname = " << hostName
                       << " teamId = " << m_videoReceiverObjMap.value(channelId)->getData().teamId();
@@ -598,7 +598,7 @@ void HandlerVideoReceiver::activateChannel(const int channelId, const bool activ
 
   if (!m_videoReceiverObjMap.contains(channelId))
   {
-    ERROR_LOG() << "channelId " << channelId << " does not exist";
+    ERROR_LOG(m_logger) << "channelId " << channelId << " does not exist";
     return;
   }
 
@@ -608,7 +608,7 @@ void HandlerVideoReceiver::activateChannel(const int channelId, const bool activ
     active1 = activate;
     if (!m_videoReceiverObjMap.contains(id + 1))
     {
-      ERROR_LOG() << "channelId " << id + 1 << " does not exist";
+      ERROR_LOG(m_logger) << "channelId " << id + 1 << " does not exist";
       return;
     }
     active2 = m_videoReceiverObjMap.value(id + 1)->getData().isActive();
@@ -622,7 +622,7 @@ void HandlerVideoReceiver::activateChannel(const int channelId, const bool activ
     active2 = activate;
   }
   active = active1 + active2 * 2;
-  DEBUG_LOG() << "activateChannel hostname=" << hostName
+  DEBUG_LOG(m_logger) << "activateChannel hostname=" << hostName
                       << " active1=" << active1
                       << " active2=" << active2
                       << " active=" << active;
@@ -642,7 +642,7 @@ void HandlerVideoReceiver::checkActiveState(const int key, const int remuxInputM
   ObjectVideoReceiver *channel1 = m_videoReceiverObjMap.value(key);
   if (channel1 == nullptr )
   {
-    ERROR_LOG() << "checkActiveState key="  << key
+    ERROR_LOG(m_logger) << "checkActiveState key="  << key
                           << " remuxInputMask=" << remuxInputMask << " channel1 == nullptr";
     return;
   }
@@ -651,7 +651,7 @@ void HandlerVideoReceiver::checkActiveState(const int key, const int remuxInputM
   ObjectVideoReceiver *channel2 = m_videoReceiverObjMap.value(key + 1);
   int channel2Active = channel2->getData().isActive();
   int active = channel1Active + channel2Active * 2;
-  DEBUG_LOG() << "checkActiveState "
+  DEBUG_LOG(m_logger) << "checkActiveState "
                       << " key=" << key
                       << " active=" << active
                       << " remuxInputMask=" << remuxInputMask
@@ -663,7 +663,7 @@ void HandlerVideoReceiver::checkActiveState(const int key, const int remuxInputM
     {
       bool activate = channel1Active;
       activateChannel(key, activate);
-      DEBUG_LOG() << "checkActiveState Send HTTP-Request activateChannel"
+      DEBUG_LOG(m_logger) << "checkActiveState Send HTTP-Request activateChannel"
                           << " key=" << key
                           << " activate=" << activate;
     }
@@ -672,7 +672,7 @@ void HandlerVideoReceiver::checkActiveState(const int key, const int remuxInputM
     {
       bool activate = channel2Active;
       activateChannel(key + 1, activate);
-      DEBUG_LOG() << "checkActiveState Send HTTP-Request activateChannel"
+      DEBUG_LOG(m_logger) << "checkActiveState Send HTTP-Request activateChannel"
                           << " key=" << key + 1
                           << " activate=" << activate
                           << " channel2Active=" << channel2Active
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_team.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_team.cpp
index 87c2a944b..0da276176 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_team.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_team.cpp
@@ -37,7 +37,7 @@ public:
     Database::AvmDeviceConfig   deviceConfig = toDeviceConfig(videoTeam);
 
     if (!m_db->insert(deviceConfig))
-      ERROR_LOG() << "Error while inserting device config into database";
+      ERROR_LOG(m_logger) << "Error while inserting device config into database";
 
     m_cache.insert(videoTeam.id(), deviceConfig);
     emit m_handler->avDbReloadNeeded();
@@ -53,7 +53,7 @@ public:
     deviceConfig.id = oldDeviceConfig.id;
 
     if (!m_db->update(deviceConfig))
-      ERROR_LOG() << "Error while updating device config";
+      ERROR_LOG(m_logger) << "Error while updating device config";
 
     m_cache[videoTeam.id()] = deviceConfig;
     emit m_handler->avDbReloadNeeded();
@@ -73,7 +73,7 @@ public:
     Q_ASSERT(found != m_cache.end());
 
     if (!m_db->removeAvmDeviceConfig(found->id))
-      ERROR_LOG() << "Error while removing device config";
+      ERROR_LOG(m_logger) << "Error while removing device config";
 
     m_cache.erase(found);
     emit m_handler->avDbReloadNeeded();
@@ -137,7 +137,7 @@ bool HandlerVideoTeam::init()
   // read all VideoTeam Data from database
   if (!m_db->select(dataVec))
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
 
@@ -150,7 +150,7 @@ bool HandlerVideoTeam::init()
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       return false;
     }
     m_videoTeamObjMap.insert(ifs->getId(), ifs);
@@ -159,7 +159,7 @@ bool HandlerVideoTeam::init()
       m_deviceConfig->create(ddsData);
   }
 
-  DEBUG_LOG() << "m_VideoTeamObjMap.size() = " << m_videoTeamObjMap.size();
+  DEBUG_LOG(m_logger) << "m_VideoTeamObjMap.size() = " << m_videoTeamObjMap.size();
 
   return true;
 }
@@ -176,10 +176,10 @@ QMap<int, VideoTeam> HandlerVideoTeam::videoTeams() const
 void HandlerVideoTeam::onVideoTeamModifyRequest(const rti::core::SampleIdentity &cookie,
                                                 const VideoTeamModifyRequest &request)
 {
-  DEBUG_LOG() << "onVideoTeamModifyRequest: " << request;
+  DEBUG_LOG(m_logger) << "onVideoTeamModifyRequest: " << request;
   auto ret = request.id() > 0 ? videoTeamModifyRequest(request) : videoTeamCreateRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_fts->videoTeamModifyReply(cookie, ret);
 }
 
@@ -232,7 +232,7 @@ Core::FunctionReplyObject HandlerVideoTeam::videoTeamModifyRequest(const VideoTe
   ObjectVideoTeam *ifs = m_videoTeamObjMap.value(request.id());
   if (ifs == nullptr)
     return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Video Team with id %1 not found")).arg(request.id());
-  DEBUG_LOG() << "on Modify Request" << request.streamName() << " ID: " << request.name() << " exId " << request.exerciseId();
+  DEBUG_LOG(m_logger) << "on Modify Request" << request.streamName() << " ID: " << request.name() << " exId " << request.exerciseId();
 
   VideoTeam   ddsData = convert(request, ifs->getData());
   if (needDeviceConfig(ddsData))
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/main_handler.cpp
index e3a8ed5e9..e24993680 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/main_handler.cpp
@@ -36,9 +36,8 @@
 
 using namespace AudioVideoManagement;
 
-MainHandler::MainHandler(QObject *parent)
-  : QObject(parent)
-{}
+MainHandler::MainHandler(QObject *parent) : QObject(parent),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 MainHandler::~MainHandler() = default;
 
@@ -48,7 +47,7 @@ bool MainHandler::init(int domainId)
   m_dbHandler.reset(new DbHandler());
   if (!m_dbHandler->init(0, Settings::settings()))
   {
-    ERROR_LOG() << "Initialisation dbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
     return false;
   }
   m_dbInterface = m_dbHandler->db();
@@ -57,7 +56,7 @@ bool MainHandler::init(int domainId)
   m_ddsHandler.reset(new DdsHandler(domainId));
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation ddsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
     return false;
   }
 
@@ -82,7 +81,7 @@ bool MainHandler::init(int domainId)
   connect(m_videoTeamHandler.get(), &HandlerVideoTeam::avDbReloadNeeded, m_exHandler.get(), &ExercisesHandler::onAvDbReloadNeeded);
   if (!m_videoTeamHandler->init())
   {
-    ERROR_LOG() << "Initialisation HandlerVideoTeam failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerVideoTeam failed.";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
   }
@@ -90,7 +89,7 @@ bool MainHandler::init(int domainId)
   m_frequencyPlanningStatusHandler.reset(new HandlerFrequencyPlanningStatus(m_ddsHandler->dts(), m_ddsHandler->fts(), m_dbInterface.get()));
   if (!m_frequencyPlanningStatusHandler->init())
   {
-    ERROR_LOG() << "Initialisation HandlerFrequencyPlanningStatus failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerFrequencyPlanningStatus failed.";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
   }
@@ -108,7 +107,7 @@ bool MainHandler::init(int domainId)
   connect(m_tvcHandler.get(), &TvcHandler::avDbReloadNeeded, m_exHandler.get(), &ExercisesHandler::onAvDbReloadNeeded);
   if (!m_tvcHandler->init())
   {
-    ERROR_LOG() << "Initialisation tvcHandler failed";
+    ERROR_LOG(m_logger) << "Initialisation tvcHandler failed";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
   }
@@ -116,7 +115,7 @@ bool MainHandler::init(int domainId)
   m_frequencySetHandler.reset(new FrequencySetHandler(m_ddsHandler->dts(), m_dbInterface.get()));
   if (!m_frequencySetHandler->init())
   {
-    ERROR_LOG() << "Initialisation FrequencySetHandler failed";
+    ERROR_LOG(m_logger) << "Initialisation FrequencySetHandler failed";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
   }
@@ -130,14 +129,14 @@ bool MainHandler::init(int domainId)
   m_frequencyPlanningHandler->setCnrHandler(m_cnrHandler.get());
   if (!m_frequencyPlanningHandler->init())
   {
-    ERROR_LOG() << "Initialisation FrequencyPlanningHandler failed";
+    ERROR_LOG(m_logger) << "Initialisation FrequencyPlanningHandler failed";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
   }
 
   if (!m_cnrHandler->init())
   {
-    ERROR_LOG() << "Initialisation cnrHandler failed";
+    ERROR_LOG(m_logger) << "Initialisation cnrHandler failed";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
   }
@@ -145,7 +144,7 @@ bool MainHandler::init(int domainId)
   m_cnrTvcProfileHandler.reset(new CnrTvcProfileHandler(m_dbInterface.get(), m_ddsHandler->dts(), m_ddsHandler->fts(), m_cnrHandler.get(), m_tvcHandler.get()));
   if (!m_cnrTvcProfileHandler->init())
   {
-    ERROR_LOG() << "Initialisation RadioCircuitsHandler failed";
+    ERROR_LOG(m_logger) << "Initialisation RadioCircuitsHandler failed";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
   }
@@ -156,7 +155,7 @@ bool MainHandler::init(int domainId)
   m_videoReceiverHandler.reset(new HandlerVideoReceiver(this, m_ddsHandler->dts(), m_ddsHandler->fts(), m_dbInterface.get()));
   if (!m_videoReceiverHandler->init())
   {
-    ERROR_LOG() << "Initialisation HandlerVideoReceiver failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerVideoReceiver failed.";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
   }
@@ -165,7 +164,7 @@ bool MainHandler::init(int domainId)
 
   if (!m_ddsHandler->enableDtcClients())
   {
-    ERROR_LOG() << "Initialisation DTCs failed.";
+    ERROR_LOG(m_logger) << "Initialisation DTCs failed.";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/main_handler.h
index 81b968638..ff32557b1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/main_handler.h
@@ -61,6 +61,7 @@ public:
   CnrHandler    *cnrHandler() { return m_cnrHandler.get(); }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::unique_ptr<DdsHandler>                      m_ddsHandler;
   std::unique_ptr<DbHandler>                       m_dbHandler;
   std::shared_ptr<DatabaseInterface>               m_dbInterface; //!< just to make sure we own a reference to it; we can then simply forward a plain pointer to our clients
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 71c60a2f9..c070760a2 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
@@ -13,10 +13,9 @@ namespace AudioVideoManagement
 {
 //-------------------------------------------------------------------------------------------------------------
 ObjectFrequencyPlanningStatus::ObjectFrequencyPlanningStatus(Interface::Dts *dts,
-                                 DatabaseInterface *db)
-  : m_dts(dts)
-  , m_db(db)
-{
+                                 DatabaseInterface *db) : m_dts(dts)
+  , m_db(db),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 //-------------------------------------------------------------------------------------------------------------
@@ -62,7 +61,7 @@ Core::FunctionReplyObject ObjectFrequencyPlanningStatus::createObjectFromDDS(con
     return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating VideoTeam into database"));
 
   m_data.id() = dbData.id;
-  DEBUG_LOG() << "Data changed for VideoTeam Id: " << m_data.id();
+  DEBUG_LOG(m_logger) << "Data changed for VideoTeam Id: " << m_data.id();
 
   // Publish Data via DTS
   onPublishData();
@@ -82,7 +81,7 @@ Core::FunctionReplyObject ObjectFrequencyPlanningStatus::updateObject(const Freq
   if (!m_db->update(dbData))
     return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating FrequencyPlanningStatus into database"));
 
-  DEBUG_LOG() << "Data changed for FrequencyPlanningStatus Id: " << data.id();
+  DEBUG_LOG(m_logger) << "Data changed for FrequencyPlanningStatus Id: " << data.id();
 
   // Publish Data via DTS
   onPublishData();
@@ -104,10 +103,10 @@ Core::FunctionReplyObject ObjectFrequencyPlanningStatus::removeObject()
 //-------------------------------------------------------------------------------------------------------------
 void ObjectFrequencyPlanningStatus::onPublishData()
 {
-  INFO_LOG() << "Publish ObjectFrequencyPlanningStatus to dds (" << m_data.id() << ") ..." << m_data.client() << ") ...";
+  INFO_LOG(m_logger) << "Publish ObjectFrequencyPlanningStatus to dds (" << m_data.id() << ") ..." << m_data.client() << ") ...";
 
   if (!m_dts->publish(m_data))
-    ERROR_LOG() << "Error publishing ObjectFrequencyPlanningStatus to dds";
+    ERROR_LOG(m_logger) << "Error publishing ObjectFrequencyPlanningStatus to dds";
 }
 
 //-------------------------------------------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_menu_struct.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_menu_struct.cpp
index 65da8b1d8..918058d9e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_menu_struct.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_menu_struct.cpp
@@ -75,10 +75,9 @@ void checkHierarchy(const std::vector<AudioVideoManagement::AvMenuEntry> &entrie
 namespace AudioVideoManagement
 {
 
-ObjectMenuStruct::ObjectMenuStruct(Interface::Dts *dts, DatabaseInterface *db)
-  : m_dts(dts)
-  , m_db(db)
-{
+ObjectMenuStruct::ObjectMenuStruct(Interface::Dts *dts, DatabaseInterface *db) : m_dts(dts)
+  , m_db(db),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   Q_ASSERT(dts);
   Q_ASSERT(db);
 }
@@ -127,10 +126,10 @@ Core::FunctionReplyObject ObjectMenuStruct::remove()
 {
   DBTransaction trans(m_db->database());
 
-  INFO_LOG() << "menuEntries.size(): " << m_data.menuEntries().size();
+  INFO_LOG(m_logger) << "menuEntries.size(): " << m_data.menuEntries().size();
   for (const AudioVideoManagement::AvMenuEntry &me : m_data.menuEntries())
   {
-    INFO_LOG() << "Remove entries with id/parentId: " << me.id();
+    INFO_LOG(m_logger) << "Remove entries with id/parentId: " << me.id();
     // no recursion needed, only 2 levels allowed
     if (me.isGroup())
       if (!m_db->removeAvmMenuStructByParentId(me.id()))
@@ -151,10 +150,10 @@ Core::FunctionReplyObject ObjectMenuStruct::remove()
 void ObjectMenuStruct::onPublishData()
 {
 
-  INFO_LOG() << "Publish MenuStruct-data to dds (" << m_data.id() << ") ...";
+  INFO_LOG(m_logger) << "Publish MenuStruct-data to dds (" << m_data.id() << ") ...";
 
   if (!m_dts->publish(m_data))
-    ERROR_LOG() << "Error publishing MenuStruct-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing MenuStruct-data to dds";
 }
 
 
@@ -198,7 +197,7 @@ Core::FunctionReplyObject ObjectMenuStruct::insertUpdateDb(const MenuStruct &dat
   if (ret.error())
     return ret;
 
-  DEBUG_LOG() << "old entries: " << m_data;
+  DEBUG_LOG(m_logger) << "old entries: " << m_data;
   for (const AvMenuEntry &me : oldEntries)
   {
     // new entries - ignore
@@ -208,14 +207,14 @@ Core::FunctionReplyObject ObjectMenuStruct::insertUpdateDb(const MenuStruct &dat
     auto   found = std::find_if(newEntries.begin(), newEntries.end(), [&me] (const AvMenuEntry &newEntry) { return me.id() == newEntry.id(); });
     if (found == newEntries.end())
     {
-      DEBUG_LOG() << "Menu Entry with id not found - was removed: " << me.id();
+      DEBUG_LOG(m_logger) << "Menu Entry with id not found - was removed: " << me.id();
       m_db->removeAvmMenuStruct(me.id());
     }
   }
 
   m_data.menuEntries(newEntries);
   HandlerMenuStruct::sortEntries(m_data);
-  DEBUG_LOG() << "new entries: " << m_data;
+  DEBUG_LOG(m_logger) << "new entries: " << m_data;
 
   trans.commit();
   return Core::FunctionReplyObject(m_data.id());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_menu_struct.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_menu_struct.h
index 3c0b97d3a..ff6cc33bb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_menu_struct.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_menu_struct.h
@@ -50,6 +50,7 @@ public:
   long getId() const { return m_data.id(); }
 
 private:
+  NGL::INGLLogger &m_logger;
   void onPublishData();
 
   Core::FunctionReplyObject insertUpdateDb(const MenuStruct &data);
@@ -59,6 +60,7 @@ private:
                                                  std::vector<AvMenuEntry> &contToAdd);
 
 private:
+  NGL::INGLLogger &m_logger;
   Interface::Dts      *m_dts;
   DatabaseInterface   *m_db;
   MenuStruct           m_data;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_video_receiver.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_video_receiver.cpp
index c286bf306..3903115d1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_video_receiver.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_video_receiver.cpp
@@ -14,10 +14,9 @@ namespace AudioVideoManagement
 {
 //-------------------------------------------------------------------------------------------------------------
 ObjectVideoReceiver::ObjectVideoReceiver(Interface::Dts *dts,
-                                         DatabaseInterface *db)
-  : m_dts(dts)
-  , m_db(db)
-{
+                                         DatabaseInterface *db) : m_dts(dts)
+  , m_db(db),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 //-------------------------------------------------------------------------------------------------------------
@@ -38,7 +37,7 @@ Core::FunctionReplyObject ObjectVideoReceiver::createObject(const VideoReceiver
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting AvmVideoReceiver-data into database"));
 
     m_data.id(dbData.id);
-    DEBUG_LOG() << "New Id: " << m_data.id();
+    DEBUG_LOG(m_logger) << "New Id: " << m_data.id();
   }
 
   // Publish Data via DTS
@@ -51,7 +50,7 @@ Core::FunctionReplyObject ObjectVideoReceiver::createObject(const VideoReceiver
 Core::FunctionReplyObject ObjectVideoReceiver::updateObject(const VideoReceiver &data)
 {
   m_data = data;
-  DEBUG_LOG() << "ObjectVideoReceiver::updateObject id=" << data.id()
+  DEBUG_LOG(m_logger) << "ObjectVideoReceiver::updateObject id=" << data.id()
                       << " isActive=" << data.isActive()
                       << " hostName=" << data.hostName()
                       << " isLocked=" << data.isLocked();
@@ -62,7 +61,7 @@ Core::FunctionReplyObject ObjectVideoReceiver::updateObject(const VideoReceiver
     return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating VideoReceiver2 into database"));
 
 
-  DEBUG_LOG() << "Data changed for VideoReceiver Id: " << data.id();
+  DEBUG_LOG(m_logger) << "Data changed for VideoReceiver Id: " << data.id();
 
   // Publish Data via DTS
   onPublishData();
@@ -85,10 +84,10 @@ Core::FunctionReplyObject ObjectVideoReceiver::removeObject()
 //-------------------------------------------------------------------------------------------------------------
 void ObjectVideoReceiver::onPublishData()
 {
-  INFO_LOG() << "Publish MvsVideoReceiver-data to dds (" << m_data.id() << ") ...";
+  INFO_LOG(m_logger) << "Publish MvsVideoReceiver-data to dds (" << m_data.id() << ") ...";
 
   if (!m_dts->publish(m_data))
-    ERROR_LOG() << "Error publishing MvsVideoReceiver-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing MvsVideoReceiver-data to dds";
 }
 
 //-------------------------------------------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_video_team.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_video_team.cpp
index 1d197deee..78d9b24ae 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_video_team.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_video_team.cpp
@@ -13,10 +13,9 @@ namespace AudioVideoManagement
 {
 //-------------------------------------------------------------------------------------------------------------
 ObjectVideoTeam::ObjectVideoTeam(Interface::Dts *dts,
-                                 DatabaseInterface *db)
-  : m_dts(dts)
-  , m_db(db)
-{
+                                 DatabaseInterface *db) : m_dts(dts)
+  , m_db(db),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 //-------------------------------------------------------------------------------------------------------------
@@ -49,7 +48,7 @@ Core::FunctionReplyObject ObjectVideoTeam::updateObject(const VideoTeam &data)
   if (!m_db->update(dbData))
     return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating VideoTeam into database"));
 
-  DEBUG_LOG() << "Data changed for VideoTeam Id: " << data.id();
+  DEBUG_LOG(m_logger) << "Data changed for VideoTeam Id: " << data.id();
 
   // Publish Data via DTS
   onPublishData();
@@ -59,10 +58,10 @@ Core::FunctionReplyObject ObjectVideoTeam::updateObject(const VideoTeam &data)
 //-------------------------------------------------------------------------------------------------------------
 void ObjectVideoTeam::onPublishData()
 {
-  INFO_LOG() << "Publish AvmVideoTeam-data to dds (" << m_data.id() << ") ...";
+  INFO_LOG(m_logger) << "Publish AvmVideoTeam-data to dds (" << m_data.id() << ") ...";
 
   if (!m_dts->publish(m_data))
-    ERROR_LOG() << "Error publishing AvmVideoTeam-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing AvmVideoTeam-data to dds";
 }
 
 //-------------------------------------------------------------------------------------------------------------
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 64a81ba6f..1ba694a01 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
@@ -98,7 +98,7 @@ public:
     Database::AvmDeviceConfig   deviceConfig = toDeviceConfig(config);
 
     if (!m_db->insert(deviceConfig))
-      ERROR_LOG() << "Error while inserting device config into database";
+      ERROR_LOG(m_logger) << "Error while inserting device config into database";
 
     m_cache.insert(config.id(), deviceConfig);
     emit m_handler->avDbReloadNeeded();
@@ -114,7 +114,7 @@ public:
     deviceConfig.id = oldDeviceConfig.id;
 
     if (!m_db->update(deviceConfig))
-      ERROR_LOG() << "Error while updating device config";
+      ERROR_LOG(m_logger) << "Error while updating device config";
 
     m_cache[config.id()] = deviceConfig;
     emit m_handler->avDbReloadNeeded();
@@ -140,7 +140,7 @@ public:
     Q_ASSERT(found != m_cache.end());
 
     if (!m_db->removeAvmDeviceConfig(found->id))
-      ERROR_LOG() << "Error while removing device config";
+      ERROR_LOG(m_logger) << "Error while removing device config";
 
     m_cache.erase(found);
     emit m_handler->avDbReloadNeeded();
@@ -196,7 +196,7 @@ bool TvcHandler::init()
 
   if (!m_db->select(m_channels))
   {
-    ERROR_LOG() << "Error while selecting tetra channels from db";
+    ERROR_LOG(m_logger) << "Error while selecting tetra channels from db";
     return false;
   }
 
@@ -207,7 +207,7 @@ bool TvcHandler::init()
 
   if (!m_db->select(tvcConfigs))
   {
-    ERROR_LOG() << "Error while selecting TVC configs from db";
+    ERROR_LOG(m_logger) << "Error while selecting TVC configs from db";
     return false;
   }
 
@@ -232,23 +232,23 @@ const TvcConfig &TvcHandler::config(int32_t id) const
 void TvcHandler::onModifyTvcConfigRequest(const rti::core::SampleIdentity &cookie,
                                           const ModifyTvcConfigRequest &request)
 {
-  DEBUG_LOG() << "onModifyTvcConfigRequest: " << request;
+  DEBUG_LOG(m_logger) << "onModifyTvcConfigRequest: " << request;
   Q_ASSERT(request.id() >= 0);
   auto ret = request.id() > 0 ? modifyTvcConfig(request) : createTvcConfig(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_fts->modifyTvcConfigReply(cookie, ret);
 }
 
 void TvcHandler::onRemoveTvcConfigRequest(const rti::core::SampleIdentity &cookie,
                                           const Core::RemoveElementRequest &request)
 {
-  DEBUG_LOG() << "onRemoveTvcConfigRequest" << request;
+  DEBUG_LOG(m_logger) << "onRemoveTvcConfigRequest" << request;
 
   Core::FunctionReplyObject rep = removeTvcConfig(request);
 
   if (rep.error())
-    WARNING_LOG() << rep.translated();
+    WARNING_LOG(m_logger) << rep.translated();
 
   m_fts->removeTvcConfigReply(cookie, rep);
 }
@@ -481,7 +481,7 @@ void TvcHandler::onDbDeleteAvmTvcConfig(const QVariant &id)
   if (!m_cache.contains(configId))
     return; // the notification was a result of our own removal of the entry
   
-  DEBUG_LOG() << "DB deleted AvmTvcConfig with id: " << configId;
+  DEBUG_LOG(m_logger) << "DB deleted AvmTvcConfig with id: " << configId;
   
   removeTvcConfig(Core::RemoveElementRequest(configId));
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_comm.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_comm.cpp
index 028092359..915161e73 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_comm.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_comm.cpp
@@ -64,7 +64,7 @@ void VdComm::vdSetScript(const QString &scriptName, AvaStreamType typ, int fileS
 
   static const QString   cmd = QStringLiteral(R"(VDSetScript "%1" %2 %3 "%4" "%5" "%6")");
   TRACE_LOG(m_loggerIO) << "New Export Script: '" << cmd << "'";
-  TRACE_LOG() << "New Export Script: '" << cmd << "'";
+  TRACE_LOG(m_logger) << "New Export Script: '" << cmd << "'";
 
   m_avSocket.send(cmd.arg(scriptName).arg(static_cast<int>(typ)).arg(QString::number(fileSplitting), streamList.join(QLatin1Char('\n')),
                                                                      exportedDirBaseName, absolutePath).toUtf8());
@@ -137,7 +137,7 @@ void VdComm::parseResponse(const QByteArray &line)
     break;
 
   default:
-    DEBUG_LOG() << "Response not implemented: " << line;
+    DEBUG_LOG(m_logger) << "Response not implemented: " << line;
   }
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_control.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_control.cpp
index 794cac254..b4dafc043 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_control.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_control.cpp
@@ -58,13 +58,13 @@ void VdControl::keepAlive()
 void VdControl::onConnected()
 {
   m_connected = true;
-  DEBUG_LOG() << "connected";
+  DEBUG_LOG(m_logger) << "connected";
 }
 
 void VdControl::onDisconnected()
 {
   m_connected = false;
-  DEBUG_LOG() << "disconnected";
+  DEBUG_LOG(m_logger) << "disconnected";
   m_queue.flush();
 }
 
@@ -73,12 +73,12 @@ void VdControl::onTimeout()
   ICommand *cmd = m_queue.currentCommand();
   if (cmd->canTimeout())
   {
-    INFO_LOG() << "command '" << cmd->debug() << "' failed";
+    INFO_LOG(m_logger) << "command '" << cmd->debug() << "' failed";
     m_queue.done();
     return;
   }
 
-  ERROR_LOG() << "command timed out";
+  ERROR_LOG(m_logger) << "command timed out";
   failed(cmd);
 }
 
@@ -97,7 +97,7 @@ void VdControl::queue(ICommand *cmd, LtsUtils::IConnection *connection)
 
   if (!m_connected)
   {
-    DEBUG_LOG() << "not connected -> dropping command";
+    DEBUG_LOG(m_logger) << "not connected -> dropping command";
     return;
   }
 
@@ -127,7 +127,7 @@ void VdControl::done(AvaCommands::VdSetScript *cmd)
 
 void VdControl::failed(ICommand *cmd)
 {
-  ERROR_LOG() << "command '" << cmd->debug() << "' failed";
+  ERROR_LOG(m_logger) << "command '" << cmd->debug() << "' failed";
   Q_ASSERT(cmd == m_queue.currentCommand());
   m_queue.flush();
   m_comm->forceDisconnect();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_session.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_session.cpp
index 9d2b612b5..d0fab325b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_session.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_session.cpp
@@ -36,7 +36,7 @@ void VdSession::onConnected()
   m_established = true;
   if (m_keepAliveEnabled)
     m_keepAliveTimer.start();
-  DEBUG_LOG() << "session established";
+  DEBUG_LOG(m_logger) << "session established";
   emit sessionEstablished();
 }
 
@@ -44,7 +44,7 @@ void VdSession::onDisconnected()
 {
   m_keepAliveTimer.stop();
   m_established = false;
-  DEBUG_LOG() << "disconnected";
+  DEBUG_LOG(m_logger) << "disconnected";
   emit disconnected();
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests.cpp
index 15a23ee54..747ba4c06 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests.cpp
@@ -76,7 +76,7 @@ CesTests::CesTests(QObject *parent)
 bool CesTests::init(int domainId, int exerciseId, int testId, int roomId)
 {
   bool bRet = true;
-  INFO_LOG() << "init begin";
+  INFO_LOG(m_logger) << "init begin";
 
   m_testId = testId;
   m_roomId = roomId;
@@ -96,7 +96,7 @@ bool CesTests::init(int domainId, int exerciseId, int testId, int roomId)
   bRet &= m_aesDts->enableBorderline();
   bRet &= m_aesDts->enableDusMineState();
   bRet &= m_aesDts->enableMineArea();
-  DEBUG_LOG() << "AES Dts create interface bRet:" << bRet ;
+  DEBUG_LOG(m_logger) << "AES Dts create interface bRet:" << bRet ;
 
   m_ismDts = InfrastructureManagement::Interface::Dts::create(m_ddsConnector42);
   bRet &= m_ismDts->enableMainStructureElement();
@@ -141,7 +141,7 @@ bool CesTests::init(int domainId, int exerciseId, int testId, int roomId)
 
 void CesTests::startTest()
 {
-  INFO_LOG() << "startTest m_testId:" << m_testId;
+  INFO_LOG(m_logger) << "startTest m_testId:" << m_testId;
   if (m_testId <= 1) // AES-Hit On Buildings area explosions
   {
     m_countHitOnBuildingReply = 0;
@@ -464,7 +464,7 @@ void CesTests::tryCreateTriggeredExplosion()
   ti.bitfield().resize(1);
   ti.bitfield()[0] = 0;  // 0 = Mine active
 
-  DEBUG_LOG() << "Publishing TriggeredExplosions: " << ti;
+  DEBUG_LOG(m_logger) << "Publishing TriggeredExplosions: " << ti;
   if (!m_aesDts->publish(ti))
     failExit("Error publishing TriggeredExplosions");
 }
@@ -476,7 +476,7 @@ void CesTests::tryCreateExplosionArea()
   ea.participantId(m_originatorParticipantId); // In ddsview <not set>
   ea.effectStateId(AreaEffectSimulation::AesEffectState::inner_enum::EsPrepared);
 
-  DEBUG_LOG() << "Publishing ExplosionArea: " << ea;
+  DEBUG_LOG(m_logger) << "Publishing ExplosionArea: " << ea;
   if (!m_aesDts->publish(ea))
     failExit("Error publishing ExplosionArea");
 }
@@ -505,7 +505,7 @@ void CesTests::tryCreateExplosionSinglePrepared()
   m_es.sampleTime(QDateTime::currentMSecsSinceEpoch());
   m_es.chargeStruct().chargeTypeId(m_chargeTypeId);
 
-  DEBUG_LOG() << "Publishing ExplosionSingle: " << m_es;
+  DEBUG_LOG(m_logger) << "Publishing ExplosionSingle: " << m_es;
   if (!m_aesDts->publish(m_es))
     failExit("Error publishing ExplosionSingle");
 }
@@ -521,14 +521,14 @@ void CesTests::tryCreateExplosionSingle()
   m_es.effectStateId(AreaEffectSimulation::AesEffectState_def::EsActivated);
   m_es.sampleTime(QDateTime::currentMSecsSinceEpoch());
 
-  DEBUG_LOG() << "Publishing ExplosionSingle: " << m_es;
+  DEBUG_LOG(m_logger) << "Publishing ExplosionSingle: " << m_es;
   if (!m_aesDts->publish(m_es))
     failExit("Error publishing ExplosionSingle");
 }
 
 void CesTests::tryCreateAesItemView()
 {
-  INFO_LOG() << "trying to send AesItemView AtExplosionArea";
+  INFO_LOG(m_logger) << "trying to send AesItemView AtExplosionArea";
 
   m_aiv = AreaEffectSimulation::AesItemView();
   m_aiv.aesItemId(m_aesItemId);
@@ -547,7 +547,7 @@ void CesTests::tryCreateAesItemView()
   setPos(m_aiv.form(), m_housePos.geographic(30,  30));
   setPos(m_aiv.form(), m_housePos.geographic(30,  -10));
 
-  DEBUG_LOG() << "Publishing AesItemView: " << m_aiv;
+  DEBUG_LOG(m_logger) << "Publishing AesItemView: " << m_aiv;
   if (!m_aesDts->publish(m_aiv))
     failExit("Error publishing AesItemView");
 }
@@ -557,13 +557,13 @@ void CesTests::tryCreateChargeType()
   ProjectDataManagement::ChargeType ct;
   ct.id(m_chargeTypeId);
   ct.properties("{\"impactRadius\":5}");
-  DEBUG_LOG() << "Publishing ChargeType: " << ct;
+  DEBUG_LOG(m_logger) << "Publishing ChargeType: " << ct;
   if (!m_pdmDts->publish(ct))
     failExit("Error publishing ChargeType");
 
   ct.id(40); // old charge type 10040 -> 40, hard-codded?!
   ct.properties("{\"impactRadius\":6}");
-  DEBUG_LOG() << "Publishing ChargeType: " << ct;
+  DEBUG_LOG(m_logger) << "Publishing ChargeType: " << ct;
   if (!m_pdmDts->publish(ct))
     failExit("Error publishing ChargeType");
 }
@@ -591,7 +591,7 @@ void CesTests::tryCreateAesItemViewSingleExplosions()
   setPos(m_aiv.form(), m_housePos.geographic(-10,  20));
   setPos(m_aiv.form(), m_housePos.geographic(-10,  30));
 
-  DEBUG_LOG() << "Publishing AesItemView: " << m_aiv;
+  DEBUG_LOG(m_logger) << "Publishing AesItemView: " << m_aiv;
   if (!m_aesDts->publish(m_aiv))
     failExit("Error publishing AesItemView");
 }
@@ -615,7 +615,7 @@ void CesTests::tryCreateAesItemViewBC(AreaEffectSimulation::AesEffectState desir
   setPos(m_aiv.form(), m_housePos.geographic(35, 35));
   setPos(m_aiv.form(), m_housePos.geographic(35,  3));
 
-  DEBUG_LOG() << "Publishing AesItemView: " << m_aiv;
+  DEBUG_LOG(m_logger) << "Publishing AesItemView: " << m_aiv;
   if (!m_aesDts->publish(m_aiv))
     failExit("Error publishing AesItemView");
 }
@@ -640,14 +640,14 @@ void CesTests::tryCreateAesItemViewSM()
   setPos(m_aiv.form(), m_housePos.geographic(35, 35));
   setPos(m_aiv.form(), m_housePos.geographic(35,  3));
 
-  DEBUG_LOG() << "Publishing AesItemView: " << m_aiv;
+  DEBUG_LOG(m_logger) << "Publishing AesItemView: " << m_aiv;
   if (!m_aesDts->publish(m_aiv))
     failExit("Error publishing AesItemView");
 }
 
 void CesTests::tryCreateAesItemViewMA()
 {
-  INFO_LOG() << "trying to send AesItemView AtMineArea";
+  INFO_LOG(m_logger) << "trying to send AesItemView AtMineArea";
 
   m_aiv = AreaEffectSimulation::AesItemView();
   m_aiv.aesItemId(m_aesItemId);
@@ -667,7 +667,7 @@ void CesTests::tryCreateAesItemViewMA()
   setPos(m_aiv.form(), m_housePos.geographic(37, 37));
   setPos(m_aiv.form(), m_housePos.geographic(37,  1));
 
-  DEBUG_LOG() << "Publishing AesItemView: " << m_aiv;
+  DEBUG_LOG(m_logger) << "Publishing AesItemView: " << m_aiv;
   if (!m_aesDts->publish(m_aiv))
     failExit("Error publishing AesItemView");
 }
@@ -689,7 +689,7 @@ void CesTests::tryCreateBorderline()
   setPos(bl.segments(), m_housePos.geographic(5,  3));
 
   bl.isDeleted(false);
-  DEBUG_LOG() << "Publishing BorderLine: " << bl;
+  DEBUG_LOG(m_logger) << "Publishing BorderLine: " << bl;
   if (!m_aesDts->publish(bl))
     failExit("Error publishing Borderline");
 }
@@ -708,7 +708,7 @@ void CesTests::tryCreateMainStructureElement()
   m_mse.angle(318.83);
   m_mse.modelId(1337);
   m_mse.externalWlsId(0);
-  DEBUG_LOG() << "Publishing MainStructureElement: " << m_mse;
+  DEBUG_LOG(m_logger) << "Publishing MainStructureElement: " << m_mse;
   if (!m_ismDts->publish(m_mse))
     failExit("Error publishing MainStructureElement");
 }
@@ -739,7 +739,7 @@ void CesTests::tryCreateMainFootprint()
   elem.relPosition(Core::RelativePosition(0.0, 10.0, 0.0));
   mf.elements().push_back(elem);
 
-  DEBUG_LOG() << "Publishing MainFootprint: " << mf;
+  DEBUG_LOG(m_logger) << "Publishing MainFootprint: " << mf;
   if (!m_ismDts->publish(mf))
     failExit("Error publishing MainFootprint");
 }
@@ -758,7 +758,7 @@ void CesTests::tryCreateDynamicParticipantData()
 
   dp.sampleTime(si.stateTime());
 
-  DEBUG_LOG() << "Publishing DynamicParticipantData: " << dp;
+  DEBUG_LOG(m_logger) << "Publishing DynamicParticipantData: " << dp;
   if (!m_ppmDts->publish(dp))
     failExit("Error publishing DynamicParticipantData");
 }
@@ -782,7 +782,7 @@ void CesTests::tryCreateParticipantPosition()
   pp.pos(pos);
   m_expectedPosition[pp.participantId()] = Core::GeoPosition2D(posF.x(), posF.y());
 
-  DEBUG_LOG() << "Publishing ParticipantPosition: " << pp;
+  DEBUG_LOG(m_logger) << "Publishing ParticipantPosition: " << pp;
   if (!m_ppmDts->publish(pp))
     failExit("Error publishing ParticipantPosition");
 }
@@ -812,7 +812,7 @@ void CesTests::tryCreateBuildingState()
   rs.remainingEffectPercent(60);
   bs.roomStates().push_back(rs);
 
-  DEBUG_LOG() << "Publishing BuildingState: " << bs;
+  DEBUG_LOG(m_logger) << "Publishing BuildingState: " << bs;
   if (!m_bldDts->publish(bs))
     failExit("Error publishing BuildingState");
 }
@@ -833,7 +833,7 @@ void CesTests::onSendCesHitOnBuildingRequest(const rti::core::SampleIdentity &co
 
   // debug und co
   m_countHitOnBuildingReply++;
-  DEBUG_LOG() << "onSendCesHitOnBuildingRequest cnt = " << m_countHitOnBuildingReply << "\n"
+  DEBUG_LOG(m_logger) << "onSendCesHitOnBuildingRequest cnt = " << m_countHitOnBuildingReply << "\n"
                       << " request: "  << request << ", "
                       << dateTime.toString(QStringLiteral("dd.MM.yy - hh:mm:ss.zzz")) << "\n";
 
@@ -889,7 +889,7 @@ void CesTests::onSendCesHitRequest(const rti::core::SampleIdentity &cookie,
 /* comes out with timeout on STTW
   if (request.effectTime() + 1000 < QDateTime::currentMSecsSinceEpoch())
   {
-    DEBUG_LOG() << "onSendCesHitRequest from previous test - ignoring"
+    DEBUG_LOG(m_logger) << "onSendCesHitRequest from previous test - ignoring"
                         << request.effectTime()
                         << QDateTime::currentMSecsSinceEpoch();
     return;
@@ -897,7 +897,7 @@ void CesTests::onSendCesHitRequest(const rti::core::SampleIdentity &cookie,
 */
   // debug und co
   const QDateTime dateTime(QDateTime::fromMSecsSinceEpoch(request.effectTime()));
-  DEBUG_LOG() << "onSendCesHitRequest" << "\n"
+  DEBUG_LOG(m_logger) << "onSendCesHitRequest" << "\n"
                       << " request: "  << request << ", "
                       << dateTime.toString(QStringLiteral("dd.MM.yy - hh:mm:ss.zzz")) << "\n";
   if (request.remainEffectPercent())
@@ -924,7 +924,7 @@ void CesTests::onSendCesHitRequest(const rti::core::SampleIdentity &cookie,
     // 3 x Enter
     if (request.remainEffectPercent() == 1)
       m_replyEnterFunctionalArea ++;
-    DEBUG_LOG()<< "m_replyEnterFunctionalArea=" << m_replyEnterFunctionalArea;
+    DEBUG_LOG(m_logger)<< "m_replyEnterFunctionalArea=" << m_replyEnterFunctionalArea;
     if (m_replyEnterFunctionalArea == 3)
       ExitSuccess();
     break;
@@ -968,7 +968,7 @@ void CesTests::checkParticipantEvent()
     return;
   }
 
-  DEBUG_LOG() << "Waiting for a participant event: " << expectedType;
+  DEBUG_LOG(m_logger) << "Waiting for a participant event: " << expectedType;
 
   bool bRet = false;
   for (int i = 0; i < 50; ++i)
@@ -1012,7 +1012,7 @@ void CesTests::tryCreateParticipant()
   pt.isSimulated(false);
   pt.equipmentNumber(4711);
 
-  DEBUG_LOG() << "Publishing  Participant:" << pt;
+  DEBUG_LOG(m_logger) << "Publishing  Participant:" << pt;
   if (!m_ppmDts->publish(pt))
     failExit("Error requesting create Participant");
 }
@@ -1020,7 +1020,7 @@ void CesTests::tryCreateParticipant()
 
 void CesTests::failExit(const char *reason)
 {
-  ERROR_LOG() << "FailExit: " << reason << " for test case = " << m_testId;
+  ERROR_LOG(m_logger) << "FailExit: " << reason << " for test case = " << m_testId;
   m_bTestsSuccessful = false;
   QTimer::singleShot(50, qApp, QCoreApplication::quit);
 }
@@ -1029,7 +1029,7 @@ void CesTests::ExitSuccess()
 {
   if (!m_bTestsSuccessful)
     return;
-  INFO_LOG() << "ExitSuccess for test case = " << m_testId;
+  INFO_LOG(m_logger) << "ExitSuccess for test case = " << m_testId;
   m_bTestsSuccessful = true;
   QTimer::singleShot(50, qApp, QCoreApplication::quit);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests.h
index c02f54425..6cf10d6b2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests.h
@@ -77,6 +77,7 @@ protected Q_SLOTS:
   void testTimeout() { failExit("Test timeout"); }
   void ExitSuccess();
 private:
+  NGL::INGLLogger &m_logger;
   void onSendCesHitOnBuildingRequest(const rti::core::SampleIdentity &cookie,
                                      const Buildings::SendCesHitOnBuildingRequest &request) override;
   void onSendCesHitRequest(const rti::core::SampleIdentity &cookie,
@@ -94,6 +95,7 @@ private: // structs
   };
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
 
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector42;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_blocked_areas.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_blocked_areas.cpp
index 11f4b9bbb..4e7f04170 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_blocked_areas.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_blocked_areas.cpp
@@ -33,14 +33,13 @@
 namespace CentralEffectSimulation
 {
 
-CesTestsBlockedAreas::CesTestsBlockedAreas(QObject *parent)
-  : QObject(parent)
+CesTestsBlockedAreas::CesTestsBlockedAreas(QObject *parent) : QObject(parent)
   , m_bTestsSuccessful(true)
   , m_housePos(LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UMD8000090000")))
   , m_testId(0)
   , m_participantIndex(0)
-  , m_DynamicParticipantIndex(0)
-{}
+  , m_DynamicParticipantIndex(0),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 CesTestsBlockedAreas::~CesTestsBlockedAreas()
 {}
@@ -48,7 +47,7 @@ CesTestsBlockedAreas::~CesTestsBlockedAreas()
 bool CesTestsBlockedAreas::init(int domainId, int exerciseId, int testId)
 {
   bool bRet = true;
-  INFO_LOG() << "init begin";
+  INFO_LOG(m_logger) << "init begin";
 
   m_testId = testId;
   m_buildingId = 7; // ism_main_structure_element:id
@@ -83,7 +82,7 @@ bool CesTestsBlockedAreas::init(int domainId, int exerciseId, int testId)
 
 void CesTestsBlockedAreas::startTest()
 {
-  INFO_LOG() << "startTest m_testId=" << m_testId;
+  INFO_LOG(m_logger) << "startTest m_testId=" << m_testId;
   if (m_testId <= 1) // 1 Participant in BT56
   {
     QTimer::singleShot(0, this, &CesTestsBlockedAreas::tryCreateParticipantPositionOutside);
@@ -136,7 +135,7 @@ void CesTestsBlockedAreas::startTest()
   }
   else
   {
-    ERROR_LOG() << "Unknown test id = " << m_testId;
+    ERROR_LOG(m_logger) << "Unknown test id = " << m_testId;
     failExit();
   }
   QTimer::singleShot(6000, this, &CesTestsBlockedAreas::failExit);
@@ -158,10 +157,10 @@ void CesTestsBlockedAreas::tryCreateDynamicParticipantData()
   dp.sampleTime(esTime);
   m_DynamicParticipantIndex++;
 
-  DEBUG_LOG() << "Publishing  DynamicParticipantData";
+  DEBUG_LOG(m_logger) << "Publishing  DynamicParticipantData";
   if (!m_ppmDts->publish(dp))
   {
-    ERROR_LOG() << "Error requesting create ParticipantPosition";
+    ERROR_LOG(m_logger) << "Error requesting create ParticipantPosition";
     failExit();
   }
 }
@@ -182,10 +181,10 @@ void CesTestsBlockedAreas::tryCreateParticipantPositionOutside()
   pp.sampleTime(posTime);
   pp.pos(pos);
 
-  DEBUG_LOG() << "Publishing  ParticipantPosition";
+  DEBUG_LOG(m_logger) << "Publishing  ParticipantPosition";
   if (!m_ppmDts->publish(pp))
   {
-    ERROR_LOG() << "Error requesting create ParticipantPosition";
+    ERROR_LOG(m_logger) << "Error requesting create ParticipantPosition";
     failExit();
   }
 }
@@ -206,10 +205,10 @@ void CesTestsBlockedAreas::tryCreateParticipantPosition()
   pp.sampleTime(posTime);
   pp.pos(pos);
 
-  DEBUG_LOG() << "Publishing  ParticipantPosition";
+  DEBUG_LOG(m_logger) << "Publishing  ParticipantPosition";
   if (!m_ppmDts->publish(pp))
   {
-    ERROR_LOG() << "Error requesting create ParticipantPosition";
+    ERROR_LOG(m_logger) << "Error requesting create ParticipantPosition";
     failExit();
   }
 }
@@ -223,10 +222,10 @@ void CesTestsBlockedAreas::tryCreateParticipant()
   pt.id(m_participants[m_participantIndex].participantId);
   pt.equipmentNumber(m_participants[m_participantIndex].equipmentNumber);
 
-  DEBUG_LOG() << "Publishing  Participant";
+  DEBUG_LOG(m_logger) << "Publishing  Participant";
   if (!m_ppmDts->publish(pt))
   {
-    ERROR_LOG() << "Error requesting create Participant";
+    ERROR_LOG(m_logger) << "Error requesting create Participant";
     failExit();
   }
 }
@@ -248,10 +247,10 @@ void CesTestsBlockedAreas::tryCreateBuildingStateInit()
   bs.vulnerabilityState(ProjectDataManagement::VulnerabilityState::CombatReady);
   bs.sampleTime(QDateTime::currentMSecsSinceEpoch());
 
-  DEBUG_LOG() << "Publishing  BuildingState";
+  DEBUG_LOG(m_logger) << "Publishing  BuildingState";
   if (!m_bldDts->publish(bs))
   {
-    ERROR_LOG() << "Error requesting create BuildingState";
+    ERROR_LOG(m_logger) << "Error requesting create BuildingState";
     failExit();
   }
 }
@@ -278,30 +277,30 @@ void CesTestsBlockedAreas::tryCreateBuildingState()
   bs.roomStates()[0]  = rs;
   bs.sampleTime(QDateTime::currentMSecsSinceEpoch());
 
-  DEBUG_LOG() << "Publishing  BuildingState";
+  DEBUG_LOG(m_logger) << "Publishing  BuildingState";
   if (!m_bldDts->publish(bs))
   {
-    ERROR_LOG() << "Error requesting create BuildingState";
+    ERROR_LOG(m_logger) << "Error requesting create BuildingState";
     failExit();
   }
 }
 
 void CesTestsBlockedAreas::checkBuildingOwnership()
 {
-  INFO_LOG() << "checkBuildingOwnership";
+  INFO_LOG(m_logger) << "checkBuildingOwnership";
   ExitSuccess();
 }
 
 void CesTestsBlockedAreas::failExit()
 {
-  DEBUG_LOG() << "FailExit";
+  DEBUG_LOG(m_logger) << "FailExit";
   m_bTestsSuccessful = false;
   QTimer::singleShot(50, qApp, QCoreApplication::quit);
 }
 
 void CesTestsBlockedAreas::ExitSuccess()
 {
-  DEBUG_LOG() << "ExitSuccess";
+  DEBUG_LOG(m_logger) << "ExitSuccess";
   m_bTestsSuccessful = true;
   QTimer::singleShot(50, qApp, QCoreApplication::quit);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_blocked_areas.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_blocked_areas.h
index 81391cbc0..653556a83 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_blocked_areas.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_blocked_areas.h
@@ -65,6 +65,7 @@ private: // structs
   };
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
 
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector42;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_booby_trap.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_booby_trap.cpp
index ad865d3ad..98e0b0dbe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_booby_trap.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_booby_trap.cpp
@@ -29,8 +29,7 @@
 namespace CentralEffectSimulation
 {
 
-CesTestsBoobyTrap::CesTestsBoobyTrap(QObject *parent)
-  : QObject(parent)
+CesTestsBoobyTrap::CesTestsBoobyTrap(QObject *parent) : QObject(parent)
   , m_bTestsSuccessful(true)
   //, m_refPos(LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UMD8000090000")))
   , m_refPos(LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UMD9387781202")))
@@ -41,8 +40,8 @@ CesTestsBoobyTrap::CesTestsBoobyTrap(QObject *parent)
   , m_DynamicParticipantIndex(0)
   , m_aesItemId(5)
   , m_chargeTypeId(252) // Verdeckte Ladung
-  , m_countEventBoobyTrap(0)
-{}
+  , m_countEventBoobyTrap(0),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 CesTestsBoobyTrap::~CesTestsBoobyTrap()
 {}
@@ -52,7 +51,7 @@ bool CesTestsBoobyTrap::init(int domainId, int exerciseId, int testId)
   bool bRet = true;
   int equipmentTypeIdVehicle = 27;
   int equipmentTypeIdSoldier = 55; // dds-Topic Participant-Management::Type
-  INFO_LOG() << "init begin";
+  INFO_LOG(m_logger) << "init begin";
 
   m_testId = testId;
 
@@ -117,7 +116,7 @@ bool CesTestsBoobyTrap::init(int domainId, int exerciseId, int testId)
 
 void CesTestsBoobyTrap::startTest()
 {
-  INFO_LOG() << "startTest m_testId=" << m_testId;
+  INFO_LOG(m_logger) << "startTest m_testId=" << m_testId;
   if (m_testId <= 1) // 1 SMART
   {
     m_explosionSingle = m_refPos.geographic(5, 5);
@@ -132,7 +131,7 @@ void CesTestsBoobyTrap::startTest()
   }
   else
   {
-    ERROR_LOG() << "Unknown test id = " << m_testId;
+    ERROR_LOG(m_logger) << "Unknown test id = " << m_testId;
     failExit();
   }
   QTimer::singleShot(8000, this, &CesTestsBoobyTrap::failExit);
@@ -158,11 +157,11 @@ void CesTestsBoobyTrap::tryCreateParticipantPosition()
   pp.sampleTime(posTime);
   pp.pos(pos);
 
-  DEBUG_LOG() << "Publishing  ParticipantPosition[" << m_participantIndex << "]"
+  DEBUG_LOG(m_logger) << "Publishing  ParticipantPosition[" << m_participantIndex << "]"
                       << " pos=" << posF.x() << "/" << posF.y();
   if (!m_ppmDts->publish(pp))
   {
-    ERROR_LOG() << "Error requesting create ParticipantPosition";
+    ERROR_LOG(m_logger) << "Error requesting create ParticipantPosition";
     failExit();
   }
 }
@@ -170,7 +169,7 @@ void CesTestsBoobyTrap::tryCreateParticipantPosition()
 
 void CesTestsBoobyTrap::checkParticipantEvent()
 {
-  INFO_LOG() << "checkParicipantEvent";
+  INFO_LOG(m_logger) << "checkParicipantEvent";
   m_cesDtc->waitForHistoricalDataParticipantEvent();
 
   switch (m_testId)
@@ -178,7 +177,7 @@ void CesTestsBoobyTrap::checkParticipantEvent()
   case 1:
     if (  m_countEventBoobyTrap == 2)
     {
-      INFO_LOG() << "ExitSuccess";
+      INFO_LOG(m_logger) << "ExitSuccess";
       ExitSuccess();
     }
     break;
@@ -198,7 +197,7 @@ static void setPos(std::vector<Core::GeoPosition> &cont, const QPointF &pos)
 
 void CesTestsBoobyTrap::tryCreateAesItemViewBoobyTrap()
 {
-  INFO_LOG() << "trying to send AesItemView tryCreateAesItemViewBoobyTrap";
+  INFO_LOG(m_logger) << "trying to send AesItemView tryCreateAesItemViewBoobyTrap";
 
   AreaEffectSimulation::AesItemView iv;
   iv.effectStateId(AreaEffectSimulation::AesEffectState_def::EsActivated);
@@ -221,17 +220,17 @@ void CesTestsBoobyTrap::tryCreateAesItemViewBoobyTrap()
   setPos(iv.form(), m_refPos.geographic( 10,  30));
   setPos(iv.form(), m_refPos.geographic( 10, -10));
 
-  DEBUG_LOG() << "Publishing  AesItemView";
+  DEBUG_LOG(m_logger) << "Publishing  AesItemView";
   if (!m_aesDts->publish(iv))
   {
-    ERROR_LOG() << "Error requesting create tryCreateAesItemViewBoobyTrap";
+    ERROR_LOG(m_logger) << "Error requesting create tryCreateAesItemViewBoobyTrap";
     failExit();
   }
 }
 
 void CesTestsBoobyTrap::tryCreateAesBoobyTrap()
 {
-  INFO_LOG() << "trying to send AesItemView tryCreateAesBoobyTrap";
+  INFO_LOG(m_logger) << "trying to send AesItemView tryCreateAesBoobyTrap";
 
   AreaEffectSimulation::BoobyTrap iv;
   iv.effectStateId(AreaEffectSimulation::AesEffectState_def::EsActivated);
@@ -251,10 +250,10 @@ void CesTestsBoobyTrap::tryCreateAesBoobyTrap()
   iv.effectStart ( QDateTime::currentMSecsSinceEpoch() + 2000);
 
 
-  DEBUG_LOG() << "Publishing  AesItemView";
+  DEBUG_LOG(m_logger) << "Publishing  AesItemView";
   if (!m_aesDts->publish(iv))
   {
-    ERROR_LOG() << "Error requesting create tryCreateBoobyTrap";
+    ERROR_LOG(m_logger) << "Error requesting create tryCreateBoobyTrap";
     failExit();
   }
 }
@@ -262,7 +261,7 @@ void CesTestsBoobyTrap::tryCreateAesBoobyTrap()
 
 void CesTestsBoobyTrap::tryCreateAesItemViewBoobyTrapSecondary()
 {
-  INFO_LOG() << "trying to send AesItemView tryCreateAesItemViewBoobyTrapSecondary";
+  INFO_LOG(m_logger) << "trying to send AesItemView tryCreateAesItemViewBoobyTrapSecondary";
 
   AreaEffectSimulation::AesItemView iv;
   iv.effectStateId(AreaEffectSimulation::AesEffectState_def::EsActivated);
@@ -285,10 +284,10 @@ void CesTestsBoobyTrap::tryCreateAesItemViewBoobyTrapSecondary()
   setPos(iv.form(), m_refPos.geographic( 50,  50));
   setPos(iv.form(), m_refPos.geographic( 50, -20));
 
-  DEBUG_LOG() << "Publishing  AesItemView";
+  DEBUG_LOG(m_logger) << "Publishing  AesItemView";
   if (!m_aesDts->publish(iv))
   {
-    ERROR_LOG() << "Error requesting create AesItemViewBoobyTrapSecondary";
+    ERROR_LOG(m_logger) << "Error requesting create AesItemViewBoobyTrapSecondary";
     failExit();
   }
 }
@@ -296,7 +295,7 @@ void CesTestsBoobyTrap::tryCreateAesItemViewBoobyTrapSecondary()
 
 void CesTestsBoobyTrap::onEventChanged(const CentralEffectSimulation::ParticipantEvent &eventData, DataModification modType)
 {
-  DEBUG_LOG() << "onParticipantEventChanged participantId=" << eventData.participantId()
+  DEBUG_LOG(m_logger) << "onParticipantEventChanged participantId=" << eventData.participantId()
                       << " eventType=" << eventData.eventTypeId()
                       << " aesItemId=" << eventData.aesItemId();
   if (modType == DataModification::eRemoved ||
@@ -305,7 +304,7 @@ void CesTestsBoobyTrap::onEventChanged(const CentralEffectSimulation::Participan
   if (eventData.eventTypeId() ==  ProjectDataManagement::EventType_def::HitMine)
   {
     m_countEventBoobyTrap ++;
-    DEBUG_LOG() << "m_countEventBoobyTrap=" << m_countEventBoobyTrap
+    DEBUG_LOG(m_logger) << "m_countEventBoobyTrap=" << m_countEventBoobyTrap
                         << " eventData.aesItemId()=" << eventData.aesItemId()
                         << " eventData.participantId()=" << eventData.participantId();
   }
@@ -321,14 +320,14 @@ Core::FunctionReplyObject CesTestsBoobyTrap::fillFro(int participantId, bool bSu
 
 void CesTestsBoobyTrap::failExit()
 {
-  DEBUG_LOG() << "FailExit";
+  DEBUG_LOG(m_logger) << "FailExit";
   m_bTestsSuccessful = false;
   QTimer::singleShot(200, qApp, QCoreApplication::quit);
 }
 
 void CesTestsBoobyTrap::ExitSuccess()
 {
-  DEBUG_LOG() << "ExitSuccess";
+  DEBUG_LOG(m_logger) << "ExitSuccess";
   m_bTestsSuccessful = true;
   QTimer::singleShot(200, qApp, &QCoreApplication::quit);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_booby_trap.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_booby_trap.h
index 733e566b1..3016ba5c0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_booby_trap.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_booby_trap.h
@@ -54,6 +54,7 @@ protected Q_SLOTS:
 
 protected:
 
+  NGL::INGLLogger &m_logger;
 private: // methods
 
   void checkParticipantEvent();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_gas_pipe.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_gas_pipe.cpp
index 8f303b1b2..8fa176a9c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_gas_pipe.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_gas_pipe.cpp
@@ -29,8 +29,7 @@
 namespace CentralEffectSimulation
 {
 
-CesTestsGasPipe::CesTestsGasPipe(QObject *parent)
-  : QObject(parent)
+CesTestsGasPipe::CesTestsGasPipe(QObject *parent) : QObject(parent)
   , m_bTestsSuccessful(true)
   , m_refPos(LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UMD8000090000")))
   , m_testId(0)
@@ -40,8 +39,8 @@ CesTestsGasPipe::CesTestsGasPipe(QObject *parent)
   , m_DynamicParticipantIndex(0)
   , m_aesItemId(5)
   , m_chargeTypeId(374) // SMART
-  , m_countEventGasPipe(0)
-{}
+  , m_countEventGasPipe(0),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 CesTestsGasPipe::~CesTestsGasPipe()
 {}
@@ -51,7 +50,7 @@ bool CesTestsGasPipe::init(int domainId, int exerciseId, int testId)
   bool bRet = true;
   int equipmentTypeIdVehicle = 35;
   int equipmentTypeIdSoldier = 30; // dds-Topic Participant-Management::Type
-  INFO_LOG() << "init begin";
+  INFO_LOG(m_logger) << "init begin";
 
   m_testId = testId;
 
@@ -137,7 +136,7 @@ bool CesTestsGasPipe::init(int domainId, int exerciseId, int testId)
 
 void CesTestsGasPipe::startTest()
 {
-  INFO_LOG() << "startTest m_testId=" << m_testId;
+  INFO_LOG(m_logger) << "startTest m_testId=" << m_testId;
   if (m_testId <= 1) // 1 SMART
   {
     m_explosionSingle = m_refPos.geographic(5, 5);
@@ -162,7 +161,7 @@ void CesTestsGasPipe::startTest()
   }
   else
   {
-    ERROR_LOG() << "Unknown test id = " << m_testId;
+    ERROR_LOG(m_logger) << "Unknown test id = " << m_testId;
     failExit();
   }
   QTimer::singleShot(8000, this, &CesTestsGasPipe::failExit);
@@ -184,10 +183,10 @@ void CesTestsGasPipe::tryCreateDynamicParticipantData()
   dp.sampleTime(esTime);
   m_DynamicParticipantIndex++;
 
-  DEBUG_LOG() << "Publishing  DynamicParticipantData";
+  DEBUG_LOG(m_logger) << "Publishing  DynamicParticipantData";
   if (!m_ppmDts->publish(dp))
   {
-    ERROR_LOG() << "Error requesting create ParticipantPosition";
+    ERROR_LOG(m_logger) << "Error requesting create ParticipantPosition";
     failExit();
   }
 }
@@ -211,10 +210,10 @@ void CesTestsGasPipe::tryCreateParticipantPosition()
   pp.sampleTime(posTime);
   pp.pos(pos);
 
-  DEBUG_LOG() << "Publishing  ParticipantPosition";
+  DEBUG_LOG(m_logger) << "Publishing  ParticipantPosition";
   if (!m_ppmDts->publish(pp))
   {
-    ERROR_LOG() << "Error requesting create ParticipantPosition";
+    ERROR_LOG(m_logger) << "Error requesting create ParticipantPosition";
     failExit();
   }
 }
@@ -228,10 +227,10 @@ void CesTestsGasPipe::tryCreateParticipant()
   pt.id(m_id);
   pt.equipmentNumber(m_equipmentNumber);
 
-  DEBUG_LOG() << "Publishing  Participant";
+  DEBUG_LOG(m_logger) << "Publishing  Participant";
   if (!m_ppmDts->publish(pt))
   {
-    ERROR_LOG() << "Error requesting create Participant";
+    ERROR_LOG(m_logger) << "Error requesting create Participant";
     failExit();
   }
   m_id++;
@@ -240,7 +239,7 @@ void CesTestsGasPipe::tryCreateParticipant()
 
 void CesTestsGasPipe::checkParticipantEvent()
 {
-  INFO_LOG() << "checkParicipantEvent";
+  INFO_LOG(m_logger) << "checkParicipantEvent";
   m_cesDtc->waitForHistoricalDataParticipantEvent();
 
   switch (m_testId)
@@ -273,10 +272,10 @@ void CesTestsGasPipe::tryCreateTypeVehicle()
   ty.name("HMMWV Utility");
 
 
-  DEBUG_LOG() << "Publishing  Type";
+  DEBUG_LOG(m_logger) << "Publishing  Type";
   if (!m_ppmDts->publish(ty))
   {
-    ERROR_LOG() << "Error requesting create Type";
+    ERROR_LOG(m_logger) << "Error requesting create Type";
     failExit();
   }
 }
@@ -294,10 +293,10 @@ void CesTestsGasPipe::tryCreateTypeSoldier()
   ty.name("Soldier");
 
 
-  DEBUG_LOG() << "Publishing  Type";
+  DEBUG_LOG(m_logger) << "Publishing  Type";
   if (!m_ppmDts->publish(ty))
   {
-    ERROR_LOG() << "Error requesting create Type";
+    ERROR_LOG(m_logger) << "Error requesting create Type";
     failExit();
   }
 }
@@ -308,7 +307,7 @@ static void setPos(std::vector<Core::GeoPosition> &cont, const QPointF &pos)
 
 void CesTestsGasPipe::tryCreateAesItemViewGasPipe()
 {
-  INFO_LOG() << "trying to send AesItemView AtExplosionAreaSingleExplosions";
+  INFO_LOG(m_logger) << "trying to send AesItemView AtExplosionAreaSingleExplosions";
 
   AreaEffectSimulation::AesItemView iv;
   iv.effectStateId(AreaEffectSimulation::AesEffectState_def::EsActivated);
@@ -331,30 +330,30 @@ void CesTestsGasPipe::tryCreateAesItemViewGasPipe()
   setPos(iv.form(), m_refPos.geographic( 10,  30));
   setPos(iv.form(), m_refPos.geographic( 10, -10));
 
-  DEBUG_LOG() << "Publishing  AesItemView";
+  DEBUG_LOG(m_logger) << "Publishing  AesItemView";
   if (!m_aesDts->publish(iv))
   {
-    ERROR_LOG() << "Error requesting create AesItemViewSingleExplosions";
+    ERROR_LOG(m_logger) << "Error requesting create AesItemViewSingleExplosions";
     failExit();
   }
 }
 
 void CesTestsGasPipe::tryCreateChargeType()
 {
-  DEBUG_LOG() << "Publishing  ChargeType";
+  DEBUG_LOG(m_logger) << "Publishing  ChargeType";
   ProjectDataManagement::ChargeType ct;
   ct.id(m_chargeTypeId);
   ct.properties("{\"impactRadius\":25,\"impactEdgeLength\":50,\"isSmart\":true,\"searchRadius\":150}");
   if (!m_pdmDts->publish(ct))
   {
-    ERROR_LOG() << "Error publish ChargeType";
+    ERROR_LOG(m_logger) << "Error publish ChargeType";
     failExit();
   }
 }
 
 void CesTestsGasPipe::onEventChanged(const CentralEffectSimulation::ParticipantEvent &eventData, DataModification modType)
 {
-  DEBUG_LOG() << "onParticipantEventChanged participantId=" << eventData.participantId()
+  DEBUG_LOG(m_logger) << "onParticipantEventChanged participantId=" << eventData.participantId()
                       << " eventType=" << eventData.eventTypeId();
   if (modType == DataModification::eRemoved ||
       modType == DataModification::eModified)
@@ -362,7 +361,7 @@ void CesTestsGasPipe::onEventChanged(const CentralEffectSimulation::ParticipantE
   if (eventData.eventTypeId() ==  ProjectDataManagement::EventType_def::HitGasPipe)
   {
     m_countEventGasPipe ++;
-    DEBUG_LOG() << "m_countEventGasPipe=" << m_countEventGasPipe;
+    DEBUG_LOG(m_logger) << "m_countEventGasPipe=" << m_countEventGasPipe;
   }
 }
 
@@ -376,14 +375,14 @@ Core::FunctionReplyObject CesTestsGasPipe::fillFro(int participantId, bool bSucc
 
 void CesTestsGasPipe::failExit()
 {
-  DEBUG_LOG() << "FailExit";
+  DEBUG_LOG(m_logger) << "FailExit";
   m_bTestsSuccessful = false;
   QTimer::singleShot(50, qApp, QCoreApplication::quit);
 }
 
 void CesTestsGasPipe::ExitSuccess()
 {
-  DEBUG_LOG() << "ExitSuccess";
+  DEBUG_LOG(m_logger) << "ExitSuccess";
   m_bTestsSuccessful = true;
   QTimer::singleShot(200, qApp, &QCoreApplication::quit);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_gas_pipe.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_gas_pipe.h
index 42332702a..3abbddd31 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_gas_pipe.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_gas_pipe.h
@@ -57,6 +57,7 @@ protected Q_SLOTS:
 
 protected:
 
+  NGL::INGLLogger &m_logger;
 private: // methods
 
   void checkParticipantEvent();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing.cpp
index 84832d2dd..d93184909 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing.cpp
@@ -32,12 +32,11 @@
 namespace CentralEffectSimulation
 {
 
-CesTestsGeopairing::CesTestsGeopairing(QObject *parent)
-  : QObject(parent)
+CesTestsGeopairing::CesTestsGeopairing(QObject *parent) : QObject(parent)
   , m_bTestsSuccessful(true)
   , m_housePos(LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UMD8000090000")))
-  , m_testId(0)
-{}
+  , m_testId(0),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 CesTestsGeopairing::~CesTestsGeopairing()
 {}
@@ -45,7 +44,7 @@ CesTestsGeopairing::~CesTestsGeopairing()
 bool CesTestsGeopairing::init(int domainId, int exerciseId, int testId)
 {
   bool bRet = true;
-  INFO_LOG() << "init begin";
+  INFO_LOG(m_logger) << "init begin";
 
   m_testId = testId;
 
@@ -80,7 +79,7 @@ bool CesTestsGeopairing::init(int domainId, int exerciseId, int testId)
 
 void CesTestsGeopairing::startTest()
 {
-  INFO_LOG() << "startTest m_testId=" << m_testId;
+  INFO_LOG(m_logger) << "startTest m_testId=" << m_testId;
   switch (m_testId)
   {
   case 1:
@@ -92,7 +91,7 @@ void CesTestsGeopairing::startTest()
   }
   case 2:
   {
-    INFO_LOG() << "Geopairing IGLA";
+    INFO_LOG(m_logger) << "Geopairing IGLA";
     QTimer::singleShot(0, this, &CesTestsGeopairing::tryCreateMeteoData);
     QTimer::singleShot(250, this, &CesTestsGeopairing::tryCreateSoldierPosition);
     QTimer::singleShot(500, this, &CesTestsGeopairing::tryCreateAircraftPosition);
@@ -102,7 +101,7 @@ void CesTestsGeopairing::startTest()
   }
   case 3:
   {
-    INFO_LOG() << "Geopairing IGLA Damage States";
+    INFO_LOG(m_logger) << "Geopairing IGLA Damage States";
     QTimer::singleShot(0, this, &CesTestsGeopairing::tryCreateMeteoData);
     QTimer::singleShot(250, this, &CesTestsGeopairing::tryCreateSoldierPosition);
     QTimer::singleShot(500, this, &CesTestsGeopairing::tryCreateAircraftPosition);
@@ -112,7 +111,7 @@ void CesTestsGeopairing::startTest()
   }
   case 4: // MK 19
   {
-    INFO_LOG() << "Geopairing MK 19";
+    INFO_LOG(m_logger) << "Geopairing MK 19";
     QTimer::singleShot(0, this, &CesTestsGeopairing::tryCreateMeteoData);
     QTimer::singleShot(250, this, &CesTestsGeopairing::tryCreateSoldierPosition);
     QTimer::singleShot(500, this, &CesTestsGeopairing::tryCreateAircraftPosition);
@@ -122,7 +121,7 @@ void CesTestsGeopairing::startTest()
   }
   default:
   {
-    ERROR_LOG() << "Unknown test id = " << m_testId;
+    ERROR_LOG(m_logger) << "Unknown test id = " << m_testId;
     failExit();
   }
   }
@@ -141,10 +140,10 @@ void CesTestsGeopairing::tryCreateMeteoData()
   md.windDirection(0.0);
   md.temperature(20.0);
   md.pressure(1013);
-  DEBUG_LOG() << "Publishing  MeteoData";
+  DEBUG_LOG(m_logger) << "Publishing  MeteoData";
   if (!m_mdmDts->publish(md))
   {
-    ERROR_LOG() << "Error requesting create MeteoData";
+    ERROR_LOG(m_logger) << "Error requesting create MeteoData";
     failExit();
   }
 }
@@ -166,10 +165,10 @@ void CesTestsGeopairing::tryCreateSoldierPosition()
   pp.roomId(0);
   pp.sampleTime(posTime);
 
-  DEBUG_LOG() << "Publishing  ParticipantPosition";
+  DEBUG_LOG(m_logger) << "Publishing  ParticipantPosition";
   if (!m_ppmDts->publish(pp))
   {
-    ERROR_LOG() << "Error requesting create ParticipantPosition";
+    ERROR_LOG(m_logger) << "Error requesting create ParticipantPosition";
     failExit();
   }
 }
@@ -191,10 +190,10 @@ void CesTestsGeopairing::tryCreateAircraftPosition()
   pp.roomId(0);
   pp.sampleTime(posTime);
 
-  DEBUG_LOG() << "Publishing  ParticipantPosition";
+  DEBUG_LOG(m_logger) << "Publishing  ParticipantPosition";
   if (!m_ppmDts->publish(pp))
   {
-    ERROR_LOG() << "Error requesting create ParticipantPosition";
+    ERROR_LOG(m_logger) << "Error requesting create ParticipantPosition";
     failExit();
   }
 }
@@ -255,10 +254,10 @@ void CesTestsGeopairing::tryCreateGeopairingData()
   const Core::GeoPosition pos(Core::GeoPosition(posF.x(), posF.y(), 0));
   gd.position(pos);
 
-  DEBUG_LOG() << "Publishing  GeopairingData";
+  DEBUG_LOG(m_logger) << "Publishing  GeopairingData";
   if (!m_tabDts->publish(gd))
   {
-    ERROR_LOG() << "Error requesting create GeopairingData";
+    ERROR_LOG(m_logger) << "Error requesting create GeopairingData";
     failExit();
   }
 
@@ -343,10 +342,10 @@ void CesTestsGeopairing::tryCreateGeopairingDataIGLA()
   gd.position().lon(lon);
   gd.position().lat(lat);
 
-  DEBUG_LOG() << "Publishing  GeopairingData";
+  DEBUG_LOG(m_logger) << "Publishing  GeopairingData";
   if (!m_tabDts->publish(gd))
   {
-    ERROR_LOG() << "Error requesting create GeopairingData";
+    ERROR_LOG(m_logger) << "Error requesting create GeopairingData";
     failExit();
   }
 
@@ -389,10 +388,10 @@ void CesTestsGeopairing::tryCreateGeopairingDataMK19()
   gd.position().lon(lon);
   gd.position().lat(lat);
 
-  DEBUG_LOG() << "Publishing  GeopairingData";
+  DEBUG_LOG(m_logger) << "Publishing  GeopairingData";
   if (!m_tabDts->publish(gd))
   {
-    ERROR_LOG() << "Error requesting create GeopairingData";
+    ERROR_LOG(m_logger) << "Error requesting create GeopairingData";
     failExit();
   }
 
@@ -401,12 +400,12 @@ void CesTestsGeopairing::tryCreateGeopairingDataMK19()
 
 void CesTestsGeopairing::checkGeopairing()
 {
-  INFO_LOG() << "checkMessageOnDds";
+  INFO_LOG(m_logger) << "checkMessageOnDds";
   m_aesDtc->waitForHistoricalDataExplosionSingle();
   QMap < int ,AreaEffectSimulation::ExplosionSingle> explosionSingles = m_aesDtc->explosionSingles();
-  INFO_LOG() << "explosionSingles.size()" << explosionSingles.size();
+  INFO_LOG(m_logger) << "explosionSingles.size()" << explosionSingles.size();
   AreaEffectSimulation::ExplosionSingle explosionSingle = explosionSingles.last();
-  DEBUG_LOG() << "explosionSingle.lat=" << explosionSingle.impactPosition().lat()
+  DEBUG_LOG(m_logger) << "explosionSingle.lat=" << explosionSingle.impactPosition().lat()
                       << " lon=" << explosionSingle.impactPosition().lon();
 
   switch (m_testId)
@@ -428,14 +427,14 @@ void CesTestsGeopairing::checkGeopairing()
 
 void CesTestsGeopairing::failExit()
 {
-  DEBUG_LOG() << "FailExit";
+  DEBUG_LOG(m_logger) << "FailExit";
   m_bTestsSuccessful = false;
   QTimer::singleShot(50, qApp, &QCoreApplication::quit);
 }
 
 void CesTestsGeopairing::ExitSuccess()
 {
-  DEBUG_LOG() << "ExitSuccess";
+  DEBUG_LOG(m_logger) << "ExitSuccess";
   m_bTestsSuccessful = true;
   QTimer::singleShot(50, qApp,  &QCoreApplication::quit);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing.h
index b80045618..b282d3966 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing.h
@@ -52,6 +52,8 @@ protected Q_SLOTS:
 
 private: // methods
 
+
+NGL::INGLLogger &m_logger;
   void checkParicipantEvent();
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing_bsp.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing_bsp.cpp
index fdc3cf8cc..efad21e21 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing_bsp.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing_bsp.cpp
@@ -32,12 +32,11 @@
 namespace CentralEffectSimulation
 {
 
-CesTestsGeopairing::CesTestsGeopairing(QObject *parent)
-  : QObject(parent)
+CesTestsGeopairing::CesTestsGeopairing(QObject *parent) : QObject(parent)
   , m_bTestsSuccessful(true)
   , m_housePos(LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UMD8000090000")))
-  , m_testId(0)
-{}
+  , m_testId(0),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 CesTestsGeopairing::~CesTestsGeopairing()
 {}
@@ -45,7 +44,7 @@ CesTestsGeopairing::~CesTestsGeopairing()
 bool CesTestsGeopairing::init(int domainId, int exerciseId, int testId)
 {
   bool bRet = true;
-  INFO_LOG() << "init begin";
+  INFO_LOG(m_logger) << "init begin";
 
   m_testId = testId;
 
@@ -80,7 +79,7 @@ bool CesTestsGeopairing::init(int domainId, int exerciseId, int testId)
 
 void CesTestsGeopairing::startTest()
 {
-  INFO_LOG() << "startTest m_testId=" << m_testId;
+  INFO_LOG(m_logger) << "startTest m_testId=" << m_testId;
   switch (m_testId)
   {
   case 1: // Geopairing Mortar
@@ -91,7 +90,7 @@ void CesTestsGeopairing::startTest()
   }
   case 2: // IGLA Target Detection
   {
-    INFO_LOG() << "Geopairing IGLA";
+    INFO_LOG(m_logger) << "Geopairing IGLA";
     //QTimer::singleShot(500, this, &CesTestsGeopairing::tryCreateAircraftPosition);
     QTimer::singleShot(750, this, &CesTestsGeopairing::tryCreateGeopairingDataIGLA);
     QTimer::singleShot(1000, this, &CesTestsGeopairing::checkGeopairing);
@@ -99,7 +98,7 @@ void CesTestsGeopairing::startTest()
   }
   case 3: // IGLA Target Fire
   {
-    INFO_LOG() << "Geopairing IGLA Target Fire";
+    INFO_LOG(m_logger) << "Geopairing IGLA Target Fire";
     QTimer::singleShot(500, this, &CesTestsGeopairing::tryCreateAircraftPosition);
     QTimer::singleShot(750, this, &CesTestsGeopairing::tryCreateGeopairingDataIGLATarget);
     QTimer::singleShot(1000, this, &CesTestsGeopairing::checkGeopairing);
@@ -107,14 +106,14 @@ void CesTestsGeopairing::startTest()
   }
   case 4: // MK 19
   {
-    INFO_LOG() << "Geopairing MK 19";
+    INFO_LOG(m_logger) << "Geopairing MK 19";
     QTimer::singleShot(750, this, &CesTestsGeopairing::tryCreateGeopairingDataMK19);
     QTimer::singleShot(1000, this, &CesTestsGeopairing::checkGeopairing);
     break;
   }
   default:
   {
-    ERROR_LOG() << "Unknown test id = " << m_testId;
+    ERROR_LOG(m_logger) << "Unknown test id = " << m_testId;
     failExit();
   }
   }
@@ -139,10 +138,10 @@ void CesTestsGeopairing::tryCreateSoldierPosition()
   pp.roomId(0);
   pp.sampleTime(posTime);
 
-  DEBUG_LOG() << "Publishing  ParticipantPosition";
+  DEBUG_LOG(m_logger) << "Publishing  ParticipantPosition";
   if (!m_ppmDts->publish(pp))
   {
-    ERROR_LOG() << "Error requesting create ParticipantPosition";
+    ERROR_LOG(m_logger) << "Error requesting create ParticipantPosition";
     failExit();
   }
 }
@@ -164,10 +163,10 @@ void CesTestsGeopairing::tryCreateAircraftPosition()
   pp.roomId(0);
   pp.sampleTime(posTime);
 
-  DEBUG_LOG() << "Publishing  ParticipantPosition";
+  DEBUG_LOG(m_logger) << "Publishing  ParticipantPosition";
   if (!m_ppmDts->publish(pp))
   {
-    ERROR_LOG() << "Error requesting create ParticipantPosition";
+    ERROR_LOG(m_logger) << "Error requesting create ParticipantPosition";
     failExit();
   }
 }
@@ -211,10 +210,10 @@ void CesTestsGeopairing::tryCreateGeopairingData()
   gd.position().lon(lon);
   gd.position().lat(lat);
 
-  DEBUG_LOG() << "Publishing  GeopairingData";
+  DEBUG_LOG(m_logger) << "Publishing  GeopairingData";
   if (!m_tabDts->publish(gd))
   {
-    ERROR_LOG() << "Error requesting create GeopairingData";
+    ERROR_LOG(m_logger) << "Error requesting create GeopairingData";
     failExit();
   }
 
@@ -258,10 +257,10 @@ void CesTestsGeopairing::tryCreateGeopairingDataIGLA()
   gd.position().lon(lon);
   gd.position().lat(lat);
 
-  DEBUG_LOG() << "Publishing  GeopairingData";
+  DEBUG_LOG(m_logger) << "Publishing  GeopairingData";
   if (!m_tabDts->publish(gd))
   {
-    ERROR_LOG() << "Error requesting create GeopairingData";
+    ERROR_LOG(m_logger) << "Error requesting create GeopairingData";
     failExit();
   }
 
@@ -304,10 +303,10 @@ void CesTestsGeopairing::tryCreateGeopairingDataIGLATarget()
   gd.position().lon(lon);
   gd.position().lat(lat);
 
-  DEBUG_LOG() << "Publishing  GeopairingData";
+  DEBUG_LOG(m_logger) << "Publishing  GeopairingData";
   if (!m_tabDts->publish(gd))
   {
-    ERROR_LOG() << "Error requesting create GeopairingData";
+    ERROR_LOG(m_logger) << "Error requesting create GeopairingData";
     failExit();
   }
 
@@ -350,10 +349,10 @@ void CesTestsGeopairing::tryCreateGeopairingDataMK19()
   gd.position().lon(lon);
   gd.position().lat(lat);
 
-  DEBUG_LOG() << "Publishing  GeopairingData";
+  DEBUG_LOG(m_logger) << "Publishing  GeopairingData";
   if (!m_tabDts->publish(gd))
   {
-    ERROR_LOG() << "Error requesting create GeopairingData";
+    ERROR_LOG(m_logger) << "Error requesting create GeopairingData";
     failExit();
   }
 
@@ -362,7 +361,7 @@ void CesTestsGeopairing::tryCreateGeopairingDataMK19()
 
 void CesTestsGeopairing::checkGeopairing()
 {
-  INFO_LOG() << "checkMessageOnDds";
+  INFO_LOG(m_logger) << "checkMessageOnDds";
 
   switch (m_testId)
   {
@@ -370,9 +369,9 @@ void CesTestsGeopairing::checkGeopairing()
   {
     m_aesDtc->waitForHistoricalDataExplosionSingle();
     QMap < int ,AreaEffectSimulation::ExplosionSingle> explosionSingles = m_aesDtc->explosionSingles();
-    INFO_LOG() << "explosionSingles.size()" << explosionSingles.size();
+    INFO_LOG(m_logger) << "explosionSingles.size()" << explosionSingles.size();
     AreaEffectSimulation::ExplosionSingle explosionSingle = explosionSingles.last();
-    DEBUG_LOG() << "explosionSingle.lat=" << explosionSingle.impactPosition().lat()
+    DEBUG_LOG(m_logger) << "explosionSingle.lat=" << explosionSingle.impactPosition().lat()
                         << " lon=" << explosionSingle.impactPosition().lon();
     if (   (explosionSingle.impactPosition().lat() > 0.9 && explosionSingle.impactPosition().lat() < 1.0)
            && (explosionSingle.impactPosition().lon() > 0.1 && explosionSingle.impactPosition().lon() < 0.2))
@@ -391,14 +390,14 @@ void CesTestsGeopairing::checkGeopairing()
 
 void CesTestsGeopairing::failExit()
 {
-  DEBUG_LOG() << "FailExit";
+  DEBUG_LOG(m_logger) << "FailExit";
   m_bTestsSuccessful = false;
   QTimer::singleShot(50, qApp, &QCoreApplication::quit);
 }
 
 void CesTestsGeopairing::ExitSuccess()
 {
-  DEBUG_LOG() << "ExitSuccess";
+  DEBUG_LOG(m_logger) << "ExitSuccess";
   m_bTestsSuccessful = true;
   QTimer::singleShot(50, qApp, &QCoreApplication::quit);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing_bsp.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing_bsp.h
index b38dd8635..b1a46bb33 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing_bsp.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_geo_pairing_bsp.h
@@ -52,6 +52,8 @@ protected Q_SLOTS:
 
 private: // methods
 
+
+NGL::INGLLogger &m_logger;
   void checkParicipantEvent();
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_mine_areas.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_mine_areas.cpp
index db47bf04a..5450ac4df 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_mine_areas.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_mine_areas.cpp
@@ -68,8 +68,7 @@
 namespace CentralEffectSimulation
 {
 
-CesTestsMineAreas::CesTestsMineAreas(QObject *parent)
-  : QObject(parent)
+CesTestsMineAreas::CesTestsMineAreas(QObject *parent) : QObject(parent)
   , m_bTestsSuccessful(true)
   , m_refPos(LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UMD8000090000")))
   , m_testId(0)
@@ -79,8 +78,8 @@ CesTestsMineAreas::CesTestsMineAreas(QObject *parent)
   , m_DynamicParticipantIndex(0)
   , m_aesItemId(5)
   , m_chargeTypeId(374) // SMART
-  , m_countEventMineAreas(0)
-{}
+  , m_countEventMineAreas(0),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 CesTestsMineAreas::~CesTestsMineAreas()
 {}
@@ -90,7 +89,7 @@ bool CesTestsMineAreas::init(int domainId, int exerciseId, int testId)
   bool bRet = true;
   int equipmentTypeIdVehicle = 35;
   int equipmentTypeIdSoldier = 30; // dds-Topic Participant-Management::Type
-  INFO_LOG() << "init begin";
+  INFO_LOG(m_logger) << "init begin";
 
   m_testId = testId;
 
@@ -176,7 +175,7 @@ bool CesTestsMineAreas::init(int domainId, int exerciseId, int testId)
 
 void CesTestsMineAreas::startTest()
 {
-  INFO_LOG() << "startTest m_testId=" << m_testId;
+  INFO_LOG(m_logger) << "startTest m_testId=" << m_testId;
   if (m_testId <= 1) // 1 SMART
   {
     m_explosionSingle = m_refPos.geographic(5, 5);
@@ -201,7 +200,7 @@ void CesTestsMineAreas::startTest()
   }
   else
   {
-    ERROR_LOG() << "Unknown test id = " << m_testId;
+    ERROR_LOG(m_logger) << "Unknown test id = " << m_testId;
     failExit();
   }
   QTimer::singleShot(8000, this, &CesTestsMineAreas::failExit);
@@ -223,10 +222,10 @@ void CesTestsMineAreas::tryCreateDynamicParticipantData()
   dp.sampleTime(esTime);
   m_DynamicParticipantIndex++;
 
-  DEBUG_LOG() << "Publishing  DynamicParticipantData";
+  DEBUG_LOG(m_logger) << "Publishing  DynamicParticipantData";
   if (!m_ppmDts->publish(dp))
   {
-    ERROR_LOG() << "Error requesting create ParticipantPosition";
+    ERROR_LOG(m_logger) << "Error requesting create ParticipantPosition";
     failExit();
   }
 }
@@ -250,10 +249,10 @@ void CesTestsMineAreas::tryCreateParticipantPosition()
   pp.sampleTime(posTime);
   pp.pos(pos);
 
-  DEBUG_LOG() << "Publishing  ParticipantPosition";
+  DEBUG_LOG(m_logger) << "Publishing  ParticipantPosition";
   if (!m_ppmDts->publish(pp))
   {
-    ERROR_LOG() << "Error requesting create ParticipantPosition";
+    ERROR_LOG(m_logger) << "Error requesting create ParticipantPosition";
     failExit();
   }
 }
@@ -267,10 +266,10 @@ void CesTestsMineAreas::tryCreateParticipant()
   pt.id(m_id);
   pt.equipmentNumber(m_equipmentNumber);
 
-  DEBUG_LOG() << "Publishing  Participant";
+  DEBUG_LOG(m_logger) << "Publishing  Participant";
   if (!m_ppmDts->publish(pt))
   {
-    ERROR_LOG() << "Error requesting create Participant";
+    ERROR_LOG(m_logger) << "Error requesting create Participant";
     failExit();
   }
   m_id++;
@@ -279,7 +278,7 @@ void CesTestsMineAreas::tryCreateParticipant()
 
 void CesTestsMineAreas::checkParticipantEvent()
 {
-  INFO_LOG() << "checkParicipantEvent";
+  INFO_LOG(m_logger) << "checkParicipantEvent";
   m_cesDtc->waitForHistoricalDataParticipantEvent();
 
   switch (m_testId)
@@ -312,10 +311,10 @@ void CesTestsMineAreas::tryCreateTypeVehicle()
   ty.name("HMMWV Utility");
 
 
-  DEBUG_LOG() << "Publishing  Type";
+  DEBUG_LOG(m_logger) << "Publishing  Type";
   if (!m_ppmDts->publish(ty))
   {
-    ERROR_LOG() << "Error requesting create Type";
+    ERROR_LOG(m_logger) << "Error requesting create Type";
     failExit();
   }
 }
@@ -333,10 +332,10 @@ void CesTestsMineAreas::tryCreateTypeSoldier()
   ty.name("Soldier");
 
 
-  DEBUG_LOG() << "Publishing  Type";
+  DEBUG_LOG(m_logger) << "Publishing  Type";
   if (!m_ppmDts->publish(ty))
   {
-    ERROR_LOG() << "Error requesting create Type";
+    ERROR_LOG(m_logger) << "Error requesting create Type";
     failExit();
   }
 }
@@ -347,7 +346,7 @@ static void setPos(std::vector<Core::GeoPosition> &cont, const QPointF &pos)
 
 void CesTestsMineAreas::tryCreateAesItemViewMineArea()
 {
-  INFO_LOG() << "trying to send AesItemView AtExplosionAreaSingleExplosions";
+  INFO_LOG(m_logger) << "trying to send AesItemView AtExplosionAreaSingleExplosions";
 
   AreaEffectSimulation::AesItemView iv;
   iv.effectStateId(AreaEffectSimulation::AesEffectState_def::EsActivated);
@@ -370,30 +369,30 @@ void CesTestsMineAreas::tryCreateAesItemViewMineArea()
   setPos(iv.form(), m_refPos.geographic( 10,  30));
   setPos(iv.form(), m_refPos.geographic( 10, -10));
 
-  DEBUG_LOG() << "Publishing  AesItemView";
+  DEBUG_LOG(m_logger) << "Publishing  AesItemView";
   if (!m_aesDts->publish(iv))
   {
-    ERROR_LOG() << "Error requesting create AesItemViewSingleExplosions";
+    ERROR_LOG(m_logger) << "Error requesting create AesItemViewSingleExplosions";
     failExit();
   }
 }
 
 void CesTestsMineAreas::tryCreateChargeType()
 {
-  DEBUG_LOG() << "Publishing  ChargeType";
+  DEBUG_LOG(m_logger) << "Publishing  ChargeType";
   ProjectDataManagement::ChargeType ct;
   ct.id(m_chargeTypeId);
   ct.properties("{\"impactRadius\":25,\"impactEdgeLength\":50,\"isSmart\":true,\"searchRadius\":150}");
   if (!m_pdmDts->publish(ct))
   {
-    ERROR_LOG() << "Error publish ChargeType";
+    ERROR_LOG(m_logger) << "Error publish ChargeType";
     failExit();
   }
 }
 
 void CesTestsMineAreas::onEventChanged(const CentralEffectSimulation::ParticipantEvent &eventData, DataModification modType)
 {
-  DEBUG_LOG() << "onParticipantEventChanged participantId=" << eventData.participantId()
+  DEBUG_LOG(m_logger) << "onParticipantEventChanged participantId=" << eventData.participantId()
                       << " eventType=" << eventData.eventTypeId();
   if (modType == DataModification::eRemoved ||
       modType == DataModification::eModified)
@@ -401,7 +400,7 @@ void CesTestsMineAreas::onEventChanged(const CentralEffectSimulation::Participan
   if (eventData.eventTypeId() ==  ProjectDataManagement::EventType_def::HitGasPipe)
   {
     m_countEventMineAreas ++;
-    DEBUG_LOG() << "m_countEventMineAreas=" << m_countEventMineAreas;
+    DEBUG_LOG(m_logger) << "m_countEventMineAreas=" << m_countEventMineAreas;
   }
 }
 
@@ -415,14 +414,14 @@ Core::FunctionReplyObject CesTestsMineAreas::fillFro(int participantId, bool bSu
 
 void CesTestsMineAreas::failExit()
 {
-  DEBUG_LOG() << "FailExit";
+  DEBUG_LOG(m_logger) << "FailExit";
   m_bTestsSuccessful = false;
   QTimer::singleShot(50, qApp, QCoreApplication::quit);
 }
 
 void CesTestsMineAreas::ExitSuccess()
 {
-  DEBUG_LOG() << "ExitSuccess";
+  DEBUG_LOG(m_logger) << "ExitSuccess";
   m_bTestsSuccessful = true;
   QTimer::singleShot(200, qApp, &QCoreApplication::quit);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_mine_areas.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_mine_areas.h
index e5eb81b9d..74f3611fd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_mine_areas.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_mine_areas.h
@@ -57,6 +57,7 @@ protected Q_SLOTS:
 
 protected:
 
+  NGL::INGLLogger &m_logger;
 private: // methods
 
   void checkParticipantEvent();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_ownership.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_ownership.cpp
index 7910ffd82..f0cbfced9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_ownership.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_ownership.cpp
@@ -48,7 +48,7 @@ CesTestsOwnership::~CesTestsOwnership()
 bool CesTestsOwnership::init(int domainId, int exerciseId, int testId)
 {
   bool bRet = true;
-  INFO_LOG() << "init begin";
+  INFO_LOG(m_logger) << "init begin";
 
   m_testId = testId;
   m_buildingId = 7; // ism_main_structure_element:id
@@ -111,7 +111,7 @@ bool CesTestsOwnership::init(int domainId, int exerciseId, int testId)
 
 void CesTestsOwnership::startTest()
 {
-  INFO_LOG() << "startTest m_testId=" << m_testId;
+  INFO_LOG(m_logger) << "startTest m_testId=" << m_testId;
   if (m_testId <= 1) // 1 Participant in BT56
   {
     QTimer::singleShot(0, this, &CesTestsOwnership::tryCreateParticipantPosition);
@@ -168,7 +168,7 @@ void CesTestsOwnership::startTest()
   }
   else
   {
-    ERROR_LOG() << "Unknown test id = " << m_testId;
+    ERROR_LOG(m_logger) << "Unknown test id = " << m_testId;
     failExit();
   }
   QTimer::singleShot(6000, this, &CesTestsOwnership::failExit);
@@ -190,10 +190,10 @@ void CesTestsOwnership::tryCreateDynamicParticipantData()
   dp.sampleTime(esTime);
   m_DynamicParticipantIndex++;
 
-  DEBUG_LOG() << "Publishing  DynamicParticipantData";
+  DEBUG_LOG(m_logger) << "Publishing  DynamicParticipantData";
   if (!m_ppmDts->publish(dp))
   {
-    ERROR_LOG() << "Error requesting create ParticipantPosition";
+    ERROR_LOG(m_logger) << "Error requesting create ParticipantPosition";
     failExit();
   }
 }
@@ -216,10 +216,10 @@ void CesTestsOwnership::tryCreateParticipantPosition()
   pp.sampleTime(posTime);
   pp.pos(pos);
 
-  DEBUG_LOG() << "Publishing  ParticipantPosition";
+  DEBUG_LOG(m_logger) << "Publishing  ParticipantPosition";
   if (!m_ppmDts->publish(pp))
   {
-    ERROR_LOG() << "Error requesting create ParticipantPosition";
+    ERROR_LOG(m_logger) << "Error requesting create ParticipantPosition";
     failExit();
   }
 }
@@ -233,10 +233,10 @@ void CesTestsOwnership::tryCreateParticipant()
   pt.id(m_participants[m_participantIndex].participantId);
   pt.equipmentNumber(m_participants[m_participantIndex].equipmentNumber);
 
-  DEBUG_LOG() << "Publishing  Participant";
+  DEBUG_LOG(m_logger) << "Publishing  Participant";
   if (!m_ppmDts->publish(pt))
   {
-    ERROR_LOG() << "Error requesting create Participant";
+    ERROR_LOG(m_logger) << "Error requesting create Participant";
     failExit();
   }
 }
@@ -245,32 +245,32 @@ void CesTestsOwnership::trySetOwnershipRequest()
 {
   int32_t partyId = 0;
 
-  DEBUG_LOG() << " request.buildingId() = " << m_buildingId
+  DEBUG_LOG(m_logger) << " request.buildingId() = " << m_buildingId
                       << " request.partyId() = " << m_buildingId;
 
   if (!m_cesFtc->setOwnershipRequest(SetOwnershipRequest(m_buildingId, partyId), this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
 }
 
 void CesTestsOwnership::onSetOwnershipReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "onSetOwnershipReply() replyObject.id=" << replyObject.id();
+  INFO_LOG(m_logger) << "onSetOwnershipReply() replyObject.id=" << replyObject.id();
 }
 
 void CesTestsOwnership::checkBuildingOwnership()
 {
-  INFO_LOG() << "checkBuildingOwnership";
+  INFO_LOG(m_logger) << "checkBuildingOwnership";
   /*
   m_cesDtc->waitForHistoricalDataBuildingOwnership();
   QMap < int ,CentralEffectSimulation::BuildingOwnership> buildingOwnership = m_cesDtc->buildingOwnerships();
-  INFO_LOG() << "Recived ParicipantEvent BuildingOwnership:"<<buildingOwnership.buildingId();
+  INFO_LOG(m_logger) << "Recived ParicipantEvent BuildingOwnership:"<<buildingOwnership.buildingId();
   for (unsigned int i = 0; i < buildingOwnership.ownerships().size(); i++)
   {
     CentralEffectSimulation::Ownership ownership = buildingOwnership.ownerships().at(i);
-    INFO_LOG() <<  "ownership["<<i<<"].floorId="<< ownership.floorId()
+    INFO_LOG(m_logger) <<  "ownership["<<i<<"].floorId="<< ownership.floorId()
                        << " ownership["<<i<<"].partyId="<< ownership.partyId();
   }
   switch (m_testId)
@@ -338,14 +338,14 @@ void CesTestsOwnership::checkBuildingOwnership()
 
 void CesTestsOwnership::failExit()
 {
-  DEBUG_LOG() << "FailExit";
+  DEBUG_LOG(m_logger) << "FailExit";
   m_bTestsSuccessful = false;
   QTimer::singleShot(50, qApp, QCoreApplication::quit);
 }
 
 void CesTestsOwnership::ExitSuccess()
 {
-  DEBUG_LOG() << "ExitSuccess";
+  DEBUG_LOG(m_logger) << "ExitSuccess";
   m_bTestsSuccessful = true;
   QTimer::singleShot(50, qApp, QCoreApplication::quit);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_ownership.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_ownership.h
index 61413577c..070d79f89 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_ownership.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_ownership.h
@@ -49,6 +49,7 @@ protected Q_SLOTS:
   void ExitSuccess();
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onSetOwnershipReply(const Core::FunctionReplyObject &replyObject) override final;
 
 private: // methods
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_simulated_movement.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_simulated_movement.cpp
index 4dd4be9d5..09809f7a1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_simulated_movement.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_simulated_movement.cpp
@@ -46,7 +46,7 @@ cesTestsSimulatedMovement::~cesTestsSimulatedMovement()
 bool cesTestsSimulatedMovement::init(int domainId, int exerciseId, int testId)
 {
   bool bRet = true;
-  INFO_LOG() << "init begin";
+  INFO_LOG(m_logger) << "init begin";
 
   m_testId = testId;
 
@@ -65,7 +65,7 @@ bool cesTestsSimulatedMovement::init(int domainId, int exerciseId, int testId)
 
 void cesTestsSimulatedMovement::startTest()
 {
-  INFO_LOG() << "startTest m_testId=" << m_testId;
+  INFO_LOG(m_logger) << "startTest m_testId=" << m_testId;
   if (m_testId <= 1) // 1 SMART
   {
     QTimer::singleShot(0, this, &cesTestsSimulatedMovement::tryCreateParticipant);
@@ -87,7 +87,7 @@ void cesTestsSimulatedMovement::startTest()
   }
   else
   {
-    ERROR_LOG() << "Unknown test id = " << m_testId;
+    ERROR_LOG(m_logger) << "Unknown test id = " << m_testId;
     failExit();
   }
   QTimer::singleShot(8000, this, &cesTestsSimulatedMovement::failExit);
@@ -96,13 +96,13 @@ void cesTestsSimulatedMovement::startTest()
 
 void cesTestsSimulatedMovement::checkParticipantEvent()
 {
-  INFO_LOG() << "checkParticipantEvent";
+  INFO_LOG(m_logger) << "checkParticipantEvent";
   m_cesDtc->waitForHistoricalDataParticipantEvent();
   CentralEffectSimulation::ParticipantEvent participantEvent0 = m_cesDtc->participantEvent(0);
   CentralEffectSimulation::ParticipantEvent participantEvent1 = m_cesDtc->participantEvent(1);
-  INFO_LOG() << "Recived ParicipantEvent equipmentNumber:" << participantEvent0.equipmentNumber()
+  INFO_LOG(m_logger) << "Recived ParicipantEvent equipmentNumber:" << participantEvent0.equipmentNumber()
                      << " eventType=" << participantEvent0.eventTypeId();
-  INFO_LOG() << "Recived ParicipantEvent equipmentNumber:" << participantEvent1.equipmentNumber()
+  INFO_LOG(m_logger) << "Recived ParicipantEvent equipmentNumber:" << participantEvent1.equipmentNumber()
                      << " eventType=" << participantEvent1.eventTypeId();
 
   switch (m_testId)
@@ -182,7 +182,7 @@ void cesTestsSimulatedMovement::trySimulatedMovementModifyRequest()
 
   if (!m_cesFtc->simulatedMovementModifyRequest(req, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
 
@@ -195,7 +195,7 @@ void cesTestsSimulatedMovement::trySimulatedMovementRemoveRequest()
 
   if (!m_cesFtc->simulatedMovementRemoveRequest(SimulatedMovementRemoveRequest(id), this))
   {
-    ERROR_LOG() << "Error requesting remove data";
+    ERROR_LOG(m_logger) << "Error requesting remove data";
     failExit();
   }
   QTest::qWait(2000);
@@ -210,10 +210,10 @@ void cesTestsSimulatedMovement::tryCreateParticipant()
   pt.id(m_participantId);
   pt.partyId(5);
 
-  DEBUG_LOG() << "Publishing  Participant";
+  DEBUG_LOG(m_logger) << "Publishing  Participant";
   if (!m_ppmDts->publish(pt))
   {
-    ERROR_LOG() << "Error requesting create Participant";
+    ERROR_LOG(m_logger) << "Error requesting create Participant";
     failExit();
   }
   QTest::qWait(2000);
@@ -222,25 +222,25 @@ void cesTestsSimulatedMovement::tryCreateParticipant()
 void cesTestsSimulatedMovement::onSimulatedMovementModifyReply(const Core::FunctionReplyObject &replyObject)
 {
   Q_UNUSED(replyObject);
-  INFO_LOG() << "onSimulatedMovementModifyReply()";
+  INFO_LOG(m_logger) << "onSimulatedMovementModifyReply()";
 }
 
 void cesTestsSimulatedMovement::onSimulatedMovementRemoveReply(const Core::FunctionReplyObject &replyObject)
 {
   Q_UNUSED(replyObject);
-  INFO_LOG() << "onSimulatedMovementRemoveReply()";
+  INFO_LOG(m_logger) << "onSimulatedMovementRemoveReply()";
 }
 
 void cesTestsSimulatedMovement::failExit()
 {
-  ERROR_LOG() << "FailExit";
+  ERROR_LOG(m_logger) << "FailExit";
   m_bTestsSuccessful = false;
   QTimer::singleShot(50, qApp, QCoreApplication::quit);
 }
 
 void cesTestsSimulatedMovement::ExitSuccess()
 {
-  INFO_LOG() << "ExitSuccess";
+  INFO_LOG(m_logger) << "ExitSuccess";
   m_bTestsSuccessful = true;
   QTimer::singleShot(200, qApp, &QCoreApplication::quit);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_simulated_movement.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_simulated_movement.h
index 5f259a07e..61fc4b88d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_simulated_movement.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_simulated_movement.h
@@ -50,6 +50,7 @@ protected Q_SLOTS:
 
 protected:
 
+  NGL::INGLLogger &m_logger;
 private: // methods
 
   void checkParticipantEvent();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_smart.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_smart.cpp
index b28eeb995..097292402 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_smart.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_smart.cpp
@@ -53,7 +53,7 @@ bool CesTestsSmart::init(int domainId, int exerciseId, int testId)
   bool bRet = true;
   int equipmentTypeIdVehicle = 35;
   int equipmentTypeIdSoldier = 30; // dds-Topic Participant-Management::Type
-  INFO_LOG() << "init begin";
+  INFO_LOG(m_logger) << "init begin";
 
   m_testId = testId;
   m_buildingId = 0; // ism_main_structure_element:id
@@ -141,7 +141,7 @@ bool CesTestsSmart::init(int domainId, int exerciseId, int testId)
 
 void CesTestsSmart::startTest()
 {
-  INFO_LOG() << "startTest m_testId=" << m_testId;
+  INFO_LOG(m_logger) << "startTest m_testId=" << m_testId;
   if (m_testId <= 1) // 1 SMART
   {
     m_explosionSingle = m_housePos.geographic(5, 5);
@@ -163,7 +163,7 @@ void CesTestsSmart::startTest()
   }
   else
   {
-    ERROR_LOG() << "Unknown test id = " << m_testId;
+    ERROR_LOG(m_logger) << "Unknown test id = " << m_testId;
     failExit();
   }
   QTimer::singleShot(8000, this, &CesTestsSmart::failExit);
@@ -185,10 +185,10 @@ void CesTestsSmart::tryCreateDynamicParticipantData()
   dp.sampleTime(esTime);
   m_DynamicParticipantIndex++;
 
-  DEBUG_LOG() << "Publishing  DynamicParticipantData";
+  DEBUG_LOG(m_logger) << "Publishing  DynamicParticipantData";
   if (!m_ppmDts->publish(dp))
   {
-    ERROR_LOG() << "Error requesting create ParticipantPosition";
+    ERROR_LOG(m_logger) << "Error requesting create ParticipantPosition";
     failExit();
   }
 }
@@ -212,10 +212,10 @@ void CesTestsSmart::tryCreateParticipantPosition()
   pp.sampleTime(posTime);
   pp.pos(pos);
 
-  DEBUG_LOG() << "Publishing  ParticipantPosition";
+  DEBUG_LOG(m_logger) << "Publishing  ParticipantPosition";
   if (!m_ppmDts->publish(pp))
   {
-    ERROR_LOG() << "Error requesting create ParticipantPosition";
+    ERROR_LOG(m_logger) << "Error requesting create ParticipantPosition";
     failExit();
   }
 }
@@ -229,17 +229,17 @@ void CesTestsSmart::tryCreateParticipant()
   pt.id(21);
   pt.equipmentNumber(61);
 
-  DEBUG_LOG() << "Publishing  Participant";
+  DEBUG_LOG(m_logger) << "Publishing  Participant";
   if (!m_ppmDts->publish(pt))
   {
-    ERROR_LOG() << "Error requesting create Participant";
+    ERROR_LOG(m_logger) << "Error requesting create Participant";
     failExit();
   }
 }
 
 void CesTestsSmart::checkParticipantEvent()
 {
-  INFO_LOG() << "checkParicipantEvent m_cesDtc->participantEvents().size() =" << m_cesDtc->participantEvents().size();
+  INFO_LOG(m_logger) << "checkParicipantEvent m_cesDtc->participantEvents().size() =" << m_cesDtc->participantEvents().size();
   m_cesDtc->waitForHistoricalDataParticipantEvent();
   CentralEffectSimulation::ParticipantEvent participantEvent0 = m_cesDtc->participantEvent(0);
   CentralEffectSimulation::ParticipantEvent participantEvent1 = m_cesDtc->participantEvent(1);
@@ -247,7 +247,7 @@ void CesTestsSmart::checkParticipantEvent()
   for ( int i = 0; i < m_cesDtc->participantEvents().size(); i++)
   {
     CentralEffectSimulation::ParticipantEvent participantEvent = m_cesDtc->participantEvent(i);
-    INFO_LOG() << "Recived ParicipantEvent equipmentNumber:"<<participantEvent.equipmentNumber()
+    INFO_LOG(m_logger) << "Recived ParicipantEvent equipmentNumber:"<<participantEvent.equipmentNumber()
                      << " eventType="<<participantEvent.eventTypeId();
   }
 
@@ -262,7 +262,7 @@ void CesTestsSmart::checkParticipantEvent()
     break;
   default:
     // nothing
-    ERROR_LOG() << "Error checkParticipantEvent";
+    ERROR_LOG(m_logger) << "Error checkParticipantEvent";
     failExit();
     break;
   }
@@ -283,10 +283,10 @@ void CesTestsSmart::tryCreateTypeVehicle()
   ty.name("HMMWV Utility");
 
 
-  DEBUG_LOG() << "Publishing  Type";
+  DEBUG_LOG(m_logger) << "Publishing  Type";
   if (!m_ppmDts->publish(ty))
   {
-    ERROR_LOG() << "Error requesting create Type";
+    ERROR_LOG(m_logger) << "Error requesting create Type";
     failExit();
   }
 }
@@ -304,10 +304,10 @@ void CesTestsSmart::tryCreateTypeSoldier()
   ty.name("Soldier");
 
 
-  DEBUG_LOG() << "Publishing  Type";
+  DEBUG_LOG(m_logger) << "Publishing  Type";
   if (!m_ppmDts->publish(ty))
   {
-    ERROR_LOG() << "Error requesting create Type";
+    ERROR_LOG(m_logger) << "Error requesting create Type";
     failExit();
   }
 }
@@ -318,7 +318,7 @@ static void setPos(std::vector<Core::GeoPosition> &cont, const QPointF &pos)
 
 void CesTestsSmart::tryCreateAesItemViewSingleExplosion()
 {
-  INFO_LOG() << "trying to send AesItemView AtExplosionAreaSingleExplosions";
+  INFO_LOG(m_logger) << "trying to send AesItemView AtExplosionAreaSingleExplosions";
 
   AreaEffectSimulation::AesItemView iv;
   iv.effectStateId(AreaEffectSimulation::AesEffectState_def::EsActivated);
@@ -343,30 +343,30 @@ void CesTestsSmart::tryCreateAesItemViewSingleExplosion()
   setPos(iv.form(), m_housePos.geographic(-10,  20));
   setPos(iv.form(), m_housePos.geographic(-10,  30));
 
-  DEBUG_LOG() << "Publishing  AesItemView";
+  DEBUG_LOG(m_logger) << "Publishing  AesItemView";
   if (!m_aesDts->publish(iv))
   {
-    ERROR_LOG() << "Error requesting create AesItemViewSingleExplosions";
+    ERROR_LOG(m_logger) << "Error requesting create AesItemViewSingleExplosions";
     failExit();
   }
 }
 
 void CesTestsSmart::tryCreateChargeType()
 {
-  DEBUG_LOG() << "Publishing  ChargeType";
+  DEBUG_LOG(m_logger) << "Publishing  ChargeType";
   ProjectDataManagement::ChargeType ct;
   ct.id(m_chargeTypeId);
   ct.properties("{\"impactRadius\":25,\"impactEdgeLength\":50,\"isSmart\":true,\"searchRadius\":150}");
   if (!m_pdmDts->publish(ct))
   {
-    ERROR_LOG() << "Error publish ChargeType";
+    ERROR_LOG(m_logger) << "Error publish ChargeType";
     failExit();
   }
 }
 
 void CesTestsSmart::tryCreatePrepareExplosionSingle()
 {
-  INFO_LOG() << "trying to send ExplosionSingle";
+  INFO_LOG(m_logger) << "trying to send ExplosionSingle";
   AreaEffectSimulation::ExplosionSingle es;
   const qint64 time = QDateTime::currentMSecsSinceEpoch();
   const rti::core::int64 esTime = static_cast<rti::core::int64>(time);
@@ -382,17 +382,17 @@ void CesTestsSmart::tryCreatePrepareExplosionSingle()
   es.isCentral(true);
   es.effectStart ( QDateTime::currentMSecsSinceEpoch() + 2000);
 
-  DEBUG_LOG() << "Publishing ExplosionSingle";
+  DEBUG_LOG(m_logger) << "Publishing ExplosionSingle";
   if (!m_aesDts->publish(es))
   {
-    ERROR_LOG() << "Error publish ExplosionArea";
+    ERROR_LOG(m_logger) << "Error publish ExplosionArea";
     failExit();
   }
 }
 
 void CesTestsSmart::tryCreateExplosionSingle()
 {
-  INFO_LOG() << "trying to send ExplosionSingle";
+  INFO_LOG(m_logger) << "trying to send ExplosionSingle";
   AreaEffectSimulation::ExplosionSingle es;
   const qint64 time = QDateTime::currentMSecsSinceEpoch();
   const rti::core::int64 esTime = static_cast<rti::core::int64>(time);
@@ -410,10 +410,10 @@ void CesTestsSmart::tryCreateExplosionSingle()
   es.sampleTime(esTime);
   es.chargeStruct().chargeTypeId(m_chargeTypeId);
 
-  DEBUG_LOG() << "Publishing ExplosionSingle";
+  DEBUG_LOG(m_logger) << "Publishing ExplosionSingle";
   if (!m_aesDts->publish(es))
   {
-    ERROR_LOG() << "Error publish ExplosionArea";
+    ERROR_LOG(m_logger) << "Error publish ExplosionArea";
     failExit();
   }
 }
@@ -433,7 +433,7 @@ void CesTestsSmart::onSendCesHitRequest(const rti::core::SampleIdentity &cookie,
   QDateTime dateTime;
   dateTime.setMSecsSinceEpoch(msecs);
 
-  DEBUG_LOG() << "onSendCesHitRequest" << "\n"
+  DEBUG_LOG(m_logger) << "onSendCesHitRequest" << "\n"
                       << " request.aesId() = "                   << request.aesId() << "\n"
                       << " request.chargeTypeId() = "            << request.chargeTypeId() << "\n"
                       << " request.equipmentNumber() = "         << request.equipmentNumber() << "\n"
@@ -448,14 +448,14 @@ void CesTestsSmart::onSendCesHitRequest(const rti::core::SampleIdentity &cookie,
 
 void CesTestsSmart::failExit()
 {
-  DEBUG_LOG() << "FailExit";
+  DEBUG_LOG(m_logger) << "FailExit";
   m_bTestsSuccessful = false;
   QTimer::singleShot(50, qApp, QCoreApplication::quit);
 }
 
 void CesTestsSmart::ExitSuccess()
 {
-  DEBUG_LOG() << "ExitSuccess";
+  DEBUG_LOG(m_logger) << "ExitSuccess";
   m_bTestsSuccessful = true;
   QTimer::singleShot(200, qApp, &QCoreApplication::quit);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_smart.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_smart.h
index ca252d82f..0d050072f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_smart.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_smart.h
@@ -59,6 +59,7 @@ protected Q_SLOTS:
 
 protected:
 
+  NGL::INGLLogger &m_logger;
 private: // methods
 
   void checkParticipantEvent();
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 4657b1c25..89af757b5 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
@@ -38,7 +38,7 @@ bool HandlerArtillerieSound::init()
 
   if (Settings::cesPlayArtillerieSounds())
   {
-    DEBUG_LOG() << "init with Artillerie-Sounds";
+    DEBUG_LOG(m_logger) << "init with Artillerie-Sounds";
     auto dtcAes = m_ddsHandler->dtcAes();
 
     dtcAes->enableExplosionSingle();
@@ -50,7 +50,7 @@ bool HandlerArtillerieSound::init()
             this, &HandlerArtillerieSound::onTechnicalAreaChanged);
   }
   else
-    DEBUG_LOG() << "init without Artillerie-Sounds";
+    DEBUG_LOG(m_logger) << "init without Artillerie-Sounds";
   return true;
 } // end of init()
 //-----------------------------------------------------------------------------
@@ -68,7 +68,7 @@ void HandlerArtillerieSound::onExplosionSingleChanged(const AreaEffectSimulation
 
   if (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsRemoved)
   {
-    DEBUG_LOG() << "Remove SingleExplosion";
+    DEBUG_LOG(m_logger) << "Remove SingleExplosion";
     m_explosionSingleState.remove(data.id());
     return;
   }
@@ -77,28 +77,28 @@ void HandlerArtillerieSound::onExplosionSingleChanged(const AreaEffectSimulation
        m_explosionSingleState.value(data.id()) == AreaEffectSimulation::AesEffectState_def::EsFired) &&
       data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated)
   {
-    DEBUG_LOG() << "Handle SingleExplosion";
+    DEBUG_LOG(m_logger) << "Handle SingleExplosion";
     handleExplosion = true;
   }
   m_explosionSingleState.insert(data.id(), data.effectStateId());
 
 
-  DEBUG_LOG() << "Got ExplosionSingle State=" << data.effectStateId()
+  DEBUG_LOG(m_logger) << "Got ExplosionSingle State=" << data.effectStateId()
                       <<  " id=" << data.id();
   if (handleExplosion)
   {
-    DEBUG_LOG() << "Handle ExplosionSingle (EsActivated) HandlerArtillerieSound";
+    DEBUG_LOG(m_logger) << "Handle ExplosionSingle (EsActivated) HandlerArtillerieSound";
 
     auto assetPositions = m_handlerBuildingData->getAssetPositions();
     ///////////////////////////////////////////////////////////////////
     /// Play Sound to each EGCU and OSGU volume depends on distance
     ///////////////////////////////////////////////////////////////////
-    INFO_LOG() << "printAssetPositions: ";
+    INFO_LOG(m_logger) << "printAssetPositions: ";
     QHashIterator<int, CentralEffectSimulation::HandlerBuildingData::AssetPosition> i(assetPositions);
     while (i.hasNext())
     {
       i.next();
-      INFO_LOG() << "printAssetPositions: "
+      INFO_LOG(m_logger) << "printAssetPositions: "
                          << i.key() << ": " << i.value().structureElementId
                          << " type = " << i.value().mountingPointType
                          << " hostname =" << i.value().hostname
@@ -113,7 +113,7 @@ void HandlerArtillerieSound::onExplosionSingleChanged(const AreaEffectSimulation
       const qreal distanceThreshold = Settings::cesDistanceThreshold(); // [m]
       const qreal factor = Settings::cesFactor();
       const qreal cesReduceFactor = Settings::cesReduceFactor();
-      INFO_LOG() << "Distance to Explosion =" << distance
+      INFO_LOG(m_logger) << "Distance to Explosion =" << distance
                          << " hostname =" << i.value().hostname
                          << " distanceThreshold=" << distanceThreshold
                          << " factor=" << factor;
@@ -138,13 +138,13 @@ void HandlerArtillerieSound::playSound(QString &user, QString &passwd, const QSt
   url.setUrl(request);
   url.setUserName(user);
   url.setPassword(passwd);
-  DEBUG_LOG() << "startRequest: " << url.toString();
+  DEBUG_LOG(m_logger) << "startRequest: " << url.toString();
   startRequest(url);
 }
 
 void HandlerArtillerieSound::startRequest(const QUrl &requestedUrl)
 {
-  DEBUG_LOG() << "startRequest: " << requestedUrl.toString();
+  DEBUG_LOG(m_logger) << "startRequest: " << requestedUrl.toString();
   m_httpRequestAborted = false;
   auto reply = m_qnam.get(QNetworkRequest(requestedUrl));
   connect(reply, &QNetworkReply::finished, this, &HandlerArtillerieSound::httpFinished);
@@ -153,14 +153,14 @@ void HandlerArtillerieSound::startRequest(const QUrl &requestedUrl)
 
 void HandlerArtillerieSound::httpFinished()
 {
-  DEBUG_LOG() << "httpFinished";
+  DEBUG_LOG(m_logger) << "httpFinished";
   auto reply = qobject_cast<QNetworkReply *>(sender());
   if (!reply)
     return;
 
   if (m_httpRequestAborted)
   {
-    ERROR_LOG() << "httpRequestAborted";
+    ERROR_LOG(m_logger) << "httpRequestAborted";
     reply->deleteLater();
     return;
   }
@@ -169,7 +169,7 @@ void HandlerArtillerieSound::httpFinished()
   {
     QNetworkRequest request = reply->request();
     QUrl url = request.url();
-    ERROR_LOG() << "reply->error: " << reply->errorString()
+    ERROR_LOG(m_logger) << "reply->error: " << reply->errorString()
                         << " host=" << url.host()
                         << " query='" << url.query()
                         << "' '" << qUtf8Printable(url.toString()) << "'";
@@ -182,7 +182,7 @@ void HandlerArtillerieSound::httpFinished()
 
   //parse the reply JSON and display result in the UI
   const QByteArray json(reply->readAll());
-  DEBUG_LOG() << "Sucess " << json;
+  DEBUG_LOG(m_logger) << "Sucess " << json;
 
   reply->deleteLater();
 }
@@ -199,7 +199,7 @@ void HandlerArtillerieSound::onTechnicalAreaChanged(const AreaEffectSimulation::
 
   if (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsRemoved)
   {
-    DEBUG_LOG() << "Remove TechnicalArea";
+    DEBUG_LOG(m_logger) << "Remove TechnicalArea";
     m_technicalAreas.remove(data.id());
     return;
   }
@@ -207,14 +207,14 @@ void HandlerArtillerieSound::onTechnicalAreaChanged(const AreaEffectSimulation::
   {
     int zone = -1;
     m_technicalAreas.insert(data.id(), data);
-    DEBUG_LOG() << "Handle TechnicalArea HandlerArtillerieSound id=" << data.id();
+    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() << "Handle TechnicalArea HandlerArtillerieSound cornerButtomLeft = " << cornerButtomLeft.x() << "/" << cornerButtomLeft.y()
+    DEBUG_LOG(m_logger) << "Handle TechnicalArea HandlerArtillerieSound cornerButtomLeft = " << cornerButtomLeft.x() << "/" << cornerButtomLeft.y()
                         << " zone=" << zone;
-    DEBUG_LOG() << "Handle TechnicalArea HandlerArtillerieSound center           = " << center.x() << "/" << center.y()
+    DEBUG_LOG(m_logger) << "Handle TechnicalArea HandlerArtillerieSound center           = " << center.x() << "/" << center.y()
                         << " zone=" << zone;
   }
 } // onTechnicalAreaChanged
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/plugin.cpp
index 9ffe87d4a..07bf3137c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/plugin.cpp
@@ -61,7 +61,7 @@ bool CesArtillerySoundInterfaceImpl::init(int domainId, int exerciseId)
 {
   m_domainId = domainId;
   m_exerciseId = exerciseId;
-  INFO_LOG() << "CentralEffectSimulation2DInterfaceImpl::init()"
+  INFO_LOG(m_logger) << "CentralEffectSimulation2DInterfaceImpl::init()"
                      << " m_domainId=" << m_domainId
                      << " m_exerciseId=" << m_exerciseId;
 
@@ -74,11 +74,11 @@ bool CesArtillerySoundInterfaceImpl::init(int domainId, int exerciseId)
 
   if (!m_handlerArtillerieSound->init())
   {
-    ERROR_LOG() << "Initialisation m_handlerArtillerieSound failed.";
+    ERROR_LOG(m_logger) << "Initialisation m_handlerArtillerieSound failed.";
     return false;
   }
 
-  INFO_LOG() << "CentralEffectSimulation2DInterfaceImpl::init() return true";
+  INFO_LOG(m_logger) << "CentralEffectSimulation2DInterfaceImpl::init() return true";
   return true;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/plugin.h
index 2492b1393..a3bc8af41 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/plugin.h
@@ -78,6 +78,7 @@ private Q_SLOTS:
   bool init(int domainId, int exerciseId) override;
 private:
 
+NGL::INGLLogger &m_logger;
 private:
   CentralEffectSimulation::Plugin::DataProvider *m_pdp;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
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 5e5a1c351..6eac69952 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
@@ -25,7 +25,7 @@ HandlerParticipantBorderline::HandlerParticipantBorderline(const std::shared_ptr
   , m_handlerParticipant(participantHandler)
   , m_logger(CentralEffectSimulation::getLogger("Plugin.Basic.HandlerParticipantBorderline"))
 {
-  INFO_LOG() << "HandlerParticipantBorderline::HandlerParticipantBorderline";
+  INFO_LOG(m_logger) << "HandlerParticipantBorderline::HandlerParticipantBorderline";
 
 } // end of ctor()
 //-----------------------------------------------------------------------------
@@ -37,7 +37,7 @@ HandlerParticipantBorderline::~HandlerParticipantBorderline()
 
 bool HandlerParticipantBorderline::init()
 {
-  INFO_LOG() << "HandlerParticipantBorderline::init";
+  INFO_LOG(m_logger) << "HandlerParticipantBorderline::init";
   auto dtcAes = m_ddsHandler->dtcAes();
 
   dtcAes->waitForHistoricalDataBorderline(1000);
@@ -59,7 +59,7 @@ bool HandlerParticipantBorderline::init()
       return false;
   }
 
-  INFO_LOG() << "HandlerParticipantBorderline::init() finished. ";
+  INFO_LOG(m_logger) << "HandlerParticipantBorderline::init() finished. ";
   return true;
 } // end of init()
 //-----------------------------------------------------------------------------
@@ -69,7 +69,7 @@ void HandlerParticipantBorderline::onBorderlineChanged(const AreaEffectSimulatio
   switch (modType)
   {
   case DataModification::eRemoved:
-    DEBUG_LOG() << " remove Borderline- data.id()=" << data.id();
+    DEBUG_LOG(m_logger) << " remove Borderline- data.id()=" << data.id();
     m_borderlines.remove(data.id());
     break;
   case DataModification::eAdded:
@@ -85,7 +85,7 @@ void HandlerParticipantBorderline::onBorderlineChanged(const AreaEffectSimulatio
     case AreaEffectSimulation::AesEffectState_def::EsActivated:
     {
       BorderlineUtm borderline(data);
-      DEBUG_LOG() << "m_borderlines.insert id=" << data.id();
+      DEBUG_LOG(m_logger) << "m_borderlines.insert id=" << data.id();
       m_borderlines.insert(data.id(), borderline);
       break;
     }
@@ -105,12 +105,12 @@ void HandlerParticipantBorderline::onBorderlineChanged(const AreaEffectSimulatio
 
 bool HandlerParticipantBorderline::intersect(const QPolygonF &polygonf, const QLineF &linef) const
 {
-  DEBUG_LOG() << "line to check: " << CentralEffectSimulation::debug(linef.p1()) << " - " << CentralEffectSimulation::debug(linef.p2());
+  DEBUG_LOG(m_logger) << "line to check: " << CentralEffectSimulation::debug(linef.p1()) << " - " << CentralEffectSimulation::debug(linef.p2());
   QPointF a = polygonf.first();
   for (const QPointF &b : polygonf)
   {
     const QLineF segment(a, b);
-    DEBUG_LOG() << "segment:" << CentralEffectSimulation::debug(a) << " -  " << CentralEffectSimulation::debug(b);
+    DEBUG_LOG(m_logger) << "segment:" << CentralEffectSimulation::debug(a) << " -  " << CentralEffectSimulation::debug(b);
     if (QLineF::BoundedIntersection == linef.intersect(segment, nullptr))
       return true;
     a = b;
@@ -122,14 +122,14 @@ bool HandlerParticipantBorderline::intersect(const QPolygonF &polygonf, const QL
 void HandlerParticipantBorderline::onParticipantPositionChanged(const CentralEffectSimulation::HandlerParticipant::CesParticipantData &partPos)
 {
   // Bounding Box von der Linie
-  DEBUG_LOG() << "ParicipantStep "
+  DEBUG_LOG(m_logger) << "ParicipantStep "
                       << " participantId=" << partPos.participantId()
                       << " participantTypeId=" << partPos.participantTypeId()
                       << " Anzahl Borderlines=" << m_borderlines.size();
 
   for (const BorderlineUtm &borderline : std::as_const(m_borderlines))
   {
-    DEBUG_LOG() << "borderline id = " << borderline.id
+    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);
@@ -139,7 +139,7 @@ void HandlerParticipantBorderline::onParticipantPositionChanged(const CentralEff
     // Intersection von Polygon und Line: Polygon = Borderline, Line from last Participant pos to actual participant pos
     const QLineF utmStep(utmStepPoly[0], utmStepPoly[1]);
     const bool result = intersect(borderline.points, utmStep);
-    DEBUG_LOG() << "result intersection = " << result;
+    DEBUG_LOG(m_logger) << "result intersection = " << result;
     if (result)
     {
       if (borderline.operatorId <= 0)
@@ -175,7 +175,7 @@ void HandlerParticipantBorderline::sendParticipantEvent(const BorderlineUtm &bor
     return;
 
   CentralEffectSimulation::ParticipantEvent pe;
-  DEBUG_LOG() << "sendParticipantEvent participantId=" << participantPosition.participantId()
+  DEBUG_LOG(m_logger) << "sendParticipantEvent participantId=" << participantPosition.participantId()
                       << " lat= " << participantPosition.pos().lat()
                       << " lon= " << participantPosition.pos().lon()
                       << " equipmentNumber=" << equipmentNumber
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 508c66375..ee80a20b7 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
@@ -52,18 +52,18 @@ bool HandlerSimulatedMovement::loadSimulatedMovementFromDb()
   QVector<CentralEffectSimulation::Database::CesSimulatedMovement> simMoveVec;
   if (!m_db->select(simMoveVec))
   {
-    ERROR_LOG() << "Error reading data from database 'CesSimulatedMovement'";
+    ERROR_LOG(m_logger) << "Error reading data from database 'CesSimulatedMovement'";
     return false;
   }
-  DEBUG_LOG() << "loadSimulatedMovementFromDb size =" << simMoveVec.size();
+  DEBUG_LOG(m_logger) << "loadSimulatedMovementFromDb size =" << simMoveVec.size();
 
   QVector<CentralEffectSimulation::Database::CesSimulatedMovementSegment> simMoveSegVec;
   if (!m_db->select(simMoveSegVec))
   {
-    ERROR_LOG() << "Error reading data from database 'CesSimulatedMovementSegment'";
+    ERROR_LOG(m_logger) << "Error reading data from database 'CesSimulatedMovementSegment'";
     return false;
   }
-  DEBUG_LOG() << "loadSimulatedMovementSegmentsFromDb size =" << simMoveSegVec.size();
+  DEBUG_LOG(m_logger) << "loadSimulatedMovementSegmentsFromDb size =" << simMoveSegVec.size();
 
   // add to internal buffer
   for (const CentralEffectSimulation::Database::CesSimulatedMovement &data : std::as_const(simMoveVec))
@@ -75,7 +75,7 @@ bool HandlerSimulatedMovement::loadSimulatedMovementFromDb()
     request.participantId(data.participantId);
     request.repeat(data.repeat);
     request.nextPoint(data.nextpoint);
-    DEBUG_LOG() << "Loading SimulatedMovement: " << request;
+    DEBUG_LOG(m_logger) << "Loading SimulatedMovement: " << request;
 
     QMap <int, CentralEffectSimulation::Database::CesSimulatedMovementSegment> segDbMap; // QMap to get it sorted
     for (const CentralEffectSimulation::Database::CesSimulatedMovementSegment &segData : std::as_const(simMoveSegVec))
@@ -115,7 +115,7 @@ Core::FunctionReplyObject HandlerSimulatedMovement::insertInDb(const CentralEffe
 
   if (!m_db->insert(newSimulatedMovement))
     return Core::FunctionReplyObject(0, tr_lts("dds", "Error adding 'CesSimulatedMovement' to database"));
-  DEBUG_LOG() << "newSimulatedMovement.id = " << newSimulatedMovement.id;
+  DEBUG_LOG(m_logger) << "newSimulatedMovement.id = " << newSimulatedMovement.id;
 
   CentralEffectSimulation::Database::CesSimulatedMovementSegment newSegment;
   newSegment.simulatedMovementId = newSimulatedMovement.id;
@@ -134,7 +134,7 @@ Core::FunctionReplyObject HandlerSimulatedMovement::insertInDb(const CentralEffe
 
   trans.commit();
 
-  DEBUG_LOG() << "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
 
@@ -143,7 +143,7 @@ Core::FunctionReplyObject HandlerSimulatedMovement::updateDb(const CentralEffect
   CentralEffectSimulation::Database::CesSimulatedMovement newSimulatedMovement(SimulationMovement::toDb(request));
   if (!m_db->update(newSimulatedMovement))
     return Core::FunctionReplyObject(0, tr_lts("dds", "Error update 'CesSimulatedMovement' to database"));
-  DEBUG_LOG() << "newSimulatedMovement.id = " << newSimulatedMovement.id;
+  DEBUG_LOG(m_logger) << "newSimulatedMovement.id = " << newSimulatedMovement.id;
 
 
   // First remove all participant-segments
@@ -164,14 +164,14 @@ Core::FunctionReplyObject HandlerSimulatedMovement::updateDb(const CentralEffect
     ++newSegment.positionIndex;
   }
 
-  DEBUG_LOG() << "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
 
 
 Core::FunctionReplyObject HandlerSimulatedMovement::removeFromDb(const int32_t id)
 {
-  DEBUG_LOG() << "removeFromDb: id=" << id;
+  DEBUG_LOG(m_logger) << "removeFromDb: id=" << id;
   if (!m_db->removeCesSimulatedMovement(id))
     return Core::FunctionReplyObject(0, tr_lts("dds", "Error remove 'CesSimulatedMovement' from database"));
   return Core::FunctionReplyObject(id);
@@ -179,7 +179,7 @@ Core::FunctionReplyObject HandlerSimulatedMovement::removeFromDb(const int32_t i
 
 void HandlerSimulatedMovement::publishSimulatedMovement(const CentralEffectSimulation::SimulatedMovement &request)
 {
-  INFO_LOG() << "publishSimulatedMovement: " << request;
+  INFO_LOG(m_logger) << "publishSimulatedMovement: " << request;
   m_ddsHandler->dtsCes()->publish(request);
 }
 
@@ -189,25 +189,25 @@ void HandlerSimulatedMovement::setParticipantAsSimulated(const int &participantI
     return;
   ParticipantManagement::SetAsSimulated req(participantId,isSimulated);
   if (!m_ddsHandler->ftcPpm()->setAsSimulatedRequest(req, this))
-    ERROR_LOG() << "Error modify participant data participantId=" << participantId;
+    ERROR_LOG(m_logger) << "Error modify participant data participantId=" << participantId;
 }
 
 void HandlerSimulatedMovement::onModifyParticipantDataReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    WARNING_LOG() << "onModifyParticipantDataReply: " << replyObject();
+    WARNING_LOG(m_logger) << "onModifyParticipantDataReply: " << replyObject();
 }
 
 void HandlerSimulatedMovement::onSetAsSimulatedReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    WARNING_LOG() << "onSetAsSimulatedReply: " << replyObject();
+    WARNING_LOG(m_logger) << "onSetAsSimulatedReply: " << replyObject();
 }
 
 void HandlerSimulatedMovement::onSimulatedMovementModifyRequest(const rti::core::SampleIdentity &cookie,
                                                                 const CentralEffectSimulation::SimulatedMovement &request)
 {
-  DEBUG_LOG() << "onSimulatedMovementModifyRequest: " << request;
+  DEBUG_LOG(m_logger) << "onSimulatedMovementModifyRequest: " << request;
   m_jumpToStart = request.jumpToStart();
 
   // we allow a modify with requestId = 0 and participantId != 0
@@ -220,7 +220,7 @@ void HandlerSimulatedMovement::onSimulatedMovementModifyRequest(const rti::core:
   // New Route
   if (request.jumpToStart())
   {
-    DEBUG_LOG() << "sm->setJump(true)";
+    DEBUG_LOG(m_logger) << "sm->setJump(true)";
     sm->setJump(true);
   }
 
@@ -234,14 +234,14 @@ void HandlerSimulatedMovement::onSimulatedMovementModifyRequest(const rti::core:
 
   setParticipantAsSimulated(request.participantId(), true);
 
-  DEBUG_LOG() << "simulatedMovementModifyReply id=" << reply.id();
+  DEBUG_LOG(m_logger) << "simulatedMovementModifyReply id=" << reply.id();
 
   m_ddsHandler->ftsCes()->simulatedMovementModifyReply(cookie, reply);
 } // end onSimulatedMovementModifyRequest
 
 Core::FunctionReplyObject HandlerSimulatedMovement::removeSimulatedMovement(int32_t ddsId)
 {
-  DEBUG_LOG() << "removeSimulatedMovement with id " << ddsId << ", " << m_simulationMovements.size();
+  DEBUG_LOG(m_logger) << "removeSimulatedMovement with id " << ddsId << ", " << m_simulationMovements.size();
 
   if (ddsId <= 0)
     return Core::FunctionReplyObject(0, tr_lts("dds", "remove participant simulation "));
@@ -259,7 +259,7 @@ Core::FunctionReplyObject HandlerSimulatedMovement::removeSimulatedMovement(int3
     m_simulationMovements.erase(it);
   }
   if (participantId == -1)
-    WARNING_LOG() << "Could not find movement simulation with id " << ddsId << ", " << m_simulationMovements.size();
+    WARNING_LOG(m_logger) << "Could not find movement simulation with id " << ddsId << ", " << m_simulationMovements.size();
 
   setParticipantAsSimulated(participantId, false);
   return reply;
@@ -270,7 +270,7 @@ void HandlerSimulatedMovement::onSimulatedMovementRemoveRequest(const rti::core:
 {
   Core::FunctionReplyObject reply = removeSimulatedMovement(request.id());
   if (reply.error())
-    WARNING_LOG() << reply();
+    WARNING_LOG(m_logger) << reply();
   m_ddsHandler->ftsCes()->simulatedMovementRemoveReply(cookie, reply);
 
 } // end onSimulatedMovementRemoveRequest
@@ -278,7 +278,7 @@ void HandlerSimulatedMovement::onSimulatedMovementRemoveRequest(const rti::core:
 void HandlerSimulatedMovement::onSimulatedMovementRemoveByParticipantIdRequest(const rti::core::SampleIdentity &cookie,
                                                                                const CentralEffectSimulation::SimulatedMovementRemoveByParticipantId &request)
 {
-  DEBUG_LOG() << "onSimulatedMovementRemoveByParticipantIdRequest: " << request;
+  DEBUG_LOG(m_logger) << "onSimulatedMovementRemoveByParticipantIdRequest: " << request;
 
   int id = 0;
   for (const SimulationMovement *simMovement : std::as_const(m_simulationMovements))
@@ -291,7 +291,7 @@ void HandlerSimulatedMovement::onSimulatedMovementRemoveByParticipantIdRequest(c
   }
   Core::FunctionReplyObject reply = removeSimulatedMovement(id);
   if (reply.error())
-    WARNING_LOG() << reply();
+    WARNING_LOG(m_logger) << reply();
   m_ddsHandler->ftsCes()->simulatedMovementRemoveByParticipantIdReply(cookie, reply);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/plugin.cpp
index 6731b0c62..c9dd8d69e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/plugin.cpp
@@ -49,7 +49,7 @@ bool CesBasicInterfaceImpl::init(int domainId, int exerciseId)
 
   m_domainId = domainId;
   m_exerciseId = exerciseId;
-  INFO_LOG() << "CesBasicInterfaceImpl::init()"
+  INFO_LOG(m_logger) << "CesBasicInterfaceImpl::init()"
                      << " m_domainId=" << m_domainId
                      << " m_exerciseId=" << m_exerciseId;
 
@@ -63,7 +63,7 @@ bool CesBasicInterfaceImpl::init(int domainId, int exerciseId)
 
   if (!m_handlerParticipantBorderline->init())
   {
-    ERROR_LOG() << "Initialisation HandlerParticipantBorderline failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerParticipantBorderline failed.";
     return false;
   }
 
@@ -75,11 +75,11 @@ bool CesBasicInterfaceImpl::init(int domainId, int exerciseId)
 
   if (!m_handlerSimulatedMovement->init())
   {
-    ERROR_LOG() << "Initialisation m_handlerSimulatedMovement failed.";
+    ERROR_LOG(m_logger) << "Initialisation m_handlerSimulatedMovement failed.";
     return false;
   }
 
-  INFO_LOG() << "CentralEffectSimulationBasicInterfaceImpl::init() return true";
+  INFO_LOG(m_logger) << "CentralEffectSimulationBasicInterfaceImpl::init() return true";
   return true;
 }
 
@@ -87,8 +87,8 @@ QString CesBasicInterfaceImpl::echo(const QString &message)
 {
 
   QString ret(QStringLiteral("<<<< %1 >>>> CesBasicInterfaceImpl::echo").arg(message));
-  INFO_LOG() << "CesBasicInterfaceImpl::echo return:" << ret;
-  DEBUG_LOG() << "DEBUG: CesBasicInterfaceImpl::echo return:" << ret;
+  INFO_LOG(m_logger) << "CesBasicInterfaceImpl::echo return:" << ret;
+  DEBUG_LOG(m_logger) << "DEBUG: CesBasicInterfaceImpl::echo return:" << ret;
   return ret;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/plugin.h
index 322bedd2e..4ea95f815 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/plugin.h
@@ -63,6 +63,7 @@ private Q_SLOTS:
   bool init(int domainId, int exerciseId) override;
 private:
 
+NGL::INGLLogger &m_logger;
 private:
   CentralEffectSimulation::Plugin::DataProvider                              *m_pdp{nullptr};
   std::shared_ptr<DDSConnector::DdsConnector>                                 m_ddsConnector;
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 ea0e02909..fe7c4fe59 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
@@ -43,7 +43,7 @@ SimulationMovement::SimulationMovement(const std::shared_ptr<CentralEffectSimula
 
 SimulationMovement::~SimulationMovement()
 {
-  DEBUG_LOG() << "Delete SimulatedMovement "
+  DEBUG_LOG(m_logger) << "Delete SimulatedMovement "
                       << " id=" << m_simMovement.id()
                       << " participantId= " << m_simMovement.participantId();
   m_ddsHandler->dtsCes()->removeSimulatedMovementByKey(m_simMovement.id());
@@ -72,7 +72,7 @@ void SimulationMovement::setSimulatedMovementRequest(const CentralEffectSimulati
   {
     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() << "pointGeo lat=" << pointGeo.lat() << " lon=" << pointGeo.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());
@@ -80,7 +80,7 @@ void SimulationMovement::setSimulatedMovementRequest(const CentralEffectSimulati
   }
 
   // Only start simulation in future
-  DEBUG_LOG() << "m_startTime - QDateTime::currentMSecsSinceEpoch()=" << m_simMovement.startTime() - QDateTime::currentMSecsSinceEpoch()
+  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();
@@ -92,7 +92,7 @@ void SimulationMovement::setSimulatedMovementRequest(const CentralEffectSimulati
     m_moveTimer->start(m_simMovement.startTime() - QDateTime::currentMSecsSinceEpoch());
   else
   {
-    DEBUG_LOG() << "Service-Start";
+    DEBUG_LOG(m_logger) << "Service-Start";
     m_moveTimer->start(10); // Service-Start
   }
 }
@@ -101,7 +101,7 @@ void SimulationMovement::updateNextPointInDb()
 {
   if (m_simMovement.id() <= 0)
   {
-    WARNING_LOG() << "Internal error - id not set!";
+    WARNING_LOG(m_logger) << "Internal error - id not set!";
     return;
   }
   CentralEffectSimulation::Database::CesSimulatedMovement dbSim = toDb(m_simMovement);
@@ -111,7 +111,7 @@ void SimulationMovement::updateNextPointInDb()
 
 void SimulationMovement::startNewSegment()
 {
-  DEBUG_LOG() << "simulate participantId = " << m_simMovement.participantId()
+  DEBUG_LOG(m_logger) << "simulate participantId = " << m_simMovement.participantId()
                       << " m_nextPoint = " << m_simMovement.nextPoint();
 
   m_moveTime = 1;
@@ -123,31 +123,31 @@ void SimulationMovement::startNewSegment()
     if (pos.participantId() == m_simMovement.participantId())
     {
       p1 = CentralEffectSimulation::geographic2Utm(pos.pos(), m_zone);
-      DEBUG_LOG() << "Next segment ParticipantPosition =" << CentralEffectSimulation::debug(p1);
+      DEBUG_LOG(m_logger) << "Next segment ParticipantPosition =" << CentralEffectSimulation::debug(p1);
     }
     else
     {
       if (m_simStart)  // Wait for participantPosition
       {
-        INFO_LOG() << "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)
       {
         p1 = m_points.at(m_simMovement.participantId() - 1);
-        DEBUG_LOG() << "nextPoint>0 (" << m_simMovement.nextPoint() << ") ParticipantPosition =" << CentralEffectSimulation::debug(p1);
+        DEBUG_LOG(m_logger) << "nextPoint>0 (" << m_simMovement.nextPoint() << ") ParticipantPosition =" << CentralEffectSimulation::debug(p1);
       }
       else
       {
         p1 = m_points.at(m_points.size() - 1);
-        DEBUG_LOG() << "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());
     m_actSegment.setPoints(p1, p2);
     int curDelay = m_segDelay.at(m_simMovement.nextPoint());
-    DEBUG_LOG() << "New Segment: p1 = " << CentralEffectSimulation::debug(p1) << " p2=" << CentralEffectSimulation::debug(p2)
+    DEBUG_LOG(m_logger) << "New Segment: p1 = " << CentralEffectSimulation::debug(p1) << " p2=" << CentralEffectSimulation::debug(p2)
                         << " delay =" << curDelay;
     m_moveTimer->start(curDelay);
   }
@@ -165,7 +165,7 @@ void SimulationMovement::startNewSegment()
 
 void SimulationMovement::setJump(bool jump)
 {
-  DEBUG_LOG() << "Jump";
+  DEBUG_LOG(m_logger) << "Jump";
   if (jump)
   {
     m_simMovement.nextPoint(1);
@@ -175,13 +175,13 @@ void SimulationMovement::setJump(bool jump)
     m_moveTime = 1;
     m_simStart = false;
     publishNewPos();
-    DEBUG_LOG() << "Jump done";
+    DEBUG_LOG(m_logger) << "Jump done";
   }
 }
 
 void SimulationMovement::publishSimulatedMovement()
 {
-  DEBUG_LOG() << " m_nextPoint= " << m_simMovement.nextPoint();
+  DEBUG_LOG(m_logger) << " m_nextPoint= " << m_simMovement.nextPoint();
   m_ddsHandler->dtsCes()->publish(m_simMovement);
 }
 
@@ -195,7 +195,7 @@ void SimulationMovement::publishNewPos()
   utmPos.x = m_newPos.x();
   utmPos.y = m_newPos.y();
   const QPointF posGeo = utmPos.geographic();
-  DEBUG_LOG() << "participantPos zone=" << utmPos.zone
+  DEBUG_LOG(m_logger) << "participantPos zone=" << utmPos.zone
                       << " northp=" << utmPos.northp
                       << " x=" << utmPos.x
                       << " y=" << utmPos.y;
@@ -213,10 +213,10 @@ void SimulationMovement::publishNewPos()
 
 void SimulationMovement::move()
 {
-  DEBUG_LOG() << "move";
+  DEBUG_LOG(m_logger) << "move";
   if (m_simMovement.nextPoint() < 0)
   {
-    DEBUG_LOG() << "move next point < 0";
+    DEBUG_LOG(m_logger) << "move next point < 0";
     return;
   }
 
@@ -224,17 +224,17 @@ void SimulationMovement::move()
   const QPointF participantPosUtm = CentralEffectSimulation::geographic2Utm(partPos.pos(), m_zone);
   if (partPos.participantId() != m_simMovement.participantId())
   {
-    DEBUG_LOG() << "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() << "move no ParticipantId=" << m_simMovement.participantId();
+    DEBUG_LOG(m_logger) << "move no ParticipantId=" << m_simMovement.participantId();
     m_moveTimer->start(1000);
     return;
   }
-  DEBUG_LOG() << " pos=" << CentralEffectSimulation::debug(participantPosUtm);
+  DEBUG_LOG(m_logger) << " pos=" << CentralEffectSimulation::debug(participantPosUtm);
 
   QLineF step = m_actSegment;
   if (m_simStart)
@@ -242,7 +242,7 @@ void SimulationMovement::move()
     m_actSegment.setPoints(participantPosUtm,
                            m_points.at(m_simMovement.nextPoint()));
     step = m_actSegment;
-    DEBUG_LOG() << "m_simStart set m_actSegment"
+    DEBUG_LOG(m_logger) << "m_simStart set m_actSegment"
                         << " p1: " << CentralEffectSimulation::debug(m_actSegment.p1())
                         << " p2: " << CentralEffectSimulation::debug(m_actSegment.p2());
     m_simStart = false;
@@ -250,7 +250,7 @@ void SimulationMovement::move()
 
   if (m_segSpeed[m_simMovement.nextPoint()] <= 0.0)
   {
-    DEBUG_LOG() << "move next point < 0";
+    DEBUG_LOG(m_logger) << "move next point < 0";
     return;
   }
 
@@ -261,7 +261,7 @@ void SimulationMovement::move()
   if (step.length() >= m_actSegment.length() + 0.1 ||
       step.length() < 0.1) // 0.1 Magic Number but 10 cm distance to Point is arrived
   {
-    DEBUG_LOG() << "move ready step.length()=" << step.length()
+    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())
@@ -275,7 +275,7 @@ void SimulationMovement::move()
       }
     }
     updateNextPointInDb();
-    DEBUG_LOG() << "ready move participantId = " << m_simMovement.participantId()
+    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
@@ -291,7 +291,7 @@ void SimulationMovement::move()
     return;
   }
   m_newPos = step.p2();
-  DEBUG_LOG() << "move participantId = " << m_simMovement.participantId()
+  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
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 f02f04d17..3b2f43829 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
@@ -91,14 +91,14 @@ bool BuildingModel::init(
 )
 {
   m_buildingId = buildingId;
-  TRACE_LOG() << Q_FUNC_INFO << " START, m_buildingId=" << m_buildingId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " 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()};
 
-  DEBUG_LOG() << Q_FUNC_INFO << " START, m_buildingId=" << m_buildingId
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, m_buildingId=" << m_buildingId
                       << ", m_angle=" << m_angle
                       << ", m_refPosGeo=" << m_refPosGeo
                       << ", m_refPos=" << m_refPos;
@@ -108,7 +108,7 @@ bool BuildingModel::init(
     m_footprint << QPointF(footprintElement.relPosition().offsetX(), footprintElement.relPosition().offsetY());
   if (m_footprint.isEmpty())
   {
-    ERROR_LOG() << "Error reading MainFootprint for building " << m_buildingId;
+    ERROR_LOG(m_logger) << "Error reading MainFootprint for building " << m_buildingId;
     return false;
   } // if
   m_boundingRect = m_footprint.boundingRect();
@@ -117,7 +117,7 @@ bool BuildingModel::init(
 //  QByteArray array = qUncompress(QByteArray::fromRawData(reinterpret_cast<const char*>(&data[0]), data.size()));
   if (!BuildingControlUnit::VWM::XmlReader::readBuilding(vmd, *this))
   {
-    ERROR_LOG() << "Error reading VulnerabilityModelData for building " << m_buildingId;
+    ERROR_LOG(m_logger) << "Error reading VulnerabilityModelData for building " << m_buildingId;
     return false;
   } // if
 
@@ -130,7 +130,7 @@ bool BuildingModel::init(
           if (point.z() > m_height)
             m_height = point.z();
 
-  TRACE_LOG() << Q_FUNC_INFO << " END, m_buildingId=" << m_buildingId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, m_buildingId=" << m_buildingId;
   return true;
 }
 
@@ -141,7 +141,7 @@ bool BuildingModel::init(
 
 bool BuildingModel::hasIntersectionSimplified(const LtsUtils::QPoint3D &start, const LtsUtils::QPoint3D &end) const
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " m_buildingId=" << m_buildingId
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " m_buildingId=" << m_buildingId
                       << ", start=" << start << ", end=" << end;
 
   // keep origin of QRect (topLeft) in mind:
@@ -230,7 +230,7 @@ bool BuildingModel::hasIntersection(const LtsUtils::QPoint3D &start, const LtsUt
 
   bool bHasIntersection = BuildingControlUnit::VWM::Math::hasIntersection(start, end, rooms());
 
-  DEBUG_LOG() << Q_FUNC_INFO << " m_buildingId=" << m_buildingId
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " m_buildingId=" << m_buildingId
                       << ", start=" << start << ", end=" << end
                       << ", rooms().size()" << rooms().size()
                       << ", bHasIntersection=" << bHasIntersection;
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 c490119e0..0c4831b2d 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
@@ -91,7 +91,7 @@ bool HandlerAesData::init()
 
 void HandlerAesData::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap &data, DataModification modType)
 {
-  DEBUG_LOG() << "onBoobyTrapChanged"
+  DEBUG_LOG(m_logger) << "onBoobyTrapChanged"
                       << " id=" << data.id()
                       << " impactPosition=" << data.impactPosition()
                       << " impactRadius=" << data.impactRadius()
@@ -105,7 +105,7 @@ void HandlerAesData::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap &d
   if (!data.triggered())
     return;
 
-  INFO_LOG() << "HandlerParticipantBoobyTrap::onBoobyTrapChanged"
+  INFO_LOG(m_logger) << "HandlerParticipantBoobyTrap::onBoobyTrapChanged"
                      << " data.id=" << data.id()
                      << " effectStateId=" << data.effectStateId();
 
@@ -114,7 +114,7 @@ void HandlerAesData::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap &d
 
   if ((m_ddsHandler->currentPartitionTime() - (data.effectStart().get() + data.effectDuration())) > 2000)
   {
-    INFO_LOG() << "onBoobyTrap outdated";
+    INFO_LOG(m_logger) << "onBoobyTrap outdated";
     return;
   }
   AreaEffectSimulation::AesItemView itemView;
@@ -131,16 +131,16 @@ void HandlerAesData::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap &d
 
 void HandlerAesData::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &data, DataModification modType)
 {
-  DEBUG_LOG() << "onAesItemViewChanged"
+  DEBUG_LOG(m_logger) << "onAesItemViewChanged"
                       << " data.aesTypeId()=" <<  data.aesTypeId();
   if (modType != DataModification::eAdded &&
       modType != DataModification::eModified)
     return;
 
-  DEBUG_LOG() << "Got AesItemView: " << data.effectStateId();
+  DEBUG_LOG(m_logger) << "Got AesItemView: " << data.effectStateId();
   if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired)
   {
-    INFO_LOG() << "AesEffectState_def::EsExpired"
+    INFO_LOG(m_logger) << "AesEffectState_def::EsExpired"
                        << " currentPartitionTime=" << m_ddsHandler->currentPartitionTime()
                        << " effectStart=" <<  data.effectStart()
                        << " diff = " << m_ddsHandler->currentPartitionTime() - data.effectStart() ;
@@ -153,61 +153,61 @@ void HandlerAesData::onAesItemViewChanged(const AreaEffectSimulation::AesItemVie
 
       if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary)
       {
-        DEBUG_LOG() << "AtOffRouteMineSecondary id=" << data.id() / 1000;
+        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() << "!offRouteMine.effectStart().is_set()";
+          DEBUG_LOG(m_logger) << "!offRouteMine.effectStart().is_set()";
           return;
         }
-        DEBUG_LOG() << " currentPartitionTime=" << m_ddsHandler->currentPartitionTime()
+        DEBUG_LOG(m_logger) << " currentPartitionTime=" << m_ddsHandler->currentPartitionTime()
                             << " 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)
         {
-          DEBUG_LOG() << "AtBoobyTrapSecondary Mine wird ausgeloeset.";
+          DEBUG_LOG(m_logger) << "AtBoobyTrapSecondary Mine wird ausgeloeset.";
           checkBuildingsHit(data);
         }
         else
         {
-          DEBUG_LOG() << "outdated return";
+          DEBUG_LOG(m_logger) << "outdated return";
 
           return;
         }
       }
       if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary)
       {
-        DEBUG_LOG() << "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())
         {
-          DEBUG_LOG() << "!offRouteMine.effectStart().is_set()";
+          DEBUG_LOG(m_logger) << "!offRouteMine.effectStart().is_set()";
           return;
         }
-        DEBUG_LOG() << " currentPartitionTime=" << m_ddsHandler->currentPartitionTime()
+        DEBUG_LOG(m_logger) << " currentPartitionTime=" << m_ddsHandler->currentPartitionTime()
                             << " 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)
         {
-          DEBUG_LOG() << "AtBoobyTrapSecondary Mine wird ausgeloeset.";
+          DEBUG_LOG(m_logger) << "AtBoobyTrapSecondary Mine wird ausgeloeset.";
           checkBuildingsHit(data);
         }
         else
         {
-          DEBUG_LOG() << "outdated return";
+          DEBUG_LOG(m_logger) << "outdated return";
 
           return;
         }
       }
 
-      DEBUG_LOG() << "removeStates data";
+      DEBUG_LOG(m_logger) << "removeStates data";
       removeStates(data);
-      DEBUG_LOG() << "m_aesItemViewsUtm remove id" << data.aesItemId();
+      DEBUG_LOG(m_logger) << "m_aesItemViewsUtm remove id" << data.aesItemId();
       m_aesItemViewsUtm.remove(data.aesItemId());
     }
   }
@@ -217,7 +217,7 @@ void HandlerAesData::removeStates(const AreaEffectSimulation::AesItemView &data)
 {
   if (data.aesTypeId() != AreaEffectSimulation::AesType_def::AtExplosionArea)
     return;
-  DEBUG_LOG() << "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());
@@ -228,7 +228,7 @@ void HandlerAesData::calculateBuildingExplosion(const AreaEffectSimulation::Char
                                                 const int id)
 {
   const double impactRadius = m_ddsHandler->chargeTypeRadius(chargeStruct);
-  DEBUG_LOG() << "Handle ExplosionSingle (EsActivated)"
+  DEBUG_LOG(m_logger) << "Handle ExplosionSingle (EsActivated)"
                       << ", m_handlerBuildingData.getFootprints().size =" << m_handlerBuildingData->getFootprints().size();
 
   QHash<int, CentralEffectSimulation::HandlerBuildingData::Footprint>  footprints = m_handlerBuildingData->getFootprints();
@@ -241,7 +241,7 @@ void HandlerAesData::calculateBuildingExplosion(const AreaEffectSimulation::Char
     const Core::GeoPosition2D impactPosition2D(impactPosition.lon(), impactPosition.lat());
     if (inFootprint(impactPosition, footprint, impactRadius))
     {
-      DEBUG_LOG() << "ftc sendCESHitOnBuilding mseId = " << footprint.mseId
+      DEBUG_LOG(m_logger) << "ftc sendCESHitOnBuilding mseId = " << footprint.mseId
                           << " chargeTypeId = " << chargeStruct.chargeTypeId()
                           << " id = " << id
                           << " currentPartitionTime = " << m_ddsHandler->currentPartitionTime()
@@ -260,9 +260,9 @@ void HandlerAesData::calculateBuildingExplosion(const AreaEffectSimulation::Char
       m_ddsHandler->ftcBld()->sendCesHitOnBuildingRequest(requestBld, this);
     }
     else
-      DEBUG_LOG() << "Not sendCESHitOnBuilding mseId = " << footprint.mseId;
+      DEBUG_LOG(m_logger) << "Not sendCESHitOnBuilding mseId = " << footprint.mseId;
 
-    DEBUG_LOG() << "boundingBoxImpact.contains(footprint)";
+    DEBUG_LOG(m_logger) << "boundingBoxImpact.contains(footprint)";
 
   } // for
 
@@ -275,7 +275,7 @@ void HandlerAesData::startTimer(int id, int msec) {
     // Timeout-Slot mit echtem SLOT
     connect(timer, &QTimer::timeout, this, &HandlerAesData::onStartTimeReached);
     timer->start(msec);
-    DEBUG_LOG() << "Timer " << id << " gestartet fuer " << msec << " ms.";
+    DEBUG_LOG(m_logger) << "Timer " << id << " gestartet fuer " << msec << " ms.";
 }
 
 void HandlerAesData::onStartTimeReached()
@@ -288,7 +288,7 @@ void HandlerAesData::onStartTimeReached()
   if (!bOk)
     return;
 
-  DEBUG_LOG() << "Timer " << chargeEffectId << " ausgeloest!";
+  DEBUG_LOG(m_logger) << "Timer " << chargeEffectId << " ausgeloest!";
 
   // Timer stoppen und loeschen
   AreaEffectSimulation::ChargeEffect data = m_chargeEffects.value(chargeEffectId);
@@ -300,12 +300,12 @@ void HandlerAesData::onStartTimeReached()
 
 void HandlerAesData::onChargeEffectChanged(const AreaEffectSimulation::ChargeEffect &data, DataModification modType)
 {
-  DEBUG_LOG() << "HandlerExplosions::onChargeEffectChanged";
+  DEBUG_LOG(m_logger) << "HandlerExplosions::onChargeEffectChanged";
   if (modType == DataModification::eRemoved)
     return;
   const long long effectStart = data.effectStart();
 
-  DEBUG_LOG() << "HandlerExplosions::onChargeEffectChanged"
+  DEBUG_LOG(m_logger) << "HandlerExplosions::onChargeEffectChanged"
                       << ", effectStart=" << effectStart
                       << ", currentPartitionTime=" << m_ddsHandler->currentPartitionTime();
 
@@ -313,14 +313,14 @@ void HandlerAesData::onChargeEffectChanged(const AreaEffectSimulation::ChargeEff
   // Startzeit in der Vergangenheit: aktuelle Zeit - 3 Sekunden
   if ( effectStart < m_ddsHandler->currentPartitionTime() - TIMEDIFFVALID )
   {
-    DEBUG_LOG() << "Startzeit in der Vergangenheit: aktuelle Zeit - 3 Sekunden";
+    DEBUG_LOG(m_logger) << "Startzeit in der Vergangenheit: aktuelle Zeit - 3 Sekunden";
     return;
   }
   // Startzeit entspricht der aktuellen Zeit
   if (    effectStart > m_ddsHandler->currentPartitionTime() - TIMEDIFFVALID
        && effectStart < m_ddsHandler->currentPartitionTime() + data.effectDuration() )
   {
-    DEBUG_LOG() << "Startzeit entspricht der aktuellen Zeit";
+    DEBUG_LOG(m_logger) << "Startzeit entspricht der aktuellen Zeit";
     AreaEffectSimulation::ChargeStruct chargeStruct;
     chargeStruct.chargeTypeId(data.chargeTypeId());
     chargeStruct.igniterTypeId(data.igniterTypeId());
@@ -330,13 +330,13 @@ void HandlerAesData::onChargeEffectChanged(const AreaEffectSimulation::ChargeEff
   else if (effectStart > m_ddsHandler->currentPartitionTime() + data.effectDuration())
   {
     // Start mit Timer
-    DEBUG_LOG() << "Startzeit in der Zukunft"
+    DEBUG_LOG(m_logger) << "Startzeit in der Zukunft"
                          << ", id :" << data.id()
                          << ", duration=" << effectStart - m_ddsHandler->currentPartitionTime();
     m_chargeEffects.insert(data.id(), data);
     startTimer(data.id(), effectStart - m_ddsHandler->currentPartitionTime());
   }
-  DEBUG_LOG() << "END onChargeEffectChanged";
+  DEBUG_LOG(m_logger) << "END onChargeEffectChanged";
 
 }
 
@@ -352,7 +352,7 @@ void HandlerAesData::onExplosionSingleChanged(const AreaEffectSimulation::Explos
 
   if (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsRemoved)
   {
-    DEBUG_LOG() << "Remove SingleExplosion";
+    DEBUG_LOG(m_logger) << "Remove SingleExplosion";
     m_explosionSingleState.remove(data.id());
     return;
   }
@@ -361,12 +361,12 @@ void HandlerAesData::onExplosionSingleChanged(const AreaEffectSimulation::Explos
        m_explosionSingleState.value(data.id()) == AreaEffectSimulation::AesEffectState_def::EsFired) &&
       data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated)
   {
-    DEBUG_LOG() << "Handle SingleExplosion";
+    DEBUG_LOG(m_logger) << "Handle SingleExplosion";
     handleExplosion = true;
   }
   m_explosionSingleState.insert(data.id(), data.effectStateId());
 
-  DEBUG_LOG() << "Got ExplosionSingle";
+  DEBUG_LOG(m_logger) << "Got ExplosionSingle";
   if (handleExplosion)
   {
     calculateBuildingExplosion(data.chargeStruct(), data.impactPosition(), data.id());
@@ -375,7 +375,7 @@ void HandlerAesData::onExplosionSingleChanged(const AreaEffectSimulation::Explos
 
 void HandlerAesData::onAirSupportImpactChanged(const AreaEffectSimulation::AirSupportImpact &data, DataModification modType)
 {
-  DEBUG_LOG() << "Got onAirSupportImpactChanged()";
+  DEBUG_LOG(m_logger) << "Got onAirSupportImpactChanged()";
   AreaEffectSimulation::ExplosionSingle esData;
   esData.id(data.id());
   esData.chargeStruct().chargeTypeId(data.chargeStruct().chargeTypeId());
@@ -390,20 +390,20 @@ void HandlerAesData::onTriggeredImpactsChanged(const AreaEffectSimulation::Trigg
       modType != DataModification::eModified)
     return;
 
-  DEBUG_LOG() << "Got TriggeredImpacts";
+  DEBUG_LOG(m_logger) << "Got TriggeredImpacts";
   preCalculateImpacts(data);
 }
 
 void HandlerAesData::onEffectsChanged(const AreaEffectSimulation::Effects &effects, DataModification modType)
 {
-  TRACE_LOG() << " Got Effects " << effects;
+  TRACE_LOG(m_logger) << " Got Effects " << effects;
   if (modType == DataModification::eRemoved)
     return;
 
   if (effects.aesTypeId().underlying() != AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions)
     return;
 
-  DEBUG_LOG() << " Got typechecked effects " << effects;
+  DEBUG_LOG(m_logger) << " Got typechecked effects " << effects;
 
   // calculate for every building of our exercise:
   const QHash<int, CentralEffectSimulation::HandlerBuildingData::Footprint> &footprints = m_handlerBuildingData->getFootprints();
@@ -451,9 +451,9 @@ bool HandlerAesData::inFootprint(const Core::GeoPosition2D &geoPosition,
   //  if (m_logger.isDebugEnabled())
   //  {
   //    const QPointF utmBuilding(CentralEffectSimulation::geographic2Utm(footPrint.geoPosition, footPrint.zone));
-  //    DEBUG_LOG() << "Impact (x/y)=" << CentralEffectSimulation::debug(impact - utmBuilding);
+  //    DEBUG_LOG(m_logger) << "Impact (x/y)=" << CentralEffectSimulation::debug(impact - utmBuilding);
   //    for (int i = 0; i < footPrint.polyUtm.length(); i++)
-  //      DEBUG_LOG() << "  poly (x/y)=" << CentralEffectSimulation::debug(footPrint.polyUtm[i] - utmBuilding);
+  //      DEBUG_LOG(m_logger) << "  poly (x/y)=" << CentralEffectSimulation::debug(footPrint.polyUtm[i] - utmBuilding);
   //  }
 
   // Check, if hit direct on building
@@ -472,7 +472,7 @@ void HandlerAesData::preCalculateImpacts(const AreaEffectSimulation::TriggeredIm
 {
   if (data.id() <= 0)
     return;
-  DEBUG_LOG() << "preCalculateImpacts";
+  DEBUG_LOG(m_logger) << "preCalculateImpacts";
   // Find AES ItemView and set Bounding-Box of Aes-Field
 
   const int aesItemId = data.aesItemId();
@@ -485,7 +485,7 @@ void HandlerAesData::preCalculateImpacts(const AreaEffectSimulation::TriggeredIm
   if (!dtcAes->aesItemViewFromEntityId(aesItemId, data.aesTypeId(), aesItemView))
   {
     static long msgCnt = 0;
-    WARNING_LOG() << "TriggeredExplosions.aesItemId=" << data.aesItemId() << " No aesItemView available"
+    WARNING_LOG(m_logger) << "TriggeredExplosions.aesItemId=" << data.aesItemId() << " No aesItemView available"
                           << " (cnt=" << ++msgCnt << ")";
     return;
   }
@@ -504,39 +504,39 @@ void HandlerAesData::preCalculateImpacts(const AreaEffectSimulation::TriggeredIm
 void HandlerAesData::onSendCesHitOnBuildingReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    WARNING_LOG() << "Can not send hit on building to building service: " << replyObject()
+    WARNING_LOG(m_logger) << "Can not send hit on building to building service: " << replyObject()
                           << ", m_handlerBuildingData.getFootprints().size()" << m_handlerBuildingData->getFootprints().size();
   else
-    DEBUG_LOG() << "onSendCesHitOnBuildingReply for id " << replyObject.id() << " success\n"
+    DEBUG_LOG(m_logger) << "onSendCesHitOnBuildingReply for id " << replyObject.id() << " success\n"
                         << " replyObject.str() = " << replyObject.str();
 }
 
 void HandlerAesData::onSendCesHit3DonBuildingReply(const Core::FunctionReplyObject &replyObject)
 {
-  DEBUG_LOG() << "m_handlerBuildingData.getFootprints() size " << m_handlerBuildingData->getFootprints().size();
+  DEBUG_LOG(m_logger) << "m_handlerBuildingData.getFootprints() size " << m_handlerBuildingData->getFootprints().size();
 
   if (replyObject.error())
-    WARNING_LOG() << "Can not send hit3D on building to building service: " << replyObject()
+    WARNING_LOG(m_logger) << "Can not send hit3D on building to building service: " << replyObject()
                           << ", m_handlerBuildingData.getFootprints().size()" << m_handlerBuildingData->getFootprints().size();
   else
-    DEBUG_LOG() << "onSendCesHit3DonBuildingReply for id " << replyObject.id() << " success\n"
+    DEBUG_LOG(m_logger) << "onSendCesHit3DonBuildingReply for id " << replyObject.id() << " success\n"
                         << " replyObject.str() = " << replyObject.str();
 }
 
 void HandlerAesData::onSendCesHitInformationReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    WARNING_LOG() << "onSendCesHitInformationReply for id " << reply.id() << " failed: " << reply.str();
+    WARNING_LOG(m_logger) << "onSendCesHitInformationReply for id " << reply.id() << " failed: " << reply.str();
   else
-    DEBUG_LOG() << "onSendCesHitInformationReply for id " << reply.id() << " successful";
+    DEBUG_LOG(m_logger) << "onSendCesHitInformationReply for id " << reply.id() << " successful";
 }
 
 void HandlerAesData::onSetBuildingStatesReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    WARNING_LOG() << "onSetBuildingStatesReply for id " << reply.id() << " failed: " << reply.str();
+    WARNING_LOG(m_logger) << "onSetBuildingStatesReply for id " << reply.id() << " failed: " << reply.str();
   else
-    DEBUG_LOG() << "onSetBuildingStatesReply for id " << reply.id() << " successful";
+    DEBUG_LOG(m_logger) << "onSetBuildingStatesReply for id " << reply.id() << " successful";
 }
 
 // calculate impacts for one building
@@ -560,26 +560,26 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac
   {
     bIsExplosionCluster = true;
     ignFuncBase = igniterFunctionBaseExplosionCluster(aesItemId); // assume that fuseType does not differ within a single ExplosionArea
-    DEBUG_LOG() << "Calculate, bIsExplosionCluster = " << bIsExplosionCluster
+    DEBUG_LOG(m_logger) << "Calculate, bIsExplosionCluster = " << bIsExplosionCluster
                         << ", ignFuncBase = " << ignFuncBase;
   }
   else if (s_relevantTypes.contains(data.aesTypeId().underlying()))
-    DEBUG_LOG() << "Calculate";
+    DEBUG_LOG(m_logger) << "Calculate";
   else
   {
-    DEBUG_LOG() << "No Calculation";
+    DEBUG_LOG(m_logger) << "No Calculation";
     return;
   }
 
   if (aesItemId != aesItemView.aesItemId())
   {
-    WARNING_LOG() << "mismatch: "
+    WARNING_LOG(m_logger) << "mismatch: "
                           << ", TriggeredExplosions.aesItemId=" << data.aesItemId()
                           << ", AesItemView.aesItemId=" << aesItemView.aesItemId();
     return;
   }
 
-  DEBUG_LOG() << "calculateImpacts mseId=" << footprint.mseId << " aesItemId " << aesItemId
+  DEBUG_LOG(m_logger) << "calculateImpacts mseId=" << footprint.mseId << " aesItemId " << aesItemId
                       << ", bIsExplosionCluster = " << bIsExplosionCluster;
 
   // get position(s) of impact(s):
@@ -587,7 +587,7 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac
   CentralEffectSimulation::BitfieldStates &bitfieldStates = m_bitfieldStatesBld[footprint.mseId];
   QSet<int> &bitfieldState = bitfieldStates[aesItemId];
   for (int i : std::as_const(bitfieldState))
-    DEBUG_LOG() << "bitfieldState for " << aesItemId << ": " << i;
+    DEBUG_LOG(m_logger) << "bitfieldState for " << aesItemId << ": " << i;
 
   for (int32_t bitFieldIdx = 0; bitFieldIdx < data.impactCount(); ++bitFieldIdx)
   {
@@ -600,7 +600,7 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac
       continue;
 
     const Core::GeoPosition &impactPosition = aesItemView.form()[bitFieldIdx];
-    DEBUG_LOG() << Q_FUNC_INFO
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO
                         << " impactPosition: lat/lon" << impactPosition.lat() << "/" << impactPosition.lon() << " z=" << impactPosition.z()
                         << " UTM=" << CentralEffectSimulation::debug(CentralEffectSimulation::geographic2Utm(impactPosition));
 
@@ -609,13 +609,13 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac
     const double impactRadius = m_ddsHandler->chargeTypeRadius(aesItemView.chargeStruct());
     if (inFootprint(impactPosition, footprint, impactRadius))
     {
-      DEBUG_LOG() << "In Footprint of mseId = " << footprint.mseId;
+      DEBUG_LOG(m_logger) << "In Footprint of mseId = " << footprint.mseId;
       if (!bitfieldState.contains(bitFieldIdx))
       {
-        DEBUG_LOG() << "m_bitfieldStates.insert(aesItemId=" << aesItemId << ", bitfieldState)" << " bitFieldIdx=" << bitFieldIdx;
+        DEBUG_LOG(m_logger) << "m_bitfieldStates.insert(aesItemId=" << aesItemId << ", bitfieldState)" << " bitFieldIdx=" << bitFieldIdx;
         bitfieldState.insert(bitFieldIdx);
 
-        DEBUG_LOG() << "sendCesHit mseId = " << footprint.mseId
+        DEBUG_LOG(m_logger) << "sendCesHit mseId = " << footprint.mseId
                             << ", aesItemId=" << aesItemId
                             << ", bitFieldIdx= " << bitFieldIdx
                             << ", ignFuncBase = " << ignFuncBase;
@@ -656,7 +656,7 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac
             detonationDistance,
             QStringLiteral("properties").toStdString());
 
-          DEBUG_LOG() << "sendCesHit3DonBuildingRequest for aesItemId=" << aesItemId
+          DEBUG_LOG(m_logger) << "sendCesHit3DonBuildingRequest for aesItemId=" << aesItemId
                               << " bitFieldIdx= " << bitFieldIdx
                               << ", requestBld= " << requestBld;
 
@@ -675,7 +675,7 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac
             Core::GeoPosition(impactPosition.lon(), impactPosition.lat(), 0.0),
             QStringLiteral("properties").toStdString());
 
-          DEBUG_LOG() << "sendCesHitOnBuildingRequest for aesItemId=" << aesItemId
+          DEBUG_LOG(m_logger) << "sendCesHitOnBuildingRequest for aesItemId=" << aesItemId
                               << " bitFieldIdx= " << bitFieldIdx
                               << ", impactPosition= " << impactPosition;
 
@@ -684,7 +684,7 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac
 
       }
       else
-        DEBUG_LOG() << "NOT in Footprint of mseId = " << footprint.mseId;
+        DEBUG_LOG(m_logger) << "NOT in Footprint of mseId = " << footprint.mseId;
       // if (inFootprint(impactPosition
     } // foreach Impact
   } // for (int32_t bitFieldId
@@ -696,7 +696,7 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::Effects &effec
     return;
 
   const int aesItemId = effects.aesItemId();
-  DEBUG_LOG() << "calculateImpacts mseId=" << footprint.mseId << " data.aesItemId() " << 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)
@@ -741,19 +741,19 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::Effects &effec
     QString mseIdAsStr;
     for (auto mseId : buildingIdsInBetween)
       mseIdAsStr += QString(QStringLiteral("_coveredByMseId_%1;")).arg(mseId);
-    DEBUG_LOG() << "findBuildingsBetween returns mseIdAsStr =" << mseIdAsStr;
+    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() << "getBuildingChargeEffectByChargeTypeId failed, chargeTypeId not found: =" << ec.chargeStruct().chargeTypeId();
+      ERROR_LOG(m_logger) << "getBuildingChargeEffectByChargeTypeId failed, chargeTypeId not found: =" << ec.chargeStruct().chargeTypeId();
 
 
     qint32 destructiveFactor = bldgChargeEffect.destructiveFactor();
     qint32 penetrationFactor = bldgChargeEffect.penetrationFactor();
 
     if ((destructiveFactor <= 0) || (penetrationFactor <= 0))
-      WARNING_LOG() << "getBuildingChargeEffectByChargeTypeId failed, destructiveFactor or penetrationFactor invalid"
+      WARNING_LOG(m_logger) << "getBuildingChargeEffectByChargeTypeId failed, destructiveFactor or penetrationFactor invalid"
                             << ", destructiveFactor = " << destructiveFactor
                             << ", penetrationFactor = " << penetrationFactor;
 
@@ -784,7 +784,7 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::Effects &effec
         Core::GeoPosition(impactPositionGeo.lon(), impactPositionGeo.lat(), 0.0),
         properties.toStdString());
 
-      DEBUG_LOG() << "sendCesHitOnBuildingRequest for aesItemId=" << aesItemId
+      DEBUG_LOG(m_logger) << "sendCesHitOnBuildingRequest for aesItemId=" << aesItemId
                           << " bitFieldIdx= " << indexBitFieldIdx
                           << ", impactPositionGeo= " << impactPositionGeo
                           << ", chargeTypeId= " << ec.chargeStruct().chargeTypeId()
@@ -831,7 +831,7 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::Effects &effec
         detonationDistance,
         properties.toStdString());
 
-      DEBUG_LOG() << "SendCesHit3DonBuildingRequest for aesItemId=" << aesItemId
+      DEBUG_LOG(m_logger) << "SendCesHit3DonBuildingRequest for aesItemId=" << aesItemId
                           << " bitFieldIdx= " << indexBitFieldIdx
                           << ", impactPosition= " << impactPositionGeo
                           << ", zPlacement= " << zPlacement
@@ -851,9 +851,9 @@ void HandlerAesData::checkBuildingsHit(const AreaEffectSimulation::AesItemView &
   const int exerciseId      = m_ddsHandler->getExerciseId();
   QPolygonF polyGeo;
 
-  DEBUG_LOG() << "checkBuildingsHit " << ", aesItemId=" << data.aesItemId();
+  DEBUG_LOG(m_logger) << "checkBuildingsHit " << ", aesItemId=" << data.aesItemId();
 
-  DEBUG_LOG() << "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()))
@@ -861,7 +861,7 @@ void HandlerAesData::checkBuildingsHit(const AreaEffectSimulation::AesItemView &
     QPointF point;
     point.setX(pointGeo.lon());
     point.setY(pointGeo.lat());
-    DEBUG_LOG() << "point= " << point.x() << "/" << point.y();
+    DEBUG_LOG(m_logger) << "point= " << point.x() << "/" << point.y();
     polyGeo.append(point);
   }
 
@@ -869,13 +869,13 @@ void HandlerAesData::checkBuildingsHit(const AreaEffectSimulation::AesItemView &
   bool isGroundLevel = true;
   const QVector<int> &buildingIdsInside = m_ddsHandler->dtcIsm()->getBuildingByPolygon(exerciseId, polyGeo, completeEnclosed, isGroundLevel);
 
-  DEBUG_LOG() << "buildingsInside.size=" << buildingIdsInside.size()
+  DEBUG_LOG(m_logger) << "buildingsInside.size=" << buildingIdsInside.size()
                       << " exerciseId=" << exerciseId;
   // only include buildings within the radius
 
   for (const int buildingId : std::as_const(buildingIdsInside))
   {
-    DEBUG_LOG() << " BuildingId=" << buildingId;
+    DEBUG_LOG(m_logger) << " BuildingId=" << buildingId;
     Buildings::Building tmpBldg;
     tmpBldg.buildingId(buildingId);
 
@@ -898,7 +898,7 @@ void HandlerAesData::checkBuildingsHit(const AreaEffectSimulation::AesItemView &
       QPointF pointGeo = impactPosPoint.geographic();
       impactPosition.lon(pointGeo.x());
       impactPosition.lat(pointGeo.y());
-      DEBUG_LOG() << "impactPosition lon/lat=" << impactPosition.lon() << "/" << impactPosition.lat()
+      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
@@ -916,7 +916,7 @@ void HandlerAesData::checkBuildingsHit(const AreaEffectSimulation::AesItemView &
       QStringLiteral("properties").toStdString());
 
 
-    DEBUG_LOG() << "sendCesHitOnBuildingRequest for aesItemId=" << data.aesItemId()
+    DEBUG_LOG(m_logger) << "sendCesHitOnBuildingRequest for aesItemId=" << data.aesItemId()
                         << ", impactPosition= " << impactPosition;
     m_ddsHandler->ftcBld()->sendCesHitOnBuildingRequest(requestBld, this);
   }
@@ -934,7 +934,7 @@ QVector<int> HandlerAesData::findBuildingsBetween(const LtsCoordTrans::LtsCoordi
   const LtsCoordTrans::LtsCoordinate targetFootprintPos =
     LtsCoordTrans::LtsCoordinate::fromUtm(targetFootprint.polyUtm.first(), targetFootprint.zone, 0.0);
 
-  DEBUG_LOG() << "findBuildingsBetween" << " START impactPosition " << impactPositionUTM.mgrs()
+  DEBUG_LOG(m_logger) << "findBuildingsBetween" << " START impactPosition " << impactPositionUTM.mgrs()
                        << ", maybe effected mseId is = " << targetFootprint.mseId
                        << " with targetFootprintPos = " << targetFootprintPos.utmCoordinate().mgrs();
 
@@ -976,14 +976,14 @@ QVector<int> HandlerAesData::findBuildingsBetween(const LtsCoordTrans::LtsCoordi
     const bool intersects = impactToFootprintLineMetric.intersects(footprintToCheck.polyUtm);
 #endif
 
-    DEBUG_LOG() << "findBuildingsBetween"
+    DEBUG_LOG(m_logger) << "findBuildingsBetween"
                          << " to mseId " << footprintToCheck.mseId
                          << " with curFpTargetPos " << impactPosition.utmCoordinate().mgrs()
                          << " -> intersects = " << intersects;
 
     if (intersects)
     {
-      DEBUG_LOG() << "findBuildingsBetween"
+      DEBUG_LOG(m_logger) << "findBuildingsBetween"
                            << " regarding impactPosition " << impactPositionUTM.mgrs()
                            << " and mseId " << targetFootprint.mseId
                            << " is concealed/covered by footpriont of mseId = " << footprintToCheck.mseId;
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 0392cd23f..4bce41b92 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
@@ -52,19 +52,19 @@ HandlerBuildingModel::HandlerBuildingModel(
   , m_aesDataHandler(aesDataHandler)
   , m_logger(CentralEffectSimulation::getLogger("Plugin.Buildings.HandlerBuildingModel"))
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 HandlerBuildingModel::~HandlerBuildingModel()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool HandlerBuildingModel::init()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   std::shared_ptr<InfrastructureManagement::Interface::Dtc> dtcIsm = m_ddsHandler->dtcIsm();
 
   dtcIsm->waitForHistoricalDataMainStructureElement(1000);
@@ -77,16 +77,16 @@ bool HandlerBuildingModel::init()
     onMainStructureElementChanged(data, DataModification::eAdded);
   });
 
-  INFO_LOG() << "HandlerBuildingModel is running."
+  INFO_LOG(m_logger) << "HandlerBuildingModel is running."
                        << ", m_buildingModels.size() = " << m_buildingModels.size();
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
 HandlerBuildingModelInterface::LineBuildingIntersectionResult HandlerBuildingModel::getLineBuildingIntersection(
   const std::vector<Core::GeoPosition> &line, const std::string &requestIdOpt)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   CentralEffectSimulation::GetLineBuildingIntersectionRequest newRequest;
   newRequest.line(line);
@@ -105,13 +105,13 @@ HandlerBuildingModelInterface::LineBuildingIntersectionResult HandlerBuildingMod
   result.errorParams  = reply.errorParams();
   result.intersection = reply.intersection();
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return result;
 }
 
 HandlerBuildingModelInterface::LineBuildingIntersectsResult HandlerBuildingModel::getLineBuildingIntersects(const std::vector<Core::GeoPosition> &line, const std::string &requestIdOpt)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   CentralEffectSimulation::GetLineBuildingIntersectionRequest newRequest;
   newRequest.line(line);
@@ -130,7 +130,7 @@ HandlerBuildingModelInterface::LineBuildingIntersectsResult HandlerBuildingModel
   result.errorParams  = reply.errorParams();
   result.intersects   = ! std::isnan(reply.intersection().lat()); // ! std::isnan
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return result;
 }
 
@@ -138,7 +138,7 @@ void HandlerBuildingModel::onMainStructureElementChanged(const InfrastructureMan
 {
   const int mseBldgId = data.id();
 
-  TRACE_LOG() << "MainStructureElement === " << data;
+  TRACE_LOG(m_logger) << "MainStructureElement === " << data;
 
   // Always delete m_buildingModels-entry
   BuildingModel *buildingModelPtr = m_buildingModels.value((mseBldgId));
@@ -147,7 +147,7 @@ void HandlerBuildingModel::onMainStructureElementChanged(const InfrastructureMan
 
   if (modType == DataModification::eRemoved)
   {
-    DEBUG_LOG() << "Building not added or modified id=" << mseBldgId;
+    DEBUG_LOG(m_logger) << "Building not added or modified id=" << mseBldgId;
     return;
   }
 
@@ -163,7 +163,7 @@ void HandlerBuildingModel::onMainStructureElementChanged(const InfrastructureMan
   const Core::GeoPosition &geoPos = data.geoPosition();
   if (qFuzzyIsNull(geoPos.z()))
   {
-    INFO_LOG() << "BuildingId " << mseBldgId
+    INFO_LOG(m_logger) << "BuildingId " << mseBldgId
                        << " kann übersprungen werden, da von Hand importiert."
                        << ", name: '" << data.name() << "'"
                        << ", name: '" << data.description() << "'";
@@ -175,17 +175,17 @@ void HandlerBuildingModel::onMainStructureElementChanged(const InfrastructureMan
   const int exerciseId = m_ddsHandler->getExerciseId();
   if (m_ddsHandler->dtcIsm()->isElementAssignedToExercise(data, exerciseId))
   {
-    DEBUG_LOG() << "BuildingId " << mseBldgId
+    DEBUG_LOG(m_logger) << "BuildingId " << mseBldgId
                         << ",  in Exercise";
   }
   else
   {
-    DEBUG_LOG() << "BuildingId " << mseBldgId
+    DEBUG_LOG(m_logger) << "BuildingId " << mseBldgId
                         << ",  not in Exercise";
     return;
   }
 
-  DEBUG_LOG() << "HandlerBuildingData::onMainStructureElementChanged() id=" << mseBldgId
+  DEBUG_LOG(m_logger) << "HandlerBuildingData::onMainStructureElementChanged() id=" << mseBldgId
                       << " properties=" << data.properties();
 
 
@@ -195,7 +195,7 @@ void HandlerBuildingModel::onMainStructureElementChanged(const InfrastructureMan
 
   // InfrastructureManagement::VulnerabilityModelData vulnerabilityModelDataEle;
   QByteArray vulnerabilityModelData = m_ddsHandler->dtcIsm()->getVulnerabilityModelData(data.id());
-  TRACE_LOG() << "vulnerabilityModelData=" << vulnerabilityModelData
+  TRACE_LOG(m_logger) << "vulnerabilityModelData=" << vulnerabilityModelData
                       << " id=" << data.id();
 
 
@@ -211,27 +211,27 @@ void HandlerBuildingModel::onMainStructureElementChanged(const InfrastructureMan
 //  } // for
 //  if (id == -1)
 //  {
-//    WARNING_LOG() << "Missing VulnerabilityModelData for building " << mseBldgId << ". Skip building.";
+//    WARNING_LOG(m_logger) << "Missing VulnerabilityModelData for building " << mseBldgId << ". Skip building.";
 //    return;
 //  } // if
 
   const InfrastructureManagement::MainFootprint &mainFootprint = m_ddsHandler->dtcIsm()->getFootprintsByExerciseId(exerciseId).value(mseBldgId);
 
-  DEBUG_LOG() << "BuildingId " << mseBldgId;
+  DEBUG_LOG(m_logger) << "BuildingId " << mseBldgId;
 
   BuildingModel *buildingModel = new BuildingModel(this);
   const InfrastructureManagement::MainStructureElement &mse = data;
   if (!buildingModel->init(mainFootprint, mse, vulnerabilityModelData, mseBldgId))
   {
-    WARNING_LOG() << "Initializing BuildingModel failed for building " << mseBldgId << ". Skipping building.";
+    WARNING_LOG(m_logger) << "Initializing BuildingModel failed for building " << mseBldgId << ". Skipping building.";
     return;
   }
   // if
 
-  INFO_LOG() << "Inserting BuildingModel for building " << mseBldgId;
+  INFO_LOG(m_logger) << "Inserting BuildingModel for building " << mseBldgId;
   m_buildingModels.insert(mseBldgId, buildingModel);
 
-  INFO_LOG() << "onMainStructureElementChanged: "
+  INFO_LOG(m_logger) << "onMainStructureElementChanged: "
                      << ", m_buildingModels.size() = " << m_buildingModels.size();
 }
 
@@ -245,7 +245,7 @@ void HandlerBuildingModel::onGetLineBuildingIntersectionRequest(const rti::core:
                                                                 const CentralEffectSimulation::GetLineBuildingIntersectionRequest &request)
 {
   const int exerciseId = m_ddsHandler->getExerciseId();
-  DEBUG_LOG() << "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,14 +253,14 @@ void HandlerBuildingModel::onGetLineBuildingIntersectionRequest(const rti::core:
   // sendReply
   m_ddsHandler->ftsCes()->getLineBuildingIntersectionReply(cookie, reply);
 
-  DEBUG_LOG() << "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() << "START onGetLineBuildingIntersectsRequest" << ", exerciseId = " << exerciseId << ", request '" << request.requestId() << "'";
+  DEBUG_LOG(m_logger) << "START onGetLineBuildingIntersectsRequest" << ", exerciseId = " << exerciseId << ", request '" << request.requestId() << "'";
 
 
   CentralEffectSimulation::GetLineBuildingIntersectionRequest newRequest;
@@ -280,7 +280,7 @@ void HandlerBuildingModel::onGetLineBuildingIntersectsRequest(const rti::core::S
 
   m_ddsHandler->ftsCes()->getLineBuildingIntersectsReply(cookie, newReply);
 
-  DEBUG_LOG() << "END onGetLineBuildingIntersectsRequest, request '" << request.requestId() << "'";
+  DEBUG_LOG(m_logger) << "END onGetLineBuildingIntersectsRequest, request '" << request.requestId() << "'";
 }
 
 
@@ -301,7 +301,7 @@ CentralEffectSimulation::GetLineBuildingIntersectionReply HandlerBuildingModel::
 
   const int exerciseId = m_ddsHandler->getExerciseId();
 
-  DEBUG_LOG() << "START getLineBuildingIntersectionInternal" << ", exerciseId = " << exerciseId << ", request '" << request.requestId() << "'"
+  DEBUG_LOG(m_logger) << "START getLineBuildingIntersectionInternal" << ", exerciseId = " << exerciseId << ", request '" << request.requestId() << "'"
                       << ", request.line().size() = " << request.line().size();
 
   CentralEffectSimulation::GetLineBuildingIntersectionReply reply;
@@ -315,7 +315,7 @@ CentralEffectSimulation::GetLineBuildingIntersectionReply HandlerBuildingModel::
   if (polylineRef.size() < 2)
   {
     reply.errorString("insufficiant number of points");
-    WARNING_LOG() << "getLineBuildingIntersectionInternal" << ", exerciseId = " << exerciseId << ", request '" << request.requestId() << "'"
+    WARNING_LOG(m_logger) << "getLineBuildingIntersectionInternal" << ", exerciseId = " << exerciseId << ", request '" << request.requestId() << "'"
                           << ", error: '" << reply.errorString() << "'";
     return reply;
   }
@@ -332,9 +332,9 @@ CentralEffectSimulation::GetLineBuildingIntersectionReply HandlerBuildingModel::
 
   if (m_logger.isDebugEnabled())
   {
-    DEBUG_LOG() << "relevantBuildings.size=" << relevantBuildings.size();
+    DEBUG_LOG(m_logger) << "relevantBuildings.size=" << relevantBuildings.size();
     for (const int bldgId :  std::as_const(relevantBuildings))
-      DEBUG_LOG() << "relevantBuilding: bldgId = " << bldgId;
+      DEBUG_LOG(m_logger) << "relevantBuilding: bldgId = " << bldgId;
   }
 
 
@@ -364,7 +364,7 @@ CentralEffectSimulation::GetLineBuildingIntersectionReply HandlerBuildingModel::
     const Core::GeoPosition &segStart = polylineRef[lineSegmentIdx];
     const Core::GeoPosition &segEnd   = polylineRef[lineSegmentIdx + 1];
 
-    DEBUG_LOG() << " lineSegmentIdx=" << lineSegmentIdx
+    DEBUG_LOG(m_logger) << " lineSegmentIdx=" << lineSegmentIdx
                         << ", start=" << segStart
                         << " , end=" << segEnd;
 
@@ -375,11 +375,11 @@ CentralEffectSimulation::GetLineBuildingIntersectionReply HandlerBuildingModel::
       BuildingModel *buildingModel = m_buildingModels.value(bldgId, nullptr);
       if (!buildingModel)
       {
-        WARNING_LOG() << " buildingModel not found, bldgId=" << bldgId;
+        WARNING_LOG(m_logger) << " buildingModel not found, bldgId=" << bldgId;
         continue;
       }
 
-      DEBUG_LOG() << " buildingModel->buildingId=" << buildingModel->buildingId()
+      DEBUG_LOG(m_logger) << " buildingModel->buildingId=" << buildingModel->buildingId()
                           << " , HEIGHT = " << buildingModel-> height();
 
 
@@ -391,7 +391,7 @@ CentralEffectSimulation::GetLineBuildingIntersectionReply HandlerBuildingModel::
       // if buildingState is not found, assume intact:
       if (/*(buildingState.id() == bldgId) && */(buildingState.damagePercent() >= 80))
       {
-        WARNING_LOG() << " buildingModel->buildingId=" << buildingModel->buildingId()
+        WARNING_LOG(m_logger) << " buildingModel->buildingId=" << buildingModel->buildingId()
                               << ", lineSegmentIdx=" << lineSegmentIdx
                               << ", damagePercent > 80% (" << buildingState.damagePercent() << ")";
         continue;
@@ -436,29 +436,29 @@ CentralEffectSimulation::GetLineBuildingIntersectionReply HandlerBuildingModel::
       const LtsUtils::QPoint3D &relStart = buildingModel->fromGeographic(segStart); // lift / lift_zValueToIfNegative
       const LtsUtils::QPoint3D &relEnd   = buildingModel->fromGeographic(segEnd);   // lift / lift_zValueToIfNegative
 
-      DEBUG_LOG() << " buildingModel->buildingId=" << buildingModel->buildingId()
+      DEBUG_LOG(m_logger) << " buildingModel->buildingId=" << buildingModel->buildingId()
                           << ", lineSegmentIdx=" << lineSegmentIdx;
 
-      DEBUG_LOG() << " segStart=" << segStart << " relStart=" << relStart;
-      DEBUG_LOG() << " segEnd  =" << segEnd << " relEnd=" << relEnd;
+      DEBUG_LOG(m_logger) << " segStart=" << segStart << " relStart=" << relStart;
+      DEBUG_LOG(m_logger) << " segEnd  =" << segEnd << " relEnd=" << relEnd;
 
       if (!buildingModel->hasIntersectionSimplified(relStart, relEnd)) // check height and footprint
         continue;
 
-      DEBUG_LOG() << " buildingModel->buildingId=" << buildingModel->buildingId()
+      DEBUG_LOG(m_logger) << " buildingModel->buildingId=" << buildingModel->buildingId()
                           << ", lineSegmentIdx=" << lineSegmentIdx
                           << ", hasIntersectionSimplified was true";
 
       const Core::GeoPosition &intersection = buildingModel->intersection(relStart, relEnd); // assume intersection and calculate
 
-      DEBUG_LOG() << " buildingModel->buildingId=" << buildingModel->buildingId()
+      DEBUG_LOG(m_logger) << " buildingModel->buildingId=" << buildingModel->buildingId()
                           << ", lineSegmentIdx=" << lineSegmentIdx
                           << ", intersection = " << intersection;
 
       if (!BuildingModel::isValid(intersection)) // no intersection
         continue;
 
-      DEBUG_LOG() << " buildingModel->buildingId=" << buildingModel->buildingId()
+      DEBUG_LOG(m_logger) << " buildingModel->buildingId=" << buildingModel->buildingId()
                           << ", lineSegmentIdx=" << lineSegmentIdx
                           << ", has valid intersection = " << intersection;
       if (buildingIdOut)
@@ -468,7 +468,7 @@ CentralEffectSimulation::GetLineBuildingIntersectionReply HandlerBuildingModel::
       if (justForLineOfSight)
       {
         reply.intersection(intersection);
-        DEBUG_LOG() << "END getLineBuildingIntersectionInternal, return due to justForLineOfSight " << request.requestId() << "'";
+        DEBUG_LOG(m_logger) << "END getLineBuildingIntersectionInternal, return due to justForLineOfSight " << request.requestId() << "'";
         return reply;
       }
       // : justForLineOfSight
@@ -477,9 +477,9 @@ CentralEffectSimulation::GetLineBuildingIntersectionReply HandlerBuildingModel::
       if (dist < distance) // new intersection is closer than the last one
       {
         if (buildingId == -1) // first intersection found
-          DEBUG_LOG() << "Building " << buildingModel->buildingId() << " was hit.";
+          DEBUG_LOG(m_logger) << "Building " << buildingModel->buildingId() << " was hit.";
         else // this building "covers" the last one found
-          DEBUG_LOG() << "Building " << buildingModel->buildingId() << " was hit prior to building " << buildingId << ".";
+          DEBUG_LOG(m_logger) << "Building " << buildingModel->buildingId() << " was hit prior to building " << buildingId << ".";
         buildingId = buildingModel->buildingId();
         distance = dist;
         reply.intersection(intersection);
@@ -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() << "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() << "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() << "DetonationLocationRequest for aesId " << request.id() << " failed: " << reply.errorString();
+    WARNING_LOG(m_logger) << "DetonationLocationRequest for aesId " << request.id() << " failed: " << reply.errorString();
   // if
   m_ddsHandler->ftsCes()->detonationLocationReply(cookie, reply);
 }
@@ -517,7 +517,7 @@ void HandlerBuildingModel::onDetonationLocationRequest(
 CentralEffectSimulation::DetonationLocationReply HandlerBuildingModel::handleDetonationLocationRequest(const CentralEffectSimulation::DetonationLocationRequest &request) const
 {
   const int exerciseId = m_ddsHandler->getExerciseId();
-  DEBUG_LOG() << " handleDetonationLocationRequest request=" << request
+  DEBUG_LOG(m_logger) << " handleDetonationLocationRequest request=" << request
                       << ", m_buildingModels.size() = " << m_buildingModels.size();
   // AES::
   // ExplosionCluster most likely has serveral impacts and therefore several trajectories.
@@ -542,7 +542,7 @@ CentralEffectSimulation::DetonationLocationReply HandlerBuildingModel::handleDet
 
   if (reqTrajRef.size() < 2)
   {
-    ERROR_LOG() << " handleDetonationLocationRequest request.trajectory() invalid, size =" << reqTrajRef.size();
+    ERROR_LOG(m_logger) << " handleDetonationLocationRequest request.trajectory() invalid, size =" << reqTrajRef.size();
     return reply;
   }
 
@@ -572,17 +572,17 @@ CentralEffectSimulation::DetonationLocationReply HandlerBuildingModel::handleDet
   const bool bHasBuildingIntersection = BuildingModel::isValid(bldgIntersectionCoord.geoPosition());
   if (bHasBuildingIntersection)
   {
-    DEBUG_LOG() << "RESULT: Trajectory: hasBuildingIntersection YES, at: " << bldgIntersectionCoord.mgrs()
+    DEBUG_LOG(m_logger) << "RESULT: Trajectory: hasBuildingIntersection YES, at: " << bldgIntersectionCoord.mgrs()
                         << " buildingId=" << buildingId;
   }
   else
   {
-    DEBUG_LOG() << "RESULT: Trajectory: hasBuildingIntersection NO";
+    DEBUG_LOG(m_logger) << "RESULT: Trajectory: hasBuildingIntersection NO";
 
     const bool bIsInTrainingOrCentralArea = true;
     if (bIsInTrainingOrCentralArea)
     {
-      DEBUG_LOG() << "RESULT: integrate free area...";
+      DEBUG_LOG(m_logger) << "RESULT: integrate free area...";
 
       // free area and FuseType_def::IfbDelay:
       // We can´t move the detonation point _below_ the surface.
@@ -610,13 +610,13 @@ CentralEffectSimulation::DetonationLocationReply HandlerBuildingModel::handleDet
   {
     if (!bHasBuildingIntersection)
     {
-      DEBUG_LOG() << "detonationLocation on ground" << detonationLocation.geoPosition()
+      DEBUG_LOG(m_logger) << "detonationLocation on ground" << detonationLocation.geoPosition()
                           << std::fixed << std::setprecision(3)
                           << ", heightOverElevation = " << detonationLocation.heightOverElevation();
       Q_ASSERT_X(std::fabs(detonationLocation.heightOverElevation()) < 1.0, "handleDetonationLocationRequest", "heightOverElevation is to high");
     }
 
-    DEBUG_LOG() << "Trajectory bAdjusted/bHasBuildingIntersection: " << bHasBuildingIntersection
+    DEBUG_LOG(m_logger) << "Trajectory bAdjusted/bHasBuildingIntersection: " << bHasBuildingIntersection
                         << ", igniterFunctionBase: " << ignFuncBase
                         << ", detonationDistance: " << detonationDistance
                         << ", reqTrajRef.size():" << reqTrajRef.size() << " back: " << reqTrajRef.back()
@@ -632,7 +632,7 @@ CentralEffectSimulation::DetonationLocationReply HandlerBuildingModel::handleDet
     // instead of backtrackTrajectory(), use simply resize and push_back(bldgIntersectionCoord)
     std::vector<Core::GeoPosition> trajectoryCopy = reqTrajRef;
 
-    DEBUG_LOG() << "validSizeOfOriginalTraj is below zero: " << validSizeOfOriginalTraj << ", exerciseId " << exerciseId << ", buildingId=" << buildingId;
+    DEBUG_LOG(m_logger) << "validSizeOfOriginalTraj is below zero: " << validSizeOfOriginalTraj << ", exerciseId " << exerciseId << ", buildingId=" << buildingId;
 
     // in case of hasBuildingIntersection
     if (validSizeOfOriginalTraj > 0)
@@ -644,7 +644,7 @@ CentralEffectSimulation::DetonationLocationReply HandlerBuildingModel::handleDet
     // adjust detonationLocation by taking detonationDistance (!= 0) into account:
     detonationLocation = LtsCoordTrans::LtsCoordinate(calculateDetonationLocation(trajectoryCopy, detonationDistance));
 
-    DEBUG_LOG() << "Trajectory bAdjusted/bHasBuildingIntersection: " << bHasBuildingIntersection
+    DEBUG_LOG(m_logger) << "Trajectory bAdjusted/bHasBuildingIntersection: " << bHasBuildingIntersection
                         << ", igniterFunctionBase: " << ignFuncBase
                         << ", detonationDistance: " << detonationDistance
                         << ", trajectoryCopy.size()=" << trajectoryCopy.size() << " back: " << trajectoryCopy.back()
@@ -661,12 +661,12 @@ CentralEffectSimulation::DetonationLocationReply HandlerBuildingModel::handleDet
 
 Core::GeoPosition HandlerBuildingModel::calculateDetonationLocation(const std::vector<Core::GeoPosition> &trajectoryGeometry, double detonationDistance) const
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   const int geometrySize = trajectoryGeometry.size();
   if (geometrySize < 3)
   {
-    ERROR_LOG() << Q_FUNC_INFO << ", trajectoryGeometry not sufficiant";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << ", trajectoryGeometry not sufficiant";
     return {};
   }
 
@@ -683,7 +683,7 @@ Core::GeoPosition HandlerBuildingModel::calculateDetonationLocation(const std::v
 
   QVector3D flightVec = segEnd - segStart;
 
-  INFO_LOG() << "flightVec1 "
+  INFO_LOG(m_logger) << "flightVec1 "
                      << ", utm1 " << utm1 << " , z " << p1.z()
                      << ", utm2 " << utm2 << " , z " << p2.z()
                      << ", flightVec " << flightVec;
@@ -721,7 +721,7 @@ Core::GeoPosition HandlerBuildingModel::calculateDetonationLocation(const std::v
   const QPointF &pointDeto = utmDeto.geographic();
   Core::GeoPosition geoPosDeto(pointDeto.x(), pointDeto.y(), detonationLoc.z());
 
-  DEBUG_LOG() << "flightVec2 "
+  DEBUG_LOG(m_logger) << "flightVec2 "
                       << ", utm1 " << utm1 << " , z " << p1.z()
                       << ", utm2 " << utm2 << " , z " << p2.z()
                       << ", flightVec " << flightVec
@@ -774,7 +774,7 @@ Core::GeoPosition HandlerBuildingModel::backtrackTrajectory(const std::vector<Co
     return startGeo;
   } // for
 
-  WARNING_LOG() << "Backtracing trajectory for proximity fuse type failed.";
+  WARNING_LOG(m_logger) << "Backtracing trajectory for proximity fuse type failed.";
   return startGeo;
 }
 */
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 b83407cc9..26f9aba31 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
@@ -30,7 +30,7 @@ HandlerBuildingOwnership::HandlerBuildingOwnership(const std::shared_ptr<Central
   , m_db(db)
   , m_logger(CentralEffectSimulation::getLogger("Plugin.Buildings.HandlerBuildingOwnership"))
 {
-  INFO_LOG() << "HandlerBuildingOwnership::HandlerBuildingOwnership";
+  INFO_LOG(m_logger) << "HandlerBuildingOwnership::HandlerBuildingOwnership";
 } // end of ctor()
 //-----------------------------------------------------------------------------
 
@@ -41,10 +41,10 @@ HandlerBuildingOwnership::~HandlerBuildingOwnership()
 
 bool HandlerBuildingOwnership::init()
 {
-  INFO_LOG() << "HandlerBuildingOwnership::init";
+  INFO_LOG(m_logger) << "HandlerBuildingOwnership::init";
   auto dtcIsm = m_ddsHandler->dtcIsm();
 
-  DEBUG_LOG() << "init";
+  DEBUG_LOG(m_logger) << "init";
   loadOwnershipsFromDb();
 
   connect(m_handlerParticipant.get(), &CentralEffectSimulation::HandlerParticipant::newOutdoorPosition,
@@ -83,7 +83,7 @@ bool HandlerBuildingOwnership::init()
 void HandlerBuildingOwnership::onSetOwnershipRequest(const rti::core::SampleIdentity &cookie,
                                                      const CentralEffectSimulation::SetOwnershipRequest &request)
 {
-  INFO_LOG() << "onSetOwnershipRequest: " << request;
+  INFO_LOG(m_logger) << "onSetOwnershipRequest: " << request;
 
   // remove Ownership, if partyId == 0
   if (request.partyId() == 0)
@@ -103,7 +103,7 @@ void HandlerBuildingOwnership::onParticipantPositionChanged(const CentralEffectS
 {
 
   const int participantId = partPos.participantId();
-  INFO_LOG() << "BuildingOwnership onParticipantPositionChanged participantId=" << participantId
+  INFO_LOG(m_logger) << "BuildingOwnership onParticipantPositionChanged participantId=" << participantId
                      << " vulnerabilityState=" << partPos.vulnerabilityState
                      << " buildingId=" << partPos.buildingId()
                      << " notfightMode=" << partPos.notfightMode;
@@ -121,7 +121,7 @@ void HandlerBuildingOwnership::onParticipantPositionChanged(const CentralEffectS
 
   int newOwnership = calculateOwnershipByParticipantId(participantId);
   checkAndSendOwnership(newOwnership, floorId);
-  INFO_LOG() << "END BuildingOwnership onParticipantPositionChanged participantId=" << participantId
+  INFO_LOG(m_logger) << "END BuildingOwnership onParticipantPositionChanged participantId=" << participantId
                      << " vulnerabilityState=" << partPos.vulnerabilityState;
 } // end of onParticipantPositionChanged()
 
@@ -131,7 +131,7 @@ void HandlerBuildingOwnership::onParticipantPositionChanged(const CentralEffectS
 // ///////////////////////////////////
 void HandlerBuildingOwnership::onMainStructureElementChanged(const InfrastructureManagement::MainStructureElement &data, DataModification modType)
 {
-  INFO_LOG() << "onMainStructureElementChanged id=" << data.id()
+  INFO_LOG(m_logger) << "onMainStructureElementChanged id=" << data.id()
                      << " modelId =" << data.modelId();
   if (modType == DataModification::eRemoved || data.modelId() <= 0)
   {
@@ -140,7 +140,7 @@ void HandlerBuildingOwnership::onMainStructureElementChanged(const Infrastructur
   }
 
   QJsonArray jsonArray = QJsonDocument::fromJson(QByteArray::fromStdString(data.properties())).object().value(QLatin1String("available_in_exercise")).toArray();
-  DEBUG_LOG() << "available_in_exercise jsonDocument.size()=" <<  jsonArray.size();
+  DEBUG_LOG(m_logger) << "available_in_exercise jsonDocument.size()=" <<  jsonArray.size();
   QVector<int> result;
   result.reserve(jsonArray.size());
 
@@ -154,11 +154,11 @@ void HandlerBuildingOwnership::onMainStructureElementChanged(const Infrastructur
 
   for (auto it = jsonArray.constBegin(); it != jsonArray.constEnd(); ++it)
   {
-    DEBUG_LOG() << "available_in_exercise jsonDocument=" << it->toInt();
+    DEBUG_LOG(m_logger) << "available_in_exercise jsonDocument=" << it->toInt();
     if (m_ddsHandler->getExerciseId() !=  it->toInt())
       continue;
 
-    DEBUG_LOG() << "Got MainStructureElement"
+    DEBUG_LOG(m_logger) << "Got MainStructureElement"
                         << " data.id()=" << data.id()
                         << " data.modelId=" << data.modelId();
     if (!m_buildingOwnership.contains(data.id()))
@@ -176,7 +176,7 @@ void HandlerBuildingOwnership::onMainStructureElementChanged(const Infrastructur
 
 void HandlerBuildingOwnership::onParticipantLeavesBuilding(const int participantId)
 {
-  INFO_LOG() << "BuildingOwnership onParticipantLeavesBuilding participantId=" << participantId;
+  INFO_LOG(m_logger) << "BuildingOwnership onParticipantLeavesBuilding participantId=" << participantId;
   auto it = m_participantFloor.find(participantId);
   if (it == m_participantFloor.end())
     return;
@@ -184,26 +184,26 @@ void HandlerBuildingOwnership::onParticipantLeavesBuilding(const int participant
 
   const int floorId = it.value();
   const int newOwnership = calculateOwnershipByFloorId(floorId);
-  DEBUG_LOG() << "newOwnership=" << newOwnership;
+  DEBUG_LOG(m_logger) << "newOwnership=" << newOwnership;
   if (newOwnership > 0)
     checkAndSendOwnership(newOwnership, floorId);
 } // end of onParticipantLeavesBuilding()
 
 int HandlerBuildingOwnership::calculateOwnershipByParticipantId(const int participantId)
 {
-  INFO_LOG() << "BuildingOwnership calculateOwnershipByParticipantId participantId=" << participantId;
+  INFO_LOG(m_logger) << "BuildingOwnership calculateOwnershipByParticipantId participantId=" << participantId;
   CentralEffectSimulation::HandlerParticipant::CesParticipantData partPos = m_handlerParticipant->position(participantId);
   return calculateOwnershipByFloorId(m_handlerBuildingData->getFloorIdFromRoomId(partPos.roomId()));
 }
 
 int HandlerBuildingOwnership::calculateOwnershipByFloorId(const int floorId)
 {
-  INFO_LOG() << "BuildingOwnership calculateOwnershipByFloorId floorId=" << floorId;
+  INFO_LOG(m_logger) << "BuildingOwnership calculateOwnershipByFloorId floorId=" << floorId;
   int ownership = -1;
   if (floorId == -1)
     return ownership;
 
-  DEBUG_LOG() << "calculateOwnership floorId = " << floorId;
+  DEBUG_LOG(m_logger) << "calculateOwnership floorId = " << floorId;
 
   QHash <int, int>    partyCount; // key = Party, value= Count of Participants;
   // Suche alle Participants in der Etage
@@ -235,7 +235,7 @@ int HandlerBuildingOwnership::calculateOwnershipByFloorId(const int floorId)
 
 int HandlerBuildingOwnership::getOwnership(int buildingId, int floorId) const
 {
-  INFO_LOG() << "BuildingOwnership getOwnership buildingId=" << buildingId
+  INFO_LOG(m_logger) << "BuildingOwnership getOwnership buildingId=" << buildingId
                      << " floorId=" << floorId;
   auto itBldg = m_buildingOwnership.find(buildingId);
   if (itBldg == m_buildingOwnership.end())
@@ -251,18 +251,18 @@ int HandlerBuildingOwnership::getOwnership(int buildingId, int floorId) const
 
 void HandlerBuildingOwnership::checkAndSendOwnership(const int newOwnership, const int floorId)
 {
-  INFO_LOG() << "BuildingOwnership checkAndSendOwnership";
+  INFO_LOG(m_logger) << "BuildingOwnership checkAndSendOwnership";
   if (floorId < 0)  // outside building
     return;
   const int buildingId = m_handlerBuildingData->getBuildingIdFromFloorId(floorId);
   if (buildingId < 0)
   {
-    WARNING_LOG() << "Could not find building for floor with id " << floorId << " - ignoring";
+    WARNING_LOG(m_logger) << "Could not find building for floor with id " << floorId << " - ignoring";
     return;
   }
   // prüfe, ob sich die Farbe geändert hat.
   const int oldOwnership = getOwnership(buildingId, floorId);
-  DEBUG_LOG() << "checkAndSendOwnership buildingId = "
+  DEBUG_LOG(m_logger) << "checkAndSendOwnership buildingId = "
                       << buildingId
                       << " floorId=" << floorId
                       << " oldOwnership=" << oldOwnership
@@ -273,23 +273,23 @@ void HandlerBuildingOwnership::checkAndSendOwnership(const int newOwnership, con
     saveBuildingOwnership(floorId, newOwnership, buildingId);
     // und Meldung verschicken.
     sendBuildingOwnership(buildingId);
-    DEBUG_LOG() << "new Building Ownership";
+    DEBUG_LOG(m_logger) << "new Building Ownership";
   }
 }
 
 void HandlerBuildingOwnership::updateOwnerships(CentralEffectSimulation::BuildingOwnership *bo)
 {
-  INFO_LOG() << "BuildingOwnership updateOwnerships";
+  INFO_LOG(m_logger) << "BuildingOwnership updateOwnerships";
   QMap <int, int> ownershipMap;
 
   const QVector<int> floors = m_handlerBuildingData->getFloorsFromBuilding(bo->buildingId());
-  DEBUG_LOG() << "updateOwnerships floors.size= " << floors.size();
+  DEBUG_LOG(m_logger) << "updateOwnerships floors.size= " << floors.size();
   for (const int floorId : floors)
     ownershipMap[floorId] = 0;
 
   for (const CentralEffectSimulation::Ownership &ownership : bo->ownerships())
   {
-    DEBUG_LOG() << "updateOwnerships floorId=" << ownership.floorId() << ": " << ownership.partyId();
+    DEBUG_LOG(m_logger) << "updateOwnerships floorId=" << ownership.floorId() << ": " << ownership.partyId();
     ownershipMap[ownership.floorId()] = ownership.partyId();
   }
 
@@ -299,7 +299,7 @@ void HandlerBuildingOwnership::updateOwnerships(CentralEffectSimulation::Buildin
   CentralEffectSimulation::Ownership ownership;
   for (auto it = ownershipMap.cbegin(); it != ownershipMap.cend(); ++it)
   {
-    DEBUG_LOG() << it.key() << ": " << it.value();
+    DEBUG_LOG(m_logger) << it.key() << ": " << it.value();
     ownership.floorId(it.key());
     ownership.partyId(it.value());
     bo->ownerships().push_back(ownership);
@@ -308,7 +308,7 @@ void HandlerBuildingOwnership::updateOwnerships(CentralEffectSimulation::Buildin
 }
 void HandlerBuildingOwnership::saveBuildingOwnership(int floorId, int partyId, int buildingId)
 {
-  INFO_LOG() << "saveBuildingOwnership floorId: " << floorId
+  INFO_LOG(m_logger) << "saveBuildingOwnership floorId: " << floorId
                      << ", partyId: " << partyId
                      << ", buildingId: " << buildingId;
 
@@ -349,7 +349,7 @@ void HandlerBuildingOwnership::saveBuildingOwnership(int floorId, int partyId, i
 
 void HandlerBuildingOwnership::sendBuildingOwnership(int buildingId)
 {
-  INFO_LOG() << "sendBuildingOwnership for building: " << buildingId;
+  INFO_LOG(m_logger) << "sendBuildingOwnership for building: " << buildingId;
   CentralEffectSimulation::BuildingOwnership bo = m_buildingOwnership.value(buildingId);
   bo.buildingId(buildingId);
   bo.sampleTime(QDateTime::currentMSecsSinceEpoch());
@@ -363,7 +363,7 @@ void HandlerBuildingOwnership::sendBuildingOwnership(int buildingId)
 ///
 bool HandlerBuildingOwnership::loadOwnershipsFromDb()
 {
-  INFO_LOG() << "HandlerBuildingOwnership::loadOwnershipsFromDb ";
+  INFO_LOG(m_logger) << "HandlerBuildingOwnership::loadOwnershipsFromDb ";
   m_buildingOwnership.clear();
   auto cbBo = [this](const CentralEffectSimulation::Database::CesOwnership & bo)
   {
@@ -371,7 +371,7 @@ bool HandlerBuildingOwnership::loadOwnershipsFromDb()
   };
   if (!m_db->select(cbBo))
   {
-    ERROR_LOG() << "Error reading data from database 'CesOwnership'";
+    ERROR_LOG(m_logger) << "Error reading data from database 'CesOwnership'";
     return false;
   }
   return true;
@@ -379,7 +379,7 @@ bool HandlerBuildingOwnership::loadOwnershipsFromDb()
 
 void HandlerBuildingOwnership::removeFromDbBuildingId(const int buildingId)
 {
-  INFO_LOG() << "HandlerBuildingOwnership::removeFromDbBuildingId buildingId: " << buildingId;
+  INFO_LOG(m_logger) << "HandlerBuildingOwnership::removeFromDbBuildingId buildingId: " << buildingId;
   m_db->removeCesOwnershipByBuildingId(buildingId);
 }
 
@@ -389,7 +389,7 @@ void HandlerBuildingOwnership::insertInDb(const CentralEffectSimulation::Buildin
   DBTransaction trans(m_db->database());
 
   removeFromDbBuildingId(bo.buildingId());
-  INFO_LOG() << "insertInDb buildingId: " << bo.buildingId()
+  INFO_LOG(m_logger) << "insertInDb buildingId: " << bo.buildingId()
                      << ", bo.ownerships().size(): " << bo.ownerships().size();
   CentralEffectSimulation::Database::CesOwnership newOwnership;
   newOwnership.buildingId = bo.buildingId();
@@ -398,10 +398,10 @@ void HandlerBuildingOwnership::insertInDb(const CentralEffectSimulation::Buildin
     newOwnership.id = 0;
     newOwnership.floorId = ownership.floorId();
     newOwnership.partyId = ownership.partyId();
-    DEBUG_LOG() << "ownership: floorId = " << newOwnership.floorId
+    DEBUG_LOG(m_logger) << "ownership: floorId = " << newOwnership.floorId
                         << " partyId = " << newOwnership.partyId;
     if (!m_db->insert(newOwnership))
-      ERROR_LOG() << "Error adding 'CesOwnership' to database "
+      ERROR_LOG(m_logger) << "Error adding 'CesOwnership' to database "
                           << " buildingId =" << newOwnership.buildingId
                           << " floorId = " << newOwnership.floorId
                           << " partyId = " << newOwnership.partyId;
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 d72b265a2..d8cb12c5d 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,7 +102,7 @@ void HandlerContamination::onAesItemViewChanged(const AreaEffectSimulation::AesI
       modType != DataModification::eModified)
     return;
 
-  DEBUG_LOG() << "Got AesItemView: " << data.effectStateId()
+  DEBUG_LOG(m_logger) << "Got AesItemView: " << data.effectStateId()
                       << " data.aesItemId()" << data.aesItemId()
                       << " data.aesTypeId()" << data.aesTypeId();
   switch (data.effectStateId().underlying())
@@ -116,21 +116,21 @@ void HandlerContamination::onAesItemViewChanged(const AreaEffectSimulation::AesI
     {
       chargeHeight = 500.0; // Alle Stockwerke beruecksichtigen
       chargeDepression = -1000.0; // Alle Kellerraeume beruecksichtigen
-      DEBUG_LOG() << "AtNContamination: chargeHeight=" << chargeHeight
+      DEBUG_LOG(m_logger) << "AtNContamination: chargeHeight=" << chargeHeight
                           << " chargeDepression=" << chargeDepression;
     }
     else
     {
       chargeHeight = m_aesBCContaminations.value(data.aesItemId()).upperOffset();
       chargeDepression = m_aesBCContaminations.value(data.aesItemId()).lowerOffset();
-      DEBUG_LOG() << "BCContaminations: chargeHeight=" << chargeHeight
+      DEBUG_LOG(m_logger) << "BCContaminations: chargeHeight=" << chargeHeight
                           << " chargeDepression=" << chargeDepression;
     }
 
     if (data.aesTypeId() != AreaEffectSimulation::AesType_def::AtBCContamination
         && data.aesTypeId() != AreaEffectSimulation::AesType_def::AtNContamination)
     {
-      DEBUG_LOG() << "return1: AesItemView: " << data.effectStateId();
+      DEBUG_LOG(m_logger) << "return1: AesItemView: " << data.effectStateId();
       return;
     }
 
@@ -139,11 +139,11 @@ void HandlerContamination::onAesItemViewChanged(const AreaEffectSimulation::AesI
     if (volatilityType != ProjectDataManagement::VolatilityType_def::Resident
         && data.aesTypeId() != AreaEffectSimulation::AesType_def::AtNContamination)
     {
-      DEBUG_LOG() << "return2: AesItemView: " << data.effectStateId();
+      DEBUG_LOG(m_logger) << "return2: AesItemView: " << data.effectStateId();
       return;
     }
 
-    DEBUG_LOG() << "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();
@@ -156,7 +156,7 @@ void HandlerContamination::onAesItemViewChanged(const AreaEffectSimulation::AesI
     bool completeEnclosed = true;
     bool isGroundLevel = false;
     const QVector<int> &buildingIds = dtcIsm.get()->getBuildingByPolygon(exerciseId, polygonGeo, completeEnclosed, isGroundLevel);
-    DEBUG_LOG() << "buildingIds.size=" << buildingIds.size();
+    DEBUG_LOG(m_logger) << "buildingIds.size=" << buildingIds.size();
     for (int buildingId : std::as_const(buildingIds))
     {
       calculateBuilding(buildingId, data,  chargeHeight, chargeDepression);
@@ -181,7 +181,7 @@ void HandlerContamination::calculateBuilding(int buildingId,
   if (data.aesTypeId() != AreaEffectSimulation::AesType_def::AtBCContamination
       && data.aesTypeId() != AreaEffectSimulation::AesType_def::AtNContamination)
   {
-    DEBUG_LOG() << "return: NO BC-Contamination AesItemView: " << data.effectStateId();
+    DEBUG_LOG(m_logger) << "return: NO BC-Contamination AesItemView: " << data.effectStateId();
     return;
   }
 
@@ -190,27 +190,27 @@ void HandlerContamination::calculateBuilding(int buildingId,
       && data.aesTypeId() != AreaEffectSimulation::AesType_def::AtNContamination)
       return;
 
-  DEBUG_LOG() << "buildingId=" << buildingId;
+  DEBUG_LOG(m_logger) << "buildingId=" << buildingId;
   effectedRooms.clear();
   effectedFloors = getEffectedFloors(buildingId, chargeHeight, chargeDepression);
   for (int effectedFloor : std::as_const(effectedFloors))
     effectedRooms += dtcIsm.get()->getRoomIdsFromFloorId(buildingId, effectedFloor);
   if (!effectedRooms.empty())
   {
-    DEBUG_LOG() << "effectedRooms.size=" << effectedRooms.size();
+    DEBUG_LOG(m_logger) << "effectedRooms.size=" << effectedRooms.size();
     ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState::CombatReady;
 
     // [GUEZE-2752] N-Contamination: Only Contamionation inside Range1
     if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtNContamination
         && !isInsideRange1(buildingId,  data.aesItemId()))
     {
-      DEBUG_LOG() << "!isInsideRange1 buildingId=" << buildingId;
+      DEBUG_LOG(m_logger) << "!isInsideRange1 buildingId=" << buildingId;
       return;
     }
     if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtBCContamination
         && !isInsideBCContamination(buildingId,  data.aesItemId()))
     {
-      DEBUG_LOG() << "AtBCContamination !isInsideRange buildingId=" << buildingId << "return";
+      DEBUG_LOG(m_logger) << "AtBCContamination !isInsideRange buildingId=" << buildingId << "return";
       return;
     }
     if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtNContamination
@@ -220,15 +220,15 @@ void HandlerContamination::calculateBuilding(int buildingId,
         // Only actual explosion not old N-Fields
         if ( m_ddsHandler->dtcCore()->partitionTime().timeStamp() < (data.effectStart() + TIME_2_SECONDS))
         {
-            DEBUG_LOG() << "VulnerabilityState=CatastrophicKill";
+            DEBUG_LOG(m_logger) << "VulnerabilityState=CatastrophicKill";
             vulnerabilityState = ProjectDataManagement::VulnerabilityState::CatastrophicKill;
         }
     }
-    DEBUG_LOG() << "setBuildingContaminationStateRequest buildingId=" << buildingId
+    DEBUG_LOG(m_logger) << "setBuildingContaminationStateRequest buildingId=" << buildingId
                         << " data.aesTypeId()=" << data.aesTypeId()
                         << " isInsideInnerCircle(buildingId,  data.aesItemId()=" << isInsideInnerCircle(buildingId,  data.aesItemId());
     {
-      DEBUG_LOG() << "isInsideInnerCircle buildingId=" << buildingId;
+      DEBUG_LOG(m_logger) << "isInsideInnerCircle buildingId=" << buildingId;
       setBuildingContaminationStateRequest(buildingId, data.aesItemId(), vulnerabilityState, effectedRooms);
     }
   }
@@ -244,7 +244,7 @@ void HandlerContamination::onBuildingStateChanged(const Buildings::BuildingState
       && modType != DataModification::eModified)
     return;
 
-  INFO_LOG() << "onBuildingStateChanged"
+  INFO_LOG(m_logger) << "onBuildingStateChanged"
                      << " id=" << data.id()
                      << " aesId=" << data.aesId()
                      << " contaminationStates().size=" << data.contaminationStates().size();
@@ -260,7 +260,7 @@ void HandlerContamination::onBuildingStateChanged(const Buildings::BuildingState
   {
     if (aesItemView.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated)
     {
-      DEBUG_LOG() << "Wirkfeld aesItemView.id()=" << aesItemView.id()
+      DEBUG_LOG(m_logger) << "Wirkfeld aesItemView.id()=" << aesItemView.id()
                           << " aesItemView.aesItemId()=" << aesItemView.aesItemId()
                           << " fuer Gebaeude " << data.id() << " neu berechnen";
 
@@ -271,7 +271,7 @@ void HandlerContamination::onBuildingStateChanged(const Buildings::BuildingState
       {
         chargeHeight = 500.0; // Alle Stockwerke beruecksichtigen
         chargeDepression = -1000.0; // Alle Kellerraeume beruecksichtigen
-        DEBUG_LOG() << "AtNContamination: chargeHeight=" << chargeHeight
+        DEBUG_LOG(m_logger) << "AtNContamination: chargeHeight=" << chargeHeight
                             << " chargeDepression=" << chargeDepression;
       }
       else
@@ -280,12 +280,12 @@ void HandlerContamination::onBuildingStateChanged(const Buildings::BuildingState
         {
           chargeHeight = m_aesBCContaminations.value(aesItemView.aesItemId()).upperOffset();
           chargeDepression = m_aesBCContaminations.value(aesItemView.aesItemId()).lowerOffset();
-          DEBUG_LOG() << "BCContaminations: chargeHeight=" << chargeHeight
+          DEBUG_LOG(m_logger) << "BCContaminations: chargeHeight=" << chargeHeight
                               << " chargeDepression=" << chargeDepression;
         }
         else
         {
-          DEBUG_LOG() << "BCContaminations: m_aesBCContaminations not contains:"<< aesItemView.aesItemId();
+          DEBUG_LOG(m_logger) << "BCContaminations: m_aesBCContaminations not contains:"<< aesItemView.aesItemId();
         }
       }
 
@@ -304,7 +304,7 @@ void HandlerContamination::onBuildingStateChanged(const Buildings::BuildingState
       if (buildingIds.contains(data.id() ))
           calculateBuilding(data.id(), aesItemView, chargeHeight, chargeDepression);
       else
-          DEBUG_LOG() << "Building not in Area BuildingId="  << data.id();
+          DEBUG_LOG(m_logger) << "Building not in Area BuildingId="  << data.id();
     }
   }
 }
@@ -321,7 +321,7 @@ void HandlerContamination::setBuildingContaminationStateRequest(int buildingId,
   contaminationState.vulnerabilityState(vulnerabilityState);
 //  contaminationState.vulne
 
-  DEBUG_LOG() << "setBuildingContaminationStateRequest"
+  DEBUG_LOG(m_logger) << "setBuildingContaminationStateRequest"
                       << " buildingId=" << buildingId
                       << " aesId=" << aesId
                       << " vulnerabilityState=" << vulnerabilityState
@@ -331,7 +331,7 @@ void HandlerContamination::setBuildingContaminationStateRequest(int buildingId,
   {
     contaminationState.rooms()[i] = rooms[i];
     contaminationState.vulnerabilityState(vulnerabilityState);
-    DEBUG_LOG() << "    room[" << i << "]=" << rooms[i];
+    DEBUG_LOG(m_logger) << "    room[" << i << "]=" << rooms[i];
   }
 
   Buildings::SetBuildingContaminationStateRequest requestContamination(
@@ -341,7 +341,7 @@ void HandlerContamination::setBuildingContaminationStateRequest(int buildingId,
   // Senden, wenn fuer das Gebaeude noch keine Contamination vorhanden ist.
   if (!m_contaminationState.contains(buildingId))
   {
-    DEBUG_LOG() << "Neue Kontamination BuildingId=" << buildingId
+    DEBUG_LOG(m_logger) << "Neue Kontamination BuildingId=" << buildingId
                         << " requestContamination aesId=" << requestContamination.contaminationState().aesId();
 
     m_ddsHandler->ftcBld()->setBuildingContaminationStateRequest(requestContamination, this);
@@ -352,19 +352,19 @@ void HandlerContamination::setBuildingContaminationStateRequest(int buildingId,
   Buildings::SetBuildingContaminationStateRequest lastRequestContamination = m_contaminationState.value(buildingId);
   if (lastRequestContamination != requestContamination)
   {
-    DEBUG_LOG() << "Änderung der Kontamination BuildingId=" << buildingId
+    DEBUG_LOG(m_logger) << "Änderung der Kontamination BuildingId=" << buildingId
                         << " aesId=" << requestContamination.contaminationState().aesId();
     m_ddsHandler->ftcBld()->setBuildingContaminationStateRequest(requestContamination, this);
     m_contaminationState.insert(buildingId, requestContamination);
     return;
   }
-  DEBUG_LOG() << "Keine Änderung der Kontamination BuildingId=" << buildingId;
+  DEBUG_LOG(m_logger) << "Keine Änderung der Kontamination BuildingId=" << buildingId;
 }
 
 QVector<int> HandlerContamination::getEffectedFloors(const int buildingId, const int chargeHeight, const int depression)
 {
   auto dtcIsm = m_ddsHandler->dtcIsm();
-  DEBUG_LOG() << "Contaminated-Building=" << buildingId
+  DEBUG_LOG(m_logger) << "Contaminated-Building=" << buildingId
                       << " chargeHeight=" << chargeHeight
                       << " depression=" << depression;
 
@@ -374,17 +374,17 @@ QVector<int> HandlerContamination::getEffectedFloors(const int buildingId, const
   for (int floorId : std::as_const(floorIds))
   {
     double halfFloorHeight = dtcIsm->getHalfFloorHeight(buildingId, floorId);
-    DEBUG_LOG() << " floorId=" << floorId
+    DEBUG_LOG(m_logger) << " floorId=" << floorId
                         << " halfFloorHeight=" << halfFloorHeight
                         << " chargeHeight=" << chargeHeight
                         << " depression=" << depression;
     if (depression < 0) // Kellerraeme beruecksichtigen
     {
       if (halfFloorHeight > depression)
-        DEBUG_LOG() << "Checke Obergrenze";
+        DEBUG_LOG(m_logger) << "Checke Obergrenze";
       else
       {
-        DEBUG_LOG() << "halfFloorHeight > depression floorId=" << floorId << " continue";
+        DEBUG_LOG(m_logger) << "halfFloorHeight > depression floorId=" << floorId << " continue";
         continue;
       }
     }
@@ -392,7 +392,7 @@ QVector<int> HandlerContamination::getEffectedFloors(const int buildingId, const
     {
       if (halfFloorHeight < 0)  // Kellerraeume nicht beruecksichtigen
       {
-        DEBUG_LOG() << "depression ist nicht < 0"
+        DEBUG_LOG(m_logger) << "depression ist nicht < 0"
                             << " Kelleretagen nicht beruecksichtigen floorId=" << floorId << " continue";
         continue;
       }
@@ -407,9 +407,9 @@ QVector<int> HandlerContamination::getEffectedFloors(const int buildingId, const
 void HandlerContamination::onSetBuildingContaminationStateReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    WARNING_LOG() << "Can not send ContaminationStates on building to building service: " << replyObject();
+    WARNING_LOG(m_logger) << "Can not send ContaminationStates on building to building service: " << replyObject();
   else
-    DEBUG_LOG() << "onSetBuildingContaminationStateReply for id " << replyObject.id() << " success\n"
+    DEBUG_LOG(m_logger) << "onSetBuildingContaminationStateReply for id " << replyObject.id() << " success\n"
                         << " replyObject.str() = " << replyObject.str();
 }
 
@@ -429,27 +429,27 @@ 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() << "isInsideInnerCircle borderLengthInner=" << nContamination.borderLengthInner()
+  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);
-  DEBUG_LOG() << "impactPositionUtm=" << impactPositionUtm.x() << "/" << impactPositionUtm.y()
+  DEBUG_LOG(m_logger) << "impactPositionUtm=" << impactPositionUtm.x() << "/" << impactPositionUtm.y()
                       << " zone=" << zone;
   const QPointF buildingPositionUtm = CentralEffectSimulation::geographic2Utm(mse.geoPosition(), zone);
-  DEBUG_LOG() << "buildingPositionUtm=" << buildingPositionUtm.x() << "/" << buildingPositionUtm.y();
+  DEBUG_LOG(m_logger) << "buildingPositionUtm=" << buildingPositionUtm.x() << "/" << buildingPositionUtm.y();
 
   double squareDistance = CentralEffectSimulation::getSquareDistance(impactPositionUtm, buildingPositionUtm);
 
   if (squareDistance < nContamination.impactRadius() * nContamination.impactRadius())
   {
-    DEBUG_LOG() << "isInsideInnerCircle return true";
+    DEBUG_LOG(m_logger) << "isInsideInnerCircle return true";
     return true;
   }
   else
   {
-    DEBUG_LOG() << "isInsideInnerCircle return false";
+    DEBUG_LOG(m_logger) << "isInsideInnerCircle return false";
     return false;
   }
 }
@@ -462,25 +462,25 @@ 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() << " impactRadius=" << bcContamination.impactRadius();
+  DEBUG_LOG(m_logger) << " impactRadius=" << bcContamination.impactRadius();
 
   int zone = -1;
   const QPointF impactPositionUtm = CentralEffectSimulation::geographic2Utm(bcContamination.impactPosition(), zone);
-  DEBUG_LOG() << "impactPositionUtm=" << impactPositionUtm.x() << "/" << impactPositionUtm.y()
+  DEBUG_LOG(m_logger) << "impactPositionUtm=" << impactPositionUtm.x() << "/" << impactPositionUtm.y()
                       << " zone=" << zone;
   const QPointF buildingPositionUtm = CentralEffectSimulation::geographic2Utm(mse.geoPosition(), zone);
-  DEBUG_LOG() << "buildingPositionUtm=" << buildingPositionUtm.x() << "/" << buildingPositionUtm.y();
+  DEBUG_LOG(m_logger) << "buildingPositionUtm=" << buildingPositionUtm.x() << "/" << buildingPositionUtm.y();
 
   double squareDistance = CentralEffectSimulation::getSquareDistance(impactPositionUtm, buildingPositionUtm);
 
   if (squareDistance < bcContamination.impactRadius() * bcContamination.impactRadius())
   {
-    DEBUG_LOG() << "isInsideInnerCircle return true";
+    DEBUG_LOG(m_logger) << "isInsideInnerCircle return true";
     return true;
   }
   else
   {
-    DEBUG_LOG() << "isInsideInnerCircle return false";
+    DEBUG_LOG(m_logger) << "isInsideInnerCircle return false";
     return false;
   }
 }
@@ -492,27 +492,27 @@ 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() << "isInsideRange1 borderLengthInner=" << nContamination.borderLengthInner()
+  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);
-  DEBUG_LOG() << "impactPositionUtm=" << impactPositionUtm.x() << "/" << impactPositionUtm.y()
+  DEBUG_LOG(m_logger) << "impactPositionUtm=" << impactPositionUtm.x() << "/" << impactPositionUtm.y()
                       << " zone=" << zone;
   const QPointF buildingPositionUtm = CentralEffectSimulation::geographic2Utm(mse.geoPosition(), zone);
-  DEBUG_LOG() << "buildingPositionUtm=" << buildingPositionUtm.x() << "/" << buildingPositionUtm.y();
+  DEBUG_LOG(m_logger) << "buildingPositionUtm=" << buildingPositionUtm.x() << "/" << buildingPositionUtm.y();
 
   double squareDistance = CentralEffectSimulation::getSquareDistance(impactPositionUtm, buildingPositionUtm);
 
   if (squareDistance < nContamination.borderLengthInner() * nContamination.borderLengthInner())
   {
-    DEBUG_LOG() << "isInsideRange1 return true";
+    DEBUG_LOG(m_logger) << "isInsideRange1 return true";
     return true;
   }
   else
   {
-    DEBUG_LOG() << "isInsideRange1 return false";
+    DEBUG_LOG(m_logger) << "isInsideRange1 return false";
     return false;
   }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/plugin.cpp
index 6d15214ae..67628f464 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/plugin.cpp
@@ -53,13 +53,13 @@ bool CesBuildingsInterfaceImpl::init(int domainId, int exerciseId)
 {
   m_domainId = domainId;
   m_exerciseId = exerciseId;
-  INFO_LOG() << "CesBuildingsInterfaceImpl::init()"
+  INFO_LOG(m_logger) << "CesBuildingsInterfaceImpl::init()"
                      << " m_domainId=" << m_domainId
                      << " m_exerciseId=" << m_exerciseId;
 
 
   // initialize handlerBuildingOwnership
-  INFO_LOG() << "initialize handlerBuildingOwnership ----------------------------";
+  INFO_LOG(m_logger) << "initialize handlerBuildingOwnership ----------------------------";
   m_handlerBuildingOwnership = std::make_shared<HandlerBuildingOwnership>(m_ddsHandler,
                                                                           m_handlerParticipant,
                                                                           m_handlerBuildingData,
@@ -69,47 +69,47 @@ bool CesBuildingsInterfaceImpl::init(int domainId, int exerciseId)
 
   if (!m_handlerBuildingOwnership->init())
   {
-    ERROR_LOG() << "Initialisation m_handlerBuildingOwnership failed.";
+    ERROR_LOG(m_logger) << "Initialisation m_handlerBuildingOwnership failed.";
     return false;
   }
-  INFO_LOG() << "end initialize handlerBuildingOwnership ----------------------------";
+  INFO_LOG(m_logger) << "end initialize handlerBuildingOwnership ----------------------------";
 
   // initialize handlerAesData
-  INFO_LOG() << "initialize handlerAesData ----------------------------";
+  INFO_LOG(m_logger) << "initialize handlerAesData ----------------------------";
   m_handlerAesData = std::make_shared<HandlerAesData>(m_ddsHandler,
                                                       m_handlerBuildingData,
                                                       this);
   if (!m_handlerAesData->init())
   {
-    ERROR_LOG() << "Initialisation m_handlerAesData failed.";
+    ERROR_LOG(m_logger) << "Initialisation m_handlerAesData failed.";
     return false;
   }
-  INFO_LOG() << "end initialize HandlerAesData ----------------------------";
+  INFO_LOG(m_logger) << "end initialize HandlerAesData ----------------------------";
 
   // initialize handlerAesData
-  INFO_LOG() << "initialize handlerContaminations ----------------------------";
+  INFO_LOG(m_logger) << "initialize handlerContaminations ----------------------------";
   m_handlerContaminations = std::make_shared<HandlerContamination>(m_ddsHandler,
                                                                    this);
 
   if (!m_handlerContaminations->init())
   {
-    ERROR_LOG() << "Initialisation m_handlerContaminations failed.";
+    ERROR_LOG(m_logger) << "Initialisation m_handlerContaminations failed.";
     return false;
   }
-  INFO_LOG() << "end initialize HandlerContaminations ----------------------------";
+  INFO_LOG(m_logger) << "end initialize HandlerContaminations ----------------------------";
 
 
   // initialize handlerBuildingModel
-  INFO_LOG() << "initialize handlerBuildingModel ----------------------------";
+  INFO_LOG(m_logger) << "initialize handlerBuildingModel ----------------------------";
   m_handlerBuildingModel = std::make_shared<HandlerBuildingModel>(m_ddsHandler,
                                                                   m_handlerAesData,
                                                                   this);
   if (!m_handlerBuildingModel->init())
   {
-    ERROR_LOG() << "Initialisation m_handlerBuildingModel failed.";
+    ERROR_LOG(m_logger) << "Initialisation m_handlerBuildingModel failed.";
     return false;
   }
-  INFO_LOG() << "end initialize handlerBuildingModel ----------------------------";
+  INFO_LOG(m_logger) << "end initialize handlerBuildingModel ----------------------------";
 
 
   // Maybe not all MainStructureElements are processed yet.
@@ -121,20 +121,20 @@ bool CesBuildingsInterfaceImpl::init(int domainId, int exerciseId)
     std::shared_ptr<CentralEffectSimulation::ProxyBuilding> proxyBuilding = m_mainHandler->proxyBuilding();
     if (proxyBuilding)
     {
-      INFO_LOG() << "set_handlerBuildingModel ----------------------------";
+      INFO_LOG(m_logger) << "set_handlerBuildingModel ----------------------------";
       proxyBuilding->set_handlerBuildingModel(m_handlerBuildingModel);
     }
   });
 
-  INFO_LOG() << "CesBuildingsInterfaceImpl::init() return true";
+  INFO_LOG(m_logger) << "CesBuildingsInterfaceImpl::init() return true";
   return true;
 }
 
 QString CesBuildingsInterfaceImpl::echo(const QString &message)
 {
   QString ret(QStringLiteral("<<<< %1 >>>> CentralEffectSimulationBuildingOwnershipInterfaceImpl::echo").arg(message));
-  INFO_LOG() << "CentralEffectSimulationBuildingOwnershipInterfaceImpl::echo return:" << ret;
-  DEBUG_LOG() << "DEBUG: CentralEffectSimulationBuildingOwnershipInterfaceImpl::echo return:" << ret;
+  INFO_LOG(m_logger) << "CentralEffectSimulationBuildingOwnershipInterfaceImpl::echo return:" << ret;
+  DEBUG_LOG(m_logger) << "DEBUG: CentralEffectSimulationBuildingOwnershipInterfaceImpl::echo return:" << ret;
   return ret;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/plugin.h
index 93fa09a5a..c381be325 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/plugin.h
@@ -64,6 +64,7 @@ private Q_SLOTS:
   bool init(int domainId, int exerciseId) override;
 private:
 
+NGL::INGLLogger &m_logger;
 private:
   CentralEffectSimulation::Plugin::DataProvider                              *m_pdp{nullptr};
   std::shared_ptr<DDSConnector::DdsConnector>                                 m_ddsConnector;
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 754b4e207..49d45f663 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
@@ -115,7 +115,7 @@ void HandlerAesData::onAesItemViewChanged(const AreaEffectSimulation::AesItemVie
       modType != DataModification::eModified)
     return;
 
-  DEBUG_LOG() << "Got AesItemView: " << data.effectStateId();
+  DEBUG_LOG(m_logger) << "Got AesItemView: " << data.effectStateId();
   switch (data.effectStateId().underlying())
   {
   case AreaEffectSimulation::AesEffectState_def::EsUnknown:
@@ -141,7 +141,7 @@ void HandlerAesData::removeStates(const AreaEffectSimulation::AesItemView &data)
 {
   if (data.aesTypeId() != AreaEffectSimulation::AesType_def::AtExplosionArea)
     return;
-  DEBUG_LOG() << "Remove aesItemId=" << data.aesItemId();
+  DEBUG_LOG(m_logger) << "Remove aesItemId=" << data.aesItemId();
   // remove State for each building
   for (BitfieldStates &bfs : m_bitfieldStatesBld)
     bfs.remove(data.aesItemId());
@@ -159,7 +159,7 @@ void HandlerAesData::onExplosionSingleChanged(const AreaEffectSimulation::Explos
 
   if (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsRemoved)
   {
-    DEBUG_LOG() << "Remove SingleExplosion";
+    DEBUG_LOG(m_logger) << "Remove SingleExplosion";
     m_explosionSingleState.remove(data.id());
     return;
   }
@@ -167,17 +167,17 @@ void HandlerAesData::onExplosionSingleChanged(const AreaEffectSimulation::Explos
   if (m_explosionSingleState.value(data.id()) == AreaEffectSimulation::AesEffectState_def::EsPrepared
       && data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated)
   {
-    DEBUG_LOG() << "Handle SingleExplosion";
+    DEBUG_LOG(m_logger) << "Handle SingleExplosion";
     handleExplosion = true;
   }
   m_explosionSingleState.insert(data.id(), data.effectStateId());
 
 
-  DEBUG_LOG() << "Got ExplosionSingle";
+  DEBUG_LOG(m_logger) << "Got ExplosionSingle";
   if (handleExplosion)
   {
     const double impactRadius = m_ddsHandler->chargeTypeRadius(data.chargeTypeId());
-    DEBUG_LOG() << "Handle ExplosionSingle (EsActivated)";
+    DEBUG_LOG(m_logger) << "Handle ExplosionSingle (EsActivated)";
 
     // Bounding-Box-Check
     // QMap<int, Footprint> m_footprints;
@@ -200,7 +200,7 @@ void HandlerAesData::onExplosionSingleChanged(const AreaEffectSimulation::Explos
         const Core::GeoPosition2D impactPosition(data.impactPosition().lon(), data.impactPosition().lat());
         if (inFootprint(impactPosition, impactRadius, footprint))
         {
-          DEBUG_LOG() << "ftc sendCESHitOnBuilding mseId = " << footprint.mseId
+          DEBUG_LOG(m_logger) << "ftc sendCESHitOnBuilding mseId = " << footprint.mseId
                               << " chargeTypeId = " << data.chargeTypeId()
                               << " id = " << data.id()
                               << " currentPartitionTime = " << m_ddsHandler->currentPartitionTime()
@@ -216,9 +216,9 @@ void HandlerAesData::onExplosionSingleChanged(const AreaEffectSimulation::Explos
           m_ddsHandler->ftcBld()->sendCesHitOnBuildingRequest(requestBld, this);
         }
         else
-          DEBUG_LOG() << "Not sendCESHitOnBuilding mseId = " << footprint.mseId;
+          DEBUG_LOG(m_logger) << "Not sendCESHitOnBuilding mseId = " << footprint.mseId;
 
-        DEBUG_LOG() << "boundingBoxImpact.contains(footprint)";
+        DEBUG_LOG(m_logger) << "boundingBoxImpact.contains(footprint)";
       }
     } // for
   }
@@ -226,7 +226,7 @@ void HandlerAesData::onExplosionSingleChanged(const AreaEffectSimulation::Explos
 
 void HandlerAesData::onAirSupportImpactChanged(const AreaEffectSimulation::AirSupportImpact &data, DataModification modType)
 {
-  DEBUG_LOG() << "Got onAirSupportImpactChanged()";
+  DEBUG_LOG(m_logger) << "Got onAirSupportImpactChanged()";
   AreaEffectSimulation::ExplosionSingle esData;
   esData.id(data.id());
   esData.chargeTypeId(data.chargeTypeId());
@@ -241,7 +241,7 @@ void HandlerAesData::onTriggeredImpactsChanged(const AreaEffectSimulation::Trigg
       modType != DataModification::eModified)
     return;
 
-  DEBUG_LOG() << "Got TriggeredImpacts";
+  DEBUG_LOG(m_logger) << "Got TriggeredImpacts";
   preCalculateImpacts(data);
 }
 
@@ -254,7 +254,7 @@ void HandlerAesData::onMainFootprintChanged(const InfrastructureManagement::Main
   {
   case DataModification::eAdded:
   case DataModification::eModified:
-    DEBUG_LOG() << "Got MainFootprint (Building)";
+    DEBUG_LOG(m_logger) << "Got MainFootprint (Building)";
     calculateFootprint(data);
     break;
   case DataModification::eRemoved:
@@ -269,8 +269,8 @@ void HandlerAesData::onMainFootprintChanged(const InfrastructureManagement::Main
 
 void HandlerAesData::calculateFootprint(const InfrastructureManagement::MainFootprint &mainFootprint)
 {
-  DEBUG_LOG() << "Footprint: " << mainFootprint.id() << ": " << mainFootprint;
-  DEBUG_LOG() << "Footprint: " << " mainFootprint.elements().size()=" << mainFootprint.elements().size();
+  DEBUG_LOG(m_logger) << "Footprint: " << mainFootprint.id() << ": " << mainFootprint;
+  DEBUG_LOG(m_logger) << "Footprint: " << " mainFootprint.elements().size()=" << mainFootprint.elements().size();
 
   // If poly is Empty continue with next Footprint
   if (mainFootprint.elements().size() <= 0)
@@ -318,9 +318,9 @@ bool HandlerAesData::inFootprint(const Core::GeoPosition2D &geoPosition, const d
   if (m_logger.isDebugEnabled())
   {
     const QPointF utmBuilding(CentralEffectSimulation::geographic2Utm(footPrint.geoPosition, footPrint.zone));
-    DEBUG_LOG() << "Impact (x/y)=" << CentralEffectSimulation::debug(impact - utmBuilding);
+    DEBUG_LOG(m_logger) << "Impact (x/y)=" << CentralEffectSimulation::debug(impact - utmBuilding);
     for (int i = 0; i < footPrint.polyUtm.length(); i++)
-      DEBUG_LOG() << "  poly (x/y)=" << CentralEffectSimulation::debug(footPrint.polyUtm[i] - utmBuilding);
+      DEBUG_LOG(m_logger) << "  poly (x/y)=" << CentralEffectSimulation::debug(footPrint.polyUtm[i] - utmBuilding);
   }
 
   // Check, if hit direct on building
@@ -339,14 +339,14 @@ void HandlerAesData::preCalculateImpacts(const AreaEffectSimulation::TriggeredIm
 {
   if (data.id() <= 0)
     return;
-  DEBUG_LOG() << "preCalculateImpacts";
+  DEBUG_LOG(m_logger) << "preCalculateImpacts";
   // Find AES ItemView and set Bounding-Box of Aes-Field
 
   // Search corresponding itemView and get boundingBox data in UTM
   const bool bFound = m_aesItemViews.contains(data.aesItemId());
   if (!bFound)
   {
-    WARNING_LOG() << "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;
   }
   // Bounding-Box-Check
@@ -362,18 +362,18 @@ void HandlerAesData::preCalculateImpacts(const AreaEffectSimulation::TriggeredIm
 void HandlerAesData::onSendCesHitOnBuildingReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    WARNING_LOG() << "Can not send hit on building to building service: " << replyObject();
+    WARNING_LOG(m_logger) << "Can not send hit on building to building service: " << replyObject();
   else
-    DEBUG_LOG() << "onSendCesHitOnBuildingReply for id " << replyObject.id() << " success\n"
+    DEBUG_LOG(m_logger) << "onSendCesHitOnBuildingReply for id " << replyObject.id() << " success\n"
                         << " replyObject.str() = " << replyObject.str();
 }
 
 void HandlerAesData::onSendCesHitInformationReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    WARNING_LOG() << "onSendCesHitInformationReply for id " << reply.id() << " failed: " << reply.str();
+    WARNING_LOG(m_logger) << "onSendCesHitInformationReply for id " << reply.id() << " failed: " << reply.str();
   else
-    DEBUG_LOG() << "onSendCesHitInformationReply for id " << reply.id() << " successful";
+    DEBUG_LOG(m_logger) << "onSendCesHitInformationReply for id " << reply.id() << " successful";
 }
 
 // calculate impacts for one building
@@ -385,14 +385,14 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac
   case AreaEffectSimulation::AesType_def::AtExplosionArea:
   case AreaEffectSimulation::AesType_def::AtExplosionSingle:
   case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions:
-    DEBUG_LOG() << "Calculate";
+    DEBUG_LOG(m_logger) << "Calculate";
     break;
   default:
-    DEBUG_LOG() << "No Calculation";
+    DEBUG_LOG(m_logger) << "No Calculation";
     return;
   }
 
-  DEBUG_LOG() << "calculateImpacts mseId=" << footprint.mseId << " data.aesItemId() " << data.aesItemId();
+  DEBUG_LOG(m_logger) << "calculateImpacts mseId=" << footprint.mseId << " data.aesItemId() " << data.aesItemId();
 
 
   // get position(s) of impact(s):
@@ -401,14 +401,14 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac
   auto it = m_aesItemViews.constFind(data.aesItemId());
   if (it == m_aesItemViews.constEnd())
   {
-    WARNING_LOG() << "TriggeredExplosions.aesItemId=" << data.aesItemId() << " No aesItemView available";
+    WARNING_LOG(m_logger) << "TriggeredExplosions.aesItemId=" << data.aesItemId() << " No aesItemView available";
     return;
   }
 
   BitfieldStates &bitfieldStates = m_bitfieldStatesBld[footprint.mseId];
   QSet<int> &bitfieldState = bitfieldStates[data.aesItemId()];
   for (int i : std::as_const(bitfieldState))
-    DEBUG_LOG() << "bitfieldState for " << data.aesItemId() << ": " << i;
+    DEBUG_LOG(m_logger) << "bitfieldState for " << data.aesItemId() << ": " << i;
 
   const AreaEffectSimulation::AesItemView &aesItemView = *it;
   for (int32_t bitFieldIdx = 0; bitFieldIdx < data.impactCount(); ++bitFieldIdx)
@@ -422,7 +422,7 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac
       continue;
 
     const Core::GeoPosition2D &impactPosition = aesItemView.form()[bitFieldIdx];
-    DEBUG_LOG() << Q_FUNC_INFO
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO
                         << " impactPosition: lat/lon" << impactPosition.lat() << "/" << impactPosition.lon()
                         << " UTM=" << CentralEffectSimulation::debug(CentralEffectSimulation::geographic2Utm(impactPosition));
 
@@ -431,14 +431,14 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac
     const double impactRadius = m_ddsHandler->chargeTypeRadius(aesItemView.chargeTypeId());
     if (inFootprint(impactPosition, impactRadius, footprint))
     {
-      DEBUG_LOG() << "In Footprint mseId = " << footprint.mseId;
+      DEBUG_LOG(m_logger) << "In Footprint mseId = " << footprint.mseId;
       if (!bitfieldState.contains(bitFieldIdx))
       {
         bitfieldState.insert(bitFieldIdx);
 
-        DEBUG_LOG() << "m_bitfieldStates.insert(data.aesItemId()=" << data.aesItemId() << ", bitfieldState)" << " bitFieldIdx=" << bitFieldIdx;
+        DEBUG_LOG(m_logger) << "m_bitfieldStates.insert(data.aesItemId()=" << data.aesItemId() << ", bitfieldState)" << " bitFieldIdx=" << bitFieldIdx;
 
-        DEBUG_LOG() << "ftc sendCESHitOnBuilding mseId = " << footprint.mseId << " bitFieldIdx= " << bitFieldIdx ;
+        DEBUG_LOG(m_logger) << "ftc sendCESHitOnBuilding mseId = " << footprint.mseId << " bitFieldIdx= " << bitFieldIdx ;
         Buildings::SendCesHitOnBuildingRequest requestBld(
           footprint.mseId,
           aesItemView.chargeTypeId(),
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.h
index 375f4ad00..9093e8dcf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.h
@@ -55,6 +55,7 @@ public:
   AreaEffectSimulation::AesItemView itemView(const int &aesId) const { return m_aesItemViews.value(aesId); }
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onSendCesHitOnBuildingReply(const Core::FunctionReplyObject &replyObject) override final;
   void onSendCesHitInformationReply(const Core::FunctionReplyObject &reply) override final;
 
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 55a438848..7bb800033 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
@@ -86,7 +86,7 @@ bool HandlerParticipantArea::init()
 {
   auto dtcAes = m_ddsHandler->dtcAes();
 
-  DEBUG_LOG() << "Settings::calculateCentralAes() =" << Settings::calculateCentralAes();
+  DEBUG_LOG(m_logger) << "Settings::calculateCentralAes() =" << Settings::calculateCentralAes();
 
   dtcAes->enableBCContamination();
   connect(dtcAes.get(), &AreaEffectSimulation::Interface::Dtc::bCContaminationChanged,
@@ -193,28 +193,28 @@ bool HandlerParticipantArea::init()
       return false;
   }
 
-  INFO_LOG() << "HandlerParticipantArea::init() finished.";
+  INFO_LOG(m_logger) << "HandlerParticipantArea::init() finished.";
   return true;
 } // end of init()
 //-----------------------------------------------------------------------------
 
 void HandlerParticipantArea::onSendCesHitReply(const Core::FunctionReplyObject &replyObject)
 {
-  DEBUG_LOG() << "onSendCesHitReply for id " << replyObject.id() << " success= " << replyObject.error();
+  DEBUG_LOG(m_logger) << "onSendCesHitReply for id " << replyObject.id() << " success= " << replyObject.error();
 
   if (replyObject.error())
-    WARNING_LOG() << "Can not send enter/leave FunctionsArea to participant in training area: " << replyObject();
+    WARNING_LOG(m_logger) << "Can not send enter/leave FunctionsArea to participant in training area: " << replyObject();
 
   // Send next Request, if available
   if (!m_sendCesHitRequestQueue.isEmpty())
   {
-    DEBUG_LOG() << "m_sendCesAreaActionRequestQueue.size()=" << m_sendCesHitRequestQueue.size();
+    DEBUG_LOG(m_logger) << "m_sendCesAreaActionRequestQueue.size()=" << m_sendCesHitRequestQueue.size();
     m_sendCesHitRequestQueue.dequeue();
     // Send next Message
     if (!m_sendCesHitRequestQueue.isEmpty())
     {
       const auto &hr = m_sendCesHitRequestQueue.head();
-      DEBUG_LOG() << "sendCesHitRequest: " << hr;
+      DEBUG_LOG(m_logger) << "sendCesHitRequest: " << hr;
       m_ddsHandler->ftcTab()->sendCesHitRequest(hr, this);
     }
   }
@@ -248,12 +248,12 @@ void HandlerParticipantArea::onAesItemViewChanged(const AreaEffectSimulation::Ae
 
   if (m_ddsHandler->isSmartChargeType(data.chargeTypeId()))
   {
-    DEBUG_LOG() << "isSmartType = TRUE";
+    DEBUG_LOG(m_logger) << "isSmartType = TRUE";
     return;
   }
 
   const int aesItemId = data.aesItemId();
-  DEBUG_LOG() << "Got AesItemView id: " << aesItemId
+  DEBUG_LOG(m_logger) << "Got AesItemView id: " << aesItemId
                       << ", type: " << data.aesTypeId()
                       << ", effectState: " << data.effectStateId()
                       << ", modType: " << modType;
@@ -278,7 +278,7 @@ void HandlerParticipantArea::onAesItemViewChanged(const AreaEffectSimulation::Ae
 
   const AreaEffectSimulation::AesEffectState &effectState = data.effectStateId();
   const double impactRadius = m_ddsHandler->chargeTypeRadius(data.chargeTypeId());
-  DEBUG_LOG() << "impactRadius=" << impactRadius;
+  DEBUG_LOG(m_logger) << "impactRadius=" << impactRadius;
   switch (effectState.underlying())
   {
   case AreaEffectSimulation::AesEffectState_def::EsPrepared:
@@ -356,7 +356,7 @@ void HandlerParticipantArea::onDusSingleMineChanged(const AreaEffectSimulation::
     {
     case AreaEffectSimulation::AesEffectState_def::EsActivated:
     {
-      //DEBUG_LOG() << "Got onDusSingleMineChanged data.id()=" << data.id();
+      //DEBUG_LOG(m_logger) << "Got onDusSingleMineChanged data.id()=" << data.id();
       CentralEffectSimulation::AesItemViewUtm itemView;
       itemView.aesItemId = data.id();
       itemView.chargeTypeId = data.chargeTypeId();
@@ -448,7 +448,7 @@ void HandlerParticipantArea::onNContaminationChanged(const AreaEffectSimulation:
 
 void HandlerParticipantArea::calculateBcContamination(const CentralEffectSimulation::AesItemViewUtm &itemView)
 {
-  DEBUG_LOG() << "HandlerParticipantArea::calculateBcContamination aesItemId =" << itemView.aesItemId;
+  DEBUG_LOG(m_logger) << "HandlerParticipantArea::calculateBcContamination aesItemId =" << itemView.aesItemId;
   const auto participantsMap = m_handlerParticipant->positions();
   for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPos : participantsMap)
   {
@@ -460,7 +460,7 @@ void HandlerParticipantArea::calculateBcContamination(const CentralEffectSimulat
 
 void HandlerParticipantArea::calculateFunctionArea(const CentralEffectSimulation::AesItemViewUtm &itemView)
 {
-  DEBUG_LOG() << "HandlerParticipantArea::calculateFunctionArea aesItemId =" << itemView.aesItemId;
+  DEBUG_LOG(m_logger) << "HandlerParticipantArea::calculateFunctionArea aesItemId =" << itemView.aesItemId;
   const auto partPosMap = m_handlerParticipant->positions();
   for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPos : partPosMap)
   {
@@ -473,7 +473,7 @@ void HandlerParticipantArea::calculateFunctionArea(const CentralEffectSimulation
 void HandlerParticipantArea::deleteFunctionalArea(const int aesItemId)
 {
   CentralEffectSimulation::AesItemViewUtm itemView =  m_aesItemViews.value(aesItemId);
-  DEBUG_LOG() << "delete " << itemView.aesItemId << ", aesItemId: " << aesItemId;
+  DEBUG_LOG(m_logger) << "delete " << itemView.aesItemId << ", aesItemId: " << aesItemId;
 
   const auto partPosMap = m_handlerParticipant->positions();
   for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPos : partPosMap)
@@ -488,7 +488,7 @@ void HandlerParticipantArea::deleteFunctionalArea(const int aesItemId)
     }
     else
       sendParticipantEvent(itemView, participantPos, ProjectDataManagement::EventType_def::LeaveDangerArea);
-    DEBUG_LOG() << "Participant inside id=" << participantPos.participantId();
+    DEBUG_LOG(m_logger) << "Participant inside id=" << participantPos.participantId();
   } // for all Participants
 } // deleteFunctionalArea
 
@@ -497,10 +497,10 @@ void HandlerParticipantArea::calculateAesParticipant(const CentralEffectSimulati
   if (m_handlerParticipant->isOutdated(participantPos))
     return;
 
-  DEBUG_LOG() << "HandlerParticipantArea::calculateAesParticipant paricipantId: " << participantPos.participantId();
+  DEBUG_LOG(m_logger) << "HandlerParticipantArea::calculateAesParticipant paricipantId: " << participantPos.participantId();
   for (const CentralEffectSimulation::AesItemViewUtm &itemView : std::as_const(m_aesItemViews))
   {
-    DEBUG_LOG() << " itemView: " << itemView.aesItemId << ", " << itemView.aesTypeId;
+    DEBUG_LOG(m_logger) << " itemView: " << itemView.aesItemId << ", " << itemView.aesTypeId;
     switch (itemView.aesTypeId.underlying())
     {
     case AreaEffectSimulation::AesType_def::AtMineArea:
@@ -542,7 +542,7 @@ bool HandlerParticipantArea::inMineRadiusCheck(const CentralEffectSimulation::Ae
   bool bOutOfBounds = false;
   for (const auto &itPos : itemView.formMines)
   {
-    DEBUG_LOG() << "participantPositionUtm: " << CentralEffectSimulation::debug(participantPosUtmPoint)
+    DEBUG_LOG(m_logger) << "participantPositionUtm: " << CentralEffectSimulation::debug(participantPosUtmPoint)
                         << ", MinePosUtm: " << CentralEffectSimulation::debug(itPos);
     // Check, if mine is active
     // already triggered (bit is already 0)
@@ -558,7 +558,7 @@ bool HandlerParticipantArea::inMineRadiusCheck(const CentralEffectSimulation::Ae
     // Check, if participant is inside danger-radius of the mine
     if (inCircle(itPos, impactRadius, participantPosUtmPoint))
     {
-      DEBUG_LOG() << "Mine Hit for aesItemId: " << itemView.aesItemId
+      DEBUG_LOG(m_logger) << "Mine Hit for aesItemId: " << itemView.aesItemId
                           << ", mineIdx: " << mineIdx
                           << ", participantId: " << participantPosition.participantId();
       sendEffectTypeEvent(itemView, participantPosition, EffectType::EffectiveMineRangeEnter, mineIdx, -1);
@@ -590,11 +590,11 @@ bool HandlerParticipantArea::inBoundingBoxCheck(const CentralEffectSimulation::A
   const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantPosition.pos(), itemView.zone);
   if (boundingBoxImpact.contains(participantPosUtmPoint))
   {
-    DEBUG_LOG() << "inBoundingBoxCheck Paricipant " << participantPosition.participantId()
+    DEBUG_LOG(m_logger) << "inBoundingBoxCheck Paricipant " << participantPosition.participantId()
                         << " inside AesItemView:" << itemView.aesItemId;
     return true;
   }
-  TRACE_LOG() << "inBoundingBoxCheck Paricipant " << participantPosition.participantId()
+  TRACE_LOG(m_logger) << "inBoundingBoxCheck Paricipant " << participantPosition.participantId()
                       << " outside AesItemView:" << itemView.aesItemId;
   return false;
 }
@@ -613,7 +613,7 @@ bool HandlerParticipantArea::inFormCheck(const CentralEffectSimulation::AesItemV
                                  itemView.boundingBoxTopRight);
   const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantPosition.pos(), itemView.zone);
   const QString  participantPosMgrs = CentralEffectSimulation::geographic2mgrs(participantPosition.pos(), itemView.zone);
-  DEBUG_LOG() << "inFormCheck start, paricipantId: " << participantPosition.participantId()
+  DEBUG_LOG(m_logger) << "inFormCheck start, paricipantId: " << participantPosition.participantId()
                       << ", aesItemId: " << itemView.aesItemId
                       << ", aesTypeId: " << itemView.aesTypeId
                       << ", form.size: " << itemView.form.size()
@@ -622,7 +622,7 @@ bool HandlerParticipantArea::inFormCheck(const CentralEffectSimulation::AesItemV
   if (boundingBoxImpact.contains(participantPosUtmPoint) &&
       itemView.form.containsPoint(participantPosUtmPoint, Qt::FillRule::OddEvenFill))
   {
-    DEBUG_LOG() << "inside AES form, paricipantId: " << participantPosition.participantId()
+    DEBUG_LOG(m_logger) << "inside AES form, paricipantId: " << participantPosition.participantId()
                         << ", aesItemId: " << itemView.aesItemId;
     switch (itemView.aesTypeId.underlying())
     {
@@ -646,7 +646,7 @@ bool HandlerParticipantArea::inFormCheck(const CentralEffectSimulation::AesItemV
       sendEffectTypeEvent(itemView, participantPosition, effectTypeForNContaminationArea(itemView, participantPosUtmPoint, participantPosition.sampleTime()), -1, -1);
       break;
     default:
-      INFO_LOG() << "inFormCheck Unhandled AES-Type" << itemView.aesTypeId;
+      INFO_LOG(m_logger) << "inFormCheck Unhandled AES-Type" << itemView.aesTypeId;
       break;
     }
     return true;
@@ -680,10 +680,10 @@ bool HandlerParticipantArea::inFormCheck(const CentralEffectSimulation::AesItemV
 #if 0
   if (m_logger.isDebugEnabled())
   {
-    DEBUG_LOG() << "inFormCheck: Paricipant " << participantPosition.participantId << " outside AesItemView " << itemView.aesItemId;
-    DEBUG_LOG() << "ParticipantPos = " << debug(participantPosUtmPoint);
+    DEBUG_LOG(m_logger) << "inFormCheck: Paricipant " << participantPosition.participantId << " outside AesItemView " << itemView.aesItemId;
+    DEBUG_LOG(m_logger) << "ParticipantPos = " << debug(participantPosUtmPoint);
     for (const auto &itPos : itemView.form)
-      DEBUG_LOG() << "itemView =" << debug(itPos);
+      DEBUG_LOG(m_logger) << "itemView =" << debug(itPos);
   }
 #endif
   return false;
@@ -696,7 +696,7 @@ void HandlerParticipantArea::onTriggeredImpactsChanged(const AreaEffectSimulatio
       modType != DataModification::eModified)
     return;
 
-  DEBUG_LOG() << "Got TriggeredImpacts: " << data;
+  DEBUG_LOG(m_logger) << "Got TriggeredImpacts: " << data;
   switch (data.aesTypeId().underlying())
   {
   case AreaEffectSimulation::AesType_def::AtExplosionArea:
@@ -723,7 +723,7 @@ void HandlerParticipantArea::onExplosionAreaChanged(const AreaEffectSimulation::
       modType != DataModification::eModified)
     return;
 
-  DEBUG_LOG() << "Got ExplosionArea, m_aesItemId2partIdMap.insert " << data.id() << " / " << data.participantId();
+  DEBUG_LOG(m_logger) << "Got ExplosionArea, m_aesItemId2partIdMap.insert " << data.id() << " / " << data.participantId();
   if (data.participantId().is_set())
     m_aesItemId2partIdMap.insert(data.id(), data.participantId().get());
   else
@@ -738,7 +738,7 @@ void HandlerParticipantArea::onExplosionSingleChanged(const AreaEffectSimulation
 
   if (m_ddsHandler->isSmartChargeType(data.chargeTypeId()))
   {
-    DEBUG_LOG() << "isSmartType = TRUE";
+    DEBUG_LOG(m_logger) << "isSmartType = TRUE";
     return;
   }
 
@@ -748,7 +748,7 @@ void HandlerParticipantArea::onExplosionSingleChanged(const AreaEffectSimulation
 
   if (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsRemoved)
   {
-    DEBUG_LOG() << "Remove SingleExplosion";
+    DEBUG_LOG(m_logger) << "Remove SingleExplosion";
     m_explosionSingleStates.remove(data.id());
     return;
   }
@@ -757,7 +757,7 @@ void HandlerParticipantArea::onExplosionSingleChanged(const AreaEffectSimulation
        m_explosionSingleStates.value(data.id()) == AreaEffectSimulation::AesEffectState_def::EsFired) &&
       data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated)
   {
-    DEBUG_LOG() << "Handle SingleExplosion";
+    DEBUG_LOG(m_logger) << "Handle SingleExplosion";
     handleExplosion = true;
   }
   m_explosionSingleStates.insert(data.id(), data.effectStateId());
@@ -765,10 +765,10 @@ void HandlerParticipantArea::onExplosionSingleChanged(const AreaEffectSimulation
   if (!handleExplosion)
     return;
 
-  DEBUG_LOG() << "isSmartType = " << m_ddsHandler->isSmartChargeType(data.chargeTypeId());
+  DEBUG_LOG(m_logger) << "isSmartType = " << m_ddsHandler->isSmartChargeType(data.chargeTypeId());
   if (m_ddsHandler->isSmartChargeType(data.chargeTypeId()))
   {
-    DEBUG_LOG() << "isSmartType = TRUE";
+    DEBUG_LOG(m_logger) << "isSmartType = TRUE";
   }
   else
   {
@@ -776,7 +776,7 @@ void HandlerParticipantArea::onExplosionSingleChanged(const AreaEffectSimulation
     const QPointF impactPos(CentralEffectSimulation::geographic2Utm(data.impactPosition(), &impactPosZone));
     const CentralEffectSimulation::AesItemViewUtm itemView = m_aesItemViews.value(data.id());
     const double impactRadius = m_ddsHandler->chargeTypeRadius(data.chargeTypeId());
-    DEBUG_LOG() << "Handle ExplosionSingle (EsActivated)";
+    DEBUG_LOG(m_logger) << "Handle ExplosionSingle (EsActivated)";
     const auto participantPositions = m_handlerParticipant->positions();
     for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition : participantPositions)
     {
@@ -787,16 +787,16 @@ void HandlerParticipantArea::onExplosionSingleChanged(const AreaEffectSimulation
         continue;
 
       const QPointF participantPosUtm = CentralEffectSimulation::geographic2Utm(participantPosition.pos(), impactPosZone);
-      DEBUG_LOG() << "impact pos: " << CentralEffectSimulation::debug(impactPos)
+      DEBUG_LOG(m_logger) << "impact pos: " << CentralEffectSimulation::debug(impactPos)
                           << " with radius " << impactRadius
                           << " and participant position " << CentralEffectSimulation::debug(participantPosUtm);
       if (inCircle(impactPos, impactRadius, participantPosUtm))
       {
-        DEBUG_LOG() << "participantId = " << participantPosition.participantId() << " inCircle = true";
+        DEBUG_LOG(m_logger) << "participantId = " << participantPosition.participantId() << " inCircle = true";
         sendEffectTypeEvent(itemView, participantPosition, EffectType::ExplosionSingle, -1, QDateTime::currentMSecsSinceEpoch());
       }
       else
-        DEBUG_LOG() << "participantId = " << participantPosition.participantId() << " inCircle = false";
+        DEBUG_LOG(m_logger) << "participantId = " << participantPosition.participantId() << " inCircle = false";
     }
   }
 } // onExplosionSingleChanged
@@ -808,7 +808,7 @@ void HandlerParticipantArea::onExplosionSingleCentralChanged(const AreaEffectSim
 
   if (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsRemoved) // EsExpired? EsError? EsUnknown?
   {
-    DEBUG_LOG() << "Remove ExplosionSingleCentral with aesId = " << data.id();
+    DEBUG_LOG(m_logger) << "Remove ExplosionSingleCentral with aesId = " << data.id();
     m_explosionSingleCentralStates.remove(data.id());
     return;
   } // if
@@ -822,7 +822,7 @@ void HandlerParticipantArea::onExplosionSingleCentralChanged(const AreaEffectSim
   } // if
 
   m_explosionSingleCentralStates.insert(data.id(), data.effectStateId());
-  DEBUG_LOG() << "Handle ExplosionSingleCentral with aesId = " << data.id();
+  DEBUG_LOG(m_logger) << "Handle ExplosionSingleCentral with aesId = " << data.id();
 
   // pre-calculate geometric data
   const AreaEffectSimulation::AesItemView &itemView = m_handlerAesData->itemView(data.id());
@@ -857,7 +857,7 @@ void HandlerParticipantArea::onExplosionSingleCentralChanged(const AreaEffectSim
       const BuildingModel *buildingModel = it.value();
       if (buildingModel->hasIntersection(centerGeo, participantPosition.lastGeoPosition))
       {
-        DEBUG_LOG() << "Participant " << participantPosition.participantId() << " is covered by building " << it.key();
+        DEBUG_LOG(m_logger) << "Participant " << participantPosition.participantId() << " is covered by building " << it.key();
         isCovered = true;
         break;
       } // if
@@ -866,7 +866,7 @@ void HandlerParticipantArea::onExplosionSingleCentralChanged(const AreaEffectSim
     if (isCovered)
       continue;
 
-    DEBUG_LOG() << "Participant " << participantPosition.participantId() << " is hit";
+    DEBUG_LOG(m_logger) << "Participant " << participantPosition.participantId() << " is hit";
     sendCesHitRequest(itemView, participantPosition, QDateTime::currentMSecsSinceEpoch(), effectType, -1);
   } // for
 }
@@ -877,7 +877,7 @@ void HandlerParticipantArea::calculateImpacts(const AreaEffectSimulation::Trigge
   auto it = m_aesItemViews.find(data.aesItemId());
   if (it == m_aesItemViews.end())
   {
-    WARNING_LOG() << "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;
@@ -904,7 +904,7 @@ void HandlerParticipantArea::calculateImpacts(const AreaEffectSimulation::Trigge
     // already checked (bit is already 0)
     if (!LtsUtils::BitArray::testBit(aesItemView.handledImpacts, bitFieldIdx))
       continue;
-    DEBUG_LOG() << "New impact at idx " << bitFieldIdx;
+    DEBUG_LOG(m_logger) << "New impact at idx " << bitFieldIdx;
     bitsToCheck += bitFieldIdx;
   }
 
@@ -933,7 +933,7 @@ void HandlerParticipantArea::calculateImpacts(const CentralEffectSimulation::Aes
 {
   const bool bIsSmartChargeType = m_ddsHandler->isSmartChargeType(itemView.chargeTypeId);
 
-  DEBUG_LOG() << "calculateImpacts, isSMart: " << bIsSmartChargeType;
+  DEBUG_LOG(m_logger) << "calculateImpacts, isSMart: " << bIsSmartChargeType;
 
   // get radius of munition
   const double impactRadius = m_ddsHandler->chargeTypeRadius(itemView.chargeTypeId);
@@ -970,30 +970,30 @@ void HandlerParticipantArea::sendCesHitRequest(const CentralEffectSimulation::Ae
   if (remaining < 0)
     return;
 
-  DEBUG_LOG() << "sendCesHitRequest Settings::calculateCentralAes=" << std::boolalpha << Settings::calculateCentralAes()
+  DEBUG_LOG(m_logger) << "sendCesHitRequest Settings::calculateCentralAes=" << std::boolalpha << Settings::calculateCentralAes()
                       << " insideWlsArea=" << std::boolalpha << participantPosition.insideWlsArea()
                       << " isSmartChargeType=" << std::boolalpha  << m_ddsHandler->isSmartChargeType(itemView.chargeTypeId)
                       << " participantId=" << participantPosition.participantId();
   if (!m_ddsHandler->isSmartChargeType(itemView.chargeTypeId))
   {
-     DEBUG_LOG() << "don't sendCesHitRequest Smart Type return";
+     DEBUG_LOG(m_logger) << "don't sendCesHitRequest Smart Type return";
      return;
   }
   const int equipNo = m_ddsHandler->participantId2EquipNo(participantPosition.participantId());
-  DEBUG_LOG() << " ftc sendCESHit to Participant participantId = " << 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)
   {
-    DEBUG_LOG() << "participantPosition.participantId != 0 && equipNo <= 0" ;
+    DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 && equipNo <= 0" ;
     return;
   }
   if (participantPosition.participantId() != 0 &&
       participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill)
   {
-    DEBUG_LOG() << "participantPosition.participantId != 0 CatastrophicKill)";
+    DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 CatastrophicKill)";
     return;
   }
 
@@ -1018,14 +1018,14 @@ void HandlerParticipantArea::sendCesHitRequest(const CentralEffectSimulation::Ae
     itemView.partyId,               // originPartyId
     mineFieldBitIndex
   );
-  DEBUG_LOG() << " participantId=" << participantPosition.participantId()
+  DEBUG_LOG(m_logger) << " participantId=" << participantPosition.participantId()
                       << " chargeTypeId=" << itemView.chargeTypeId
                       << " legacyChargeTypeId=" << legacyChargeTypeId;
 
   m_sendCesHitRequestQueue.enqueue(requestTab);
   if (m_sendCesHitRequestQueue.size() == 1)
   {
-    DEBUG_LOG() << "SendCesHitRequest: " << requestTab;
+    DEBUG_LOG(m_logger) << "SendCesHitRequest: " << requestTab;
     m_ddsHandler->ftcTab()->sendCesHitRequest(requestTab, this);
   }
 }
@@ -1041,26 +1041,26 @@ void HandlerParticipantArea::sendCesHitRequest(const AreaEffectSimulation::AesIt
 
   int32_t legacyChargeTypeId = 0;
   legacyChargeTypeId =  m_ddsHandler->getLegacyIdFromChargeTypeId(itemView.chargeTypeId());
-  DEBUG_LOG() << "sendCesHitRequest Settings::calculateCentralAes=" << std::boolalpha << Settings::calculateCentralAes()
+  DEBUG_LOG(m_logger) << "sendCesHitRequest Settings::calculateCentralAes=" << std::boolalpha << Settings::calculateCentralAes()
                       << " insideWlsArea=" << std::boolalpha << participantPosition.insideWlsArea()
                       << " isSmartChargeType=" << std::boolalpha  << m_ddsHandler->isSmartChargeType(itemView.chargeTypeId())
                       << " participantId=" << participantPosition.participantId();
 
   const int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantPosition.participantId());
-  DEBUG_LOG() << " ftc sendCESHit to Participant participantId = " << 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)
   {
-    DEBUG_LOG() << "participantPosition.participantId != 0 && equipNo <= 0" ;
+    DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 && equipNo <= 0" ;
     return;
   } // if
 
   if (participantPosition.participantId() != 0 &&
       participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill)
   {
-    DEBUG_LOG() << "participantPosition.participantId != 0 CatastrophicKill)";
+    DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 CatastrophicKill)";
     return;
   } // if
 
@@ -1074,13 +1074,13 @@ void HandlerParticipantArea::sendCesHitRequest(const AreaEffectSimulation::AesIt
     equipmentNumber, participantPosition.participantId(), legacyChargeTypeId, itemView.aesItemId(), originatorEquipmentNumber,
     remaining, pos, effectTime, itemView.partyId().get(), mineFieldBitIndex
   );
-  DEBUG_LOG() << " participantId=" << participantPosition.participantId() << " chargeTypeId=" << itemView.chargeTypeId()
+  DEBUG_LOG(m_logger) << " participantId=" << participantPosition.participantId() << " chargeTypeId=" << itemView.chargeTypeId()
                       << " legacyChargeTypeId=" << legacyChargeTypeId;
 
   m_sendCesHitRequestQueue.enqueue(requestTab);
   if (m_sendCesHitRequestQueue.size() == 1)
   {
-    DEBUG_LOG() << "SendCesHitRequest: " << requestTab;
+    DEBUG_LOG(m_logger) << "SendCesHitRequest: " << requestTab;
     m_ddsHandler->ftcTab()->sendCesHitRequest(requestTab, this);
   } // if
 }
@@ -1099,7 +1099,7 @@ void HandlerParticipantArea::sendParticipantEvent(const CentralEffectSimulation:
       typeClass == ParticipantManagement::TypeClass_def::Vessel ||
       typeClass == ParticipantManagement::TypeClass_def::Unknown)
   {
-    DEBUG_LOG() << "Participant with id " << participantPosition.participantId()
+    DEBUG_LOG(m_logger) << "Participant with id " << participantPosition.participantId()
                         << " has invalid typeClass: " << typeClass
                         << " eventType: " << eventType;
     return;
@@ -1108,7 +1108,7 @@ void HandlerParticipantArea::sendParticipantEvent(const CentralEffectSimulation:
 
   if (!eventMustBeSend(itemView.aesItemId, participantPosition.participantId(), eventType))
   {
-    DEBUG_LOG() << "Not sending Event " << eventType << " for participant " << participantPosition.participantId()
+    DEBUG_LOG(m_logger) << "Not sending Event " << eventType << " for participant " << participantPosition.participantId()
                         << " and aes " << itemView.aesItemId << " - already sent";
     return;
   }
@@ -1125,7 +1125,7 @@ void HandlerParticipantArea::sendParticipantEvent(const CentralEffectSimulation:
       calculateAes = true;
     else
     {
-      DEBUG_LOG() << "!participantPosition.insideWlsArea()";
+      DEBUG_LOG(m_logger) << "!participantPosition.insideWlsArea()";
       calculateAes = false;
     }
   }
@@ -1138,19 +1138,19 @@ void HandlerParticipantArea::sendParticipantEvent(const CentralEffectSimulation:
           || eventType == ProjectDataManagement::EventType_def::HitMine
           || eventType == ProjectDataManagement::EventType_def::HitN))
   {
-    DEBUG_LOG() << "send hit events only with central AES Simulation participant=" << participantPosition.participantId();
+    DEBUG_LOG(m_logger) << "send hit events only with central AES Simulation participant=" << participantPosition.participantId();
     return;
   }
 
   int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantPosition.participantId());
   if (equipmentNumber <= 0)
   {
-    WARNING_LOG() << "Not sending Event " << eventType << " for participant " << participantPosition.participantId()
+    WARNING_LOG(m_logger) << "Not sending Event " << eventType << " for participant " << participantPosition.participantId()
                           << " - participant has no equipment number";
     return;
   }
 
-  DEBUG_LOG() << "sendParticipantEvent" << eventType
+  DEBUG_LOG(m_logger) << "sendParticipantEvent" << eventType
                       << " participantId=" << participantPosition.participantId()
                       << " AesItemId=" << itemView.aesItemId;
 
@@ -1182,7 +1182,7 @@ void HandlerParticipantArea::sendParticipantEvent(const CentralEffectSimulation:
   else
     pe.friendlyFire(false);
 
-  INFO_LOG() << "sendParticipantEvent: " << pe
+  INFO_LOG(m_logger) << "sendParticipantEvent: " << pe
                      << ", currentMSecsSinceEpoch = " << QDateTime::currentMSecsSinceEpoch()
                      << ", time difference = " << QDateTime::currentMSecsSinceEpoch() - pe.eventTime();
   m_ddsHandler->dtsCes()->publish(pe);
@@ -1208,7 +1208,7 @@ void HandlerParticipantArea::sendEffectTypeEvent(const CentralEffectSimulation::
   case Settings::AES_CALCUALTION_ONLY_IN_WLS_AREA:
     if (!participantPosition.insideWlsArea())
     {
-      DEBUG_LOG() << "!participantPosition.insideWlsArea()";
+      DEBUG_LOG(m_logger) << "!participantPosition.insideWlsArea()";
       return;
     }
   }
@@ -1229,7 +1229,7 @@ void HandlerParticipantArea::sendEffectTypeEvent(const CentralEffectSimulation::
                             effectType, mineFieldBitIndex,
                             participantPosition.insideBuilding()))
   {
-    DEBUG_LOG() << "Not sending EffectType event " << toString(effectType)
+    DEBUG_LOG(m_logger) << "Not sending EffectType event " << toString(effectType)
                         << ", participant: " << participantPosition.participantId()
                         << ", aesItemId: " << itemView.aesItemId
                         << mfb
@@ -1237,7 +1237,7 @@ void HandlerParticipantArea::sendEffectTypeEvent(const CentralEffectSimulation::
     return;
   }
   const int ctasEffectType = static_cast<int>(effectType) & 0xffff;
-  DEBUG_LOG() << "Sending EffectType event " << toString(effectType)
+  DEBUG_LOG(m_logger) << "Sending EffectType event " << toString(effectType)
                       << ", participant: " << participantPosition.participantId()
                       << ", aesItemId: " << itemView.aesItemId
                       << mfb
@@ -1259,7 +1259,7 @@ bool HandlerParticipantArea::eventMustBeSend(int aesItemId,
   // - only send event if it was not already sent
   if (activeEvents.contains(eventType))
   {
-    DEBUG_LOG() << "activeEvents=" << eventType;
+    DEBUG_LOG(m_logger) << "activeEvents=" << eventType;
     return false;
   }
 
@@ -1309,7 +1309,7 @@ bool HandlerParticipantArea::effectTypeMustBeSend(int aesItemId,
   // - only send event if it was not already sent
   if (activeEffects.contains(effectType))
   {
-    DEBUG_LOG() << "effectTypeStates already contains aesItemId " << aesItemId;
+    DEBUG_LOG(m_logger) << "effectTypeStates already contains aesItemId " << aesItemId;
     return false;
   }
   activeEffects += effectType;
@@ -1416,7 +1416,7 @@ bool HandlerParticipantArea::inCircle(const QPointF &centerUtm, const double rad
 {
   double squareDist = CentralEffectSimulation::getSquareDistance(centerUtm, pointUtm);
   double squareRadius = radius * radius;
-  DEBUG_LOG() << "squareDist: " << squareDist << ", squareRadius: " << squareRadius;
+  DEBUG_LOG(m_logger) << "squareDist: " << squareDist << ", squareRadius: " << squareRadius;
   return (squareDist < squareRadius);
 } // inCircle
 
@@ -1465,7 +1465,7 @@ EffectType HandlerParticipantArea::effectTypeForNContaminationArea(const Central
   if (squareDist <= pow(itemView.radials.at(0), 2))
   {
     // 5s delay
-    DEBUG_LOG() << "partPosSampleTime: " << partPosSampleTime
+    DEBUG_LOG(m_logger) << "partPosSampleTime: " << partPosSampleTime
                         << ", itemView.effectStart: " << itemView.effectStart;
     if (partPosSampleTime < itemView.effectStart + 5000)
       return EffectType::NContaminationDetonation;
@@ -1499,12 +1499,12 @@ void HandlerParticipantArea::aesItemViewRemoved(int aesItemId)
     const auto effectTypLeave = leaveEffectTypeForAesType(aiv.aesTypeId);
     if (effectTypLeave != EffectType::Unknown)
     {
-      DEBUG_LOG() << "aesItemViewRemoved, leaveEffectType: " << toString(effectTypLeave);
+      DEBUG_LOG(m_logger) << "aesItemViewRemoved, leaveEffectType: " << toString(effectTypLeave);
       auto it = m_effectTypeStates.find(aesItemId);
       if (it != m_effectTypeStates.end())
       {
         const QHash<int, QSet<EffectType>> &participants = it.value();
-        DEBUG_LOG() << "aesItemViewRemoved, sending leave events to " << participants.size()
+        DEBUG_LOG(m_logger) << "aesItemViewRemoved, sending leave events to " << participants.size()
                             << " participants";
         for (auto itP = participants.begin(); itP != participants.end(); ++ itP)
           sendEffectTypeEvent(aiv, m_handlerParticipant->position(itP.key()), effectTypLeave, -1, -1);
@@ -1513,12 +1513,12 @@ void HandlerParticipantArea::aesItemViewRemoved(int aesItemId)
     const auto eventTypeLeave = leaveEventTypeForAesType(aiv.aesTypeId);
     if (eventTypeLeave != ProjectDataManagement::EventType::Unknown)
     {
-      DEBUG_LOG() << "aesItemViewRemoved, leaveEventType: " << eventTypeLeave;
+      DEBUG_LOG(m_logger) << "aesItemViewRemoved, leaveEventType: " << eventTypeLeave;
       auto it = m_eventStates.find(aesItemId);
       if (it != m_eventStates.end())
       {
         const QHash<int, QSet<ProjectDataManagement::EventType>> &participants = it.value();
-        DEBUG_LOG() << "aesItemViewRemoved, sending leave events to " << participants.size()
+        DEBUG_LOG(m_logger) << "aesItemViewRemoved, sending leave events to " << participants.size()
                             << " participants";
         for (auto itP = participants.begin(); itP != participants.end(); ++ itP)
           sendParticipantEvent(aiv, m_handlerParticipant->position(itP.key()), eventTypeLeave);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_participant_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_participant_area.h
index 7badc72dd..8080ffd3e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_participant_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_participant_area.h
@@ -70,6 +70,7 @@ public:
   bool init();
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onSendCesHitReply(const Core::FunctionReplyObject &replyObject) override final;
 
 private Q_SLOTS:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/plugin.cpp
index d2381b5e4..a7456cc5c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/plugin.cpp
@@ -58,7 +58,7 @@ bool Ces2DInterfaceImpl::init(int domainId, int exerciseId)
 
   m_domainId = domainId;
   m_exerciseId = exerciseId;
-  INFO_LOG() << "CentralEffectSimulation2DInterfaceImpl::init()"
+  INFO_LOG(m_logger) << "CentralEffectSimulation2DInterfaceImpl::init()"
                      << " m_domainId=" << m_domainId
                      << " m_exerciseId=" << m_exerciseId;
 
@@ -69,15 +69,15 @@ bool Ces2DInterfaceImpl::init(int domainId, int exerciseId)
 
   if (!m_handlerAesData->init())
   {
-    ERROR_LOG() << "Initialisation HandlerAesData failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerAesData failed.";
     return false;
   }
 
-  INFO_LOG() << "initialize HandlerBuildingModel ----------------------------";
+  INFO_LOG(m_logger) << "initialize HandlerBuildingModel ----------------------------";
   m_handlerBuildingModel = std::make_shared<HandlerBuildingModel>(m_ddsHandler, m_handlerAesData, this);
   if (!m_handlerBuildingModel->init())
   {
-    ERROR_LOG() << "Initialisation HandlerBuildingModel failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerBuildingModel failed.";
     return false;
   } // if
 
@@ -91,11 +91,11 @@ bool Ces2DInterfaceImpl::init(int domainId, int exerciseId)
 
   if (!m_handlerParticipantArea->init())
   {
-    ERROR_LOG() << "Initialisation HandlerParticipantArea failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerParticipantArea failed.";
     return false;
   }
 
-  INFO_LOG() << "CentralEffectSimulation2DInterfaceImpl::init() return true";
+  INFO_LOG(m_logger) << "CentralEffectSimulation2DInterfaceImpl::init() return true";
   return true;
 }
 
@@ -103,8 +103,8 @@ QString Ces2DInterfaceImpl::echo(const QString &message)
 {
 
   QString ret(QStringLiteral("<<<< %1 >>>> CentralEffectSimulation2DInterfaceImpl::echo").arg(message));
-  INFO_LOG() << "CentralEffectSimulation2DInterfaceImpl::echo return:" << ret;
-  DEBUG_LOG() << "DEBUG: CentralEffectSimulation2DInterfaceImpl::echo return:" << ret;
+  INFO_LOG(m_logger) << "CentralEffectSimulation2DInterfaceImpl::echo return:" << ret;
+  DEBUG_LOG(m_logger) << "DEBUG: CentralEffectSimulation2DInterfaceImpl::echo return:" << ret;
   return ret;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/plugin.h
index b94223509..20e8b7597 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/plugin.h
@@ -65,6 +65,7 @@ private Q_SLOTS:
   bool init(int domainId, int exerciseId) override;
 private:
 
+NGL::INGLLogger &m_logger;
 private:
   CentralEffectSimulation::Plugin::DataProvider *m_pdp;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ECHO/echoplugin.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ECHO/echoplugin.h
index 93aff6286..de7062963 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ECHO/echoplugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ECHO/echoplugin.h
@@ -45,6 +45,7 @@ public:
 private Q_SLOTS:
 private:
 
+NGL::INGLLogger &m_logger;
 private:
   CentralEffectSimulation::Plugin::DataProvider *m_pdp;
 };
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 2d4c9f6f3..8a2eca970 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
@@ -53,7 +53,7 @@ HandlerExplosions::~HandlerExplosions()
 //-----------------------------------------------------------------------------
 bool HandlerExplosions::init()
 {
-  DEBUG_LOG() << "HandlerExplosions::init()";
+  DEBUG_LOG(m_logger) << "HandlerExplosions::init()";
   auto dtcAes = m_ddsHandler->dtcAes();
   auto ftcTab = m_ddsHandler->ftcTab();
   auto dtcCes = m_ddsHandler->dtsCes();
@@ -95,9 +95,9 @@ bool HandlerExplosions::init()
 void HandlerExplosions::onSendCesHitReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    WARNING_LOG() << "Can not send CesHitRequest: " << replyObject();
+    WARNING_LOG(m_logger) << "Can not send CesHitRequest: " << replyObject();
   else
-    DEBUG_LOG() << "onSendCesHitReply for id " << replyObject.id() << " success\n"
+    DEBUG_LOG(m_logger) << "onSendCesHitReply for id " << replyObject.id() << " success\n"
                         << " replyObject.str() = " << replyObject.str();
 }
 
@@ -127,7 +127,7 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
   const double impactRadius                         = m_ddsHandler->chargeTypeRadius(data.chargeStruct());
   bool isCentral                                    = false;
 
-  DEBUG_LOG() << "onAesItemViewChanged 1 "
+  DEBUG_LOG(m_logger) << "onAesItemViewChanged 1 "
                       << ", aesItemId=" << aesItemId
                       << ", aesTypeId=" << aesTypeId
                       << ", chargeTypeId=" << chargeTypeId
@@ -142,7 +142,7 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
   {
     const AreaEffectSimulation::ExplosionSingle &explosionSingle = m_ddsHandler->dtcAes()->explosionSingle(aesItemId);
     isCentral = explosionSingle.isCentral();
-    DEBUG_LOG() << "ExplosionSingle";
+    DEBUG_LOG(m_logger) << "ExplosionSingle";
     break;
   }
   case AreaEffectSimulation::AesType::AtExplosionArea:
@@ -150,24 +150,24 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
   {
     const AreaEffectSimulation::ExplosionArea &explosionArea = m_ddsHandler->dtcAes()->explosionArea(aesItemId);
     isCentral = explosionArea.isCentral();
-    DEBUG_LOG() << "explosionArea";
+    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());
-    DEBUG_LOG() << "explosionCluster";
+    DEBUG_LOG(m_logger) << "explosionCluster";
     break;
   }
   default:
-    DEBUG_LOG() << "default, data.aesTypeId=" << aesTypeId;
+    DEBUG_LOG(m_logger) << "default, data.aesTypeId=" << aesTypeId;
   } // switch
 
   // skip SMART
   if (m_ddsHandler->isSmartChargeType(data.chargeStruct()))
   {
-    DEBUG_LOG() << " S M A R T return onAesItemViewChanged";
+    DEBUG_LOG(m_logger) << " S M A R T return onAesItemViewChanged";
     return;
   } // if
 
@@ -178,7 +178,7 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
   // just for isCentral == true
   //
 
-  DEBUG_LOG() << "onAesItemViewChanged 2 aesItemId=" << aesItemId
+  DEBUG_LOG(m_logger) << "onAesItemViewChanged 2 aesItemId=" << aesItemId
                       << " isCentral=" << isCentral;
 
   const bool isSupplyTruck     = false;
@@ -190,7 +190,7 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
                                                                                                            isSupplyTruck);
   // default for useHazardDistance, hazardDistance
 
-  DEBUG_LOG() << "onAesItemViewChanged 3"
+  DEBUG_LOG(m_logger) << "onAesItemViewChanged 3"
                       << ", aesItemId=" << aesItemId
                       << ", aesTypeId=" << aesTypeId
                       << ", chargeTypeId=" << chargeTypeId
@@ -206,7 +206,7 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
   case AreaEffectSimulation::AesEffectState_def::EsExpired:
   case AreaEffectSimulation::AesEffectState_def::EsRemoved:
   {
-    DEBUG_LOG() << " remove aesItemId=" << data.aesItemId();
+    DEBUG_LOG(m_logger) << " remove aesItemId=" << data.aesItemId();
     // do some cleanup:
     m_handledImpactsStorage.removeAesItem(aesItemId);
     Q_FALLTHROUGH();
@@ -233,7 +233,7 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
 
     // jetzt sollte m_enteredHazardDistanceStore eigentlich bereinigt sein:
     const int remaingPartIdsInArea = m_enteredHazardDistanceStore.allParticipantIdsOfArea(aesItemId).size();
-    DEBUG_LOG() << " remaingParticipantIdsInArea=" << remaingPartIdsInArea;
+    DEBUG_LOG(m_logger) << " remaingParticipantIdsInArea=" << remaingPartIdsInArea;
     Q_ASSERT(remaingPartIdsInArea == 0);
 
     m_enteredHazardDistanceStore.removeArea(aesItemId);
@@ -242,7 +242,7 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
     // cleanup:
     if (data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsPaused)
     {
-      DEBUG_LOG() << "Expired, remove aesItemId=" << aesItemId
+      DEBUG_LOG(m_logger) << "Expired, remove aesItemId=" << aesItemId
                           << ", m_aesItemViewsUtm.remove(" << aesItemId << ")";
       m_aesItemViewsUtm.remove(aesItemId);
       m_aesItemViewsImpactsUtm.remove(aesItemId);
@@ -256,11 +256,11 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
   case AreaEffectSimulation::AesEffectState_def::EsFired:
   case AreaEffectSimulation::AesEffectState_def::EsActivated:
   {
-    DEBUG_LOG() << "Got AesItemView: " << data.effectStateId()
+    DEBUG_LOG(m_logger) << "Got AesItemView: " << data.effectStateId()
                         << " aesItemId=" << aesItemId
                         << " isCentral=" << isCentral;
 
-    DEBUG_LOG() << "insert AesItemView: " << data.effectStateId()
+    DEBUG_LOG(m_logger) << "insert AesItemView: " << data.effectStateId()
                         << " aesItemViewUtm.effectStateId=" << aesItemViewUtm.effectStateId
                         << " chargeTypeId" << aesItemViewUtm.chargeStruct.chargeTypeId();
 
@@ -277,7 +277,7 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
                                                                            data.chargeStruct().igniterTypeId(),
                                                                            data.chargeStruct().igniterFunctionId());
 
-      DEBUG_LOG() << "+++++++++++ ExplosionCluster: hazardDistance=" << hazardDistance
+      DEBUG_LOG(m_logger) << "+++++++++++ ExplosionCluster: hazardDistance=" << hazardDistance
                           << ", impactRadius ="  << impactRadius;
       aesItemViewUtm.hazardDistance_meter = hazardDistance;
       aesItemViewUtm.hazardDistanceForm = ExpandPolygon::bufferUtmPolygon(aesItemViewUtm.form,  aesItemViewUtm.zone, hazardDistance);
@@ -289,7 +289,7 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
     else
     {
       m_aesItemViewsUtm.insert(aesItemId, aesItemViewUtm);
-      DEBUG_LOG() << "m_aesItemViewsUtm.insert aesItemId=" << aesItemId;
+      DEBUG_LOG(m_logger) << "m_aesItemViewsUtm.insert aesItemId=" << aesItemId;
     }
 
     //
@@ -308,7 +308,7 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
         const int numberOfParametrizedObjects = checkPartEnterLeaveArea(m_aesItemViewsUtm.constBegin(), m_aesItemViewsUtm.constEnd(),        // parametrize a single item
                                                                         participantPositions.constBegin(), participantPositions.constEnd());
 
-        DEBUG_LOG() << "++++++++ checkPartEnterLeaveArea checkPartEnterLeaveAreaNumber="  << numberOfParametrizedObjects;
+        DEBUG_LOG(m_logger) << "++++++++ checkPartEnterLeaveArea checkPartEnterLeaveAreaNumber="  << numberOfParametrizedObjects;
       }
     } // if (aesItemViewUtm.effectStart == AreaEffectSimulation::AesEffectState::EsActivated)
     break;
@@ -321,11 +321,11 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem
 
 void HandlerExplosions::onTriggeredImpactsChanged(const AreaEffectSimulation::TriggeredImpacts &data, DataModification modType)
 {
-  DEBUG_LOG() << "onTriggeredImpactsChanged";
+  DEBUG_LOG(m_logger) << "onTriggeredImpactsChanged";
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG() << "Got TriggeredImpacts: " << data
+  DEBUG_LOG(m_logger) << "Got TriggeredImpacts: " << data
                       << " bitfield().size=" << data.bitfield().size();
   switch (data.aesTypeId().underlying())
   {
@@ -357,10 +357,10 @@ void HandlerExplosions::calculateImpact(const AreaEffectSimulation::ChargeEffect
   {
     if (m_handlerParticipant->isOutdated(pPos)) // Participant Position is not valid Todo Magic Number
       continue;
-    DEBUG_LOG() << "pPos.participantId=" << pPos.participantId();
+    DEBUG_LOG(m_logger) << "pPos.participantId=" << pPos.participantId();
     if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill)
       continue;
-    DEBUG_LOG() << "pPos.vulnerabilityState=" << pPos.vulnerabilityState;
+    DEBUG_LOG(m_logger) << "pPos.vulnerabilityState=" << pPos.vulnerabilityState;
     if (pPos.insideBuilding())
       continue;
 
@@ -374,7 +374,7 @@ void HandlerExplosions::calculateImpact(const AreaEffectSimulation::ChargeEffect
 
     if (inCircle(impactPositionUtm, impactRadius, participantPosUtm))
     {
-      DEBUG_LOG() << "Teilnehmer getroffen => Send CesHitRequest ";
+      DEBUG_LOG(m_logger) << "Teilnehmer getroffen => Send CesHitRequest ";
 
       TrainingAreaBase::TabPosition tabPosition;
       TrainingAreaBase::SendCesHitRequest requestTab;
@@ -395,7 +395,7 @@ void HandlerExplosions::calculateImpact(const AreaEffectSimulation::ChargeEffect
            requestTab.originatorEquipmentNumber(part.equipmentNumber().get());
         else
         {
-          WARNING_LOG() << "Sending CesHitRequest without EquipNo, using negative ParticipantID : " << data.originatorId();
+          WARNING_LOG(m_logger) << "Sending CesHitRequest without EquipNo, using negative ParticipantID : " << data.originatorId();
           requestTab.originatorEquipmentNumber(-data.originatorId());
         }
       }
@@ -412,13 +412,13 @@ void HandlerExplosions::calculateImpact(const AreaEffectSimulation::ChargeEffect
       requestTab.mineId(0);
       requestTab.partyId(originator.partyId());
 
-      DEBUG_LOG() << " participantId=" << pPos.participantId()
+      DEBUG_LOG(m_logger) << " participantId=" << pPos.participantId()
                           << ", chargeTypeId=" << data.chargeTypeId()
                           << ", m_sendCesHitRequestQueue.size()=" << m_sendCesHitRequestQueue.size()
                           << ", duration=" << data.effectDuration()
                           << " \n" << requestTab;
 
-      DEBUG_LOG() << "ftcTab->SendCesHitRequest: " << requestTab;
+      DEBUG_LOG(m_logger) << "ftcTab->SendCesHitRequest: " << requestTab;
       m_ddsHandler->ftcTab()->sendCesHitRequest(requestTab, this);
 
     }
@@ -432,7 +432,7 @@ void HandlerExplosions::startTimer(int id, int msec) {
   // Timeout-Slot mit echtem SLOT
   connect(timer, &QTimer::timeout, this, &HandlerExplosions::onStartTimeReached);
   timer->start(msec);
-  DEBUG_LOG() << "Timer " << id << " gestartet fuer " << msec << " ms.";
+  DEBUG_LOG(m_logger) << "Timer " << id << " gestartet fuer " << msec << " ms.";
 }
 
 void HandlerExplosions::onStartTimeReached()
@@ -445,7 +445,7 @@ void HandlerExplosions::onStartTimeReached()
   if (!bOk)
     return;
 
-  DEBUG_LOG() << "Timer " << chargeEffectId << " ausgeloest!";
+  DEBUG_LOG(m_logger) << "Timer " << chargeEffectId << " ausgeloest!";
 
   // Timer stoppen und loeschen
   AreaEffectSimulation::ChargeEffect data = m_chargeEffects.value(chargeEffectId);
@@ -457,12 +457,12 @@ void HandlerExplosions::onStartTimeReached()
 
 void HandlerExplosions::onChargeEffectChanged(const AreaEffectSimulation::ChargeEffect &data, DataModification modType)
 {
-  DEBUG_LOG() << "HandlerExplosions::onChargeEffectChanged";
+  DEBUG_LOG(m_logger) << "HandlerExplosions::onChargeEffectChanged";
   if (modType == DataModification::eRemoved)
     return;
   const long long effectStart = data.effectStart();
 
-  DEBUG_LOG() << "HandlerExplosions::onChargeEffectChanged"
+  DEBUG_LOG(m_logger) << "HandlerExplosions::onChargeEffectChanged"
                       << ", effectStart=" << effectStart
                       << ", currentPartitionTime=" << m_ddsHandler->currentPartitionTime();
 
@@ -470,48 +470,48 @@ void HandlerExplosions::onChargeEffectChanged(const AreaEffectSimulation::Charge
   // Startzeit in der Vergangenheit: aktuelle Zeit - 3 Sekunden
   if ( effectStart < m_ddsHandler->currentPartitionTime() - 3000 )
   {
-    DEBUG_LOG() << "Startzeit in der Vergangenheit: aktuelle Zeit - 3 Sekunden";
+    DEBUG_LOG(m_logger) << "Startzeit in der Vergangenheit: aktuelle Zeit - 3 Sekunden";
     return;
   }
   // Startzeit entspricht der aktuellen Zeit
   if (    effectStart > m_ddsHandler->currentPartitionTime() - 3000
        && effectStart < m_ddsHandler->currentPartitionTime() + data.effectDuration() )
   {
-    DEBUG_LOG() << "Startzeit entspricht der aktuellen Zeit";
+    DEBUG_LOG(m_logger) << "Startzeit entspricht der aktuellen Zeit";
     calculateImpact(data);
   }
   // Startzeit in der Zukunft:
   else if (effectStart > m_ddsHandler->currentPartitionTime() + data.effectDuration())
   {
     // Start mit Timer
-    DEBUG_LOG() << "Startzeit in der Zukunft"
+    DEBUG_LOG(m_logger) << "Startzeit in der Zukunft"
                          << ", id :" << data.id()
                          << ", duration=" << effectStart - m_ddsHandler->currentPartitionTime();
     m_chargeEffects.insert(data.id(), data);
     startTimer(data.id(), effectStart - m_ddsHandler->currentPartitionTime());
   }
-  DEBUG_LOG() << "END onChargeEffectChanged";
+  DEBUG_LOG(m_logger) << "END onChargeEffectChanged";
 }
 
 void HandlerExplosions::onExplosionSingleChanged(const AreaEffectSimulation::ExplosionSingle &data, DataModification modType)
 {
-  DEBUG_LOG() << "\n onExplosionSingleChanged id=" << data.id()
+  DEBUG_LOG(m_logger) << "\n onExplosionSingleChanged id=" << data.id()
                       << " AesEffectState=" << data.effectStateId();
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG() << "onExplosionSingleChanged 1";
+  DEBUG_LOG(m_logger) << "onExplosionSingleChanged 1";
 
   if (data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsActivated)
     return;
 
-  DEBUG_LOG() << "onExplosionSingleChanged"
+  DEBUG_LOG(m_logger) << "onExplosionSingleChanged"
                       << " isCentral=" << data.isCentral();
 
   if (!data.isCentral())
     return;
 
-  DEBUG_LOG() << "onExplosionSingle Activated isCentral=" << data.isCentral()
+  DEBUG_LOG(m_logger) << "onExplosionSingle Activated isCentral=" << data.isCentral()
                       << " id=" << data.id();
 
   // get access to the aesItemViewUtm storing the data for bbox check:
@@ -521,7 +521,7 @@ void HandlerExplosions::onExplosionSingleChanged(const AreaEffectSimulation::Exp
   else if (m_aesItemViewsImpactsUtm.contains(data.id()))
     aesItemViewUtm = m_aesItemViewsImpactsUtm.value(data.id());
   else
-    ERROR_LOG() << "Kein AesItemViewUtm ";
+    ERROR_LOG(m_logger) << "Kein AesItemViewUtm ";
 
   // Now call calculateImpacts() (createEvent if in circle...)
   const auto &participantPositions = m_handlerParticipant->positions();
@@ -534,7 +534,7 @@ void HandlerExplosions::onExplosionSingleChanged(const AreaEffectSimulation::Exp
 
   if (m_ddsHandler->isSmartChargeType(data.chargeStruct()))
   {
-    DEBUG_LOG() << " S M A R T "
+    DEBUG_LOG(m_logger) << " S M A R T "
                         << " aesItemId=" << aesItemViewUtm.aesItemId
                         << " chargeTypeId=" << data.chargeStruct().chargeTypeId()
                         << " partyId=" << aesItemViewUtm.partyId
@@ -547,18 +547,18 @@ void HandlerExplosions::onExplosionSingleChanged(const AreaEffectSimulation::Exp
   {
     if (m_handlerParticipant->isOutdated(pPos)) // Participant Position is not valid Todo Magic Number
       continue;
-    DEBUG_LOG() << "pPos.participantId=" << pPos.participantId();
+    DEBUG_LOG(m_logger) << "pPos.participantId=" << pPos.participantId();
     if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill)
       continue;
-    DEBUG_LOG() << "pPos.vulnerabilityState=" << pPos.vulnerabilityState;
+    DEBUG_LOG(m_logger) << "pPos.vulnerabilityState=" << pPos.vulnerabilityState;
     if (pPos.insideBuilding())
       continue;
-    DEBUG_LOG() << "pPos.insideBuilding=" << pPos.insideBuilding();
+    DEBUG_LOG(m_logger) << "pPos.insideBuilding=" << pPos.insideBuilding();
 
     if (!inBoundingBoxCheck(aesItemViewUtm, pPos))
       continue;
 
-    DEBUG_LOG() << "calculateImpacts zone=" << aesItemViewUtm.zone;
+    DEBUG_LOG(m_logger) << "calculateImpacts zone=" << aesItemViewUtm.zone;
     const Core::GeoPosition impactPosition3D(data.impactPosition().lon(), data.impactPosition().lat(), 0.0);
 
     Options options;
@@ -594,14 +594,14 @@ void HandlerExplosions::onEffectsChanged(const AreaEffectSimulation::Effects &ef
   {
     if (m_ddsHandler->isSmartChargeType(aesItem.chargeStruct()))
     {
-      DEBUG_LOG() << "Calculate SMART";
+      DEBUG_LOG(m_logger) << "Calculate SMART";
       calculateSmartEffect(effects);
       return;
     }
   }
   else
   {
-    DEBUG_LOG() << "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:
@@ -611,7 +611,7 @@ void HandlerExplosions::onEffectsChanged(const AreaEffectSimulation::Effects &ef
   // AesItem will be created _BEOFRE_ effects (Topic Effects) could be published:
   if (aesItemViewUtm.aesItemId != aesItemId)
   {
-    DEBUG_LOG() << "aesItemViewUtm (with extent) not found for aesItemId =" << aesItemId
+    DEBUG_LOG(m_logger) << "aesItemViewUtm (with extent) not found for aesItemId =" << aesItemId
                         << " perhaps the field is not central, expired or SMART return onEffectsChanged";
     return;
   }
@@ -623,7 +623,7 @@ void HandlerExplosions::onEffectsChanged(const AreaEffectSimulation::Effects &ef
   const int chargeTypeId                            = aesItemViewUtm.chargeStruct.chargeTypeId();
   const ProjectDataManagement::GearClass &gearClass = m_ddsHandler->dtcPdm()->gearClassFromChargeTypeId(chargeTypeId);
 
-  DEBUG_LOG() << "onEffectsChanged, aesItemId=" << aesItemId
+  DEBUG_LOG(m_logger) << "onEffectsChanged, aesItemId=" << aesItemId
                       << ", chargeTypeId = " << chargeTypeId
                       << ", gearClass = " << gearClass;
 
@@ -653,7 +653,7 @@ void HandlerExplosions::onEffectsChanged(const AreaEffectSimulation::Effects &ef
 
   // now triggeredEffectsLtsCoord stores the (new) GeoPositions to be calculated:
 
-  DEBUG_LOG() << "Effects of aesItemId =" << aesItemId
+  DEBUG_LOG(m_logger) << "Effects of aesItemId =" << aesItemId
                       << ", number of new SingleEffects (in this timeslot) = " << triggeredEffectsLtsCoord.size();
 
   // Now call calculateImpacts() (createEvent if in circle...)
@@ -664,27 +664,27 @@ void HandlerExplosions::onEffectsChanged(const AreaEffectSimulation::Effects &ef
       continue;
     if (m_handlerParticipant->isOutdated(pPos)) // Participant Position is not valid Todo Magic Number
       continue;
-    DEBUG_LOG() << "pPos.participantId=" << pPos.participantId()
+    DEBUG_LOG(m_logger) << "pPos.participantId=" << pPos.participantId()
                         << ", vulnerabilityState=" << pPos.vulnerabilityState;
     if (pPos.insideBuilding())
       continue;
-    DEBUG_LOG() << "pPos.insideBuilding=" << pPos.insideBuilding();
+    DEBUG_LOG(m_logger) << "pPos.insideBuilding=" << pPos.insideBuilding();
 
     // skip inBoundingBoxCheck for ExplosionCluster since impacts could be OUTSIDE of bbox (intersection with bldg)
     //    if (!inBoundingBoxCheck(aesItemViewUtm, pPos))
     //      continue;
 
-    DEBUG_LOG() << "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() << "calculateImpactsEffect for participantId " << pPos.participantId() << " DONE";
+    DEBUG_LOG(m_logger) << "calculateImpactsEffect for participantId " << pPos.participantId() << " DONE";
   } // for const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos
 
-  INFO_LOG() << " onEffectsChanged took [ms] " << timer.elapsed();
+  INFO_LOG(m_logger) << " onEffectsChanged took [ms] " << timer.elapsed();
 }
 
 // [GUEZE-2257]3D Wirksim - Gefaehrdungsabstand Zentral
@@ -692,7 +692,7 @@ void HandlerExplosions::onNewParticipantCesPosition(const CentralEffectSimulatio
 {
   if (m_aesItemViewsUtm.empty())
   {
-    TRACE_LOG() << "++++++++ onNewParticipantOutdoorPosition participantId="  << participantData.participantId()
+    TRACE_LOG(m_logger) << "++++++++ onNewParticipantOutdoorPosition participantId="  << participantData.participantId()
                         << ", m_aesItemViewsUtm.size=" << m_aesItemViewsUtm.size();
     return;
   }
@@ -709,7 +709,7 @@ void HandlerExplosions::onNewParticipantCesPosition(const CentralEffectSimulatio
   const int numberOfParametrizedObjects = checkPartEnterLeaveArea(m_aesItemViewsUtm.constBegin(), m_aesItemViewsUtm.constEnd(),
                                                                   curPartIt, curPartIt + 1);                     // parametrize a single item
 
-  DEBUG_LOG() << "++++++++ checkPartEnterLeaveArea checkPartEnterLeaveAreaNumber="  << numberOfParametrizedObjects;
+  DEBUG_LOG(m_logger) << "++++++++ checkPartEnterLeaveArea checkPartEnterLeaveAreaNumber="  << numberOfParametrizedObjects;
 }
 
 int HandlerExplosions::checkPartEnterLeaveArea(AES_ITEM_VIEW_UTM_CONST_ITER currentAreaIt,
@@ -717,7 +717,7 @@ int HandlerExplosions::checkPartEnterLeaveArea(AES_ITEM_VIEW_UTM_CONST_ITER curr
                                                HandlerParticipant::POSITIONS_CONST_ITER currentParticipantIt,
                                                const HandlerParticipant::POSITIONS_CONST_ITER &endingParticipantIt)
 {
-  DEBUG_LOG() << "checkPartEnterLeaveArea...";
+  DEBUG_LOG(m_logger) << "checkPartEnterLeaveArea...";
 
   int numberOfParametrizedObjects = 0;
 
@@ -758,12 +758,12 @@ int HandlerExplosions::checkPartEnterLeaveArea(AES_ITEM_VIEW_UTM_CONST_ITER curr
       //
       //      if (participantData.insideBuilding())
       //      {
-      //        DEBUG_LOG() << "Participant:" << participantData.participantId() << " inside Building";
+      //        DEBUG_LOG(m_logger) << "Participant:" << participantData.participantId() << " inside Building";
       //        continue;
       //      }
 
       const QPointF &posUtm = participantData.ltsCoordinate().toUtm<QPointF>(zoneInOut);
-      DEBUG_LOG() << "Check, if participant with id = " << participantId
+      DEBUG_LOG(m_logger) << "Check, if participant with id = " << participantId
                           << " is inside hazardDistanceForm: "
                           << ", hasHazardDistance=" << curAivUtmArea.hasHazardDistance()
                           << ", hazardDistance=" << curAivUtmArea.hazardDistance_meter
@@ -773,10 +773,10 @@ int HandlerExplosions::checkPartEnterLeaveArea(AES_ITEM_VIEW_UTM_CONST_ITER curr
       if (m_logger.isDebugEnabled())
       {
         for (int i = 0; i < curAivUtmArea.form.size(); ++i)
-          DEBUG_LOG() << "form[" << i << "]=" << curAivUtmArea.form[i].x() << "/" << curAivUtmArea.form[i].y();
+          DEBUG_LOG(m_logger) << "form[" << i << "]=" << curAivUtmArea.form[i].x() << "/" << curAivUtmArea.form[i].y();
         if (m_logger.isTraceEnabled())
           for (int i = 0; i < curAivUtmArea.hazardDistanceForm.size(); ++i)
-            TRACE_LOG() << "hazardDistanceForm[" << i << "]=" << curAivUtmArea.hazardDistanceForm[i].x() << "/" << curAivUtmArea.hazardDistanceForm[i].y();
+            TRACE_LOG(m_logger) << "hazardDistanceForm[" << i << "]=" << curAivUtmArea.hazardDistanceForm[i].x() << "/" << curAivUtmArea.hazardDistanceForm[i].y();
       }
 
       // Laut ICD GUEZSB60_ICD-0052_Zentrale_Tne.doc Wirkfeldtyp Gefahrenbereich Steilfeuer
@@ -792,7 +792,7 @@ int HandlerExplosions::checkPartEnterLeaveArea(AES_ITEM_VIEW_UTM_CONST_ITER curr
       const bool bRealInHazardDistance             = participantIsInsideHazardDistance && !participantIsInsideForm;
       const bool bWasRealInHazardDistance          = m_enteredHazardDistanceStore.hasParticipantAlreadyEnteredArea(participantId, curAivUtmArea.aesItemId);
 
-      DEBUG_LOG() << "participantId = " << participantId
+      DEBUG_LOG(m_logger) << "participantId = " << participantId
                           << ", participantIsInsideHazardDistance = " << participantIsInsideHazardDistance
                           << ", participantIsInsideForm = " << participantIsInsideForm
                           << ", bRealInHazardDistance = " << bRealInHazardDistance
@@ -810,7 +810,7 @@ int HandlerExplosions::checkPartEnterLeaveArea(AES_ITEM_VIEW_UTM_CONST_ITER curr
         if (bRealInHazardDistance)
         {
           // part is ENTERING
-          DEBUG_LOG() << "Send HazardDistanceMessage to participant (ENTERING)...";
+          DEBUG_LOG(m_logger) << "Send HazardDistanceMessage to participant (ENTERING)...";
           sendEnterHazardDistance(participantId, curAivUtmArea.aesItemId);
 
         }
@@ -836,7 +836,7 @@ int HandlerExplosions::checkPartEnterLeaveArea(AES_ITEM_VIEW_UTM_CONST_ITER curr
 
           if (participantIsInsideForm)
             remaining = 1;
-          DEBUG_LOG() << "Send HazardDistanceMessage to participant (LEAVING)... remaining =" << remaining;
+          DEBUG_LOG(m_logger) << "Send HazardDistanceMessage to participant (LEAVING)... remaining =" << remaining;
           sendLeaveHazardDistance(participantData.participantId(), curAivUtmArea.aesItemId, remaining);
         }
       } // if (bWasRealInHazardDistance != bRealInHazardDistance)
@@ -850,7 +850,7 @@ int HandlerExplosions::checkPartEnterLeaveArea(AES_ITEM_VIEW_UTM_CONST_ITER curr
 
 void HandlerExplosions::onRestoreRadioReadinessChanged(const int participantId)
 {
-  DEBUG_LOG() << "HandlerExplosions::onRestoreRadioReadinessChanged participantId=" << participantId;
+  DEBUG_LOG(m_logger) << "HandlerExplosions::onRestoreRadioReadinessChanged participantId=" << participantId;
   m_enteredHazardDistanceStore.removeParticipant(participantId);
 }
 
@@ -858,14 +858,14 @@ void HandlerExplosions::onRestoreRadioReadinessChanged(const int participantId)
 bool HandlerExplosions::inBoundingBoxCheck(const CentralEffectSimulation::AesItemViewUtm &itemViewUtm,
                                            const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition)
 {
-  DEBUG_LOG() << "inBoundingBoxCheck 1"
+  DEBUG_LOG(m_logger) << "inBoundingBoxCheck 1"
                       << ", aesItemId=" << itemViewUtm.aesItemId
                       << ", effectStateId=" << itemViewUtm.effectStateId;
   if ((itemViewUtm.effectStateId != AreaEffectSimulation::AesEffectState_def::EsActivated) &&
       (itemViewUtm.effectStateId != AreaEffectSimulation::AesEffectState_def::EsPrepared) &&
       (itemViewUtm.effectStateId != AreaEffectSimulation::AesEffectState_def::EsFired))
     return false;
-  DEBUG_LOG() << "inBoundingBoxCheck 2";
+  DEBUG_LOG(m_logger) << "inBoundingBoxCheck 2";
 
   // QRectF(topLeft, bottomRight) -> no need to normalize, QRectF:contains() handles it correct
 
@@ -875,11 +875,11 @@ bool HandlerExplosions::inBoundingBoxCheck(const CentralEffectSimulation::AesIte
   const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantPosition.pos(), itemViewUtm.zone);
   if (boundingBoxImpact.contains(participantPosUtmPoint))
   {
-    DEBUG_LOG() << "inBoundingBoxCheck Paricipant " << participantPosition.participantId()
+    DEBUG_LOG(m_logger) << "inBoundingBoxCheck Paricipant " << participantPosition.participantId()
                         << " inside AesItemView:" << itemViewUtm.aesItemId;
     return true;
   }
-  DEBUG_LOG() << "inBoundingBoxCheck Paricipant " << participantPosition.participantId()
+  DEBUG_LOG(m_logger) << "inBoundingBoxCheck Paricipant " << participantPosition.participantId()
                       << " outside AesItemView:" << itemViewUtm.aesItemId;
   return false;
 } // END inBoundingBoxCheck
@@ -888,7 +888,7 @@ bool HandlerExplosions::inBoundingBoxCheck(const CentralEffectSimulation::AesIte
 // Nach der Umstellung auf 3D-WS wird der Einschlag von SMART aus dem DDS-Topic AES::Effects genommen.
 void HandlerExplosions::calculateSmartEffect(const AreaEffectSimulation::Effects &effects)
 {
-  DEBUG_LOG() << "calculateSmartEffect";
+  DEBUG_LOG(m_logger) << "calculateSmartEffect";
 
   AreaEffectSimulation::AesItem aesItem;
   bool itemAvailable = m_ddsHandler->dtcAes()->aesItemFromId(effects.aesItemId(), aesItem);
@@ -896,7 +896,7 @@ void HandlerExplosions::calculateSmartEffect(const AreaEffectSimulation::Effects
   {
     for (const AreaEffectSimulation::SingleEffect &se : std::as_const(effects.singleEffects()))
     {
-      DEBUG_LOG() << Q_FUNC_INFO << " ---> singleEffect=" << se
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " ---> singleEffect=" << se
                           << ", aesItem= " << aesItem;
       calculateSmartExplosion(effects.aesItemId(),
                               aesItem.chargeStruct(),
@@ -907,7 +907,7 @@ void HandlerExplosions::calculateSmartEffect(const AreaEffectSimulation::Effects
   } // if
   else
   {
-    WARNING_LOG() << "No aesItem found for effect aesItemId=" << effects.aesItemId();
+    WARNING_LOG(m_logger) << "No aesItem found for effect aesItemId=" << effects.aesItemId();
   } // else
 } // END calculateSmartEffect
 
@@ -917,7 +917,7 @@ void HandlerExplosions::calculateSmartExplosion(const int32_t aesItemId,
                                                 const Core::GeoPosition2D &impactPosition,
                                                 qint64 impactTime)
 {
-  DEBUG_LOG() << "calculateSmartExplosion "
+  DEBUG_LOG(m_logger) << "calculateSmartExplosion "
                       << " partyId=" << partyId;
   if (partyId == 0)
     return;
@@ -927,11 +927,11 @@ void HandlerExplosions::calculateSmartExplosion(const int32_t aesItemId,
 
   QVector <ParticipantDistance> vehiclesInSmartExplosion;
 
-  DEBUG_LOG() << "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
-  DEBUG_LOG() << "Handle ExplosionSingle (EsActivated)";
+  DEBUG_LOG(m_logger) << "Handle ExplosionSingle (EsActivated)";
   bool bHumanFound = false;
 
   const auto &participantPositions = m_handlerParticipant->positions();
@@ -943,7 +943,7 @@ void HandlerExplosions::calculateSmartExplosion(const int32_t aesItemId,
     const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantPosition.pos(), impactPosZone);
 
     ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantPosition.participantTypeId());
-    DEBUG_LOG() << "participant id=" << participantPosition.participantId()
+    DEBUG_LOG(m_logger) << "participant id=" << participantPosition.participantId()
                         << " participantTypeId=" << participantPosition.participantTypeId()
                         << " partyType =" << participantPosition.partyId()
                         << " typeClass=" << typeClass;
@@ -957,10 +957,10 @@ void HandlerExplosions::calculateSmartExplosion(const int32_t aesItemId,
         typeClass != ParticipantManagement::TypeClass_def::WeaponSystem)
       continue;
 
-    DEBUG_LOG() << "participantPosition.timestamp =" << participantPosition.sampleTime()
+    DEBUG_LOG(m_logger) << "participantPosition.timestamp =" << participantPosition.sampleTime()
                         << " effectTime                   = " << m_ddsHandler->currentPartitionTime();
 
-    DEBUG_LOG() << "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);
@@ -969,7 +969,7 @@ void HandlerExplosions::calculateSmartExplosion(const int32_t aesItemId,
       ParticipantDistance oneEntry;
       oneEntry.squareDistance = CentralEffectSimulation::getSquareDistance(impactPos, participantPosUtmPoint);
       oneEntry.participantPosition = participantPosition;
-      DEBUG_LOG() << "squareDistance = " << oneEntry.squareDistance
+      DEBUG_LOG(m_logger) << "squareDistance = " << oneEntry.squareDistance
                           << " append participantId=" << participantPosition.participantId();
       vehiclesInSmartExplosion.append(std::move(oneEntry));
     }
@@ -978,10 +978,10 @@ 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() << "aesItemViewUtm itemView.chargeTypeId =" << itemViewUtm.chargeStruct.chargeTypeId();
+  DEBUG_LOG(m_logger) << "aesItemViewUtm itemView.chargeTypeId =" << itemViewUtm.chargeStruct.chargeTypeId();
   if (vehiclesInSmartExplosion.size() == 0)
   {
-    DEBUG_LOG() << "size=0";
+    DEBUG_LOG(m_logger) << "size=0";
     if (bHumanFound)
     {
       CentralEffectSimulation::HandlerParticipant::CesParticipantData pos;
@@ -993,7 +993,7 @@ void HandlerExplosions::calculateSmartExplosion(const int32_t aesItemId,
   }
   else if (vehiclesInSmartExplosion.size() == 1)
   {
-    DEBUG_LOG() << "size=1";
+    DEBUG_LOG(m_logger) << "size=1";
     // send two single fire to the same vehicle
     sendCesHitRequest(   itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, impactTime       , 100, ProjectDataManagement::EventType_def::HitEffectSimulation);           // 100 Percent
     sendCesHitRequest(   itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, impactTime + 1000, 100, ProjectDataManagement::EventType_def::HitEffectSimulation);    // 100 Percent
@@ -1002,7 +1002,7 @@ void HandlerExplosions::calculateSmartExplosion(const int32_t aesItemId,
   }
   else
   {
-    DEBUG_LOG() << "size=" << vehiclesInSmartExplosion.size();
+    DEBUG_LOG(m_logger) << "size=" << vehiclesInSmartExplosion.size();
     // send single fire to the two nearest vehicles
 
     // sort the list by the distance
@@ -1024,7 +1024,7 @@ void HandlerExplosions::calculateSmartExplosion(const int32_t aesItemId,
 // Check for all participants wheter he is in the explosion area
 void HandlerExplosions::calculateImpacts(const AreaEffectSimulation::TriggeredImpacts &data)
 {
-  DEBUG_LOG() << "calculateImpacts m_aesItemViewsImpactsUtm.size " << m_aesItemViewsImpactsUtm.size();
+  DEBUG_LOG(m_logger) << "calculateImpacts m_aesItemViewsImpactsUtm.size " << m_aesItemViewsImpactsUtm.size();
 
   // older then 10sec? ignore
   if (data.sampleTime() < m_ddsHandler->currentPartitionTime() - 10 * 1000)
@@ -1032,7 +1032,7 @@ void HandlerExplosions::calculateImpacts(const AreaEffectSimulation::TriggeredIm
 
   if (!m_aesItemViewsImpactsUtm.contains(data.aesItemId()))
   {
-    DEBUG_LOG() << "calculateImpacts no aesItemId " << data.aesItemId();
+    DEBUG_LOG(m_logger) << "calculateImpacts no aesItemId " << data.aesItemId();
     return;
   }
 
@@ -1043,13 +1043,13 @@ void HandlerExplosions::calculateImpacts(const AreaEffectSimulation::TriggeredIm
     aesItemViewUtm = m_aesItemViewsImpactsUtm.value(static_cast<int>(data.aesItemId()));
   else
     aesItemViewUtm = m_aesItemViewsUtm.value(static_cast<int>(data.aesItemId()));
-  DEBUG_LOG() << "m_aesItemViewsUtm.insert aesItemId=" << aesItemViewUtm.aesItemId;
+  DEBUG_LOG(m_logger) << "m_aesItemViewsUtm.insert aesItemId=" << aesItemViewUtm.aesItemId;
 
   const bool bIsSmartChargeType = m_ddsHandler->isSmartChargeType(aesItemViewUtm.chargeStruct);
-  DEBUG_LOG() << "calculateImpacts, isSMart: " << bIsSmartChargeType;
+  DEBUG_LOG(m_logger) << "calculateImpacts, isSMart: " << bIsSmartChargeType;
 
 
-  DEBUG_LOG() << "XXXXXXXXXXXX calculateImpacts1  " << data.aesItemId();
+  DEBUG_LOG(m_logger) << "XXXXXXXXXXXX calculateImpacts1  " << data.aesItemId();
 
   QVector<int> bitsToCheck;
   for (int bitFieldIdx = 0; bitFieldIdx < data.impactCount(); ++bitFieldIdx)
@@ -1062,14 +1062,14 @@ void HandlerExplosions::calculateImpacts(const AreaEffectSimulation::TriggeredIm
       continue;
 
     bitsToCheck += bitFieldIdx;
-    DEBUG_LOG() << "bitsToCheck+=" << bitFieldIdx;
+    DEBUG_LOG(m_logger) << "bitsToCheck+=" << bitFieldIdx;
 
     // update storage ('remember')
     m_handledImpactsStorage.setIndexProcessed(data.aesItemId(), bitFieldIdx);
 
     if (bIsSmartChargeType)
     {
-      DEBUG_LOG() << "XXXXXXXXXXXX SMART";
+      DEBUG_LOG(m_logger) << "XXXXXXXXXXXX SMART";
       calculateSmartExplosion(aesItemViewUtm.aesItemId, aesItemViewUtm.chargeStruct, aesItemViewUtm.partyId, aesItemViewUtm.formGeo[bitFieldIdx], m_ddsHandler->currentPartitionTime());
     }
   }
@@ -1082,14 +1082,14 @@ void HandlerExplosions::calculateImpacts(const AreaEffectSimulation::TriggeredIm
   {
     if (m_handlerParticipant->isOutdated(pPos)) // Participant Position is not valid Todo Magic Number
       continue;
-    DEBUG_LOG() << "pPos.participantId=" << pPos.participantId();
+    DEBUG_LOG(m_logger) << "pPos.participantId=" << pPos.participantId();
     if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill)
       continue;
-    DEBUG_LOG() << "pPos.vulnerabilityState=" << pPos.vulnerabilityState;
+    DEBUG_LOG(m_logger) << "pPos.vulnerabilityState=" << pPos.vulnerabilityState;
     if (pPos.insideBuilding())
       continue;
-    DEBUG_LOG() << "pPos.insideBuilding=" << pPos.insideBuilding();
-    DEBUG_LOG() << "calculateImpacts";
+    DEBUG_LOG(m_logger) << "pPos.insideBuilding=" << pPos.insideBuilding();
+    DEBUG_LOG(m_logger) << "calculateImpacts";
     calculateImpacts(aesItemViewUtm, bitsToCheck, pPos);
   }
 
@@ -1100,13 +1100,13 @@ void HandlerExplosions::calculateImpacts(const CentralEffectSimulation::AesItemV
                                          const QVector<int> &impactsToCheck,
                                          const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition)
 {
-  DEBUG_LOG() << "calculateImpacts";
+  DEBUG_LOG(m_logger) << "calculateImpacts";
 
   // get radius of munition
   const double impactRadius = m_ddsHandler->chargeTypeRadius(itemView.chargeStruct);
   const QPointF &participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantPosition.pos(), itemView.zone);
 
-  DEBUG_LOG() << "XXXXXXXXXXXX calculateImpacts2a  impactsToCheck.size " << impactsToCheck.size();
+  DEBUG_LOG(m_logger) << "XXXXXXXXXXXX calculateImpacts2a  impactsToCheck.size " << impactsToCheck.size();
 
   for (int bitFieldIdx : std::as_const(impactsToCheck))
   {
@@ -1116,7 +1116,7 @@ void HandlerExplosions::calculateImpacts(const CentralEffectSimulation::AesItemV
     // get position of impact to corresponding bit
     const QPointF &impactPos = itemView.form.value(bitFieldIdx);
 
-    DEBUG_LOG() << "XXXXXXXXXXXX calculateImpacts2b  check impactPos: x= " << impactPos.x() << " y=" << impactPos.y();
+    DEBUG_LOG(m_logger) << "XXXXXXXXXXXX calculateImpacts2b  check impactPos: x= " << impactPos.x() << " y=" << impactPos.y();
 
     if (inCircle(impactPos, impactRadius,  participantPosUtmPoint))
       sendEffectTypeEvent(itemView, participantPosition, EffectType::ExplosionArea, m_ddsHandler->currentPartitionTime());
@@ -1132,7 +1132,7 @@ void HandlerExplosions::calculateImpactsEffect(const CentralEffectSimulation::Ae
   const LtsCoordinate &partLtsCoordinate = participantPosition.ltsCoordinate(); // WITH zValue
 
   const int participantId = participantPosition.participantId();
-  INFO_LOG() << "calculateImpactsEffect" << " START"
+  INFO_LOG(m_logger) << "calculateImpactsEffect" << " START"
                      << ", participantId = " << participantId
                      << ", participantPosition.ltsCoordinate = '" << participantPosition.ltsCoordinate().toString() << "'"
                      << ", triggeredEffectsLtsCoord.size() = " << triggeredEffectsLtsCoord.size()
@@ -1149,7 +1149,7 @@ void HandlerExplosions::calculateImpactsEffect(const CentralEffectSimulation::Ae
   const bool bIsAirSupport = (gearClass.underlying() == ProjectDataManagement::GearClass_def::AirSupport);
 
   const QVector<double> &rangesInMeter = chargeRanges(itemView.chargeStruct);
-  DEBUG_LOG() << "calculateImpactsEffect" << " chargeRanges:"
+  DEBUG_LOG(m_logger) << "calculateImpactsEffect" << " chargeRanges:"
                       << ", chargeTypeId = " << itemView.chargeStruct.chargeTypeId()
                       << ", gearClass = " << gearClass
                       << ", bIsAirSupport = " << bIsAirSupport
@@ -1164,7 +1164,7 @@ void HandlerExplosions::calculateImpactsEffect(const CentralEffectSimulation::Ae
   LtsCoordinate shiftedParticipantLtsCoord = partLtsCoordinate;                 // WITH zValue
   shiftedParticipantLtsCoord.rz() += 1.0;                                       // shift 1.0m
 
-  DEBUG_LOG() << "shiftedParticipantLtsCoord = " << shiftedParticipantLtsCoord.toString(true);
+  DEBUG_LOG(m_logger) << "shiftedParticipantLtsCoord = " << shiftedParticipantLtsCoord.toString(true);
 
   for (const LtsCoordinate &newTriggeredImpactLtsCoord : std::as_const(triggeredEffectsLtsCoord))
   {
@@ -1175,7 +1175,7 @@ void HandlerExplosions::calculateImpactsEffect(const CentralEffectSimulation::Ae
     if (planarDistancePartToImpact > rangesInMeter.back())
       continue;
 
-    DEBUG_LOG() << " planarDistancePartToImpact = " << planarDistancePartToImpact
+    DEBUG_LOG(m_logger) << " planarDistancePartToImpact = " << planarDistancePartToImpact
                         << ", bIsAirSupport = " << bIsAirSupport;
 
     // Wir heben pauschal um 1.0m an, um leichte Bodenunebenheiten zu kompensieren:
@@ -1195,7 +1195,7 @@ void HandlerExplosions::calculateImpactsEffect(const CentralEffectSimulation::Ae
 
       int effect = 3;
       const RANGE mostInnerRange = getMostInnerRange(planarDistancePartToImpact, itemView.chargeStruct, effect);
-      DEBUG_LOG() << "getMostInnerRange, participantId=" << participantId
+      DEBUG_LOG(m_logger) << "getMostInnerRange, participantId=" << participantId
                           << ", planarDistancePartToImpact=" << planarDistancePartToImpact
                           << " -> RANGE=" << toString(mostInnerRange);
 
@@ -1204,7 +1204,7 @@ void HandlerExplosions::calculateImpactsEffect(const CentralEffectSimulation::Ae
       case RANGE::HAZARD_DISTANCE:
       {
         effect = 3;   // hazardDistance
-        DEBUG_LOG() << "Sende CES Hit Request: participantId=" << participantId << ", RANGE=" << toString(mostInnerRange) << ", effect=" << effect;
+        DEBUG_LOG(m_logger) << "Sende CES Hit Request: participantId=" << participantId << ", RANGE=" << toString(mostInnerRange) << ", effect=" << effect;
         sendCesHitRequest(itemView, participantPosition, QDateTime::currentMSecsSinceEpoch(),
                           effect, ProjectDataManagement::EventType_def::EnterHazardDistance);
       }
@@ -1220,23 +1220,23 @@ void HandlerExplosions::calculateImpactsEffect(const CentralEffectSimulation::Ae
                                                               lineOfSightOptions,
                                                               bLOS,
                                                               m_proxyBuilding);
-        INFO_LOG() << " lineOfSight_elevationAndBuilding "
+        INFO_LOG(m_logger) << " lineOfSight_elevationAndBuilding "
                            << ", success=" << success
                            << ", shiftedNewTriggeredImpact = " << shiftedNewTriggeredImpact.toString(true);
 
         // check LOS / LineOfSight
-        DEBUG_LOG() << "calculateImpactsEffect" << " check LOS / LineOfSight bLOS=" << bLOS
+        DEBUG_LOG(m_logger) << "calculateImpactsEffect" << " check LOS / LineOfSight bLOS=" << bLOS
                             << " participantId=" << participantId;
         if (bLOS)
         {
-          DEBUG_LOG() << "Sende CES Hit Request: participantId=" << participantId << ", RANGE=" << toString(mostInnerRange) << ", effect=" << effect;
+          DEBUG_LOG(m_logger) << "Sende CES Hit Request: participantId=" << participantId << ", RANGE=" << toString(mostInnerRange) << ", effect=" << effect;
           sendCesHitRequest(itemView, participantPosition, QDateTime::currentMSecsSinceEpoch(),
                             effect, ProjectDataManagement::EventType_def::AirSupport); // AirSupport for both: LETHAL_RADIUS, NONLETHAL_RADIUS
         }
 #ifdef GUEZE_3136_IMPLEMENTED
         else
         {
-          DEBUG_LOG() << "Sende CES Hit Request: participantId=" << participantId << ", RANGE=" << toString(mostInnerRange) << "  (Verdeckung -> EnterHazardDistance)";
+          DEBUG_LOG(m_logger) << "Sende CES Hit Request: participantId=" << participantId << ", RANGE=" << toString(mostInnerRange) << "  (Verdeckung -> EnterHazardDistance)";
           sendCesHitRequest(itemView, participantPosition, QDateTime::currentMSecsSinceEpoch(),
                             effect, ProjectDataManagement::EventType_def::EnterHazardDistance);
         }
@@ -1256,7 +1256,7 @@ void HandlerExplosions::calculateImpactsEffect(const CentralEffectSimulation::Ae
     {
 
       QElapsedTimer timer;
-      DEBUG_LOG() << "calculateImpactsEffect" << " vor lineOfSightOptions start";
+      DEBUG_LOG(m_logger) << "calculateImpactsEffect" << " vor lineOfSightOptions start";
       if (m_logger.isInfoEnabled())
         timer.start();
 
@@ -1268,15 +1268,15 @@ void HandlerExplosions::calculateImpactsEffect(const CentralEffectSimulation::Ae
                                                             lineOfSightOptions,
                                                             bLOS,
                                                             m_proxyBuilding);
-      INFO_LOG() << " lineOfSight_elevationAndBuilding took [ms] " << timer.elapsed()
+      INFO_LOG(m_logger) << " lineOfSight_elevationAndBuilding took [ms] " << timer.elapsed()
                          << ", success=" << success;
 
       // check LOS / LineOfSight
-      DEBUG_LOG() << "calculateImpactsEffect" << " check LOS / LineOfSight bLOS=" << bLOS
+      DEBUG_LOG(m_logger) << "calculateImpactsEffect" << " check LOS / LineOfSight bLOS=" << bLOS
                           << " participantId=" << participantId;
       if (bLOS)
       {
-        INFO_LOG() << "calculateImpactsEffect 3 participantId = " << participantId
+        INFO_LOG(m_logger) << "calculateImpactsEffect 3 participantId = " << participantId
                            << " -> bInCircle and given LOS -> sendEffectTypeEvent ...";
         sendEffectTypeEvent(itemView, participantPosition, EffectType::ExplosionArea, m_ddsHandler->currentPartitionTime());
       }
@@ -1293,7 +1293,7 @@ void HandlerExplosions::calculateImpactsEffect_outdated(const CentralEffectSimul
 {
   const LtsCoordTrans::LtsCoordinate &partLtsCoordinate = participantPosition.ltsCoordinate(); // WITH zValue
 
-  INFO_LOG() << Q_FUNC_INFO << " START"
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " START"
                      << " participantId = " << participantPosition.participantId()
                      << " participantPosition.ltsCoordinate = '" << participantPosition.ltsCoordinate().toString() << "'"
                      << ", triggeredEffectsGeoPos.size() = " << triggeredEffectsGeoPos.size()
@@ -1302,7 +1302,7 @@ void HandlerExplosions::calculateImpactsEffect_outdated(const CentralEffectSimul
                      << ", -> partLtsCoordinate " << partLtsCoordinate
                      << ", lineOfSightOptions " << lineOfSightOptions;
 
-  INFO_LOG() << Q_FUNC_INFO << participantPosition;
+  INFO_LOG(m_logger) << Q_FUNC_INFO << participantPosition;
 
   if (triggeredEffectsGeoPos.empty())
     return;
@@ -1310,7 +1310,7 @@ void HandlerExplosions::calculateImpactsEffect_outdated(const CentralEffectSimul
   if (static_cast<int>(triggeredEffectsGeoPos.size()) != triggeredEffectsUtmPos.size())
     return;
 
-  DEBUG_LOG() << "calculateImpactsEffect, triggeredEffectsUtmPos.size: " << triggeredEffectsGeoPos.size()
+  DEBUG_LOG(m_logger) << "calculateImpactsEffect, triggeredEffectsUtmPos.size: " << triggeredEffectsGeoPos.size()
                       << " participantPosition = " << participantPosition;
 
 
@@ -1324,11 +1324,11 @@ void HandlerExplosions::calculateImpactsEffect_outdated(const CentralEffectSimul
   participantPositionGeoPos.z() += 0.5; // shift 0.5m
 
   const QPointF &participantPosUtmPoint              = CentralEffectSimulation::geographic2Utm(participantPositionGeoPos, itemView.zone);
-  DEBUG_LOG() << " participantPositionGeoPos=" << participantPositionGeoPos.lon() << "/" << participantPositionGeoPos.lat()
+  DEBUG_LOG(m_logger) << " participantPositionGeoPos=" << participantPositionGeoPos.lon() << "/" << participantPositionGeoPos.lat()
                       << " itemView.zone=" << itemView.zone
                       << " participantPosUtmPoint=" << participantPosUtmPoint.x() << "/"  << participantPosUtmPoint.y();
 
-  DEBUG_LOG() << "calculateImpactsEffect 1  triggeredEffectsUtmPos.size " << triggeredEffectsUtmPos.size();
+  DEBUG_LOG(m_logger) << "calculateImpactsEffect 1  triggeredEffectsUtmPos.size " << triggeredEffectsUtmPos.size();
 
   int idx = -1;
   for (const QPointF &newTriggeredImpactUtm : std::as_const(triggeredEffectsUtmPos))
@@ -1337,7 +1337,7 @@ void HandlerExplosions::calculateImpactsEffect_outdated(const CentralEffectSimul
 
     const bool bInCircle = inCircle(newTriggeredImpactUtm, impactRadius,  participantPosUtmPoint);
 
-    DEBUG_LOG() << "calculateImpactsEffect 2a  check impactPos: x= " << newTriggeredImpactUtm.x() << " y=" << newTriggeredImpactUtm.y()
+    DEBUG_LOG(m_logger) << "calculateImpactsEffect 2a  check impactPos: x= " << newTriggeredImpactUtm.x() << " y=" << newTriggeredImpactUtm.y()
                         << " participantPosUtmPoint=" << participantPosUtmPoint.x() << "/"  << participantPosUtmPoint.y()
                         << " impactRadius=" << impactRadius
                         << ", inCircle = " << bInCircle
@@ -1345,7 +1345,7 @@ void HandlerExplosions::calculateImpactsEffect_outdated(const CentralEffectSimul
 
     if (!bInCircle)
     {
-      DEBUG_LOG() << "Not in Circle => continue";
+      DEBUG_LOG(m_logger) << "Not in Circle => continue";
       continue;
     }
 
@@ -1353,7 +1353,7 @@ void HandlerExplosions::calculateImpactsEffect_outdated(const CentralEffectSimul
     const int exerciseId = m_ddsHandler->getExerciseId();
 
     QElapsedTimer timer;
-    DEBUG_LOG() << Q_FUNC_INFO << " vor lineOfSightOptions start";
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " vor lineOfSightOptions start";
     if (m_logger.isInfoEnabled())
       timer.start();
 
@@ -1364,15 +1364,15 @@ void HandlerExplosions::calculateImpactsEffect_outdated(const CentralEffectSimul
                                                           lineOfSightOptions,
                                                           bLOS,
                                                           m_proxyBuilding);
-    INFO_LOG() << " lineOfSight_elevationAndBuilding took [ms] " << timer.elapsed()
+    INFO_LOG(m_logger) << " lineOfSight_elevationAndBuilding took [ms] " << timer.elapsed()
                        << " success=" << success;
 
     // check LOS / LineOfSight
-    DEBUG_LOG() << Q_FUNC_INFO << " check LOS / LineOfSight bLOS=" << bLOS
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " check LOS / LineOfSight bLOS=" << bLOS
                         << " participantId=" << participantPosition.participantId();
     if (bLOS)
     {
-      INFO_LOG() << "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());
     }
@@ -1385,7 +1385,7 @@ bool HandlerExplosions::inCircle(const QPointF &centerUtm, const double radius,
 {
   double squareDist = getSquareDistance(centerUtm, pointUtm);
   double squareRadius = radius * radius;
-  DEBUG_LOG() << "squareDist: " << squareDist << ", squareRadius: " << squareRadius
+  DEBUG_LOG(m_logger) << "squareDist: " << squareDist << ", squareRadius: " << squareRadius
                       << " radius=" << radius
                       << " inCircle=" << (squareDist < squareRadius)
                       << " centerUtm=" << centerUtm.x() << "/" << centerUtm.y()
@@ -1396,7 +1396,7 @@ 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() << "chargeTypeId = " << chargeStruct.chargeTypeId() << ", gearClass = " << gearClass;
+  DEBUG_LOG(m_logger) << "chargeTypeId = " << chargeStruct.chargeTypeId() << ", gearClass = " << gearClass;
 
   if (gearClass.underlying() == ProjectDataManagement::GearClass_def::AirSupport)
   {
@@ -1502,7 +1502,7 @@ void HandlerExplosions::sendEffectTypeEvent(const CentralEffectSimulation::AesIt
 
   const int ctasEffectType = static_cast<int>(effectType) & 0xffff;
   const int participantId = participantPosition.participantId();
-  DEBUG_LOG() << "Sending EffectType event " << ctasEffectType
+  DEBUG_LOG(m_logger) << "Sending EffectType event " << ctasEffectType
                       << ", participant: " << participantId
                       << ", aesItemId: " << itemView.aesItemId
                       << ", ctasEffectType: " << ctasEffectType;
@@ -1529,7 +1529,7 @@ void HandlerExplosions::sendCesHitRequest(const CentralEffectSimulation::AesItem
   if (remaining < 0)
     return;
 
-  DEBUG_LOG() << "sendCesHitRequest"
+  DEBUG_LOG(m_logger) << "sendCesHitRequest"
                       << " participantId=" << participantPosition.participantId()
                       << " remaining=" << remaining
                       << " eventType=" << eventType
@@ -1542,20 +1542,20 @@ void HandlerExplosions::sendCesHitRequest(const CentralEffectSimulation::AesItem
 
 
   const int equipNo = m_ddsHandler->participantId2EquipNo(participantPosition.participantId());
-  DEBUG_LOG() << " ftc sendCESHit to Participant participantId = " << 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))
   {
-    DEBUG_LOG() << "participantPosition.participantId != 0 && equipNo <= 0" ;
+    DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 && equipNo <= 0" ;
     return;
   }
   if (participantPosition.participantId() != 0 &&
       participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill)
   {
-    DEBUG_LOG() << "participantPosition.participantId != 0 CatastrophicKill)";
+    DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 CatastrophicKill)";
     return;
   }
 
@@ -1597,13 +1597,13 @@ void HandlerExplosions::sendCesHitRequest(const CentralEffectSimulation::AesItem
         itemView.partyId,                                                           // originPartyId
         duration
         );
-  DEBUG_LOG() << " participantId=" << participantPosition.participantId()
+  DEBUG_LOG(m_logger) << " participantId=" << participantPosition.participantId()
                       << ", chargeTypeId=" << itemView.chargeStruct.chargeTypeId()
                       << ", legacyChargeTypeId=" << legacyChargeTypeId
                       << ", m_sendCesHitRequestQueue.size()=" << m_sendCesHitRequestQueue.size()
                       << ", duration=" << duration;
 
-  DEBUG_LOG() << "ftcTab->SendCesHitRequest: " << requestTab;
+  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_def::HitEffectSimulation);
@@ -1617,7 +1617,7 @@ double HandlerExplosions::getSquareDistance(const QPointF &centerUtm, const QPoi
 
 void HandlerExplosions::on_newHazardInfo(int participantId, int aesId)
 {
-  DEBUG_LOG() << "HandlerFunctionalAreas::on_HazardFinished participantId=" << participantId
+  DEBUG_LOG(m_logger) << "HandlerFunctionalAreas::on_HazardFinished participantId=" << participantId
                       << " aesId =" << aesId
                       << " TODO: Nach Start des Wirkfeldes müssen Teilnehmer alle 30 Sekunden bis Ablauf des Wirkfelds darüber informiert werden, dass sie sich im Gefährdungsabstand befinden";
 
@@ -1625,9 +1625,9 @@ void HandlerExplosions::on_newHazardInfo(int participantId, int aesId)
 
 void HandlerExplosions::sendEnterHazardDistance(const int participantId, const int aesItemId)
 {
-  DEBUG_LOG() << "sendEnterHazardDistance: participantId=" << participantId
+  DEBUG_LOG(m_logger) << "sendEnterHazardDistance: participantId=" << participantId
                       << " aesItemId=" << aesItemId;
-  DEBUG_LOG() << "sendCesHitRequest";
+  DEBUG_LOG(m_logger) << "sendCesHitRequest";
   const int ctasEffectType = 0;
   const CentralEffectSimulation::HandlerParticipant::CesParticipantData &cesParticipantData = m_handlerParticipant->position(participantId);
 
@@ -1644,9 +1644,9 @@ void HandlerExplosions::sendEnterHazardDistance(const int participantId, const i
 
 void HandlerExplosions::sendLeaveHazardDistance(const int participantId, const int aesItemId, const int remaining)
 {
-  DEBUG_LOG() << "sendLeaveHazardDistance: participantId=" << participantId
+  DEBUG_LOG(m_logger) << "sendLeaveHazardDistance: participantId=" << participantId
                       << " aesItemId=" << aesItemId;
-  DEBUG_LOG() << "sendCesHitRequest"
+  DEBUG_LOG(m_logger) << "sendCesHitRequest"
                       << " aesItemId=" << aesItemId;
 
   const int ctasEffectType = remaining;
@@ -1667,7 +1667,7 @@ void HandlerExplosions::sendParticipantEvent(const CentralEffectSimulation::AesI
                                              const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
                                              const ProjectDataManagement::EventType eventType)
 {
-  DEBUG_LOG() << "sendParticipantEvent participantId=" << participantPosition.participantId();
+  DEBUG_LOG(m_logger) << "sendParticipantEvent participantId=" << participantPosition.participantId();
   ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantPosition.participantTypeId());
 
   if (typeClass == ParticipantManagement::TypeClass_def::Unit ||
@@ -1675,12 +1675,12 @@ void HandlerExplosions::sendParticipantEvent(const CentralEffectSimulation::AesI
       typeClass == ParticipantManagement::TypeClass_def::SupportEntity ||
       typeClass == ParticipantManagement::TypeClass_def::Unknown)
     return;
-  DEBUG_LOG() << "  sendParticipantEvent participantId=" << participantPosition.participantId();
+  DEBUG_LOG(m_logger) << "  sendParticipantEvent participantId=" << participantPosition.participantId();
 
   int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantPosition.participantId());
   if (equipmentNumber <= 0)
     return;
-  DEBUG_LOG() << "  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);
@@ -1688,7 +1688,7 @@ void HandlerExplosions::sendParticipantEvent(const CentralEffectSimulation::AesI
 
   CentralEffectSimulation::ParticipantEvent pe;
 
-  DEBUG_LOG() << "  sendParticipantEvent participantId=" << participantPosition.participantId()
+  DEBUG_LOG(m_logger) << "  sendParticipantEvent participantId=" << participantPosition.participantId()
                       << " lat= " << participantPosition.pos().lat()
                       << " lon= " << participantPosition.pos().lon()
                       << " equipmentNumber=" << equipmentNumber
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 59625146a..993cc7d9c 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
@@ -65,7 +65,7 @@ bool HandlerVulcano::init()
   float vulcanoAttackAngleDeg = CesExplosions::Settings::vulcanoAttackAngleDeg();
   float vulcanoAlphaDeg = CesExplosions::Settings::vulcanoMaximumDesignationAngleDeg();
 
-  DEBUG_LOG() << "vulcanoViewAngleDeg=" << vulcanoViewAngleDeg
+  DEBUG_LOG(m_logger) << "vulcanoViewAngleDeg=" << vulcanoViewAngleDeg
                       << " vulcanoAttackAngleDeg=" << vulcanoAttackAngleDeg
                       << " vulcanoAlphaDeg=" << vulcanoAlphaDeg;
 
@@ -77,9 +77,9 @@ bool HandlerVulcano::init()
 void HandlerVulcano::onTargetPositionsModifyReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    WARNING_LOG() << "Can not send TargetPositionsRequest: " << replyObject();
+    WARNING_LOG(m_logger) << "Can not send TargetPositionsRequest: " << replyObject();
   else
-    DEBUG_LOG() << "TargetPositionsRequest for id " << replyObject.id() << " success\n"
+    DEBUG_LOG(m_logger) << "TargetPositionsRequest for id " << replyObject.id() << " success\n"
                         << " replyObject.str() = " << replyObject.str();
 }
 
@@ -97,7 +97,7 @@ void HandlerVulcano::onExplosionClusterChanged(const AreaEffectSimulation::Explo
 
   if (!data.effectStart().is_set())
   {
-    DEBUG_LOG() << "No effectStart";
+    DEBUG_LOG(m_logger) << "No effectStart";
     return;
   }
 
@@ -113,13 +113,13 @@ void HandlerVulcano::onExplosionClusterChanged(const AreaEffectSimulation::Explo
   const AreaEffectSimulation::FlightCurve  &fcData = data.flightCurve().get();
   const AreaEffectSimulation::LaserGuiding &lgData = data.laserGuiding().get();
 
-  DEBUG_LOG() << "\n onExplosionClusterChanged id=" << data.id()
+  DEBUG_LOG(m_logger) << "\n onExplosionClusterChanged id=" << data.id()
                       << " AesEffectState=" << data.effectStateId()
                       << " lcPrf=" << lgData.lcAttack()
                       << " originalEffectDuration=" << data.originalEffectDuration()
                       << " effectStart=" << data.effectStart();
 
-  DEBUG_LOG() << "m_prfToAesId.insert(" << lgData.lcAttack() << ", " << data.id() << ")"
+  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();
@@ -142,7 +142,7 @@ void HandlerVulcano::onExplosionClusterChanged(const AreaEffectSimulation::Explo
     long long calculatedFlightDurationMSec = fcData.calculatedFlightDuration();
     long long currentPartitionTime = m_ddsHandler->currentPartitionTime();
     const int timerTimeout = effectStart - calculatedFlightDurationMSec - currentPartitionTime;
-    DEBUG_LOG() << "Timer started mit Abflugzeit des Vulcano=" << timerTimeout;
+    DEBUG_LOG(m_logger) << "Timer started mit Abflugzeit des Vulcano=" << timerTimeout;
     if (timerTimeout >= 0)
       timer->start(timerTimeout);
   }
@@ -151,13 +151,13 @@ void HandlerVulcano::onExplosionClusterChanged(const AreaEffectSimulation::Explo
 
 void HandlerVulcano::onFiringTimeTimeout()
 {
-  DEBUG_LOG() << "++++++++++++++ onFiringTimeTimeout";
+  DEBUG_LOG(m_logger) << "++++++++++++++ onFiringTimeTimeout";
   QTimer *t = qobject_cast<QTimer *>(sender());
   int aesId = t->property("aesId").toInt();
   delete m_aesTimers.value(aesId);
   m_aesTimers.remove(aesId);
 
-  DEBUG_LOG() << "onTimerTimeout aesId=" << aesId;
+  DEBUG_LOG(m_logger) << "onTimerTimeout aesId=" << aesId;
   const auto &myEC = m_explosionCluster.value(aesId);
   if (myEC.id() != aesId)
     return;
@@ -168,7 +168,7 @@ void HandlerVulcano::onFiringTimeTimeout()
   //auto dtcPpm = m_ddsHandler->dtcPpm();
   //auto participantId = dtcPpm.get()->getParticipantFromPrf(prf);
   //auto dpd = dtcPpm.get()->dynamicParticipantData(participantId);
-  //DEBUG_LOG() << "onTimerTimeout participantId=" << participantId;
+  //DEBUG_LOG(m_logger) << "onTimerTimeout participantId=" << participantId;
   QTimer *timer = new QTimer(this);
   timer->setSingleShot(true);
   QObject::connect(timer, &QTimer::timeout,
@@ -186,7 +186,7 @@ void HandlerVulcano::onFiringTimeTimeout()
   const AreaEffectSimulation::TrajectoryTimeAware &trajectoryTimeAware = firstTrajectoryTimeAwareFromAesId(aesId);
   if (trajectoryTimeAware.geometry().size() < 2)
   {
-    DEBUG_LOG() << "return";
+    DEBUG_LOG(m_logger) << "return";
     return;
   }
 
@@ -215,7 +215,7 @@ void HandlerVulcano::onFiringTimeTimeout()
   int absTimeAtTap                 = myEC.effectStart().get() - timeDiffTapToExplosion;
   // Und die ist in wieviel Sekunden?
   int relTimeToTap                 = absTimeAtTap - m_ddsHandler->currentPartitionTime();
-  DEBUG_LOG() << "timer->start timeout= " << relTimeToTap
+  DEBUG_LOG(m_logger) << "timer->start timeout= " << relTimeToTap
                       << " calculatedFlightDurationMSec= " << calculatedFlightDurationMSec;
   if (relTimeToTap >= 0)
     timer->start(relTimeToTap);
@@ -228,7 +228,7 @@ void HandlerVulcano::onTrajectoryTimeAwareTimeout()
 
   delete m_aesTimers.value(aesId);
   m_aesTimers.remove(aesId);
-  DEBUG_LOG() << "++++++++++++++ onTrajectoryTimeAwareTimeout aesId=" << aesId;
+  DEBUG_LOG(m_logger) << "++++++++++++++ onTrajectoryTimeAwareTimeout aesId=" << aesId;
   const auto &myEC = m_explosionCluster.value(aesId);
   if (myEC.id() != aesId)
     return;
@@ -243,7 +243,7 @@ void HandlerVulcano::onTrajectoryTimeAwareTimeout()
   auto participantId          = dtcPpm->getParticipantFromPrf(prf);
   auto dpd                    = dtcPpm->dynamicParticipantData(participantId);
   const auto &designationsVec = dpd.designations();
-  DEBUG_LOG() << "onTimerTimeout participantId=" << participantId;
+  DEBUG_LOG(m_logger) << "onTimerTimeout participantId=" << participantId;
 
   for (const auto &designation : std::as_const(designationsVec))
   {
@@ -252,15 +252,15 @@ void HandlerVulcano::onTrajectoryTimeAwareTimeout()
       const AreaEffectSimulation::TrajectoryTimeAware &trajectoryTimeAware = firstTrajectoryTimeAwareFromAesId(aesId);
       const std::vector<Core::GeoPositionRelativeTime> &trajGeometry       = trajectoryTimeAware.geometry();
 
-      DEBUG_LOG() << "trajectoryTimeAware.geometry().size()=" << trajGeometry.size();
-      DEBUG_LOG() << "Designation code=" << designation.code()
+      DEBUG_LOG(m_logger) << "trajectoryTimeAware.geometry().size()=" << trajGeometry.size();
+      DEBUG_LOG(m_logger) << "Designation code=" << designation.code()
                           << " prf=" << prf
                           << " outputPower=" << designation.outputPower()
                           << " designation.spotlocation=" << designation.spotLocation().lon() << "/" << designation.spotLocation().lat();
 
       if (trajGeometry.size() < 2)
       {
-        DEBUG_LOG() << "return";
+        DEBUG_LOG(m_logger) << "return";
         return;
       }
 
@@ -274,23 +274,23 @@ void HandlerVulcano::onTrajectoryTimeAwareTimeout()
       const QPointF &pointToTestPt = CentralEffectSimulation::geographic2Utm(pointToTestGeo, &zone);
 
       const QVector3D top(topPt.x(), topPt.y(), topGeo.z());
-      DEBUG_LOG() <<  "top=" << top.x() << "/" << top.y() << "/" << top.z() << " zone=" << zone;
+      DEBUG_LOG(m_logger) <<  "top=" << top.x() << "/" << top.y() << "/" << top.z() << " zone=" << zone;
 
       const QVector3D bottom(bottomPt.x(), bottomPt.y(), bottomGeo.z());
-      DEBUG_LOG() <<  "bottom=" << bottom.x() << "/" << bottom.y() << "/" << bottom.z() << " zone=" << zone;
+      DEBUG_LOG(m_logger) <<  "bottom=" << bottom.x() << "/" << bottom.y() << "/" << bottom.z() << " zone=" << zone;
 
       const QVector3D pointToTest(pointToTestPt.x(), pointToTestPt.y(), designation.spotLocation().z());
-      DEBUG_LOG() <<  "pointToTest=" << pointToTest.x() << "/" << pointToTest.y() << "/" << pointToTest.z() << " zone=" << zone;
+      DEBUG_LOG(m_logger) <<  "pointToTest=" << pointToTest.x() << "/" << pointToTest.y() << "/" << pointToTest.z() << " zone=" << zone;
 
       float vulcanoViewAngleDeg = CesExplosions::Settings::vulcanoViewAngleDeg();
       float vulcanoAttackAngleDeg = CesExplosions::Settings::vulcanoAttackAngleDeg();
 
-      DEBUG_LOG() << "vulcanoViewAngleDeg=" << vulcanoViewAngleDeg
+      DEBUG_LOG(m_logger) << "vulcanoViewAngleDeg=" << vulcanoViewAngleDeg
                           << " vulcanoAttackAngleDeg=" << vulcanoAttackAngleDeg;
 
       if (! isInCone(top, bottom, vulcanoAttackAngleDeg,  pointToTest))
       {
-        DEBUG_LOG() << "Punkt ist ausserhalb des Attack Angles. ";
+        DEBUG_LOG(m_logger) << "Punkt ist ausserhalb des Attack Angles. ";
         return;
       }
 
@@ -304,14 +304,14 @@ void HandlerVulcano::onTrajectoryTimeAwareTimeout()
 
       double angle = CesExplosions::Settings::vulcanoMaximumDesignationAngleDeg();
 
-      DEBUG_LOG() << "isInAngle fe=" << fe.x() << "/" << fe.y()
+      DEBUG_LOG(m_logger) << "isInAngle fe=" << fe.x() << "/" << fe.y()
                           << ", lp=" << lp.x() << "/" << lp.y()
                           << ", observer=" << observer.x() << "/" << observer.y()
                           << ", angle=" << angle
                           << ", zone=" << zone;
       if (! isInCone(lp, fe, angle, observer))
       {
-        DEBUG_LOG() << "Keine neue Vulcano-Pos: Winkel ist zu gross. ";
+        DEBUG_LOG(m_logger) << "Keine neue Vulcano-Pos: Winkel ist zu gross. ";
         return;
       }
 
@@ -322,7 +322,7 @@ void HandlerVulcano::onTrajectoryTimeAwareTimeout()
       AreaEffectSimulation::TargetPositionsModifyRequest posModify;
       posModify.aesItemId(aesId);
       posModify.positions().push_back(designation.spotLocation());
-      DEBUG_LOG() << "targetPositionsModifyRequest z=" << posModify.positions().at(0).z()
+      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);
@@ -339,7 +339,7 @@ AreaEffectSimulation::TrajectoryTimeAware HandlerVulcano::firstTrajectoryTimeAwa
                                                                                   ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation);
   if (trajectories.empty())
   {
-    DEBUG_LOG() << "no trajectories found for originatorId/aesItemId " << aesId;
+    DEBUG_LOG(m_logger) << "no trajectories found for originatorId/aesItemId " << aesId;
     return {};
   }
   Q_ASSERT_X(trajectories.size() == 1, __FUNCTION__, "For Vulcano there should be just one trajectory");
@@ -356,14 +356,14 @@ Core::GeoPosition HandlerVulcano::getTrajectoryPosFromTime(int aesId, long long
   const qint64 relTime = timeParam - trajectoryTimeAwareValue.trajectoryStartTime();
 
   //trajectoryTimeAwareValue = trajectoryTimeAware(aesId);
-  DEBUG_LOG() << " getTrajectoryPosFromTime aesId=" << aesId
+  DEBUG_LOG(m_logger) << " getTrajectoryPosFromTime aesId=" << aesId
                       << " trajectoryTimeAwareValue.id=" << trajectoryTimeAwareValue.id()
                       << " time=" << timeParam
                       << " trajectoryStartTime=" << trajectoryTimeAwareValue.trajectoryStartTime()
                       << " relTime=" << relTime;
   if (trajectoryTimeAwareValue.geometry().empty())
   {
-    DEBUG_LOG() << "getTrajectoryPosFromTime no pos available";
+    DEBUG_LOG(m_logger) << "getTrajectoryPosFromTime no pos available";
     return {};
   }
 
@@ -371,7 +371,7 @@ Core::GeoPosition HandlerVulcano::getTrajectoryPosFromTime(int aesId, long long
   int i = 0;
   for (const auto &point : std::as_const(trajectoryTimeAwareValue.geometry()))
   {
-    DEBUG_LOG() << "time=" << point.relativeTime();
+    DEBUG_LOG(m_logger) << "time=" << point.relativeTime();
     if ( (point.relativeTime() > relTime) && (i > 0))
     {
       // Beachte: Geschwindigkeit wird _NICHT_ beruecksichtigt
@@ -382,14 +382,14 @@ Core::GeoPosition HandlerVulcano::getTrajectoryPosFromTime(int aesId, long long
       //      result.z() = trajectoryTimeAwareValue.geometry()[i -1].z();
       // and take benefits from downcasting
       result = geoPosRelTime; // implicit downcast :-)
-      DEBUG_LOG() << "found i=" << i
+      DEBUG_LOG(m_logger) << "found i=" << i
                           << " result=" << result.lat() << "/" << result.lon() << "/" << result.z();
       return result;
     }
     ++i;
   } // for
   result = trajectoryTimeAwareValue.geometry().back();
-  DEBUG_LOG() << " return last point result="
+  DEBUG_LOG(m_logger) << " return last point result="
                       << " result=" << result.lat() << "/" << result.lon() << "/" << result.z();
   return result;
 
@@ -400,14 +400,14 @@ void HandlerVulcano::onDynamicParticipantChanged(const ParticipantManagement::Dy
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG() << "onDynamicParticipantChanged"
+  DEBUG_LOG(m_logger) << "onDynamicParticipantChanged"
                       << data.participantId()
                       << data.designations().size();
   if (data.designations().size() > 0)
   {
     for (const ParticipantManagement::LaserDesignation &designation : std::as_const(data.designations()))
     {
-      DEBUG_LOG() << "gearId=" << designation.gearId()
+      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/Explosions/plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/plugin.cpp
index 40ec57097..fefa6e50b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/plugin.cpp
@@ -36,7 +36,7 @@ CesExplosionInterfaceImpl::CesExplosionInterfaceImpl(CentralEffectSimulation::Pl
   , m_logger(CentralEffectSimulation::getLogger("Plugin.Explosions.HandlerExplosions"))
 {
   Q_UNUSED(settings)
-  DEBUG_LOG() << "CesExplosionInterfaceImpl";
+  DEBUG_LOG(m_logger) << "CesExplosionInterfaceImpl";
 }
 
 CesExplosionInterfaceImpl::~CesExplosionInterfaceImpl()
@@ -48,11 +48,11 @@ CesExplosionInterfaceImpl::~CesExplosionInterfaceImpl()
 
 bool CesExplosionInterfaceImpl::init(int domainId, int exerciseId)
 {
-  DEBUG_LOG() << "CesExplosionInterfaceImpl init";
+  DEBUG_LOG(m_logger) << "CesExplosionInterfaceImpl init";
 
   m_domainId = domainId;
   m_exerciseId = exerciseId;
-  INFO_LOG() << "CesExplosionsInterfaceImpl::init()"
+  INFO_LOG(m_logger) << "CesExplosionsInterfaceImpl::init()"
                      << " m_domainId=" << m_domainId
                      << " m_exerciseId=" << m_exerciseId;
 
@@ -66,22 +66,22 @@ bool CesExplosionInterfaceImpl::init(int domainId, int exerciseId)
 
   if (!m_handlerExplosions->init())
   {
-    ERROR_LOG() << "Initialisation m_handlerExplosions failed.";
+    ERROR_LOG(m_logger) << "Initialisation m_handlerExplosions failed.";
     return false;
   }
 
-  INFO_LOG() << "CesExplosionsInterfaceImpl::init() return true";
+  INFO_LOG(m_logger) << "CesExplosionsInterfaceImpl::init() return true";
 
   // initialize handlerVulcano
   m_handlerVulcano = std::make_shared<HandlerVulcano>(m_ddsHandler, this);
 
   if (!m_handlerVulcano->init())
   {
-    ERROR_LOG() << "Initialisation m_handlerVulcano failed.";
+    ERROR_LOG(m_logger) << "Initialisation m_handlerVulcano failed.";
     return false;
   }
 
-  INFO_LOG() << "CesExplosionsInterfaceImpl::init() return true";
+  INFO_LOG(m_logger) << "CesExplosionsInterfaceImpl::init() return true";
 
   return true;
 }
@@ -90,8 +90,8 @@ QString CesExplosionInterfaceImpl::echo(const QString &message)
 {
 
   QString ret(QStringLiteral("<<<< %1 >>>> CesExplosionsInterfaceImpl::echo").arg(message));
-  INFO_LOG() << "CesExplosionsInterfaceImpl::echo return:" << ret;
-  DEBUG_LOG() << "DEBUG: CesExplosionsInterfaceImpl::echo return:" << ret;
+  INFO_LOG(m_logger) << "CesExplosionsInterfaceImpl::echo return:" << ret;
+  DEBUG_LOG(m_logger) << "DEBUG: CesExplosionsInterfaceImpl::echo return:" << ret;
   return ret;
 }
 
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 69b677b9f..a8c227811 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
@@ -111,28 +111,28 @@ bool HandlerFunctionalAreas::init()
       return false;
   }
 
-  INFO_LOG() << "HandlerParticipantArea::init() finished.";
+  INFO_LOG(m_logger) << "HandlerParticipantArea::init() finished.";
   return true;
 } // end of init()
 //-----------------------------------------------------------------------------
 
 void HandlerFunctionalAreas::onSendCesHitReply(const Core::FunctionReplyObject &replyObject)
 {
-  DEBUG_LOG() << "onSendCesHitReply for id " << replyObject.id() << " success= " << replyObject.error();
+  DEBUG_LOG(m_logger) << "onSendCesHitReply for id " << replyObject.id() << " success= " << replyObject.error();
 
   if (replyObject.error())
-    WARNING_LOG() << "Can not send enter/leave Area to participant in training area: " << replyObject();
+    WARNING_LOG(m_logger) << "Can not send enter/leave Area to participant in training area: " << replyObject();
 
   // Send next Request, if available
   if (!m_sendCesHitRequestQueue.isEmpty())
   {
-    DEBUG_LOG() << "m_sendCesAreaActionRequestQueue.size()=" << m_sendCesHitRequestQueue.size();
+    DEBUG_LOG(m_logger) << "m_sendCesAreaActionRequestQueue.size()=" << m_sendCesHitRequestQueue.size();
     m_sendCesHitRequestQueue.dequeue();
     // Send next Message
     if (!m_sendCesHitRequestQueue.isEmpty())
     {
       const auto &hr = m_sendCesHitRequestQueue.head();
-      DEBUG_LOG() << "sendCesHitRequest: " << hr;
+      DEBUG_LOG(m_logger) << "sendCesHitRequest: " << hr;
       m_ddsHandler->ftcTab()->sendCesHitRequest(hr, this);
     }
   }
@@ -140,21 +140,21 @@ void HandlerFunctionalAreas::onSendCesHitReply(const Core::FunctionReplyObject &
 
 void HandlerFunctionalAreas::onDemandInitReply(const Core::FunctionReplyObject &replyObject)
 {
-  DEBUG_LOG() << "onDemandInitReply for id " << replyObject.id() << " success= " << replyObject.error();
+  DEBUG_LOG(m_logger) << "onDemandInitReply for id " << replyObject.id() << " success= " << replyObject.error();
 
   if (replyObject.error())
-    WARNING_LOG() << "Can not send Init to participant in training area: " << replyObject();
+    WARNING_LOG(m_logger) << "Can not send Init to participant in training area: " << replyObject();
 
   // Send next Request, if available
   if (!m_sendInitRequestQueue.isEmpty())
   {
-    DEBUG_LOG() << "m_sendInitRequestQueue.size()=" << m_sendInitRequestQueue.size();
+    DEBUG_LOG(m_logger) << "m_sendInitRequestQueue.size()=" << m_sendInitRequestQueue.size();
     m_sendInitRequestQueue.dequeue();
     // Send next Message
     if (!m_sendInitRequestQueue.isEmpty())
     {
       const auto &hr = m_sendInitRequestQueue.head();
-      DEBUG_LOG() << "demandInitRequest: " << hr;
+      DEBUG_LOG(m_logger) << "demandInitRequest: " << hr;
       m_ddsHandler->ftcTab()->demandInitRequest(hr, this);
     }
   }
@@ -174,7 +174,7 @@ void HandlerFunctionalAreas::onAesItemViewChanged(const AreaEffectSimulation::Ae
 
   if (!fa.isCentral())
   {
-    DEBUG_LOG() << " !isCentral"
+    DEBUG_LOG(m_logger) << " !isCentral"
                         " Got AesItemView id: " << aesItemId
                         << ", type: " << data.aesTypeId()
                         << ", effectState: " << data.effectStateId()
@@ -185,7 +185,7 @@ void HandlerFunctionalAreas::onAesItemViewChanged(const AreaEffectSimulation::Ae
     return;
   }
 
-  DEBUG_LOG() << "Got AesItemView id: " << aesItemId
+  DEBUG_LOG(m_logger) << "Got AesItemView id: " << aesItemId
                       << ", type: " << data.aesTypeId()
                       << ", effectState: " << data.effectStateId()
                       << ", modType: " << modType;
@@ -200,7 +200,7 @@ void HandlerFunctionalAreas::onAesItemViewChanged(const AreaEffectSimulation::Ae
     bool isSupplyTruck = false;
     if (fa.supplyMode() == AreaEffectSimulation::AesOperatingMode_def::OmWaitingTime)
     {
-      DEBUG_LOG() << "isSupplyTruck = true";
+      DEBUG_LOG(m_logger) << "isSupplyTruck = true";
       isSupplyTruck = true;
     }
     auto aesItemViewUtm(CentralEffectSimulation::AesItemViewUtm::create(data, m_aesItemViews[data.aesItemId()], 0, isSupplyTruck));
@@ -219,16 +219,16 @@ void HandlerFunctionalAreas::onAesItemViewChanged(const AreaEffectSimulation::Ae
         polygon.append(point);
       }
       enclosedBuildings = m_handlerBuildingData->polygonEncloseBuildings(polygon);
-      DEBUG_LOG() << "enclosedBuildings.size=" << enclosedBuildings.size();
+      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);
-      DEBUG_LOG() << "insert enclosedBuildings.size=" << enclosedBuildings.size();
+      DEBUG_LOG(m_logger) << "insert enclosedBuildings.size=" << enclosedBuildings.size();
     }
 
     calculateFunctionalArea(aesItemViewUtm);
     m_aesItemViews.insert(data.aesItemId(), aesItemViewUtm);
-    DEBUG_LOG() << "insert Functiona Area AesItemView id: " << aesItemId
+    DEBUG_LOG(m_logger) << "insert Functiona Area AesItemView id: " << aesItemId
                         << ", type: " << data.aesTypeId();
     break;
   } // case EsActivated
@@ -248,14 +248,14 @@ void HandlerFunctionalAreas::onAesItemViewChanged(const AreaEffectSimulation::Ae
 void HandlerFunctionalAreas::calculateFunctionalArea(const CentralEffectSimulation::AesItemViewUtm &itemView)
 {
   bool inForm = false;
-  DEBUG_LOG() << "HandlerParticipantArea::calculateFunctionalArea aesItemId =" << itemView.aesItemId;
+  DEBUG_LOG(m_logger) << "HandlerParticipantArea::calculateFunctionalArea aesItemId =" << itemView.aesItemId;
   const auto participantsMap = m_handlerParticipant->positions();
   for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPos : participantsMap)
   {
     if (m_handlerParticipant->isOutdated(participantPos))
       continue;
 
-    DEBUG_LOG() << "participant id= " << participantPos.participantId()
+    DEBUG_LOG(m_logger) << "participant id= " << participantPos.participantId()
                         << " buildingId=" << participantPos.buildingId();
 
     if ( participantPos.buildingId() ==0 )
@@ -269,14 +269,14 @@ void HandlerFunctionalAreas::calculateFunctionalArea(const CentralEffectSimulati
         {
           inForm = true;
           m_handlerParticipant->setNotfightMode(participantPos.participantId(), true);
-          DEBUG_LOG() << "!m_aesPolygonEncloseBuilding buildingId=" << participantPos.buildingId()
+          DEBUG_LOG(m_logger) << "!m_aesPolygonEncloseBuilding buildingId=" << participantPos.buildingId()
                               << " aesId=" << itemView.aesItemId
                               << " in Form = true";
           break;
         }
         else
         {
-          DEBUG_LOG() << "!m_aesPolygonEncloseBuilding buildingId=" << participantPos.buildingId()
+          DEBUG_LOG(m_logger) << "!m_aesPolygonEncloseBuilding buildingId=" << participantPos.buildingId()
                               << " aesId=" << itemView.aesItemId
                               << " in Form = false";
         }
@@ -290,7 +290,7 @@ void HandlerFunctionalAreas::calculateFunctionalArea(const CentralEffectSimulati
 
 void HandlerFunctionalAreas::onNewParticipantPosition(const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantData)
 {
-  DEBUG_LOG() << "++++++++ onNewParticipantPosition participantId="  << participantData.participantId();
+  DEBUG_LOG(m_logger) << "++++++++ onNewParticipantPosition participantId="  << participantData.participantId();
 
   if (m_handlerParticipant->isOutdated(participantData))
     return;
@@ -298,14 +298,14 @@ void HandlerFunctionalAreas::onNewParticipantPosition(const CentralEffectSimulat
   const int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantData.participantId());
   if (equipmentNumber <= 0)
   {
-    DEBUG_LOG() << "equipmentNumber <=0";
+    DEBUG_LOG(m_logger) << "equipmentNumber <=0";
     return;
   }
 
-  DEBUG_LOG() << "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() << " itemView: " << itemView.aesItemId << ", " << itemView.aesTypeId;
+    DEBUG_LOG(m_logger) << " itemView: " << itemView.aesItemId << ", " << itemView.aesTypeId;
     switch (itemView.aesTypeId.underlying())
     {
     case AreaEffectSimulation::AesType_def::AtFunctionalArea:
@@ -315,7 +315,7 @@ 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() << "functionalArea Typ=" << functionalArea.functionalAreaTypeId()
+      DEBUG_LOG(m_logger) << "functionalArea Typ=" << functionalArea.functionalAreaTypeId()
                           << " itemView.partyId=" << itemView.partyId
                           << " participantData.partyId=" << participantData.partyId()
                           << " insideBuilding=" << participantData.insideBuilding();
@@ -333,7 +333,7 @@ void HandlerFunctionalAreas::onNewParticipantPosition(const CentralEffectSimulat
 
 void HandlerFunctionalAreas::onNewIndoorParticipantPosition(const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantData)
 {
-  DEBUG_LOG() << "New Indoor Position paticipantId=" << participantData.participantId();
+  DEBUG_LOG(m_logger) << "New Indoor Position paticipantId=" << participantData.participantId();
 
   if (m_handlerParticipant->isOutdated(participantData))
     return;
@@ -341,14 +341,14 @@ void HandlerFunctionalAreas::onNewIndoorParticipantPosition(const CentralEffectS
   const int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantData.participantId());
   if (equipmentNumber <= 0)
   {
-    DEBUG_LOG() << "equipmentNumber <=0";
+    DEBUG_LOG(m_logger) << "equipmentNumber <=0";
     return;
   }
 
-  DEBUG_LOG() << "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() << " itemView: " << itemView.aesItemId << ", " << itemView.aesTypeId;
+    DEBUG_LOG(m_logger) << " itemView: " << itemView.aesItemId << ", " << itemView.aesTypeId;
     switch (itemView.aesTypeId.underlying())
     {
     case AreaEffectSimulation::AesType_def::AtFunctionalArea:
@@ -358,7 +358,7 @@ 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() << "functionalArea Typ=" << functionalArea.functionalAreaTypeId()
+      DEBUG_LOG(m_logger) << "functionalArea Typ=" << functionalArea.functionalAreaTypeId()
                           << " itemView.partyId=" << itemView.partyId
                           << " participantData.partyId=" << participantData.partyId()
                           << " insideBuilding=" << participantData.insideBuilding();
@@ -366,7 +366,7 @@ void HandlerFunctionalAreas::onNewIndoorParticipantPosition(const CentralEffectS
         if (   (itemView.partyId == participantData.partyId())
             && (functionalArea.functionalAreaTypeId() == 8)) // Funktionsraum Nicht Kampffaehig [GUEZE-2256]
         {
-          DEBUG_LOG() << "Position mit Funktionsraum Nicht Kampffähig hat die Partei des Wirkfeldes => nicht beruecksichtigen";
+          DEBUG_LOG(m_logger) << "Position mit Funktionsraum Nicht Kampffähig hat die Partei des Wirkfeldes => nicht beruecksichtigen";
           continue;
         }
       }
@@ -396,7 +396,7 @@ void HandlerFunctionalAreas::onNewIndoorParticipantPosition(const CentralEffectS
 
 void HandlerFunctionalAreas::onRestoreRadioReadinessChanged(const int participantId)
 {
-  DEBUG_LOG() << "HandlerArtillery::onRestoreRadioReadinessChanged participantId=" << participantId;
+  DEBUG_LOG(m_logger) << "HandlerArtillery::onRestoreRadioReadinessChanged participantId=" << participantId;
   m_supplyTimers.remove(participantId);
   removeParticipant(participantId);
 }
@@ -417,11 +417,11 @@ bool HandlerFunctionalAreas::inBoundingBoxCheck(const CentralEffectSimulation::A
   const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantData.pos(), itemView.zone);
   if (boundingBoxImpact.contains(participantPosUtmPoint))
   {
-    DEBUG_LOG() << "inBoundingBoxCheck Paricipant " << participantData.participantId()
+    DEBUG_LOG(m_logger) << "inBoundingBoxCheck Paricipant " << participantData.participantId()
                         << " inside AesItemView:" << itemView.aesItemId;
     return true;
   }
-  TRACE_LOG() << "inBoundingBoxCheck Paricipant " << participantData.participantId()
+  TRACE_LOG(m_logger) << "inBoundingBoxCheck Paricipant " << participantData.participantId()
                       << " outside AesItemView:" << itemView.aesItemId;
   return false;
 }
@@ -437,7 +437,7 @@ bool HandlerFunctionalAreas::inFormCheck(const CentralEffectSimulation::AesItemV
                            itemView.boundingBoxTopRight);
   const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantData.pos(), itemView.zone);
   const QString  participantPosMgrs = CentralEffectSimulation::geographic2mgrs(participantData.pos(), itemView.zone);
-  DEBUG_LOG() << "inFormCheck start, paricipantId: " << participantData.participantId()
+  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() << "inside AES form, paricipantId: " << participantData.participantId()
+    DEBUG_LOG(m_logger) << "inside AES form, paricipantId: " << participantData.participantId()
                         << ", aesItemId: " << itemView.aesItemId;
     return true;
   } // if inside
@@ -456,10 +456,10 @@ bool HandlerFunctionalAreas::inFormCheck(const CentralEffectSimulation::AesItemV
 #if 0
   if (m_logger.isDebugEnabled())
   {
-    DEBUG_LOG() << "inFormCheck: Paricipant " << participantPosition.participantId << " outside AesItemView " << itemView.aesItemId;
-    DEBUG_LOG() << "ParticipantPos = " << debug(participantPosUtmPoint);
+    DEBUG_LOG(m_logger) << "inFormCheck: Paricipant " << participantPosition.participantId << " outside AesItemView " << itemView.aesItemId;
+    DEBUG_LOG(m_logger) << "ParticipantPos = " << debug(participantPosUtmPoint);
     for (const auto &itPos : itemView.form)
-      DEBUG_LOG() << "itemView =" << debug(itPos);
+      DEBUG_LOG(m_logger) << "itemView =" << debug(itPos);
   }
 #endif
   return false;
@@ -478,12 +478,12 @@ void HandlerFunctionalAreas::sendCesHitRequest(const CentralEffectSimulation::Ae
   switch (eventType.underlying())
   {
   case ProjectDataManagement::EventType_def::EnterFunctionalArea:
-    DEBUG_LOG() << "-------------- EnterFunctionalArea itemView =" << itemView.aesItemId;
+    DEBUG_LOG(m_logger) << "-------------- EnterFunctionalArea itemView =" << itemView.aesItemId;
     remaining = 1;
     break;
   case ProjectDataManagement::EventType_def::LeaveFunctionalArea:
     remaining = 0;
-    DEBUG_LOG() << "-------------- LeaveFunctionalArea itemView =" << itemView.aesItemId;
+    DEBUG_LOG(m_logger) << "-------------- LeaveFunctionalArea itemView =" << itemView.aesItemId;
     break;
   default:
     return;
@@ -492,26 +492,26 @@ void HandlerFunctionalAreas::sendCesHitRequest(const CentralEffectSimulation::Ae
   if (remaining < 0)
     return;
 
-  DEBUG_LOG() << "sendCesHitRequest Settings::calculateCentralAes="
+  DEBUG_LOG(m_logger) << "sendCesHitRequest Settings::calculateCentralAes="
                       << " insideWlsArea=" << std::boolalpha << participantData.insideWlsArea()
                       << " isSmartChargeType=" << std::boolalpha  << m_ddsHandler->isSmartChargeType(itemView.chargeStruct)
                       << " participantId=" << participantData.participantId();
 
   const int equipNo = m_ddsHandler->participantId2EquipNo(participantData.participantId());
-  DEBUG_LOG() << " ftc sendCESHit to Participant participantId = " << 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)
   {
-    DEBUG_LOG() << "participantPosition.participantId != 0 && equipNo <= 0";
+    DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 && equipNo <= 0";
     return;
   }
   if (participantData.participantId() != 0 &&
       participantData.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill)
   {
-    DEBUG_LOG() << "participantPosition.participantId != 0 CatastrophicKill)";
+    DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 CatastrophicKill)";
     return;
   }
 
@@ -550,14 +550,14 @@ void HandlerFunctionalAreas::sendCesHitRequest(const CentralEffectSimulation::Ae
     itemView.partyId,               // originPartyId
     mineId
   );
-  DEBUG_LOG() << " participantId=" << participantData.participantId()
+  DEBUG_LOG(m_logger) << " participantId=" << participantData.participantId()
                       << " chargeTypeId=" << itemView.chargeStruct.chargeTypeId();
 
 
   m_sendCesHitRequestQueue.enqueue(requestTab);
   if (m_sendCesHitRequestQueue.size() == 1)
   {
-    DEBUG_LOG() << "SendCesHitRequest: " << requestTab;
+    DEBUG_LOG(m_logger) << "SendCesHitRequest: " << requestTab;
     m_ddsHandler->ftcTab()->sendCesHitRequest(requestTab, this);
   }
 }
@@ -576,7 +576,7 @@ void HandlerFunctionalAreas::sendParticipantEvent(const CentralEffectSimulation:
       typeClass == ParticipantManagement::TypeClass_def::Vessel ||
       typeClass == ParticipantManagement::TypeClass_def::Unknown)
   {
-    DEBUG_LOG() << "Participant with id " << participantData.participantId()
+    DEBUG_LOG(m_logger) << "Participant with id " << participantData.participantId()
                         << " has invalid typeClass: " << typeClass
                         << " eventType: " << eventType;
     return;
@@ -585,12 +585,12 @@ void HandlerFunctionalAreas::sendParticipantEvent(const CentralEffectSimulation:
   int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantData.participantId());
   if (equipmentNumber <= 0)
   {
-    WARNING_LOG() << "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() << "sendParticipantEvent" << eventType
+  DEBUG_LOG(m_logger) << "sendParticipantEvent" << eventType
                       << " participantId=" << participantData.participantId()
                       << " AesItemId=" << itemView.aesItemId;
 
@@ -610,7 +610,7 @@ void HandlerFunctionalAreas::sendParticipantEvent(const CentralEffectSimulation:
   pe.position(participantData.pos());
   pe.friendlyFire(false);
 
-  INFO_LOG() << "sendParticipantEvent: " << pe
+  INFO_LOG(m_logger) << "sendParticipantEvent: " << pe
                      << ", currentMSecsSinceEpoch = " << QDateTime::currentMSecsSinceEpoch()
                      << ", time difference = " << QDateTime::currentMSecsSinceEpoch() - pe.eventTime();
   m_ddsHandler->dtsCes()->publish(pe);
@@ -622,17 +622,17 @@ void HandlerFunctionalAreas::sendParticipantEvent(const CentralEffectSimulation:
 
 void HandlerFunctionalAreas::aesItemViewRemoved(int aesItemId)
 {
-  DEBUG_LOG() << "aesItemViewRemoved aesItemId=" << aesItemId
+  DEBUG_LOG(m_logger) << "aesItemViewRemoved aesItemId=" << aesItemId
                       << " m_cesEnterLeaveFunctionalArea.size=" << m_cesEnterLeaveFunctionalArea.size()
                       << " m_aesItemViews.size=" << m_aesItemViews.size();
   QHashIterator<QPair<int, int>, EnterLeaveType> i(m_cesEnterLeaveFunctionalArea);
   while (i.hasNext()) {
       i.next();
-      DEBUG_LOG() << "Key: itemId=" << i.key().first << " participantId=" << i.key().second
+      DEBUG_LOG(m_logger) << "Key: itemId=" << i.key().first << " participantId=" << i.key().second
                           << " EnterLeaveType=" << i.value().eventType;
       if (i.key().first == aesItemId )
       {
-        DEBUG_LOG() << " EnterLeaveType=" << i.value().eventType;
+        DEBUG_LOG(m_logger) << " EnterLeaveType=" << i.value().eventType;
         CentralEffectSimulation::AesItemViewUtm itemView = m_aesItemViews.value(i.key().first);
         sendEnterLeave(itemView, i.key().second, false);
         m_cesEnterLeaveFunctionalArea.remove(i.key());
@@ -644,16 +644,16 @@ void HandlerFunctionalAreas::aesItemViewRemoved(int aesItemId)
 
 void HandlerFunctionalAreas::removeParticipant(int participantId)
 {
-  DEBUG_LOG() << "removeParticipant participantId=" << participantId
+  DEBUG_LOG(m_logger) << "removeParticipant participantId=" << participantId
                       << " m_cesEnterLeaveFunctionalArea.size=" << m_cesEnterLeaveFunctionalArea.size();
   QHashIterator<QPair<int, int>, EnterLeaveType> i(m_cesEnterLeaveFunctionalArea);
   while (i.hasNext()) {
       i.next();
-      DEBUG_LOG() << "Key: itemId=" << i.key().first << " participantId=" << i.key().second
+      DEBUG_LOG(m_logger) << "Key: itemId=" << i.key().first << " participantId=" << i.key().second
                           << " EnterLeaveType=" << i.value().eventType;
       if (i.key().second == participantId )
       {
-        DEBUG_LOG() << " EnterLeaveType=" << i.value().eventType;
+        DEBUG_LOG(m_logger) << " EnterLeaveType=" << i.value().eventType;
         CentralEffectSimulation::AesItemViewUtm itemView = m_aesItemViews.value(i.key().first);
         //sendEnterLeave(itemView, i.key().second, false);
         m_cesEnterLeaveFunctionalArea.remove(i.key());
@@ -670,7 +670,7 @@ void HandlerFunctionalAreas::sendEnterLeave(const CentralEffectSimulation::AesIt
   if (m_cesEnterLeaveFunctionalArea.contains(key))
     lastEnterLeaveType = m_cesEnterLeaveFunctionalArea.value(key);
 
-  DEBUG_LOG() << "HandlerFunctionalAreas::sendEnterLeave "
+  DEBUG_LOG(m_logger) << "HandlerFunctionalAreas::sendEnterLeave "
                       << " aesItemId=" << itemView.aesItemId
                       << " participantId=" << participantId
                       << " inForm=" << inForm;
@@ -684,7 +684,7 @@ void HandlerFunctionalAreas::sendEnterLeave(const CentralEffectSimulation::AesIt
       const AreaEffectSimulation::FunctionalArea &fa = m_ddsHandler->dtcAes()->functionalArea(itemView.aesItemId);
       if (!lastEnterLeaveType.isAlreadySupplied)
       {
-        DEBUG_LOG() << "sendEnterLeave.startSupplyTimer"
+        DEBUG_LOG(m_logger) << "sendEnterLeave.startSupplyTimer"
                                " m_cesEnterLeaveFunctionalArea.insert"
                             << " aesItemId=" << key.first
                             << " participantId=" << key.second
@@ -699,10 +699,10 @@ void HandlerFunctionalAreas::sendEnterLeave(const CentralEffectSimulation::AesIt
     enterLeaveType.eventType = ProjectDataManagement::EventType_def::LeaveFunctionalArea;
     if (itemView.isSupplyTruck && lastEnterLeaveType.eventType == ProjectDataManagement::EventType_def::EnterFunctionalArea)
     {
-      DEBUG_LOG() << "sendEnterLeave.stopSupplyTimer";
+      DEBUG_LOG(m_logger) << "sendEnterLeave.stopSupplyTimer";
       enterLeaveType.isAlreadySupplied = false;
       stopSupplyTimer(participantId);
-      DEBUG_LOG() << "sendEnterLeave.startSupplyTimer"
+      DEBUG_LOG(m_logger) << "sendEnterLeave.startSupplyTimer"
                              " m_cesEnterLeaveFunctionalArea.insert"
                           << " aesItemId=" << key.first
                           << " participantId=" << key.second
@@ -718,16 +718,16 @@ void HandlerFunctionalAreas::sendEnterLeave(const CentralEffectSimulation::AesIt
     sendParticipantEvent(itemView,  cesParticipantData, enterLeaveType.eventType);
 
     const AreaEffectSimulation::FunctionalArea &fa = m_ddsHandler->dtcAes()->functionalArea(itemView.aesItemId);
-    DEBUG_LOG() << "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)
     {
-      DEBUG_LOG() << "sendCesHitRequest";
+      DEBUG_LOG(m_logger) << "sendCesHitRequest";
       sendCesHitRequest(itemView, cesParticipantData, enterLeaveType.eventType);
     }
-    DEBUG_LOG() << " m_cesEnterLeaveFunctionalArea.insert"
+    DEBUG_LOG(m_logger) << " m_cesEnterLeaveFunctionalArea.insert"
                         << " aesItemId=" << key.first
                         << " participantId=" << key.second
                         << " enterLeaveType=" << enterLeaveType.eventType;
@@ -738,21 +738,21 @@ void HandlerFunctionalAreas::sendEnterLeave(const CentralEffectSimulation::AesIt
 
 void HandlerFunctionalAreas::startSupplyTimer(int participantId, int aesId, long time)
 {
-  DEBUG_LOG() << "startSupplyTimer="
+  DEBUG_LOG(m_logger) << "startSupplyTimer="
                       << " participantId=" << participantId
                       << " aesId=" << aesId
                       << " time=" << time
                       << " ST participant" << m_aesItemViews[aesId].participantId;
   if (participantId == m_aesItemViews[aesId].participantId)
   {
-    DEBUG_LOG() << "No supply for SupplyTruck";
+    DEBUG_LOG(m_logger) << "No supply for SupplyTruck";
     return;
   }
   if (m_supplyTimers.contains(participantId))
   {
     if (m_supplyTimers[participantId]->isActive())
     {
-      DEBUG_LOG() << "SupplyTimer isActive";
+      DEBUG_LOG(m_logger) << "SupplyTimer isActive";
       return;
     }
     else
@@ -760,7 +760,7 @@ void HandlerFunctionalAreas::startSupplyTimer(int participantId, int aesId, long
   }
   SupplyTimer *supplyTimer = new SupplyTimer(participantId,
                                              aesId, time);
-  DEBUG_LOG() << "supplyTimer->startTimer();";
+  DEBUG_LOG(m_logger) << "supplyTimer->startTimer();";
   QObject::connect(supplyTimer, &SupplyTimer::timeToEffectTimeout,
                    this, &HandlerFunctionalAreas::on_supplyFinished);
   m_supplyTimers.insert(participantId, supplyTimer);
@@ -769,7 +769,7 @@ void HandlerFunctionalAreas::startSupplyTimer(int participantId, int aesId, long
 
 void HandlerFunctionalAreas::stopSupplyTimer(int participantId)
 {
-  DEBUG_LOG() << "stopSupplyTimer="
+  DEBUG_LOG(m_logger) << "stopSupplyTimer="
                       << "participantId=" << participantId;
   if (m_supplyTimers.contains(participantId))
   {
@@ -781,7 +781,7 @@ void HandlerFunctionalAreas::stopSupplyTimer(int participantId)
 
 void HandlerFunctionalAreas::on_supplyFinished(int participantId, int aesId)
 {
-  DEBUG_LOG() << "HandlerFunctionalAreas::on_supplyFinished participantId=" << participantId
+  DEBUG_LOG(m_logger) << "HandlerFunctionalAreas::on_supplyFinished participantId=" << participantId
                       << " aesId =" << aesId;
 
   sendInitSupplyToTab(participantId,
@@ -802,7 +802,7 @@ void HandlerFunctionalAreas::sendInitSupplyToTab(int participantId, int aesId)
   bool resetVulnerabilityState = false;
   bool restockSanitationMaterial = false;
 
-  DEBUG_LOG() << "sendInitSupplyToTab"
+  DEBUG_LOG(m_logger) << "sendInitSupplyToTab"
                       << " participantId=" << participantId
                       << " aesId=" << aesId;
   TrainingAreaBase::DemandInitRequest demandInitRequest(
@@ -818,7 +818,7 @@ void HandlerFunctionalAreas::sendInitSupplyToTab(int participantId, int aesId)
   m_sendInitRequestQueue.enqueue(demandInitRequest);
   if (m_sendInitRequestQueue.size() == 1)
   {
-    DEBUG_LOG() << "sendInitSupply: " << demandInitRequest;
+    DEBUG_LOG(m_logger) << "sendInitSupply: " << demandInitRequest;
     m_ddsHandler->ftcTab()->demandInitRequest(demandInitRequest, this);
   }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.h
index 762073d15..304f8f9db 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.h
@@ -78,6 +78,8 @@ public:
   bool init();
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void onSendCesHitReply(const Core::FunctionReplyObject &replyObject) override final;
   void onDemandInitReply(const Core::FunctionReplyObject &replyObject) override final;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/plugin.cpp
index b1a5b87da..7a5bc267e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/plugin.cpp
@@ -48,7 +48,7 @@ bool CES_FUNCTIONAL_AREAInterfaceImpl::init(int domainId, int exerciseId)
 {
   m_domainId = domainId;
   m_exerciseId = exerciseId;
-  INFO_LOG() << "CES_FUNCTIONAL_AREAInterfaceImpl::init()"
+  INFO_LOG(m_logger) << "CES_FUNCTIONAL_AREAInterfaceImpl::init()"
                      << " m_domainId=" << m_domainId
                      << " m_exerciseId=" << m_exerciseId;
 
@@ -62,11 +62,11 @@ bool CES_FUNCTIONAL_AREAInterfaceImpl::init(int domainId, int exerciseId)
 
   if (!m_handlerFunctionalAreas->init())
   {
-    ERROR_LOG() << "Initialisation m_handlerFunctionalArea failed.";
+    ERROR_LOG(m_logger) << "Initialisation m_handlerFunctionalArea failed.";
     return false;
   }
 
-  INFO_LOG() << "CES_FUNCTIONAL_AREAInterfaceImpl::init() return true";
+  INFO_LOG(m_logger) << "CES_FUNCTIONAL_AREAInterfaceImpl::init() return true";
   return true;
 }
 
@@ -74,8 +74,8 @@ QString CES_FUNCTIONAL_AREAInterfaceImpl::echo(const QString &message)
 {
 
   QString ret(QStringLiteral("<<<< %1 >>>> CES_FUNCTIONAL_AREAInterfaceImpl::echo").arg(message));
-  INFO_LOG() << "CES_FUNCTIONAL_AREAInterfaceImpl::echo return:" << ret;
-  DEBUG_LOG() << "DEBUG: CES_FUNCTIONAL_AREAInterfaceImpl::echo return:" << ret;
+  INFO_LOG(m_logger) << "CES_FUNCTIONAL_AREAInterfaceImpl::echo return:" << ret;
+  DEBUG_LOG(m_logger) << "DEBUG: CES_FUNCTIONAL_AREAInterfaceImpl::echo return:" << ret;
   return ret;
 }
 
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 a5017491e..af2bc6d2e 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
@@ -73,7 +73,7 @@ void HandlerAesData::onAesItemViewChanged(const AreaEffectSimulation::AesItemVie
       modType != DataModification::eModified)
     return;
 
-  DEBUG_LOG() << "Got AesItemView: " << data.effectStateId();
+  DEBUG_LOG(m_logger) << "Got AesItemView: " << data.effectStateId();
   switch (data.effectStateId().underlying())
   {
   case AreaEffectSimulation::AesEffectState_def::EsUnknown:
@@ -98,7 +98,7 @@ void HandlerAesData::removeStates(const AreaEffectSimulation::AesItemView &data)
 {
   if (data.aesTypeId() != AreaEffectSimulation::AesType_def::AtExplosionArea)
     return;
-  DEBUG_LOG() << "Remove aesItemId=" << data.aesItemId();
+  DEBUG_LOG(m_logger) << "Remove aesItemId=" << data.aesItemId();
 } // end removeStates
 
 void HandlerAesData::onExplosionSingleChanged(const AreaEffectSimulation::ExplosionSingle &data, DataModification modType)
@@ -113,7 +113,7 @@ void HandlerAesData::onExplosionSingleChanged(const AreaEffectSimulation::Explos
 
   if (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsRemoved)
   {
-    DEBUG_LOG() << "Remove SingleExplosion";
+    DEBUG_LOG(m_logger) << "Remove SingleExplosion";
     m_explosionSingleState.remove(data.id());
     return;
   }
@@ -121,17 +121,17 @@ void HandlerAesData::onExplosionSingleChanged(const AreaEffectSimulation::Explos
   if (m_explosionSingleState.value(data.id()) == AreaEffectSimulation::AesEffectState_def::EsPrepared
       && data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated)
   {
-    DEBUG_LOG() << "Handle SingleExplosion";
+    DEBUG_LOG(m_logger) << "Handle SingleExplosion";
     handleExplosion = true;
   }
   m_explosionSingleState.insert(data.id(), data.effectStateId());
 
 
-  DEBUG_LOG() << "Got ExplosionSingle";
+  DEBUG_LOG(m_logger) << "Got ExplosionSingle";
   if (handleExplosion)
   {
     const double impactRadius = m_ddsHandler->chargeTypeRadius(data.chargeTypeId());
-    DEBUG_LOG() << "Handle ExplosionSingle (EsActivated)";
+    DEBUG_LOG(m_logger) << "Handle ExplosionSingle (EsActivated)";
 
     // Bounding-Box-Check
     // QMap<int, Footprint> m_footprints;
@@ -154,7 +154,7 @@ void HandlerAesData::onExplosionSingleChanged(const AreaEffectSimulation::Explos
         const Core::GeoPosition2D impactPosition(data.impactPosition().lon(), data.impactPosition().lat());
         if (inFootprint(impactPosition, impactRadius, footprint))
         {
-          DEBUG_LOG() << "ftc sendCESHitOnBuilding mseId = " << footprint.mseId
+          DEBUG_LOG(m_logger) << "ftc sendCESHitOnBuilding mseId = " << footprint.mseId
                               << " chargeTypeId = " << data.chargeTypeId()
                               << " id = " << data.id()
                               << " currentPartitionTime = " << m_ddsHandler->currentPartitionTime()
@@ -170,9 +170,9 @@ void HandlerAesData::onExplosionSingleChanged(const AreaEffectSimulation::Explos
           m_ddsHandler->ftcBld()->sendCesHitOnBuildingRequest(requestBld, this);
         }
         else
-          DEBUG_LOG() << "Not sendCESHitOnBuilding mseId = " << footprint.mseId;
+          DEBUG_LOG(m_logger) << "Not sendCESHitOnBuilding mseId = " << footprint.mseId;
 
-        DEBUG_LOG() << "boundingBoxImpact.contains(footprint)";
+        DEBUG_LOG(m_logger) << "boundingBoxImpact.contains(footprint)";
       }
     } // for
   }
@@ -180,7 +180,7 @@ void HandlerAesData::onExplosionSingleChanged(const AreaEffectSimulation::Explos
 
 void HandlerAesData::onAirSupportImpactChanged(const AreaEffectSimulation::AirSupportImpact &data, DataModification modType)
 {
-  DEBUG_LOG() << "Got onAirSupportImpactChanged()";
+  DEBUG_LOG(m_logger) << "Got onAirSupportImpactChanged()";
   AreaEffectSimulation::ExplosionSingle esData;
   esData.id(data.id());
   esData.chargeTypeId(data.chargeTypeId());
@@ -195,7 +195,7 @@ void HandlerAesData::onTriggeredImpactsChanged(const AreaEffectSimulation::Trigg
       modType != DataModification::eModified)
     return;
 
-  DEBUG_LOG() << "Got TriggeredImpacts";
+  DEBUG_LOG(m_logger) << "Got TriggeredImpacts";
   preCalculateImpacts(data);
 }
 
@@ -208,7 +208,7 @@ void HandlerAesData::onMainFootprintChanged(const InfrastructureManagement::Main
   {
   case DataModification::eAdded:
   case DataModification::eModified:
-    DEBUG_LOG() << "Got MainFootprint (Building)";
+    DEBUG_LOG(m_logger) << "Got MainFootprint (Building)";
     calculateFootprint(data);
     break;
   case DataModification::eRemoved:
@@ -223,8 +223,8 @@ void HandlerAesData::onMainFootprintChanged(const InfrastructureManagement::Main
 
 void HandlerAesData::calculateFootprint(const InfrastructureManagement::MainFootprint &mainFootprint)
 {
-  DEBUG_LOG() << "Footprint: " << mainFootprint.id() << ": " << mainFootprint;
-  DEBUG_LOG() << "Footprint: " << " mainFootprint.elements().size()=" << mainFootprint.elements().size();
+  DEBUG_LOG(m_logger) << "Footprint: " << mainFootprint.id() << ": " << mainFootprint;
+  DEBUG_LOG(m_logger) << "Footprint: " << " mainFootprint.elements().size()=" << mainFootprint.elements().size();
 
   // If poly is Empty continue with next Footprint
   if (mainFootprint.elements().size() <= 0)
@@ -272,9 +272,9 @@ bool HandlerAesData::inFootprint(const Core::GeoPosition2D &geoPosition, const d
   if (m_logger.isDebugEnabled())
   {
     const QPointF utmBuilding(CentralEffectSimulation::geographic2Utm(footPrint.geoPosition, footPrint.zone));
-    DEBUG_LOG() << "Impact (x/y)=" << CentralEffectSimulation::debug(impact - utmBuilding);
+    DEBUG_LOG(m_logger) << "Impact (x/y)=" << CentralEffectSimulation::debug(impact - utmBuilding);
     for (int i = 0; i < footPrint.polyUtm.length(); i++)
-      DEBUG_LOG() << "  poly (x/y)=" << CentralEffectSimulation::debug(footPrint.polyUtm[i] - utmBuilding);
+      DEBUG_LOG(m_logger) << "  poly (x/y)=" << CentralEffectSimulation::debug(footPrint.polyUtm[i] - utmBuilding);
   }
 
   // Check, if hit direct on building
@@ -293,14 +293,14 @@ void HandlerAesData::preCalculateImpacts(const AreaEffectSimulation::TriggeredIm
 {
   if (data.id() <= 0)
     return;
-  DEBUG_LOG() << "preCalculateImpacts";
+  DEBUG_LOG(m_logger) << "preCalculateImpacts";
   // Find AES ItemView and set Bounding-Box of Aes-Field
 
   // Search corresponding itemView and get boundingBox data in UTM
   const bool bFound = m_aesItemViews.contains(data.aesItemId());
   if (!bFound)
   {
-    WARNING_LOG() << "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;
   }
   // Bounding-Box-Check
@@ -316,18 +316,18 @@ void HandlerAesData::preCalculateImpacts(const AreaEffectSimulation::TriggeredIm
 void HandlerAesData::onSendCesHitOnBuildingReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    WARNING_LOG() << "Can not send hit on building to building service: " << replyObject();
+    WARNING_LOG(m_logger) << "Can not send hit on building to building service: " << replyObject();
   else
-    DEBUG_LOG() << "onSendCesHitOnBuildingReply for id " << replyObject.id() << " success\n"
+    DEBUG_LOG(m_logger) << "onSendCesHitOnBuildingReply for id " << replyObject.id() << " success\n"
                         << " replyObject.str() = " << replyObject.str();
 }
 
 void HandlerAesData::onSendCesHitInformationReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    WARNING_LOG() << "onSendCesHitInformationReply for id " << reply.id() << " failed: " << reply.str();
+    WARNING_LOG(m_logger) << "onSendCesHitInformationReply for id " << reply.id() << " failed: " << reply.str();
   else
-    DEBUG_LOG() << "onSendCesHitInformationReply for id " << reply.id() << " successful";
+    DEBUG_LOG(m_logger) << "onSendCesHitInformationReply for id " << reply.id() << " successful";
 }
 
 // calculate impacts for one building
@@ -339,14 +339,14 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac
   case AreaEffectSimulation::AesType_def::AtExplosionArea:
   case AreaEffectSimulation::AesType_def::AtExplosionSingle:
   case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions:
-    DEBUG_LOG() << "Calculate";
+    DEBUG_LOG(m_logger) << "Calculate";
     break;
   default:
-    DEBUG_LOG() << "No Calculation";
+    DEBUG_LOG(m_logger) << "No Calculation";
     return;
   }
 
-  DEBUG_LOG() << "calculateImpacts mseId=" << footprint.mseId << " data.aesItemId() " << data.aesItemId();
+  DEBUG_LOG(m_logger) << "calculateImpacts mseId=" << footprint.mseId << " data.aesItemId() " << data.aesItemId();
 
 
   // get position(s) of impact(s):
@@ -355,14 +355,14 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac
   auto it = m_aesItemViews.constFind(data.aesItemId());
   if (it == m_aesItemViews.constEnd())
   {
-    WARNING_LOG() << "TriggeredExplosions.aesItemId=" << data.aesItemId() << " No aesItemView available";
+    WARNING_LOG(m_logger) << "TriggeredExplosions.aesItemId=" << data.aesItemId() << " No aesItemView available";
     return;
   }
 
   BitfieldStates &bitfieldStates = m_bitfieldStatesBld[footprint.mseId];
   QSet<int> &bitfieldState = bitfieldStates[data.aesItemId()];
   for (int i : std::as_const(bitfieldState))
-    DEBUG_LOG() << "bitfieldState for " << data.aesItemId() << ": " << i;
+    DEBUG_LOG(m_logger) << "bitfieldState for " << data.aesItemId() << ": " << i;
 
   const AreaEffectSimulation::AesItemView &aesItemView = *it;
   for (int32_t bitFieldIdx = 0; bitFieldIdx < data.impactCount(); ++bitFieldIdx)
@@ -376,7 +376,7 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac
       continue;
 
     const Core::GeoPosition2D &impactPosition = aesItemView.form()[bitFieldIdx];
-    DEBUG_LOG() << Q_FUNC_INFO
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO
                         << " impactPosition: lat/lon" << impactPosition.lat() << "/" << impactPosition.lon()
                         << " UTM=" << CentralEffectSimulation::debug(CentralEffectSimulation::geographic2Utm(impactPosition));
 
@@ -385,14 +385,14 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac
     const double impactRadius = m_ddsHandler->chargeTypeRadius(aesItemView.chargeTypeId());
     if (inFootprint(impactPosition, impactRadius, footprint))
     {
-      DEBUG_LOG() << "In Footprint mseId = " << footprint.mseId;
+      DEBUG_LOG(m_logger) << "In Footprint mseId = " << footprint.mseId;
       if (!bitfieldState.contains(bitFieldIdx))
       {
         bitfieldState.insert(bitFieldIdx);
 
-        DEBUG_LOG() << "m_bitfieldStates.insert(data.aesItemId()=" << data.aesItemId() << ", bitfieldState)" << " bitFieldIdx=" << bitFieldIdx;
+        DEBUG_LOG(m_logger) << "m_bitfieldStates.insert(data.aesItemId()=" << data.aesItemId() << ", bitfieldState)" << " bitFieldIdx=" << bitFieldIdx;
 
-        DEBUG_LOG() << "ftc sendCESHitOnBuilding mseId = " << footprint.mseId << " bitFieldIdx= " << bitFieldIdx ;
+        DEBUG_LOG(m_logger) << "ftc sendCESHitOnBuilding mseId = " << footprint.mseId << " bitFieldIdx= " << bitFieldIdx ;
         Buildings::SendCesHitOnBuildingRequest requestBld(
           footprint.mseId,
           aesItemView.chargeTypeId(),
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.h
index dc74cd74d..be0cf6b2c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.h
@@ -50,6 +50,7 @@ public:
   AreaEffectSimulation::AesItemView itemView(const int &aesId) const { return m_aesItemViews.value(aesId); }
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onSendCesHitInformationReply(const Core::FunctionReplyObject &reply) override final;
 
 private slots:
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 129758ec7..5c11c43aa 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
@@ -41,7 +41,7 @@ HandlerParticipantGasPipe::~HandlerParticipantGasPipe()
 
 bool HandlerParticipantGasPipe::init()
 {
-  INFO_LOG() << "HandlerParticipantGasPipe::init";
+  INFO_LOG(m_logger) << "HandlerParticipantGasPipe::init";
   auto dtcAes = m_ddsHandler->dtcAes();
   dtcAes->waitForHistoricalDataGasPipe(2000);
 
@@ -68,7 +68,7 @@ bool HandlerParticipantGasPipe::init()
       return false;
   }
 
-  INFO_LOG() << "HandlerParticipantGasPipe::init() finished. ";
+  INFO_LOG(m_logger) << "HandlerParticipantGasPipe::init() finished. ";
   return true;
 } // end of init()
 //-----------------------------------------------------------------------------
@@ -78,14 +78,14 @@ bool HandlerParticipantGasPipe::init()
 // ///////////////////////////////////
 void HandlerParticipantGasPipe::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &data, DataModification modType)
 {
-  INFO_LOG() << "HandlerParticipantGasPipe::onAesItemViewChanged";
+  INFO_LOG(m_logger) << "HandlerParticipantGasPipe::onAesItemViewChanged";
   //
   if (data.aesTypeId() != AreaEffectSimulation::AesType_def::AtGasPipe)
     return;
 
 
   const int aesItemId = data.aesItemId();
-  DEBUG_LOG() << "Got AesItemView id: " << aesItemId
+  DEBUG_LOG(m_logger) << "Got AesItemView id: " << aesItemId
                       << ", type: " << data.aesTypeId()
                       << ", effectState: " << data.effectStateId()
                       << ", modType: " << modType;
@@ -110,14 +110,14 @@ void HandlerParticipantGasPipe::onAesItemViewChanged(const AreaEffectSimulation:
 
       const CentralEffectSimulation::AesItemViewUtm gasPipeUtm = CentralEffectSimulation::AesItemViewUtm::create(data, prevData, impactRadius);
       m_gasPipes.insert(data.aesItemId(), gasPipeUtm);
-      DEBUG_LOG() << "Check each participant";
+      DEBUG_LOG(m_logger) << "Check each participant";
       // Check each participant
       const auto partPosMap = m_handlerParticipant->positions();
       for (const auto &participantPos : partPosMap)
       {
         if (m_handlerParticipant->isOutdated(participantPos))
         {
-          DEBUG_LOG() << "isOutdated participantId=" << participantPos.participantId();
+          DEBUG_LOG(m_logger) << "isOutdated participantId=" << participantPos.participantId();
           continue;
         }
         const CentralEffectSimulation::AesItemViewUtm gasPipe = m_gasPipes.value(data.aesItemId());
@@ -127,7 +127,7 @@ void HandlerParticipantGasPipe::onAesItemViewChanged(const AreaEffectSimulation:
     }
     default:
     {
-      DEBUG_LOG() << "remove GasPipe";
+      DEBUG_LOG(m_logger) << "remove GasPipe";
       m_gasPipes.remove(aesItemId);
     }
     }
@@ -140,7 +140,7 @@ void HandlerParticipantGasPipe::onAesItemViewChanged(const AreaEffectSimulation:
 
 void HandlerParticipantGasPipe::onGasPipeChanged(const AreaEffectSimulation::GasPipe &data, DataModification modType)
 {
-  INFO_LOG() << "HandlerParticipantGasPipe::onGasPipeChanged id=" << data.id();
+  INFO_LOG(m_logger) << "HandlerParticipantGasPipe::onGasPipeChanged id=" << data.id();
   if (modType == DataModification::eRemoved)
   {
     return;
@@ -149,7 +149,7 @@ void HandlerParticipantGasPipe::onGasPipeChanged(const AreaEffectSimulation::Gas
 
 bool HandlerParticipantGasPipe::insideGasPipeArea(const QPolygonF &polygonf, const QPointF &participantPos) const
 {
-  DEBUG_LOG() << "pos to check: " << CentralEffectSimulation::debug(participantPos) ;
+  DEBUG_LOG(m_logger) << "pos to check: " << CentralEffectSimulation::debug(participantPos) ;
   return  polygonf.containsPoint(participantPos, Qt::OddEvenFill);
 }
 
@@ -159,10 +159,10 @@ void HandlerParticipantGasPipe::calculateGasPipeParticipant(const CentralEffectS
   //const AesItemViewUtm gasPipe = m_gasPipes.value(itemView.aesItemId());
   const QPointF partPosGeo = CentralEffectSimulation::geographic2Utm(participantPosition.pos(), gasPipe.zone);
 
-  DEBUG_LOG() << "calculateGasPipeParticipant itemView.id=" << gasPipe.aesItemId
+  DEBUG_LOG(m_logger) << "calculateGasPipeParticipant itemView.id=" << gasPipe.aesItemId
                       << " participantId=" << participantPosition.participantId();
 
-  DEBUG_LOG() << "gasPipe id = " << gasPipe.aesItemId
+  DEBUG_LOG(m_logger) << "gasPipe id = " << gasPipe.aesItemId
                       << ", Box bottomLeft = " << CentralEffectSimulation::debug(gasPipe.boundingBoxBottomLeft)
                       << ", topRight = " << CentralEffectSimulation::debug(gasPipe.boundingBoxTopRight);
 
@@ -177,16 +177,16 @@ void HandlerParticipantGasPipe::calculateGasPipeParticipant(const CentralEffectS
                                      });
   if (!boundingBoxGasPipe.containsPoint(partPosGeo, Qt::OddEvenFill))
   {
-    DEBUG_LOG() << "not in boundingBox";
+    DEBUG_LOG(m_logger) << "not in boundingBox";
     return;
   }
   const bool result = insideGasPipeArea(gasPipe.form, partPosGeo);
-  DEBUG_LOG() << "result gasPipe Explosion = " << result;
+  DEBUG_LOG(m_logger) << "result gasPipe Explosion = " << result;
   if (result)
   {
-    DEBUG_LOG() << "sendParticipantEvent";
+    DEBUG_LOG(m_logger) << "sendParticipantEvent";
     sendParticipantEvent(gasPipe, participantPosition, ProjectDataManagement::EventType_def::HitGasPipe);
-    DEBUG_LOG() << "sendParticipantHit";
+    DEBUG_LOG(m_logger) << "sendParticipantHit";
     sendParticipantHit(gasPipe, participantPosition, ProjectDataManagement::EventType_def::HitGasPipe);
   }
 }
@@ -195,7 +195,7 @@ void HandlerParticipantGasPipe::onParticipantPositionChanged(const CentralEffect
 {
   bool result = false;
   // Bounding Box von der Linie
-  DEBUG_LOG() << "ParicipantPos "
+  DEBUG_LOG(m_logger) << "ParicipantPos "
                       << " participantId=" << partPos.participantId()
                       << " participantTypeId=" << partPos.participantTypeId()
                       << " participantPos: lat=" << partPos.pos().lat()
@@ -209,14 +209,14 @@ void HandlerParticipantGasPipe::onParticipantPositionChanged(const CentralEffect
 
     const QPointF partPosGeo = CentralEffectSimulation::geographic2Utm(partPos.pos(), gasPipe.zone);
 
-    DEBUG_LOG() << "gasPipe id = " << gasPipe.aesItemId
+    DEBUG_LOG(m_logger) << "gasPipe id = " << gasPipe.aesItemId
                         << ", Box bottomLeft = " << CentralEffectSimulation::debug(gasPipe.boundingBoxBottomLeft)
                         << ", topRight = " << CentralEffectSimulation::debug(gasPipe.boundingBoxTopRight);
 
 //    if (!m_gasPipes.value(gasPipe.aesItemId).containsPoint(partPosGeo, Qt::OddEvenFill))
 //      continue;
     result = insideGasPipeArea(gasPipe.form, partPosGeo);
-    DEBUG_LOG() << "result gasPipe Explosion = " << result<< gasPipe.aesItemId;
+    DEBUG_LOG(m_logger) << "result gasPipe Explosion = " << result<< gasPipe.aesItemId;
     if (result)
       sendParticipantEvent(gasPipe, partPos, ProjectDataManagement::EventType_def::HitGasPipe);
   }
@@ -249,7 +249,7 @@ void HandlerParticipantGasPipe::sendParticipantEvent(const CentralEffectSimulati
   const AreaEffectSimulation::GasPipe &gp = m_ddsHandler->dtcAes()->gasPipe(gasPipe.aesItemId);
 
   CentralEffectSimulation::ParticipantEvent pe;
-  DEBUG_LOG() << "sendParticipantEvent participantId=" << participantPosition.participantId()
+  DEBUG_LOG(m_logger) << "sendParticipantEvent participantId=" << participantPosition.participantId()
                       << " lat= " << participantPosition.pos().lat()
                       << " lon= " << participantPosition.pos().lon()
                       << " equipmentNumber=" << equipmentNumber
@@ -278,7 +278,7 @@ void HandlerParticipantGasPipe::sendParticipantHit(const CentralEffectSimulation
   const int participantId = participantPosition.participantId();
   const int originatorEquipNo = 0;
 
-  DEBUG_LOG() << "sendParticipantHit participantId=" << participantId
+  DEBUG_LOG(m_logger) << "sendParticipantHit participantId=" << participantId
                       << " equipmentNumber=" <<  equipNo;
 
   Core::GeoPosition position;
@@ -310,9 +310,9 @@ void HandlerParticipantGasPipe::sendParticipantHit(const CentralEffectSimulation
 void HandlerParticipantGasPipe::onSendCesHitReply(const Core::FunctionReplyObject &replyObject)
 {
   //if (replyObject.error())
-  //  WARNING_LOG() << "Can not send hit on participant to training area: " << replyObject();
+  //  WARNING_LOG(m_logger) << "Can not send hit on participant to training area: " << replyObject();
   //else
-  DEBUG_LOG() << "onSendCesHitReply for id " << replyObject.id() << " success";
+  DEBUG_LOG(m_logger) << "onSendCesHitReply for id " << replyObject.id() << " success";
 }
 
 void HandlerParticipantGasPipe::sendFtcCesHitRequestTimeout()
@@ -320,7 +320,7 @@ void HandlerParticipantGasPipe::sendFtcCesHitRequestTimeout()
   auto ftcTab = m_ddsHandler->ftcTab();
   for (const TrainingAreaBase::SendCesHitRequest &hr : std::as_const(m_requestMap))
   {
-    DEBUG_LOG()  << "sendFtcCesHitRequestTimeout: " << hr;
+    DEBUG_LOG(m_logger)  << "sendFtcCesHitRequestTimeout: " << hr;
     ftcTab->sendCesHitRequest(hr, this);
   }
   m_requestMap.clear();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/plugin.cpp
index 411affe28..7e1b31c82 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/plugin.cpp
@@ -49,7 +49,7 @@ bool CesGasPipesInterfaceImpl::init(int domainId, int exerciseId)
 {
   m_domainId = domainId;
   m_exerciseId = exerciseId;
-  INFO_LOG() << "CesGasPipesInterfaceImpl::init()"
+  INFO_LOG(m_logger) << "CesGasPipesInterfaceImpl::init()"
                      << " m_domainId=" << m_domainId
                      << " m_exerciseId=" << m_exerciseId;
 
@@ -62,7 +62,7 @@ bool CesGasPipesInterfaceImpl::init(int domainId, int exerciseId)
 
   // if (!m_handlerParticipantBoobyTrap->init())
   // {
-  //   ERROR_LOG() << "Initialisation m_handlerParticipantBoobyTrap failed.";
+  //   ERROR_LOG(m_logger) << "Initialisation m_handlerParticipantBoobyTrap failed.";
   //   return false;
   // }
 
@@ -74,7 +74,7 @@ bool CesGasPipesInterfaceImpl::init(int domainId, int exerciseId)
 
   // if (!m_handlerParticipantOffRouteMine->init())
   // {
-  //   ERROR_LOG() << "Initialisation m_handlerParticipantOffRouteMine failed.";
+  //   ERROR_LOG(m_logger) << "Initialisation m_handlerParticipantOffRouteMine failed.";
   //   return false;
   // }
 
@@ -85,8 +85,8 @@ QString CesGasPipesInterfaceImpl::echo(const QString &message)
 {
 
   QString ret(QStringLiteral("<<<< %1 >>>> CesGasPipesInterfaceImpl::echo").arg(message));
-  INFO_LOG() << "CesGasPipesInterfaceImpl::echo return:" << ret;
-  DEBUG_LOG() << "DEBUG: CesGasPipesInterfaceImpl::echo return:" << ret;
+  INFO_LOG(m_logger) << "CesGasPipesInterfaceImpl::echo return:" << ret;
+  DEBUG_LOG(m_logger) << "DEBUG: CesGasPipesInterfaceImpl::echo return:" << ret;
   return ret;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/FW_Ballistic/BallisticService.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/FW_Ballistic/BallisticService.cpp
index 5dd320074..e9f94b282 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/FW_Ballistic/BallisticService.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/FW_Ballistic/BallisticService.cpp
@@ -54,11 +54,11 @@ bool BallisticService::init(const QString &a_configPath,
   m_configFile = a_configFile;
   m_ammunitionFile = a_ammunitionFile;
 
-  INFO_LOG() << "init";
+  INFO_LOG(m_logger) << "init";
 
   m_ammuConfig = N_ConfigSystem::AmmuConfig::getInstance();
   QString FileName = a_configPath + QLatin1Char('/') + a_ammunitionFile;
-  INFO_LOG() << "FileName=" << FileName;
+  INFO_LOG(m_logger) << "FileName=" << FileName;
 
   m_ammuConfig->initFilename(FileName);
 
@@ -74,15 +74,15 @@ bool BallisticService::createInterfaceOf(IUnknown **app_interface, E_TypeOfInter
 {
   if (!m_Initialized)
   {
-    ERROR_LOG() << "Class is not initialized" ;
+    ERROR_LOG(m_logger) << "Class is not initialized" ;
     return false;
   }
 
   Ammunition *configuredAmmunition;
   E_TypeOfImpl e_impl = e_ImplBase;
 
-  DEBUG_LOG() << "Target Interface Pointer : " << app_interface ;
-  DEBUG_LOG() << "Searching in available ammunitions for " << a_ammuName ;
+  DEBUG_LOG(m_logger) << "Target Interface Pointer : " << app_interface ;
+  DEBUG_LOG(m_logger) << "Searching in available ammunitions for " << a_ammuName ;
 
   //iterate over all Ammunition nodes and find the corresponding Ammunition name
   bool bAmmunitionFound = false;
@@ -95,7 +95,7 @@ bool BallisticService::createInterfaceOf(IUnknown **app_interface, E_TypeOfInter
     //find ammunition
     configuredAmmunition = &ammunition;
 
-    DEBUG_LOG() << "Ammunition found: " << configuredAmmunition->m_AmmunInfo.m_Name ;
+    DEBUG_LOG(m_logger) << "Ammunition found: " << configuredAmmunition->m_AmmunInfo.m_Name ;
 
     if (configuredAmmunition->m_AmmunInfo.m_Name == a_ammuName)
     {
@@ -118,7 +118,7 @@ bool BallisticService::createInterfaceOf(IUnknown **app_interface, E_TypeOfInter
         e_impl = e_ImplBase;
       else
       {
-        ERROR_LOG() << "Configured Algorithm not known :"
+        ERROR_LOG(m_logger) << "Configured Algorithm not known :"
                             << configuredAmmunition->m_AmmunInfo.m_Algorithm;
         return false;
       }
@@ -128,7 +128,7 @@ bool BallisticService::createInterfaceOf(IUnknown **app_interface, E_TypeOfInter
 
   if (!bAmmunitionFound)
   {
-    ERROR_LOG() << "Desired ammunition was not found :" << a_ammuName ;
+    ERROR_LOG(m_logger) << "Desired ammunition was not found :" << a_ammuName ;
     return false;
   }
 
@@ -162,7 +162,7 @@ bool BallisticService::createInterfaceOf(IUnknown **app_interface, E_TypeOfInter
       p_firecontrol = new FireControlRungeKuttaSimple;
       break;
     default:
-      ERROR_LOG() << "Implementation does not exist: " << e_impl ;
+      ERROR_LOG(m_logger) << "Implementation does not exist: " << e_impl ;
       *app_interface = nullptr;
       return false;
     }
@@ -198,7 +198,7 @@ bool BallisticService::createInterfaceOf(IUnknown **app_interface, E_TypeOfInter
       p_trajectorybase = new TrajectoryRungeKuttaSimple;
       break;
     default:
-      ERROR_LOG() << "Implementation does not exist: " << e_impl ;
+      ERROR_LOG(m_logger) << "Implementation does not exist: " << e_impl ;
       *app_interface = nullptr;
       return false;
     }
@@ -208,7 +208,7 @@ bool BallisticService::createInterfaceOf(IUnknown **app_interface, E_TypeOfInter
     break;
   }
   default:
-    ERROR_LOG() << "Interface does not exist: " << a_typeInterface ;
+    ERROR_LOG(m_logger) << "Interface does not exist: " << a_typeInterface ;
     *app_interface = nullptr;
     return false;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/FW_Ballistic/FireControlBase.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/FW_Ballistic/FireControlBase.cpp
index bd6ccd1e4..6c11775ab 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/FW_Ballistic/FireControlBase.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/FW_Ballistic/FireControlBase.cpp
@@ -63,7 +63,7 @@ bool FireControlBase::init(const Ammunition &a_ammunition)
 
   if (a_ammunition.m_StandardParams.m_Valid)
   {
-    TRACE_LOG() << "FireControlBase::init :  initialising StandardParams..." ;
+    TRACE_LOG(m_logger) << "FireControlBase::init :  initialising StandardParams..." ;
 
     m_InitialAmmuVelocityV0constX1 = a_ammunition.m_StandardParams.m_Speed.m_V0ConstX1;
     m_InitialAmmuVelocityV0constX0 = a_ammunition.m_StandardParams.m_Speed.m_V0ConstX0;
@@ -76,14 +76,14 @@ bool FireControlBase::init(const Ammunition &a_ammunition)
 
   m_Initialized = true;
 
-  TRACE_LOG() << "m_InitialAmmuVelocityV0constX1 : " << m_InitialAmmuVelocityV0constX1 ;
-  TRACE_LOG() << "m_InitialAmmuVelocityV0constX0 : " << m_InitialAmmuVelocityV0constX0 ;
-  TRACE_LOG() << "m_CrossWindConstX3 : " << m_CrossWindConstX3 ;
-  TRACE_LOG() << "m_CrossWindConstX2 : " << m_CrossWindConstX2 ;
-  TRACE_LOG() << "m_CrossWindConstX1 : " << m_CrossWindConstX1 ;
-  TRACE_LOG() << "m_CrossWindConstX0 : " << m_CrossWindConstX0 ;
+  TRACE_LOG(m_logger) << "m_InitialAmmuVelocityV0constX1 : " << m_InitialAmmuVelocityV0constX1 ;
+  TRACE_LOG(m_logger) << "m_InitialAmmuVelocityV0constX0 : " << m_InitialAmmuVelocityV0constX0 ;
+  TRACE_LOG(m_logger) << "m_CrossWindConstX3 : " << m_CrossWindConstX3 ;
+  TRACE_LOG(m_logger) << "m_CrossWindConstX2 : " << m_CrossWindConstX2 ;
+  TRACE_LOG(m_logger) << "m_CrossWindConstX1 : " << m_CrossWindConstX1 ;
+  TRACE_LOG(m_logger) << "m_CrossWindConstX0 : " << m_CrossWindConstX0 ;
 
-  TRACE_LOG() << "FireControlBase::init : initialized successfully!" ;
+  TRACE_LOG(m_logger) << "FireControlBase::init : initialized successfully!" ;
   return true;
 }
 
@@ -101,13 +101,13 @@ Float64 FireControlBase::getFlightTime(const Float64 a_distance,
 
   if (!m_Initialized)
   {
-    WARNING_LOG() << "The class is not initialized" ;
+    WARNING_LOG(m_logger) << "The class is not initialized" ;
     return 0.0;
   }
 
   if (a_distance < 1.0 || a_initialAmmuVelocity < 1.0)
   {
-    ERROR_LOG() << "The parameters are not correct" ;
+    ERROR_LOG(m_logger) << "The parameters are not correct" ;
     return 0.0;
   }
 
@@ -133,7 +133,7 @@ Float64 FireControlBase::getFireAngle(const Float64 a_distance, const Float64 a_
 
   if (!m_Initialized)
   {
-    WARNING_LOG() << "The class is not initialized" ;
+    WARNING_LOG(m_logger) << "The class is not initialized" ;
     return 0.0;
   }
 
@@ -143,7 +143,7 @@ Float64 FireControlBase::getFireAngle(const Float64 a_distance, const Float64 a_
       (a_terrainAngle > M_PI_2) ||
       (a_terrainAngle < -M_PI_2))
   {
-    ERROR_LOG() << "The parameters are not correct" ;
+    ERROR_LOG(m_logger) << "The parameters are not correct" ;
     return 0.0;
   }
 
@@ -168,7 +168,7 @@ N_Types::Radian64 FireControlBase::getCrossWindCorrection(const Float64 a_crossW
 
   if (!m_Initialized)
   {
-    ERROR_LOG() << "The class is not initialized" ;
+    ERROR_LOG(m_logger) << "The class is not initialized" ;
     return 0.0;
   }
 
@@ -177,7 +177,7 @@ N_Types::Radian64 FireControlBase::getCrossWindCorrection(const Float64 a_crossW
       m_CrossWindConstX1 == 0 &&
       m_CrossWindConstX0 == 0)
   {
-    WARNING_LOG() << "The class uses probably not initialized parameters" ;
+    WARNING_LOG(m_logger) << "The class uses probably not initialized parameters" ;
     return 0.0;
   }
 
@@ -206,7 +206,7 @@ Float64 FireControlBase::getAirDensity(const Float64 a_atmosphericPressure, cons
   if ((a_atmosphericPressure <= 1.0) ||
       (a_airTemperature <= -N_SST::ZERO_CELSIUS_IN_KELVIN))
   {
-    ERROR_LOG() << "The parameters are not correct, Pressure=" << a_atmosphericPressure << ", Temp=" << a_airTemperature ;
+    ERROR_LOG(m_logger) << "The parameters are not correct, Pressure=" << a_atmosphericPressure << ", Temp=" << a_airTemperature ;
     return 1.0;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/FW_Ballistic/TrajectoryBase.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/FW_Ballistic/TrajectoryBase.cpp
index 5664ac3d9..e32c4390f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/FW_Ballistic/TrajectoryBase.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/FW_Ballistic/TrajectoryBase.cpp
@@ -70,16 +70,16 @@ bool TrajectoryBase::init(const N_Types::Coord3 &a_gunPos, const N_Types::Angle3
 
   if (m_Deviation != 0)
   {
-    INFO_LOG() << "Deviation taken into account: " << m_Deviation ;
+    INFO_LOG(m_logger) << "Deviation taken into account: " << m_Deviation ;
 
     Float64 l_deviationRandomized = m_Deviation * (Float64)(rand() % 100) / 100.0;
-    INFO_LOG() << "l_deviationRandomized = " << l_deviationRandomized ;
+    INFO_LOG(m_logger) << "l_deviationRandomized = " << l_deviationRandomized ;
 
     N_Types::Coord3  o_dev(l_deviationRandomized, 1000.0, 0.0);
-    //INFO_LOG() << "o_dev = " << o_dev ;
+    //INFO_LOG(m_logger) << "o_dev = " << o_dev ;
 
     Float64 l_angleRandomized = rand() % 360;
-    INFO_LOG() << "l_angleRandomized = " << l_angleRandomized ;
+    INFO_LOG(m_logger) << "l_angleRandomized = " << l_angleRandomized ;
 
     N_Types::Radian64 l_angleRad;
     l_angleRad.setDegree(l_angleRandomized);
@@ -90,7 +90,7 @@ bool TrajectoryBase::init(const N_Types::Coord3 &a_gunPos, const N_Types::Angle3
     o_angle.m_H = o_dev.getPolar3().getAzimuth();
     o_angle.m_P = o_dev.getPolar3().getElevation();
 
-    //INFO_LOG() << "o_angle = " << o_angle << END_LOG
+    //INFO_LOG(m_logger) << "o_angle = " << o_angle << END_LOG
     m_GunAngle = m_GunAngle + o_angle;
   }
 
@@ -115,13 +115,13 @@ bool TrajectoryBase::move(const Float64 a_deltaTime)
 {
   if (!m_Initialized)
   {
-    WARNING_LOG() << "The class is not initialized" ;
+    WARNING_LOG(m_logger) << "The class is not initialized" ;
     return false;
   }
 
   if (!m_Active)
   {
-    ERROR_LOG() << "Call init(gunPos, gunAngle, ...) first" ;
+    ERROR_LOG(m_logger) << "Call init(gunPos, gunAngle, ...) first" ;
     return false;
   }
 
@@ -161,7 +161,7 @@ bool TrajectoryBase::init(const Ammunition &a_ammunition)
 {
   m_Initialized = false;
 
-  TRACE_LOG() << "TrajectoryBase::init : initialising..." ;
+  TRACE_LOG(m_logger) << "TrajectoryBase::init : initialising..." ;
 
   m_TimeOutCycles  = a_ammunition.m_AmmunInfo.m_TimeOut / 1000.0;
   m_TimeOut        = m_TimeOutCycles;
@@ -178,9 +178,9 @@ bool TrajectoryBase::init(const Ammunition &a_ammunition)
     m_IsDetonateOnImpact = true;
   }
 
-  TRACE_LOG() << "TrajectoryBase::init : initialized successfully!" ;
+  TRACE_LOG(m_logger) << "TrajectoryBase::init : initialized successfully!" ;
 
-  TRACE_LOG() << "m_TimeOutCycles : " << m_TimeOutCycles ;
+  TRACE_LOG(m_logger) << "m_TimeOutCycles : " << m_TimeOutCycles ;
 
   m_Initialized = true;
   return true;
@@ -246,7 +246,7 @@ void TrajectoryBase::setVelAccelOrientTimeOut()
 
   if (m_TimeOut < 0)
   {
-    INFO_LOG() << "Bullet timed out : " << m_TimeOutCycles ;
+    INFO_LOG(m_logger) << "Bullet timed out : " << m_TimeOutCycles ;
     m_Active = false;
   }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/geoconfig.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/geoconfig.cpp
index 60684689e..c377fbf9d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/geoconfig.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/geoconfig.cpp
@@ -30,7 +30,7 @@ GeoConfig *GeoConfig::getInstance()
 bool GeoConfig::initFilename(const QString &fileName)
 {
 //  const QFileInfo qFileInfo(fileName);
-//  INFO_LOG() << Q_FUNC_INFO << " START, GeoConfig::absoluteFilePath ='" << qFileInfo.absoluteFilePath() << "'";
+//  INFO_LOG(m_logger) << Q_FUNC_INFO << " START, GeoConfig::absoluteFilePath ='" << qFileInfo.absoluteFilePath() << "'";
 
   // AmmunitionMap
   ConfigSettings::initFilename(fileName);
@@ -41,7 +41,7 @@ bool GeoConfig::initFilename(const QString &fileName)
 
   const QStringList &filePaths_rough_to_fine = elevationName.split(QStringLiteral(";"));
 
-//  INFO_LOG() << Q_FUNC_INFO << " use following file(s) for ElevationMap: '" << elevationName << "'";
+//  INFO_LOG(m_logger) << Q_FUNC_INFO << " use following file(s) for ElevationMap: '" << elevationName << "'";
 
   if (!m_elevationMapManager)
   {
@@ -49,7 +49,7 @@ bool GeoConfig::initFilename(const QString &fileName)
     m_elevationMapManager->init(filePaths_rough_to_fine);
   }
 
-//  TRACE_LOG() << Q_FUNC_INFO << " END, filename ='" << fileName << "'";
+//  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, filename ='" << fileName << "'";
   return true;
 }
 
@@ -78,9 +78,9 @@ void GeoConfig::initializeAmmu()
 
     QVector<double> l_charges = getFloatVector(QStringLiteral("ChargeMap"), s_ammu_group);
     m_ChargeMap[i] = l_charges;
-//    INFO_LOG() << "Store ChargeMap Entry: " << " i=" << i << " s_ammu_group = '" << s_ammu_group << "'";
+//    INFO_LOG(m_logger) << "Store ChargeMap Entry: " << " i=" << i << " s_ammu_group = '" << s_ammu_group << "'";
 //    for (int j = 0; j < l_charges.size(); j++)
-//      INFO_LOG() << j << " = " << l_charges[j];
+//      INFO_LOG(m_logger) << j << " = " << l_charges[j];
   }
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/geoconfig.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/geoconfig.h
index a3d77caf0..45b5830e3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/geoconfig.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GBL_ConfigSystem/geoconfig.h
@@ -37,6 +37,7 @@ namespace N_ConfigSystem
 class GeoConfig: public ConfigSettings
 {
 private:
+  NGL::INGLLogger &m_logger;
   explicit GeoConfig();
   ~GeoConfig();
 public:
@@ -48,6 +49,7 @@ public:
   double getElevation(const double lon, const double lat) const;
 
 private:
+  NGL::INGLLogger &m_logger;
   friend class CesGeoPairing::HandlerGeoPairing;  // for initFilename
   bool initFilename(const QString &fileName);
 
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 1adaa9505..5cb8da5e8 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
@@ -33,34 +33,34 @@ GeoPairing::GeoPairing(const std::shared_ptr<N_Ballistic::BallisticService> &bal
     m_ballisticService(ballisticService)
   , m_logger(CesGeoPairing::getLogger("Plugin.GeoPairing.GeoPairing"))
 {
-  INFO_LOG() << "konfigPath = " << ballisticService->getConfigPath() ;
+  INFO_LOG(m_logger) << "konfigPath = " << ballisticService->getConfigPath() ;
 
   const QString s_configPath = ballisticService->getConfigPath();
-  INFO_LOG() << "GeoPairing Config location : " << s_configPath ;
+  INFO_LOG(m_logger) << "GeoPairing Config location : " << s_configPath ;
 
   GeoPairingImpl *l_impl = new GeoPairingImplDted;
-  INFO_LOG() << "--> Installing GeoPairingImplDted..." ;
+  INFO_LOG(m_logger) << "--> Installing GeoPairingImplDted..." ;
   GeoPairingImplFactory::setImpl(l_impl);
   readAmmunitionIni();
 
   // initialize the GeoPairing implementation
   if (!GeoPairingImplFactory::initialize(s_configPath))
   {
-    ERROR_LOG() << "Couldn't initialize GeoPairingImplFactory with GeoPairingImplDted!" ;
+    ERROR_LOG(m_logger) << "Couldn't initialize GeoPairingImplFactory with GeoPairingImplDted!" ;
 
     l_impl = new GeoPairingImplBalistic();
-    INFO_LOG() << "--> Installing GeoPairingImplBalistic...";
+    INFO_LOG(m_logger) << "--> Installing GeoPairingImplBalistic...";
     GeoPairingImplFactory::setImpl(l_impl);
     if (!GeoPairingImplFactory::initialize(s_configPath))
     {
-      ERROR_LOG() << "Couldn't initialize GeoPairingImplFactory with GeoPairingImplBalistic!" ;
+      ERROR_LOG(m_logger) << "Couldn't initialize GeoPairingImplFactory with GeoPairingImplBalistic!" ;
       abort();
     }
     else
-      INFO_LOG() << "GeoPairingImplBalistic correctly initialized" ;
+      INFO_LOG(m_logger) << "GeoPairingImplBalistic correctly initialized" ;
   }
   else
-    INFO_LOG() << "GeoPairingImplDted correctly initialized" ;
+    INFO_LOG(m_logger) << "GeoPairingImplDted correctly initialized" ;
 
 #ifdef _PSEUDO_TARGETS_
 // initial lat long position
@@ -110,24 +110,24 @@ GeoPairing::GeoPairing(const std::shared_ptr<N_Ballistic::BallisticService> &bal
 
 #endif
 
-  INFO_LOG() << "Initialization finished";
+  INFO_LOG(m_logger) << "Initialization finished";
 }
 
 void GeoPairing::calculateAirFire(const QByteArray &transparentData,
                                   const QHash<int, CentralEffectSimulation::HandlerParticipant::CesParticipantData> &aircrafts)
 {
-  INFO_LOG() << "calculateAirFire (IGLA)..." ;
+  INFO_LOG(m_logger) << "calculateAirFire (IGLA)..." ;
 
   GeoPairingDataFireReport l_Report;
   if (!l_Report.parse(transparentData))
   {
-    WARNING_LOG() << "Error: Couldn't parse Fire Report" ;
+    WARNING_LOG(m_logger) << "Error: Couldn't parse Fire Report" ;
     return;
   }
 
   if (aircrafts.size() == 0)
   {
-    INFO_LOG() << "No Aircraft available";
+    INFO_LOG(m_logger) << "No Aircraft available";
     return;
   }
 
@@ -139,7 +139,7 @@ void GeoPairing::calculateAirFire(const QByteArray &transparentData,
     SInt32 vulnerabilityState = i.value().vulnerabilityState.underlying();
     Float64 lat = i.value().pos().lat() * 180 / M_PI;
     Float64 lon = i.value().pos().lon() * 180 / M_PI;
-    DEBUG_LOG() << "GeoPairing::calculateAirFire"
+    DEBUG_LOG(m_logger) << "GeoPairing::calculateAirFire"
                         << "\nl_Updater->update : " << i.key()
                         << "\n: participantId=" << i.value().participantId()
                         << "\n participantTypeId= " << i.value().participantTypeId()
@@ -164,7 +164,7 @@ void GeoPairing::calculateAirFire(const QByteArray &transparentData,
   l_SensorData.FireTime           = m_Time;
   l_SensorData.WeaponElevation    = 0;
 
-  INFO_LOG() << "--> IGLA : Report Target Fire (createSensorData)"
+  INFO_LOG(m_logger) << "--> IGLA : Report Target Fire (createSensorData)"
                      << "\nl_SensorData.WeaponPositionLat  = " << l_SensorData.WeaponPositionLat
                      << "\nl_SensorData.WeaponPositionLong = " <<  l_SensorData.WeaponPositionLong
                      << "\nl_SensorData.WeaponAzimuth=" << l_SensorData.WeaponAzimuth
@@ -173,11 +173,11 @@ void GeoPairing::calculateAirFire(const QByteArray &transparentData,
                      ;
   SInt32 l_DeviceID = GeoPairingImplFactory::createSensorData(&l_SensorData, transparentData);
 
-   INFO_LOG() << "createSensorData -> SensorData.WeaponAzimuth=" << l_SensorData.WeaponAzimuth
+   INFO_LOG(m_logger) << "createSensorData -> SensorData.WeaponAzimuth=" << l_SensorData.WeaponAzimuth
                       << "\nl_SensorData.WeaponElevation=" << l_SensorData.WeaponElevation;
   if (l_DeviceID == -1)
   {
-    ERROR_LOG() << "Couldn't create SensorData" ;
+    ERROR_LOG(m_logger) << "Couldn't create SensorData" ;
     return;
   }
 
@@ -189,14 +189,14 @@ void GeoPairing::calculateAirFire(const QByteArray &transparentData,
 
   if (l_Report.m_DeviceID == PAN_GP_REQUEST_IGLA)
   {
-    INFO_LOG() << " -> IGLA : Request Target Detection " ;
+    INFO_LOG(m_logger) << " -> IGLA : Request Target Detection " ;
 
     QScopedPointer<GeoPairingImplAirTargetCache> l_Cache(GeoPairingImplFactory::createAirTargetCache(m_equipmentNumber));
 
     int l_TargetPlayerId = 0;
     uint64_t l_ImpactTime  = 0;
 
-    INFO_LOG() << "-> IGLA : Request Target Detection -> searchAirTarget (vor dem aufruf)"
+    INFO_LOG(m_logger) << "-> IGLA : Request Target Detection -> searchAirTarget (vor dem aufruf)"
                        << "\nl_Elevation       =  " <<  l_Elevation
                        << "\nl_Azimuth         =  " <<  l_Azimuth
                        ;
@@ -204,7 +204,7 @@ void GeoPairing::calculateAirFire(const QByteArray &transparentData,
 
     bool l_TargetFound = searchAirTarget(l_Elevation, l_Azimuth, l_TargetPlayerId, l_ImpactTime);
 
-    INFO_LOG() << "-> IGLA : Request Target Detection -> searchAirTarget (nach dem aufruf)"
+    INFO_LOG(m_logger) << "-> IGLA : Request Target Detection -> searchAirTarget (nach dem aufruf)"
                        << "\nl_TargetFound    = " << l_TargetFound
                        << "\nl_TargetPlayerId  =  " <<  l_TargetPlayerId
                        << "\nl_ImpactTime      =  " << l_ImpactTime
@@ -213,7 +213,7 @@ void GeoPairing::calculateAirFire(const QByteArray &transparentData,
     bool l_CachedTrackingState = l_Cache->getLatestTrackState(l_TargetPlayerId);
     UInt32 l_CachedTrackingTime = l_Cache->getLatestTrackTime(l_TargetPlayerId);
 
-    INFO_LOG() << "-> IGLA : Retrieved Target Detection Results from Cache"
+    INFO_LOG(m_logger) << "-> IGLA : Retrieved Target Detection Results from Cache"
                        << "\nl_CachedTrackingState = " << l_CachedTrackingState
                        << "\nl_CachedTrackingTime  = " <<  l_CachedTrackingTime
                        ;
@@ -239,26 +239,26 @@ void GeoPairing::calculateAirFire(const QByteArray &transparentData,
       m_reportTarget.send = true;
 
       // Richtung Gefechtsfeld
-      INFO_LOG() << "<-- EC : Report Target Detection " ;
-      INFO_LOG() << "Target Found : " << l_TargetFound ;
+      INFO_LOG(m_logger) << "<-- EC : Report Target Detection " ;
+      INFO_LOG(m_logger) << "Target Found : " << l_TargetFound ;
 
       //m_geoPairingData->sendData(m_PlayerId, l_SendData.data(), l_SendData.size() );
 
       l_Cache->storeLatestTrackState(l_TargetPlayerId, m_Time, l_TargetFound);
     }
   }
-  INFO_LOG() << "\n\nPAN_GP_REPORT_IGLA m_DeviceID=" << l_Report.m_DeviceID
+  INFO_LOG(m_logger) << "\n\nPAN_GP_REPORT_IGLA m_DeviceID=" << l_Report.m_DeviceID
                        << " PAN_GP_REPORT_IGLA=" << PAN_GP_REPORT_IGLA;
   if (l_Report.m_DeviceID == PAN_GP_REPORT_IGLA)
   {
-    INFO_LOG() << "--> IGLA : Report Target Fire " ;
+    INFO_LOG(m_logger) << "--> IGLA : Report Target Fire " ;
 
     int l_TargetPlayerId = 0;
     UInt64 l_ImpactTime = 0;
 
     QScopedPointer<GeoPairingImplAirTargetTracker> l_Tracker(GeoPairingImplFactory::createAirTargetTracker());
 
-    INFO_LOG() << "--> IGLA : Report Target Fire (l_Tracker->setPosition)"
+    INFO_LOG(m_logger) << "--> IGLA : Report Target Fire (l_Tracker->setPosition)"
                        << "\nm_PositionLat    = " << m_PositionLat
                        << "\nm_PositionLon    = " <<  m_PositionLon
                        << "\nm_PositionHeight = " << m_PositionHeight
@@ -266,12 +266,12 @@ void GeoPairing::calculateAirFire(const QByteArray &transparentData,
 
     l_Tracker->setPosition(m_PositionLat, m_PositionLon, m_PositionHeight);
 
-    INFO_LOG() << "--> IGLA : Report Target Fire (setTime)"
+    INFO_LOG(m_logger) << "--> IGLA : Report Target Fire (setTime)"
                        << "\nm_Time     = " << m_Time ;
 
     l_Tracker->setTime(m_Time);
 
-    INFO_LOG() << "--> IGLA : Report Target Fire (vor l_Tracker->track)"
+    INFO_LOG(m_logger) << "--> IGLA : Report Target Fire (vor l_Tracker->track)"
                        << "\nl_Azimuth        = " << l_Azimuth
                        << "\nl_Elevation      = " << l_Elevation
                        << "\nl_TargetPlayerId = " << l_TargetPlayerId
@@ -280,7 +280,7 @@ void GeoPairing::calculateAirFire(const QByteArray &transparentData,
 
     bool l_TargetFound = l_Tracker->track(l_Azimuth, l_Elevation, l_TargetPlayerId, l_ImpactTime);
 
-    INFO_LOG() << "--> IGLA : Report Target Fire (nach l_Tracker->track)"
+    INFO_LOG(m_logger) << "--> IGLA : Report Target Fire (nach l_Tracker->track)"
                        << "\nl_TargetFound        = " << l_TargetFound ;
 
     if (l_TargetFound)
@@ -295,17 +295,17 @@ void GeoPairing::calculateAirFire(const QByteArray &transparentData,
       {
         //m_surfaceToAir->fire(l_TargetPlayerId, l_ImpactTime, l_AmmunitionType, m_PlayerId, true);
         m_fireToAircraft.hit = true;
-        INFO_LOG() << "Air Target " << l_TargetPlayerId << " in reach and hit" ;
+        INFO_LOG(m_logger) << "Air Target " << l_TargetPlayerId << " in reach and hit" ;
       }
       else
       {
         //m_surfaceToAir->fire(l_TargetPlayerId, l_ImpactTime, l_AmmunitionType, m_PlayerId, false);
         m_fireToAircraft.hit = false;
-        INFO_LOG() << "Air Target " << l_TargetPlayerId << " in reach, but not hit" ;
+        INFO_LOG(m_logger) << "Air Target " << l_TargetPlayerId << " in reach, but not hit" ;
       }
     }
     else
-      INFO_LOG() << "No Air Target withing reach..." ;
+      INFO_LOG(m_logger) << "No Air Target withing reach..." ;
   }
 }
 
@@ -314,7 +314,7 @@ void GeoPairing::calculateAirFire(const QByteArray &transparentData,
 void GeoPairing::calculateAreaFire(const QByteArray &transparentData,
                                    const std::shared_ptr<N_Ballistic::BallisticService> &ballisticService)
 {
-  INFO_LOG() << "calculateAreaFire (MK19)..." ;
+  INFO_LOG(m_logger) << "calculateAreaFire (MK19)..." ;
 
   // Prepare SensorData for Implementation
   GeoPairingImplSensorData l_SensorData;
@@ -325,20 +325,20 @@ void GeoPairing::calculateAreaFire(const QByteArray &transparentData,
   GeoPairingDataFireReport l_Report;
   if (!l_Report.parse(transparentData))
   {
-    ERROR_LOG() << "Error: Couldn't parse Fire Report" ;
+    ERROR_LOG(m_logger) << "Error: Couldn't parse Fire Report" ;
     return;
   }
   SInt32 l_DeviceID = GeoPairingImplFactory::createSensorData(&l_SensorData, transparentData);
   if (l_DeviceID == -1)
   {
-    ERROR_LOG() << "Couldn't create SensorData" ;
+    ERROR_LOG(m_logger) << "Couldn't create SensorData" ;
     return;
   }
 
   QScopedPointer<GeoPairingImplFiredBullet> l_FiredBullet(GeoPairingImplFactory::createFiredBullet(l_SensorData));
   if (l_FiredBullet == nullptr)
   {
-    ERROR_LOG() << "Error: Couldn't create FiredBullet object" ;
+    ERROR_LOG(m_logger) << "Error: Couldn't create FiredBullet object" ;
     return;
   }
 
@@ -353,7 +353,7 @@ void GeoPairing::calculateAreaFire(const QByteArray &transparentData,
   GeoPairingImplImpactData *l_ImpactData = l_FiredBullet->getImpactData();
   if (l_ImpactData == nullptr)
   {
-    ERROR_LOG() << "Error: Couldn't create ImpactData object" ;
+    ERROR_LOG(m_logger) << "Error: Couldn't create ImpactData object" ;
     return;
   }
 
@@ -364,15 +364,15 @@ void GeoPairing::calculateAreaFire(const QByteArray &transparentData,
   case MK19Type_m385:
     l_AmmunitionType = N_Ballistic::MK19_M385;
     l_AmmunitionTypeOSAG = N_Ballistic::MK19_M385_OSAG;
-    INFO_LOG() << "Wirkfeld Ammunition MK19_M385" ;
+    INFO_LOG(m_logger) << "Wirkfeld Ammunition MK19_M385" ;
     break;
   case MK19Type_m430:
     l_AmmunitionType = N_Ballistic::MK19_M430;
     l_AmmunitionTypeOSAG = N_Ballistic::MK19_M430_OSAG;
-    INFO_LOG() << "Wirkfeld Ammunition MK19_M430" ;
+    INFO_LOG(m_logger) << "Wirkfeld Ammunition MK19_M430" ;
     break;
   default:
-    ERROR_LOG() << "Default Ammunition. Must not be called : " << l_SensorData.AmmunitionType ;
+    ERROR_LOG(m_logger) << "Default Ammunition. Must not be called : " << l_SensorData.AmmunitionType ;
     return;
   }
 
@@ -417,7 +417,7 @@ void GeoPairing::calculateAreaFire(const QByteArray &transparentData,
   m_areaFireToCtas.ammunitionTypeOSAG = l_AmmunitionTypeOSAG;
   m_areaFireToCtas.hit = true;
 
-  INFO_LOG() << "calculateAreaFire m_equipmentNumber=" << m_equipmentNumber
+  INFO_LOG(m_logger) << "calculateAreaFire m_equipmentNumber=" << m_equipmentNumber
                      << " ImpactTime=" << l_ImpactData->ImpactTime
                      << " ImpactPositionLat=" << l_ImpactData->ImpactPositionLat
                      << " ImpactPositionLong=" << l_ImpactData->ImpactPositionLong
@@ -431,7 +431,7 @@ void GeoPairing::calculateAreaFire(const QByteArray &transparentData,
 
 void GeoPairing::calculateSingleFire(const QByteArray &transparentData, const std::shared_ptr<N_Ballistic::BallisticService> &ballisticService)
 {
-  INFO_LOG() << "calculateSingleFire ..." ;
+  INFO_LOG(m_logger) << "calculateSingleFire ..." ;
 
   ElevationError error_elevation = ElevationError::NoError;
   int error_charge = 0;
@@ -446,10 +446,10 @@ void GeoPairing::calculateSingleFire(const QByteArray &transparentData, const st
   l_SensorData.IgnitionType       = -1; // Unknown
 
   SInt32 l_DeviceID = GeoPairingImplFactory::createSensorData(&l_SensorData, transparentData, error_mun);
-  INFO_LOG() << "l_DeviceID=" << l_DeviceID;
+  INFO_LOG(m_logger) << "l_DeviceID=" << l_DeviceID;
   if (l_DeviceID == -1)
   {
-    ERROR_LOG() << "Couldn't create SensorData" ;
+    ERROR_LOG(m_logger) << "Couldn't create SensorData" ;
     return;
   }
 
@@ -463,7 +463,7 @@ void GeoPairing::calculateSingleFire(const QByteArray &transparentData, const st
     QString pfadQstr = CesGeoPairing::Settings::cesGeopairingIniPath() + QStringLiteral("/");
     std::string pfad = pfadQstr.toStdString();
     std::string munart;
-    INFO_LOG() << "Vor switch AmmunitionType=" << l_SensorData.AmmunitionType
+    INFO_LOG(m_logger) << "Vor switch AmmunitionType=" << l_SensorData.AmmunitionType
                          << " ChargeType=" << l_SensorData.ChargeType;
 
     // Ammunition HE-M1
@@ -471,7 +471,7 @@ void GeoPairing::calculateSingleFire(const QByteArray &transparentData, const st
     {
     case HE_M1A2:
     {
-      INFO_LOG() << "HE_M1A2";
+      INFO_LOG(m_logger) << "HE_M1A2";
       switch (l_SensorData.ChargeType)
       {
       case 0:
@@ -497,32 +497,32 @@ void GeoPairing::calculateSingleFire(const QByteArray &transparentData, const st
     case M60mm_m385:
     case M60mm_m430:
     {
-      INFO_LOG() << "M60mm_m385 M60mm_m430";
+      INFO_LOG(m_logger) << "M60mm_m385 M60mm_m430";
       switch (l_SensorData.IgnitionType) // ChargeType = Ladung...
       {
       // Todo: Umbenennen und ggf. Zuordnung korrigieren
       case 0:
-        INFO_LOG() << "Moerser-60mm-Lad1";
+        INFO_LOG(m_logger) << "Moerser-60mm-Lad1";
         munart = "Moerser-60mm-Lad1";
         break;
       case 1:
-        INFO_LOG() << "Moerser-60mm-Lad2";
+        INFO_LOG(m_logger) << "Moerser-60mm-Lad2";
         munart = "Moerser-60mm-Lad2";
         break;
       case 2:
-        INFO_LOG() << "Moerser-60mm-Lad3";
+        INFO_LOG(m_logger) << "Moerser-60mm-Lad3";
         munart = "Moerser-60mm-Lad3";
         break;
       case 3:
-        INFO_LOG() << "Moerser-60mm-Lad4";
+        INFO_LOG(m_logger) << "Moerser-60mm-Lad4";
         munart = "Moerser-60mm-Lad4";
         break;
       case 4:
-        INFO_LOG() << "Moerser-60mm-Lad5";
+        INFO_LOG(m_logger) << "Moerser-60mm-Lad5";
         munart = "Moerser-60mm-Lad5";
         break;
       case 5:
-        INFO_LOG() << "Moerser-60mm-La6";
+        INFO_LOG(m_logger) << "Moerser-60mm-La6";
         munart = "Moerser-60mm-Lad6";
         break;
       default:
@@ -532,7 +532,7 @@ void GeoPairing::calculateSingleFire(const QByteArray &transparentData, const st
     }
     case VLAP_M9703:
     {
-      INFO_LOG() << "VLAP_M9703";
+      INFO_LOG(m_logger) << "VLAP_M9703";
       // Sonderfall Ammunition VLAP-M64. Da hier nur 5 x M64 Incr als Ladung vorhanden ist.
       // Sollten wir eine andere Ladung aus dem Gefechtsfeld bekommen, dann Munition HE M1A2 benutzen
       switch (l_SensorData.ChargeType)
@@ -610,7 +610,7 @@ void GeoPairing::calculateSingleFire(const QByteArray &transparentData, const st
     }
     if (munart.empty())
     {
-      WARNING_LOG() << "No valid charge type " << l_SensorData.ChargeType <<
+      WARNING_LOG(m_logger) << "No valid charge type " << l_SensorData.ChargeType <<
                             " for ammunition " << l_SensorData.AmmunitionType <<
                             " (internal ids!)" ;
       munart = "HE-M1-M64Base-TableE";
@@ -618,7 +618,7 @@ void GeoPairing::calculateSingleFire(const QByteArray &transparentData, const st
     }
 
     std::string suffix = ".sus";
-    DEBUG_LOG() << "schusstafel pfad=" << pfad
+    DEBUG_LOG(m_logger) << "schusstafel pfad=" << pfad
                         << " munart=" << munart
                         << " suffix=" << suffix;
     Schusstafel schusstafel(pfad, munart, suffix);
@@ -647,10 +647,10 @@ void GeoPairing::calculateSingleFire(const QByteArray &transparentData, const st
     double elevationGrad = l_SensorData.WeaponElevation.getDegree();
     if (elevationGrad <= 0.0)
     {
-      INFO_LOG() << "Elevation ist <= 0 Grad. Entfernung wird auf 50% des ersten Wertes aus der Schusstafel festgesetzt" ;
+      INFO_LOG(m_logger) << "Elevation ist <= 0 Grad. Entfernung wird auf 50% des ersten Wertes aus der Schusstafel festgesetzt" ;
       // Dazu aus der minimal moeglichen Elevation die Entfernung bestimmen und halbieren
       float minEval = mun.minEleval * MILRAD;
-      DEBUG_LOG() << "schusstafel tafelName=" << tafelName
+      DEBUG_LOG(m_logger) << "schusstafel tafelName=" << tafelName
                           << " minEval=" << minEval
                           << "zielhoehenwinkel=" << zielhoehenwinkel;
 
@@ -661,10 +661,10 @@ void GeoPairing::calculateSingleFire(const QByteArray &transparentData, const st
     }
     else if (elevationGrad >= 90.0)
     {
-      INFO_LOG() << "Elevation ist >= 90 Grad. Entfernung wird auf den letzten Wert aus der Schusstafel festgesetzt" ;
+      INFO_LOG(m_logger) << "Elevation ist >= 90 Grad. Entfernung wird auf den letzten Wert aus der Schusstafel festgesetzt" ;
       // Dazu aus der maximal moeglichen Elevation die Entfernung bestimmen
       double maxEval = mun.maxEleval * MILRAD;
-      DEBUG_LOG() << "schusstafel tafelName=" << tafelName
+      DEBUG_LOG(m_logger) << "schusstafel tafelName=" << tafelName
                           << " maxEval=" << maxEval
                           << "zielhoehenwinkel=" << zielhoehenwinkel;
       schusstafel.ST_artillerie(tafelName, maxEval, zielhoehenwinkel, &entfernung1, &aufsatz1, &flugzeit1, &drift1,
@@ -672,14 +672,14 @@ void GeoPairing::calculateSingleFire(const QByteArray &transparentData, const st
     }
     else
     {
-      DEBUG_LOG() << "schusstafel tafelName=" << tafelName
+      DEBUG_LOG(m_logger) << "schusstafel tafelName=" << tafelName
                           << " arg_wert=" << arg_wert
                           << "zielhoehenwinkel=" << zielhoehenwinkel;
       schusstafel.ST_artillerie(tafelName, arg_wert, zielhoehenwinkel, &entfernung1, &aufsatz1, &flugzeit1, &drift1,
                                 &entfernung2, &aufsatz2, &flugzeit2, &drift2);
     }
 
-    INFO_LOG() << "Schusstafel " << munart << ".sus: "
+    INFO_LOG(m_logger) << "Schusstafel " << munart << ".sus: "
                        <<  "Entfernung [m]: " << entfernung1
                        <<  " Elevation [mil]: " <<  evalMil
                        << " Drift [grad]: " << drift1 * 180 / M_PI
@@ -691,14 +691,14 @@ void GeoPairing::calculateSingleFire(const QByteArray &transparentData, const st
   else
   {
     // != G5G6 && != M109
-    INFO_LOG() << "calculate(ballisticService)";
+    INFO_LOG(m_logger) << "calculate(ballisticService)";
     l_FiredBullet->calculate(ballisticService);
   }
 
   GeoPairingImplImpactData *l_ImpactData = l_FiredBullet->getImpactData();
   if (!l_ImpactData)
   {
-    ERROR_LOG() << "No impact Data available";
+    ERROR_LOG(m_logger) << "No impact Data available";
     return;
   }
 
@@ -794,7 +794,7 @@ void GeoPairing::calculateSingleFire(const QByteArray &transparentData, const st
   //                                           l_DeviceID);
   QString latStr = QString::number(l_ImpactData->ImpactPositionLat, 'f', 8);
   QString lonStr = QString::number(l_ImpactData->ImpactPositionLong, 'f', 8);
-  INFO_LOG() << "calculateSingleFire m_equipmentNumber=" << m_equipmentNumber
+  INFO_LOG(m_logger) << "calculateSingleFire m_equipmentNumber=" << m_equipmentNumber
                      << " ImpactTime=" << l_ImpactData->ImpactTime
                      << " ImpactPositionLat=" << latStr
                      << " ImpactPositionLong=" << lonStr
@@ -830,20 +830,20 @@ bool GeoPairing::geoPairingData(const std::shared_ptr<N_Ballistic::BallisticServ
   m_areaFireToCtas.hit = false;
   m_reportTarget.send = false;
 
-  INFO_LOG() << "--------------- geoPairingData empfangen! -----------------" ;
-  INFO_LOG() << "playerId        = " << m_equipmentNumber ;
-  INFO_LOG() << "time            = " << (SInt64) m_Time ;
-  INFO_LOG() << "positionLat     = " << m_PositionLat ;
-  INFO_LOG() << "positonLon      = " << m_PositionLon ;
-  INFO_LOG() << "tr.Data-Size    = " << transparentDataAr.size() ;
+  INFO_LOG(m_logger) << "--------------- geoPairingData empfangen! -----------------" ;
+  INFO_LOG(m_logger) << "playerId        = " << m_equipmentNumber ;
+  INFO_LOG(m_logger) << "time            = " << (SInt64) m_Time ;
+  INFO_LOG(m_logger) << "positionLat     = " << m_PositionLat ;
+  INFO_LOG(m_logger) << "positonLon      = " << m_PositionLon ;
+  INFO_LOG(m_logger) << "tr.Data-Size    = " << transparentDataAr.size() ;
 
-  INFO_LOG() << "transparentData = " << transparentDataAr.toHex() ;
+  INFO_LOG(m_logger) << "transparentData = " << transparentDataAr.toHex() ;
 
   QHashIterator<int, CentralEffectSimulation::HandlerParticipant::CesParticipantData> i(aircrafts);
   while (i.hasNext())
   {
     i.next();
-    DEBUG_LOG() << i.key() << ": participantId=" << i.value().participantId()
+    DEBUG_LOG(m_logger) << i.key() << ": participantId=" << i.value().participantId()
                         << " participantTypeId= " << i.value().participantTypeId()
                         << " pos lat=" << i.value().pos().lat()
                         << " pos lon=" << i.value().pos().lon()
@@ -855,18 +855,18 @@ bool GeoPairing::geoPairingData(const std::shared_ptr<N_Ballistic::BallisticServ
 
   if (!l_Header.parse(transparentDataAr))
   {
-    ERROR_LOG() << "Error: Couldn't parse header of transparent Data!" ;
+    ERROR_LOG(m_logger) << "Error: Couldn't parse header of transparent Data!" ;
     return false;
   }
 
   UInt8 l_MessageID = l_Header.m_MessageID;
   PanGeoPairingDeviceId l_DeviceID  = l_Header.m_DeviceID;
-  INFO_LOG() << "l_MessageID = " << std::hex << (int)l_MessageID ;
-  INFO_LOG() << "l_DeviceID = "  << l_DeviceID ;
+  INFO_LOG(m_logger) << "l_MessageID = " << std::hex << (int)l_MessageID ;
+  INFO_LOG(m_logger) << "l_DeviceID = "  << l_DeviceID ;
 
   if (l_MessageID == 0xE3) // Firing_Report
   {
-    INFO_LOG() << "--> E3 : Firing Report " ;
+    INFO_LOG(m_logger) << "--> E3 : Firing Report " ;
 
     switch (l_DeviceID)
     {
@@ -874,7 +874,7 @@ bool GeoPairing::geoPairingData(const std::shared_ptr<N_Ballistic::BallisticServ
     case PAN_GP_REPORT_G5_G6:
     case PAN_GP_REPORT_M109:
       calculateSingleFire(transparentDataAr, ballisticService);
-      INFO_LOG() << "PAN_GP_REPORT_MORTAR  PAN_GP_REPORT_G5_G6 PAN_GP_REPORT_M109 calculateSingleFire";
+      INFO_LOG(m_logger) << "PAN_GP_REPORT_MORTAR  PAN_GP_REPORT_G5_G6 PAN_GP_REPORT_M109 calculateSingleFire";
       break;
     case PAN_GP_REPORT_MK19:
       calculateAreaFire(transparentDataAr, ballisticService);
@@ -882,16 +882,16 @@ bool GeoPairing::geoPairingData(const std::shared_ptr<N_Ballistic::BallisticServ
     case PAN_GP_REPORT_IGLA:
     case PAN_GP_REQUEST_IGLA:
       calculateAirFire(transparentDataAr, aircrafts);
-      INFO_LOG() << "PAN_GP_REPORT_IGLA  PAN_GP_REQUEST_IGLA ";
+      INFO_LOG(m_logger) << "PAN_GP_REPORT_IGLA  PAN_GP_REQUEST_IGLA ";
       break;
     default:
-      WARNING_LOG() << "--> Unknown DeviceID " << l_DeviceID << " used !" ;
+      WARNING_LOG(m_logger) << "--> Unknown DeviceID " << l_DeviceID << " used !" ;
       return false;
     }
   }
   else
   {
-    WARNING_LOG() << "--> Unknown MessageID used ! " ;
+    WARNING_LOG(m_logger) << "--> Unknown MessageID used ! " ;
     return false;
   }
 
@@ -913,7 +913,7 @@ void GeoPairing::setMeteo(double winddirection, double windspeed, double tempera
 
 bool GeoPairing::searchAirTarget(double a_elevation, double azimuth, int &playerId,  uint64_t &impactTime)
 {
-  INFO_LOG() << "searchAirTarget (IGLA)..." ;
+  INFO_LOG(m_logger) << "searchAirTarget (IGLA)..." ;
 
   QScopedPointer<GeoPairingImplAirTargetTracker> l_Tracker(GeoPairingImplFactory::createAirTargetTracker());
 
@@ -936,25 +936,25 @@ void GeoPairing::readAmmunitionIni()
   //Zu erst holen wir uns alle WaffenTypen
   const QVector<int> typesList = ammuConfig->getIntegerVector(QStringLiteral("WeaponRestriction"), QStringLiteral("Types"));
 
-  DEBUG_LOG() << "typesList.size=" << typesList.size();
+  DEBUG_LOG(m_logger) << "typesList.size=" << typesList.size();
   //Wir holen uns alle Munitionen die in Frage kommen heraus // evtl mit Liste?
   const QVector<int> ammoList =  ammuConfig->getIntegerVector(QStringLiteral("WeaponRestriction"), QStringLiteral("AmmoList"));
-  DEBUG_LOG() << "ammoList=" << ammoList.size();
+  DEBUG_LOG(m_logger) << "ammoList=" << ammoList.size();
   for (int ammo : ammoList)
   {
-    DEBUG_LOG() << "ammoListValue=" << ammo;
+    DEBUG_LOG(m_logger) << "ammoListValue=" << ammo;
 
     QString eleGroup = QStringLiteral("Ammunition") + QStringLiteral("P") + QString::number(ammo) + QStringLiteral("/CWParams");
     const QVector<double> minElevataion = ammuConfig->getFloatVector(eleGroup, QStringLiteral("ElevMin"));
-    DEBUG_LOG() << "ammo = " << ammo << " minElevataion.size() =" << minElevataion.size()
+    DEBUG_LOG(m_logger) << "ammo = " << ammo << " minElevataion.size() =" << minElevataion.size()
                         << " " << eleGroup << "/" << QStringLiteral("ElevMin");
 
     const QVector<double> maxElevataion = ammuConfig->getFloatVector(eleGroup, QStringLiteral("ElevMax"));
-    DEBUG_LOG() << "ammo = " << ammo << " maxElevataion.size() =" << maxElevataion.size() << eleGroup << "/" << QStringLiteral("ElevMax");
+    DEBUG_LOG(m_logger) << "ammo = " << ammo << " maxElevataion.size() =" << maxElevataion.size() << eleGroup << "/" << QStringLiteral("ElevMax");
 
     if (minElevataion.size() != maxElevataion.size())
     {
-      DEBUG_LOG() << "Invalid Ammunition Config for : Ammunition" << ammo ;
+      DEBUG_LOG(m_logger) << "Invalid Ammunition Config for : Ammunition" << ammo ;
       continue;
     }
     // Get Allowd fpr all Types
@@ -966,9 +966,9 @@ void GeoPairing::readAmmunitionIni()
     {
       QString alloweKey = QStringLiteral("Allowed") + QString::number(weaponTypeId);
       const QMap<int, bool> allowed = ammuConfig->getBoolMap(eleGroup, alloweKey);
-      DEBUG_LOG() << "alloweKey  allowed.size() =" << allowed.size() << " " << eleGroup << "/" << alloweKey;
+      DEBUG_LOG(m_logger) << "alloweKey  allowed.size() =" << allowed.size() << " " << eleGroup << "/" << alloweKey;
       allowedCombi.insert(weaponTypeId, allowed);
-      //DEBUG_LOG() << "allowedCombi.insert(" << weaponTypeId <<", " << allowed << ")";
+      //DEBUG_LOG(m_logger) << "allowedCombi.insert(" << weaponTypeId <<", " << allowed << ")";
     }
 
     for (int j = 0; j < minElevataion.size(); j++)
@@ -983,13 +983,13 @@ void GeoPairing::readAmmunitionIni()
         //hier holen wir nur den erlaubtstatus für die jeweilige ChargeElevation und packen sie in die
         //Map des ChargeType
         allowedCombiForCharge.insert(weaponTypeId, allowedCombi.value(weaponTypeId).value(j));
-        DEBUG_LOG() << "allowedCombiForCharge.insert(" << weaponTypeId << ", " << allowedCombi.value(weaponTypeId).value(j) << ")";
+        DEBUG_LOG(m_logger) << "allowedCombiForCharge.insert(" << weaponTypeId << ", " << allowedCombi.value(weaponTypeId).value(j) << ")";
       }
       GeoPCharge geoPCharge = GeoPCharge(_chargeId,  _minEleval,  _maxEleval,  allowedCombiForCharge);
       mun.insert(j, geoPCharge);
     }
     m_geoPMunMap.insert(ammo, mun);
   }
-  DEBUG_LOG() << "m_geoPMunMap.size=" << m_geoPMunMap.size();
+  DEBUG_LOG(m_logger) << "m_geoPMunMap.size=" << m_geoPMunMap.size();
 
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingDataBase.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingDataBase.cpp
index 9b86bf91d..c0830ef4c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingDataBase.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingDataBase.cpp
@@ -35,20 +35,20 @@ bool GeoPairingDataBase::parse(const QByteArray& a_transparentData)
 
   if (a_transparentData.size() < m_Size)
   {
-    ERROR_LOG() << "Size of transparent Data not valid :" << a_transparentData.size()
+    ERROR_LOG(m_logger) << "Size of transparent Data not valid :" << a_transparentData.size()
                         << " instead of " << m_Size;
     return false;
   }
 
   m_MessageID = a_transparentData[startMessageId];
   int messageId = m_MessageID;
-  INFO_LOG() << "Header -> MessageID : " << messageId;
+  INFO_LOG(m_logger) << "Header -> MessageID : " << messageId;
 
   UInt8 deviceId;
   deviceId = a_transparentData[startDevice];
 
   m_DeviceID = static_cast<PanGeoPairingDeviceId>(deviceId);
-  INFO_LOG() << "Header -> DeviceID  : " << m_DeviceID;
+  INFO_LOG(m_logger) << "Header -> DeviceID  : " << m_DeviceID;
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImpl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImpl.cpp
index 2128c3c00..705352019 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImpl.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImpl.cpp
@@ -84,23 +84,23 @@ GeoPairingImplAirTargetCache *GeoPairingImpl::createAirTargetCache(UInt32 a_play
 // ---------------------------------------------------------------
 SInt32 GeoPairingImpl::createSensorData(GeoPairingImplSensorData *a_sensorData, const QByteArray& a_transparendData, int &isDefault)
 {
-  INFO_LOG() << "createSensorData";
+  INFO_LOG(m_logger) << "createSensorData";
   if (!m_Initialized)
   {
-    ERROR_LOG() << "Implementation not initialized";
+    ERROR_LOG(m_logger) << "Implementation not initialized";
     return -1;
   }
 
   if (!a_sensorData)
   {
-    ERROR_LOG() << "SensorData Object argument not valid";
+    ERROR_LOG(m_logger) << "SensorData Object argument not valid";
     return -1;
   }
 
   GeoPairingDataFireReport l_Report;
   if (!l_Report.parse(a_transparendData))
   {
-    ERROR_LOG() << "Couldn't parse FireReport";
+    ERROR_LOG(m_logger) << "Couldn't parse FireReport";
     return -1;
   }
 
@@ -141,9 +141,9 @@ SInt32 GeoPairingImpl::createSensorData(GeoPairingImplSensorData *a_sensorData,
 
     if (date.isValid())
     {
-      INFO_LOG() << "GeoMagneticField DateRecord    = " << l_DateRecord;
-      INFO_LOG() << "GeoMagneticField Declination   = " << l_Declination;
-      INFO_LOG() << "GeoMagneticField ChangePerYear = " << l_ChangePerYear;
+      INFO_LOG(m_logger) << "GeoMagneticField DateRecord    = " << l_DateRecord;
+      INFO_LOG(m_logger) << "GeoMagneticField Declination   = " << l_Declination;
+      INFO_LOG(m_logger) << "GeoMagneticField ChangePerYear = " << l_ChangePerYear;
 
       time_t l_TimeNow = time(nullptr);
       struct tm l_TimeInfo;
@@ -157,42 +157,42 @@ SInt32 GeoPairingImpl::createSensorData(GeoPairingImplSensorData *a_sensorData,
 
       int l_SecondsPerYear = 365 * 24 * 3600;
       int l_Years = l_TimeDiff / l_SecondsPerYear; // number of years since DateRecords
-      DEBUG_LOG() << "GeoMagneticField Years since DateRecord : " << l_Years;
+      DEBUG_LOG(m_logger) << "GeoMagneticField Years since DateRecord : " << l_Years;
 
       l_GeoMagneticCorrection = l_Declination + (l_Years * l_ChangePerYear);
-      INFO_LOG() << "GeoMagneticField Azimuth correction [degrees]: " << l_GeoMagneticCorrection;
+      INFO_LOG(m_logger) << "GeoMagneticField Azimuth correction [degrees]: " << l_GeoMagneticCorrection;
       l_GeoMagneticCorrection *= N_SST::PI_OVER_180;
       l_Azimuth += l_GeoMagneticCorrection;
 
     }
   }
 
-  INFO_LOG() << "createSensorData";
+  INFO_LOG(m_logger) << "createSensorData";
 
   if (l_Report.m_DeviceID == PAN_GP_REPORT_MORTAR)
   {
     int l_AmmunitionField = PAN_AMMU_INDEX(l_Report.m_Ammunition);
-    INFO_LOG() << "createSensorData PAN_GP_REPORT_MORTAR l_AmmunitionField=" << +l_AmmunitionField
+    INFO_LOG(m_logger) << "createSensorData PAN_GP_REPORT_MORTAR l_AmmunitionField=" << +l_AmmunitionField
                          << " l_Report.m_Ammunition=" << +l_Report.m_Ammunition
                          << " l_Report.m_Ammunition & 0x03=" << +(l_Report.m_Ammunition & 0x03);
     switch (l_Report.m_Ammunition & 0x03)
     {
     case 1:
       a_sensorData->AmmunitionType = MortarType1;
-      INFO_LOG() << "Using Mortar Ammunition 1";
+      INFO_LOG(m_logger) << "Using Mortar Ammunition 1";
       break;
     case 2:
       a_sensorData->AmmunitionType = MortarType2;
-      INFO_LOG() << "Using Mortar Ammunition 2";
+      INFO_LOG(m_logger) << "Using Mortar Ammunition 2";
       break;
     default:
       a_sensorData->AmmunitionType = MortarType1;
-      ERROR_LOG() << "Ammunition value means 'reserved' : "
+      ERROR_LOG(m_logger) << "Ammunition value means 'reserved' : "
                           << l_AmmunitionField;
       return -1;
     }
     a_sensorData->IgnitionType = (l_Report.m_Ammunition  >> 3) & 0x07;
-    INFO_LOG() << "a_sensorData->IgnitionType= " << a_sensorData->IgnitionType;
+    INFO_LOG(m_logger) << "a_sensorData->IgnitionType= " << a_sensorData->IgnitionType;
   }
   else if ((l_Report.m_DeviceID == PAN_GP_REPORT_G5_G6) || (l_Report.m_DeviceID == PAN_GP_REPORT_M109))
   {
@@ -202,38 +202,38 @@ SInt32 GeoPairingImpl::createSensorData(GeoPairingImplSensorData *a_sensorData,
     case 1:
       a_sensorData->AmmunitionType = HE_M1A2;
       a_sensorData->IgnitionTypeG5G6 = IgnitionTypePercussion;
-      INFO_LOG() << "Using HE_M1A2 Percussion";
+      INFO_LOG(m_logger) << "Using HE_M1A2 Percussion";
       break;
     case 2:
       a_sensorData->AmmunitionType = HE_M1A2;
       a_sensorData->IgnitionTypeG5G6 = IgnitionTypeProximity;
-      INFO_LOG() << "Using HE_M1A2 Proximity";
+      INFO_LOG(m_logger) << "Using HE_M1A2 Proximity";
       break;
     case 3:
       a_sensorData->AmmunitionType = VLAP_M9703;
       a_sensorData->IgnitionTypeG5G6 = IgnitionTypePercussion;
-      INFO_LOG() << "Using VLAP_M9703 Percussion";
+      INFO_LOG(m_logger) << "Using VLAP_M9703 Percussion";
       break;
     case 4:
       a_sensorData->AmmunitionType = VLAP_M9703;
       a_sensorData->IgnitionTypeG5G6 = IgnitionTypeProximity;
-      INFO_LOG() << "Using VLAP_M9703 Proximity";
+      INFO_LOG(m_logger) << "Using VLAP_M9703 Proximity";
       break;
     case 5:
       a_sensorData->AmmunitionType = SMK_BE_M2;
       a_sensorData->IgnitionTypeG5G6 = IgnitionTypeTime;
-      INFO_LOG() << "Using SMK_BE_M2 Time";
+      INFO_LOG(m_logger) << "Using SMK_BE_M2 Time";
       break;
     case 6:
       a_sensorData->AmmunitionType = CLUSTER_HEHC_M9609;
       a_sensorData->IgnitionTypeG5G6 = IgnitionTypeTime;
-      INFO_LOG() << "Using CLUSTER_HEHC_M9609 Time";
+      INFO_LOG(m_logger) << "Using CLUSTER_HEHC_M9609 Time";
       break;
     default:
       a_sensorData->AmmunitionType = HE_M1A2;
       a_sensorData->IgnitionTypeG5G6 = IgnitionTypePercussion;
       isDefault = 1;
-      ERROR_LOG() << "Ammunition value means 'reserved' : " << l_AmmunitionField;
+      ERROR_LOG(m_logger) << "Ammunition value means 'reserved' : " << l_AmmunitionField;
       return -1;
     }
   }
@@ -277,15 +277,15 @@ SInt32 GeoPairingImpl::createSensorData(GeoPairingImplSensorData *a_sensorData,
     {
     case 1:
       a_sensorData->AmmunitionType = MK19Type_m385;
-      INFO_LOG() << "Using MK19 Ammunition 1 (m385)";
+      INFO_LOG(m_logger) << "Using MK19 Ammunition 1 (m385)";
       break;
     case 2:
       a_sensorData->AmmunitionType = MK19Type_m430;
-      INFO_LOG() << "Using MK19 Ammunition 2 (m430)";
+      INFO_LOG(m_logger) << "Using MK19 Ammunition 2 (m430)";
       break;
     default:
       a_sensorData->AmmunitionType = MK19Type_m385;
-      ERROR_LOG() << "Ammunition value means 'reserved' : " << l_AmmunitionField;
+      ERROR_LOG(m_logger) << "Ammunition value means 'reserved' : " << l_AmmunitionField;
       return -1;
     }
   }
@@ -293,11 +293,11 @@ SInt32 GeoPairingImpl::createSensorData(GeoPairingImplSensorData *a_sensorData,
            l_Report.m_DeviceID == PAN_GP_REQUEST_IGLA)
   {
     a_sensorData->AmmunitionType = AmmunitionTypeUnknown; // irrelevant
-    INFO_LOG() << "Using IGLA Ammunition 1";
+    INFO_LOG(m_logger) << "Using IGLA Ammunition 1";
   }
   else
   {
-    ERROR_LOG() << "Couldn't create sensorData for DeviceID : " << l_Report.m_DeviceID;
+    ERROR_LOG(m_logger) << "Couldn't create sensorData for DeviceID : " << l_Report.m_DeviceID;
     return -1;
   }
 
@@ -306,7 +306,7 @@ SInt32 GeoPairingImpl::createSensorData(GeoPairingImplSensorData *a_sensorData,
   a_sensorData->WeaponElevation    = l_Elevation;
   a_sensorData->WeaponTemperature  = l_Report.m_Temperature;
 
-  INFO_LOG() << "a_sensorData->ChargeType=" << a_sensorData->ChargeType
+  INFO_LOG(m_logger) << "a_sensorData->ChargeType=" << a_sensorData->ChargeType
                        << " l_Report.m_Ammunition=" <<  l_Report.m_Ammunition
                        << " l_Report.m_DeviceID=" << l_Report.m_DeviceID;
 
@@ -329,7 +329,7 @@ SInt32 GeoPairingImpl::createSensorData(GeoPairingImplSensorData *a_sensorData,
 //      a_sensorData->ChargeType = 382;
 //    else
 //      a_sensorData->ChargeType = 385;
-    INFO_LOG() << "PAN_GP_REPORT_MORTAR: l_Report.m_Ammunition" << l_Report.m_Ammunition
+    INFO_LOG(m_logger) << "PAN_GP_REPORT_MORTAR: l_Report.m_Ammunition" << l_Report.m_Ammunition
                          << " a_sensorData->ChargeType=" << a_sensorData->ChargeType;
   }
   else if ((l_Report.m_DeviceID != PAN_GP_REPORT_G5_G6) && (l_Report.m_DeviceID != PAN_GP_REPORT_M109))
@@ -339,47 +339,47 @@ SInt32 GeoPairingImpl::createSensorData(GeoPairingImplSensorData *a_sensorData,
       a_sensorData->IgnitionType = l_Report.m_TimeToDetonate;
     else
       a_sensorData->IgnitionType = 0;
-    INFO_LOG() << "if a_sensorData->ChargeType=" << a_sensorData->ChargeType;
+    INFO_LOG(m_logger) << "if a_sensorData->ChargeType=" << a_sensorData->ChargeType;
   }
   else
   {
-    INFO_LOG() << "else a_sensorData->ChargeType=" << a_sensorData->ChargeType;
+    INFO_LOG(m_logger) << "else a_sensorData->ChargeType=" << a_sensorData->ChargeType;
 
     SInt32 ch = PAN_AMMU_CHARGE_G5_G6(l_Report.m_Ammunition);
 
     if (ch == 1) // M64 Base
     {
       a_sensorData->ChargeType = 0;
-      INFO_LOG() << "Using Charge M64 Base";
+      INFO_LOG(m_logger) << "Using Charge M64 Base";
     }
     else if (ch == 3) // 3 x M64 Incr
     {
       a_sensorData->ChargeType = 1;
-      INFO_LOG() << "Using Charge M64 INCR x 3";
+      INFO_LOG(m_logger) << "Using Charge M64 INCR x 3";
     }
     else if (ch == 4) // 4 x M64 Incr
     {
       a_sensorData->ChargeType = 2;
-      INFO_LOG() << "Using Charge M64 INCR x 4";
+      INFO_LOG(m_logger) << "Using Charge M64 INCR x 4";
     }
     else if (ch == 5) // 5 x M64 Incr
     {
       a_sensorData->ChargeType = 3;
-      INFO_LOG() << "Using Charge M64 INCR x 5";
+      INFO_LOG(m_logger) << "Using Charge M64 INCR x 5";
     }
     else if (ch == 6) // 5 x M64 Incr + Base Bleed
     {
       a_sensorData->ChargeType = 4;
-      INFO_LOG() << "Using Charge M64 INCR x 5 + Base Bleed";
+      INFO_LOG(m_logger) << "Using Charge M64 INCR x 5 + Base Bleed";
     }
     else
     {
       a_sensorData->ChargeType = 0;
       isDefault = 1;
-      WARNING_LOG() << "Unknown Charge Type. Using Charge M64 Base";
+      WARNING_LOG(m_logger) << "Unknown Charge Type. Using Charge M64 Base";
     }
   }
-  INFO_LOG() << "a_sensorData->ChargeType=" << a_sensorData->ChargeType;
+  INFO_LOG(m_logger) << "a_sensorData->ChargeType=" << a_sensorData->ChargeType;
   return l_Report.m_DeviceID;
 }
 
@@ -391,16 +391,16 @@ void GeoPairingImpl::setMeteoData(const GeoPairingImplMeteoData &a_meteoData)
 {
   if (!m_Initialized)
   {
-    ERROR_LOG() << "Implementation not initialized";
+    ERROR_LOG(m_logger) << "Implementation not initialized";
     return;
   }
   m_MeteoData = a_meteoData;
 
-  INFO_LOG() <<  "---------- Setting Meteo Data ------------";
-  INFO_LOG() <<  "AirPressure   : " << m_MeteoData.AirPressure;
-  INFO_LOG() <<  "Temperature   : " << m_MeteoData.Temperature;
-  INFO_LOG() <<  "WindDirection : " << m_MeteoData.WindDirection;
-  INFO_LOG() <<  "WindSpeed     : " << m_MeteoData.WindSpeed;
+  INFO_LOG(m_logger) <<  "---------- Setting Meteo Data ------------";
+  INFO_LOG(m_logger) <<  "AirPressure   : " << m_MeteoData.AirPressure;
+  INFO_LOG(m_logger) <<  "Temperature   : " << m_MeteoData.Temperature;
+  INFO_LOG(m_logger) <<  "WindDirection : " << m_MeteoData.WindDirection;
+  INFO_LOG(m_logger) <<  "WindSpeed     : " << m_MeteoData.WindSpeed;
 }
 
 } // namespace N_GeoPairingImpl
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImplAirTarget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImplAirTarget.cpp
index d8d236ee6..92ed4ad38 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImplAirTarget.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImplAirTarget.cpp
@@ -29,7 +29,7 @@ GeoPairingImplAirTarget::GeoPairingImplAirTarget(SInt32 a_playerID)
   : m_PlayerID(a_playerID),
     m_logger(CesGeoPairing::getLogger("Plugin.GeoPairing.GeoPairingImplAirTarget"))
 {
-  INFO_LOG() << "Constructor : PlayerID " << m_PlayerID;
+  INFO_LOG(m_logger) << "Constructor : PlayerID " << m_PlayerID;
 }
 
 
@@ -40,13 +40,13 @@ bool GeoPairingImplAirTarget::updatePosition(Float64 a_positionLat, Float64 a_po
 {
   if (a_positionTime <= m_PositionTime)
   {
-    INFO_LOG() << "No new position info for Player " << m_PlayerID
+    INFO_LOG(m_logger) << "No new position info for Player " << m_PlayerID
                        << ", abandon update. PositionTime = "
                        << a_positionTime;
     return false;
   }
 
-  INFO_LOG() << "Set new Position for Player " << m_PlayerID;
+  INFO_LOG(m_logger) << "Set new Position for Player " << m_PlayerID;
 
   N_Math::GeoCoord l_NewPositionUtm;
   l_NewPositionUtm.setLlPositionDegree(a_positionLat, a_positionLon, a_positionAlt);
@@ -56,28 +56,28 @@ bool GeoPairingImplAirTarget::updatePosition(Float64 a_positionLat, Float64 a_po
   if (m_PositionTime > 0)
   {
     UInt32 l_TimeDiff = a_positionTime - m_PositionTime;
-    INFO_LOG() << "l_TimeDiff [s]: " << l_TimeDiff;
+    INFO_LOG(m_logger) << "l_TimeDiff [s]: " << l_TimeDiff;
 
     // when new position time is more current than existing one
     if (l_TimeDiff > 0)
     {
       N_Types::Vec3 l_NewDirection = l_NewPosition - m_Position;
       Float64 l_Distance = l_NewDirection.magnitude();
-      INFO_LOG() << "l_Distance [m]: " << l_Distance;
+      INFO_LOG(m_logger) << "l_Distance [m]: " << l_Distance;
       l_NewDirection /= l_Distance;
       m_Direction = l_NewDirection;
-      INFO_LOG() << "m_Direction : " << m_Direction;
+      INFO_LOG(m_logger) << "m_Direction : " << m_Direction;
 
       m_Speed = l_Distance / l_TimeDiff;
-      INFO_LOG() << "m_Speed [m/s]: " << m_Speed;
+      INFO_LOG(m_logger) << "m_Speed [m/s]: " << m_Speed;
     }
   }
 
   m_Position = l_NewPosition;
-  INFO_LOG() << "m_Position : " << m_Position;
+  INFO_LOG(m_logger) << "m_Position : " << m_Position;
 
   m_PositionTime = a_positionTime;
-  INFO_LOG() << "m_PositionTime : " << m_PositionTime;
+  INFO_LOG(m_logger) << "m_PositionTime : " << m_PositionTime;
   return true;
 }
 
@@ -87,7 +87,7 @@ bool GeoPairingImplAirTarget::updatePosition(Float64 a_positionLat, Float64 a_po
 // ---------------------------------------------------------------
 void GeoPairingImplAirTarget::updateState(SInt32 a_state)
 {
-  INFO_LOG() << "Set new State for Player "
+  INFO_LOG(m_logger) << "Set new State for Player "
                      << m_PlayerID << " : " << a_state;
   m_State = a_state;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImplAirTargetCache.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImplAirTargetCache.cpp
index 15d025945..70c330a5b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImplAirTargetCache.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImplAirTargetCache.cpp
@@ -66,20 +66,20 @@ GeoPairingImplAirTargetCacheData *GeoPairingImplAirTargetCache::getLatestCacheDa
 {
   if (m_CacheData == nullptr)
   {
-    ERROR_LOG() << "No global Cache pointer present!";
+    ERROR_LOG(m_logger) << "No global Cache pointer present!";
     return nullptr;
   }
 
   if (m_CacheData->empty())
   {
-    INFO_LOG() << "Global Cache empty";
+    INFO_LOG(m_logger) << "Global Cache empty";
     return nullptr;
   }
 
   CacheType::iterator it = m_CacheData->find(m_PlayerID);
   if (it == m_CacheData->end())
   {
-    INFO_LOG() << "No Cache present for Player " << m_PlayerID
+    INFO_LOG(m_logger) << "No Cache present for Player " << m_PlayerID
                        << " tracking Target " << a_targetID;
     return nullptr;
   }
@@ -88,14 +88,14 @@ GeoPairingImplAirTargetCacheData *GeoPairingImplAirTargetCache::getLatestCacheDa
 
   if (l_Cache->empty())
   {
-    INFO_LOG() << "Cache for Player " << m_PlayerID << " is empty";
+    INFO_LOG(m_logger) << "Cache for Player " << m_PlayerID << " is empty";
     return nullptr;
   }
 
   CacheDataType::iterator itC = l_Cache->find(a_targetID);
   if (itC == l_Cache->end())
   {
-    INFO_LOG() << "Target " << a_targetID
+    INFO_LOG(m_logger) << "Target " << a_targetID
                        << " not found in Cache of Player "
                        << m_PlayerID;
     return nullptr;
@@ -112,7 +112,7 @@ bool GeoPairingImplAirTargetCache::storeLatestTrackState(SInt32 a_targetID, UInt
 {
   if (m_CacheData == nullptr)
   {
-    ERROR_LOG() << "No global Cache pointer present!";
+    ERROR_LOG(m_logger) << "No global Cache pointer present!";
     return false;
   }
 
@@ -120,7 +120,7 @@ bool GeoPairingImplAirTargetCache::storeLatestTrackState(SInt32 a_targetID, UInt
   if (it == m_CacheData->end())
   {
     (*m_CacheData)[m_PlayerID] = new CacheDataType();
-    INFO_LOG() << "Create new Cache for Player " << m_PlayerID;
+    INFO_LOG(m_logger) << "Create new Cache for Player " << m_PlayerID;
   }
 
   CacheDataType *l_Cache = (*m_CacheData)[m_PlayerID];
@@ -131,7 +131,7 @@ bool GeoPairingImplAirTargetCache::storeLatestTrackState(SInt32 a_targetID, UInt
   {
     l_CacheData = new GeoPairingImplAirTargetCacheData();
     (*l_Cache)[a_targetID] = l_CacheData;
-    INFO_LOG() << "Create new CacheObject for Target "
+    INFO_LOG(m_logger) << "Create new CacheObject for Target "
                        << a_targetID << " in Cache of Player "
                        << m_PlayerID;
   }
@@ -141,10 +141,10 @@ bool GeoPairingImplAirTargetCache::storeLatestTrackState(SInt32 a_targetID, UInt
   l_CacheData->m_TrackTime = a_trackingTime;
   l_CacheData->m_TrackState = a_trackingState;
 
-  INFO_LOG() << "Stored Tracking Time and State for Target "
+  INFO_LOG(m_logger) << "Stored Tracking Time and State for Target "
                      << a_targetID << " in Cache of Player "
                      << m_PlayerID;
-  INFO_LOG() << "-> Cached Time : " << a_trackingTime
+  INFO_LOG(m_logger) << "-> Cached Time : " << a_trackingTime
                      << " State : " << a_trackingState;
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImplAirTargetTracker.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImplAirTargetTracker.cpp
index a41adcf3d..62c8de535 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImplAirTargetTracker.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImplAirTargetTracker.cpp
@@ -30,7 +30,7 @@ GeoPairingImplAirTargetTracker::GeoPairingImplAirTargetTracker(std::vector<GeoPa
   : m_List(a_listTargets)
   , m_logger(CesGeoPairing::getLogger("Plugin.GeoPairing.GeoPairingImplAirTargetTracker"))
 {
-  INFO_LOG() << "Construct Tracker for " << a_listTargets->size()
+  INFO_LOG(m_logger) << "Construct Tracker for " << a_listTargets->size()
                      << " air targets";
 }
 
@@ -45,7 +45,7 @@ void GeoPairingImplAirTargetTracker::setPosition(Float64 a_positionLat,
 
   N_Types::Coord3 l_Position(l_PositionUtm.utmEasting(), l_PositionUtm.utmNorthing(),
                              l_PositionUtm.height());
-  INFO_LOG() << "Tracker position : " << l_Position;
+  INFO_LOG(m_logger) << "Tracker position : " << l_Position;
   m_Position = l_Position;
 }
 
@@ -57,7 +57,7 @@ bool GeoPairingImplAirTargetTracker::track(Float64 a_azimuth,
 {
   if (m_List->size() == 0)
   {
-    INFO_LOG() << "No air targets to track";
+    INFO_LOG(m_logger) << "No air targets to track";
     return false;
   }
 
@@ -77,7 +77,7 @@ bool GeoPairingImplAirTargetTracker::track(Float64 a_azimuth,
   l_sensorAngle.m_H.setDegree(-a_azimuth);
   l_sensorAngle.m_P.setDegree(a_elevation);
 
-  INFO_LOG() << "Tracking angle : " << l_sensorAngle;
+  INFO_LOG(m_logger) << "Tracking angle : " << l_sensorAngle;
 
   N_Types::Radian64 l_ClosestAzimuth;
   N_Types::Radian64 l_ClosestElevation;
@@ -85,7 +85,7 @@ bool GeoPairingImplAirTargetTracker::track(Float64 a_azimuth,
   UInt64 l_ClosestPlayerImpactTime = 0;
   Float64 l_ClosestPlayerDistance = 0;
 
-  INFO_LOG() << "Iterating through air targets, Count : "
+  INFO_LOG(m_logger) << "Iterating through air targets, Count : "
                      << m_List->size();
   for (const auto l_Target : *m_List)
   {
@@ -94,7 +94,7 @@ bool GeoPairingImplAirTargetTracker::track(Float64 a_azimuth,
 //    Float64 l_TargetSpeed = l_Target->m_Speed;
     UInt64 l_TargetPosTime = l_Target->m_PositionTime;
 
-    INFO_LOG() << "Position of air target "
+    INFO_LOG(m_logger) << "Position of air target "
                        << l_Target->m_PlayerID << " @ "
                        << l_TargetPosTime << " s : "
                        << l_targetPos;
@@ -104,7 +104,7 @@ bool GeoPairingImplAirTargetTracker::track(Float64 a_azimuth,
     /*    if (l_TimeDiff != 0)
         {
           N_Types::Vec3 l_PosDiff = l_TargetDir * (l_TargetSpeed * l_TimeDiff);
-          INFO_LOG() << "l_PosDiff = " << l_PosDiff;
+          INFO_LOG(m_logger) << "l_PosDiff = " << l_PosDiff;
 
           l_targetPos.m_X += l_PosDiff.m_X;
           l_targetPos.m_Y += l_PosDiff.m_Y;
@@ -114,7 +114,7 @@ bool GeoPairingImplAirTargetTracker::track(Float64 a_azimuth,
     // instead of position interpolation we checkout the time difference
     if (abs(l_TimeDiff) > 2)
     {
-      WARNING_LOG() << "l_TimeDiff differs by more that 2 s ! m_Time = "
+      WARNING_LOG(m_logger) << "l_TimeDiff differs by more that 2 s ! m_Time = "
                             << m_Time << " l_TargetPosTime = " << l_TargetPosTime
                             ;
     }
@@ -123,30 +123,30 @@ bool GeoPairingImplAirTargetTracker::track(Float64 a_azimuth,
     N_Types::Polar3 l_LinePolar = l_LineVector.getPolar3();
     N_Types::Angle3 l_LineAngle(l_LinePolar.m_Azimuth, l_LinePolar.m_Elevation, 0);
 
-    INFO_LOG() << "Line of sight angle to air target : " << l_LineAngle;
+    INFO_LOG(m_logger) << "Line of sight angle to air target : " << l_LineAngle;
 
     N_Types::Radian64 l_AzimuthDiff = fabs(l_sensorAngle.m_H - l_LineAngle.m_H);
-    DEBUG_LOG() << "l_AzimuthDiff=" << l_AzimuthDiff
+    DEBUG_LOG(m_logger) << "l_AzimuthDiff=" << l_AzimuthDiff
                         << " l_sensorAngle.m_H=" << l_sensorAngle.m_H
                         << " l_LineAngle.m_H=" << l_LineAngle.m_H;
     N_Types::Radian64 l_ElevationDiff = fabs(l_sensorAngle.m_P - l_LineAngle.m_P);
 
-    INFO_LOG() << "l_AzimuthDiff     : "
+    INFO_LOG(m_logger) << "l_AzimuthDiff     : "
                        << l_AzimuthDiff.getDegree() << " [Grad] "
                        << l_AzimuthDiff << " [rad] ";
-    INFO_LOG() << "l_AzimuthWindow   : "
+    INFO_LOG(m_logger) << "l_AzimuthWindow   : "
                        << l_AzimuthWindow.getDegree() << " [Grad] "
                        << l_AzimuthWindow << " [rad] ";
-    INFO_LOG() << "l_ElevationDiff   : "
+    INFO_LOG(m_logger) << "l_ElevationDiff   : "
                        << l_ElevationDiff.getDegree() << " [Grad] "
                        << l_ElevationDiff << " [rad] ";
-    INFO_LOG() << "l_ElevationWindow : "
+    INFO_LOG(m_logger) << "l_ElevationWindow : "
                        << l_ElevationWindow.getDegree() << " [Grad] "
                        << l_ElevationWindow << " [rad] ";
 
     if (fabs(l_AzimuthDiff) > l_AzimuthWindow || fabs(l_ElevationDiff) > l_ElevationWindow)
     {
-      INFO_LOG() << "-> air target " << l_Target->m_PlayerID
+      INFO_LOG(m_logger) << "-> air target " << l_Target->m_PlayerID
                          << " is NOT in window"
                          << " fabs(l_AzimuthDiff)=" << fabs(l_AzimuthDiff)
                          << " l_AzimuthWindow=" << l_AzimuthWindow
@@ -160,7 +160,7 @@ bool GeoPairingImplAirTargetTracker::track(Float64 a_azimuth,
 
     if (l_TimeOfFlight > l_TimeRange)
     {
-      INFO_LOG() << "-> Target flight time " << l_TimeOfFlight
+      INFO_LOG(m_logger) << "-> Target flight time " << l_TimeOfFlight
                          << " exceeding max time of " << l_TimeRange
                          ;
       continue;
@@ -168,7 +168,7 @@ bool GeoPairingImplAirTargetTracker::track(Float64 a_azimuth,
 
     if (l_ClosestPlayerId == 0) // as long as no reference
     {
-      INFO_LOG() << "=> air target " << l_Target->m_PlayerID
+      INFO_LOG(m_logger) << "=> air target " << l_Target->m_PlayerID
                          << " is in window";
       l_ClosestAzimuth = l_AzimuthDiff;
       l_ClosestElevation = l_ElevationDiff;
@@ -182,7 +182,7 @@ bool GeoPairingImplAirTargetTracker::track(Float64 a_azimuth,
       {
         if (l_TargetDistance < l_ClosestPlayerDistance)
         {
-          INFO_LOG() << "=> air target " << l_Target->m_PlayerID
+          INFO_LOG(m_logger) << "=> air target " << l_Target->m_PlayerID
                              << " is in window";
           l_ClosestAzimuth = l_AzimuthDiff;
           l_ClosestElevation = l_ElevationDiff;
@@ -192,7 +192,7 @@ bool GeoPairingImplAirTargetTracker::track(Float64 a_azimuth,
         }
         else
         {
-          INFO_LOG() << "=> air target " << l_Target->m_PlayerID
+          INFO_LOG(m_logger) << "=> air target " << l_Target->m_PlayerID
                              << " is in window, but ID " << l_ClosestPlayerId
                              << " is closer";
         }
@@ -202,16 +202,16 @@ bool GeoPairingImplAirTargetTracker::track(Float64 a_azimuth,
 
   if (l_ClosestPlayerId == 0)
   {
-    INFO_LOG() << "No air target was within window...";
+    INFO_LOG(m_logger) << "No air target was within window...";
     return false;
   }
 
   a_playerId = l_ClosestPlayerId;
   a_impactTime = l_ClosestPlayerImpactTime;
 
-  INFO_LOG() << "a_impactTime = " << a_impactTime;
-  INFO_LOG() << "l_TimeOfFlight = " << a_impactTime - m_Time;
-  INFO_LOG() << "Closest air target in window: " << a_playerId;
+  INFO_LOG(m_logger) << "a_impactTime = " << a_impactTime;
+  INFO_LOG(m_logger) << "l_TimeOfFlight = " << a_impactTime - m_Time;
+  INFO_LOG(m_logger) << "Closest air target in window: " << a_playerId;
 
   return true;
 }
@@ -225,11 +225,11 @@ bool GeoPairingImplAirTargetTracker::hitCheck(SInt32 a_targetId,
 {
   if (m_List->size() == 0)
   {
-    ERROR_LOG() << "No air targets to track, strange at this point!";
+    ERROR_LOG(m_logger) << "No air targets to track, strange at this point!";
     return false;
   }
 
-  INFO_LOG() << "Searching for air target, Count : " << m_List->size();
+  INFO_LOG(m_logger) << "Searching for air target, Count : " << m_List->size();
   GeoPairingImplAirTarget *l_HitTarget = nullptr;
 
   for (const auto l_Target : *m_List)
@@ -243,7 +243,7 @@ bool GeoPairingImplAirTargetTracker::hitCheck(SInt32 a_targetId,
 
   if (l_HitTarget == nullptr)
   {
-    ERROR_LOG() << "No air targets found with ID " << a_targetId;
+    ERROR_LOG(m_logger) << "No air targets found with ID " << a_targetId;
     return false;
   }
 
@@ -252,11 +252,11 @@ bool GeoPairingImplAirTargetTracker::hitCheck(SInt32 a_targetId,
   N_Types::Vec3 l_Line = l_targetPos - m_Position;
 
   Float64 l_OriginalDistance = l_Line.magnitude();
-  INFO_LOG() << "l_OriginalDistance = " << l_OriginalDistance;
+  INFO_LOG(m_logger) << "l_OriginalDistance = " << l_OriginalDistance;
 
   l_Line = (l_TargetDir + l_targetPos) - m_Position;
   Float64 l_DirectionDistance = l_Line.magnitude();
-  INFO_LOG() << "l_DirectionDistance = " << l_DirectionDistance;
+  INFO_LOG(m_logger) << "l_DirectionDistance = " << l_DirectionDistance;
 
 
   const bool l_FliesTowardsMe = l_DirectionDistance < l_OriginalDistance;
@@ -273,14 +273,14 @@ bool GeoPairingImplAirTargetTracker::hitCheck(SInt32 a_targetId,
 
   if (l_OriginalDistance > l_DistanceRange)
   {
-    INFO_LOG() << "--> Target " << a_targetId << " distance "
+    INFO_LOG(m_logger) << "--> Target " << a_targetId << " distance "
                        << l_OriginalDistance << " beyond max distance of "
                        << l_DistanceRange;
     return false;
   }
   if (l_targetPos.m_Z > l_FlightHeightMax)
   {
-    INFO_LOG() << "--> Target " << a_targetId << " flying on height = "
+    INFO_LOG(m_logger) << "--> Target " << a_targetId << " flying on height = "
                        << l_targetPos.m_Z << ", max Height for IGLA is "
                        << l_FlightHeightMax;
     return false;
@@ -289,44 +289,44 @@ bool GeoPairingImplAirTargetTracker::hitCheck(SInt32 a_targetId,
   Float64 l_Probability = l_ModeAutoProbability;
   if (!a_modeAuto)
     l_Probability = l_ModeManuProbability;
-  INFO_LOG() << "Basic Probability = " << l_Probability
+  INFO_LOG(m_logger) << "Basic Probability = " << l_Probability
                      << (a_modeAuto ? " (auto)" : " (manual)");
 
   /* if (l_FliesTowardsMe == a_changeOverPoint)
    {
-     INFO_LOG() << "Wrong COP Factor applied";
+     INFO_LOG(m_logger) << "Wrong COP Factor applied";
      l_Probability *= l_WrongCOPFactor;
    }
   */
 
   if (a_changeOverPoint)
-    INFO_LOG() << "Depart Button pressed";
+    INFO_LOG(m_logger) << "Depart Button pressed";
   else
-    INFO_LOG() << "Depart Button released";
+    INFO_LOG(m_logger) << "Depart Button released";
 
-  INFO_LOG() << "l_FliesTowardsMe = " << l_FliesTowardsMe;
+  INFO_LOG(m_logger) << "l_FliesTowardsMe = " << l_FliesTowardsMe;
   // Wenn der Depart Button nicht gedrueckt ist, und das Ziel vom Schuetzen wegfliegt.
   if (!l_FliesTowardsMe && !a_changeOverPoint)
   {
-    INFO_LOG() << "Wrong COP Factor applied";
+    INFO_LOG(m_logger) << "Wrong COP Factor applied";
     l_Probability *= l_WrongCOPFactor;
   }
 
   if (l_HitTarget->m_IRJammer)
   {
-    INFO_LOG() << "IR Jammer Factor applied";
+    INFO_LOG(m_logger) << "IR Jammer Factor applied";
     l_Probability *= l_IRJammerFactor;
   }
 
   Float64 l_Random = (rand() % 100) / 100.0;
   if (l_Random > l_Probability)
   {
-    INFO_LOG() << "--> Target " << a_targetId << " not hit, Probability = "
+    INFO_LOG(m_logger) << "--> Target " << a_targetId << " not hit, Probability = "
                        << l_Probability << ", Randomizer = " << l_Random;
     return false;
   }
 
-  INFO_LOG() << "==> Target " << a_targetId << " hit, Probability = "
+  INFO_LOG(m_logger) << "==> Target " << a_targetId << " hit, Probability = "
                      << l_Probability << ", Randomizer = " << l_Random;
   return true;
 }
@@ -337,7 +337,7 @@ bool GeoPairingImplAirTargetTracker::hitCheck(SInt32 a_targetId,
 void GeoPairingImplAirTargetTracker::setTime(UInt64 a_time)
 {
   m_Time = a_time;
-  INFO_LOG() << "Set new tracker reference time : " << m_Time;
+  INFO_LOG(m_logger) << "Set new tracker reference time : " << m_Time;
 }
 
 } // namespace N_GeoPairingImpl
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImplAirTargetUpdater.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImplAirTargetUpdater.cpp
index 525ad2601..2cb2c3048 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImplAirTargetUpdater.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImplAirTargetUpdater.cpp
@@ -21,7 +21,7 @@ namespace N_GeoPairingImpl
 
 GeoPairingImplAirTargetUpdater::~GeoPairingImplAirTargetUpdater()
 {
-  INFO_LOG() << "Number of updated air targets : " << m_UpdateCount;
+  INFO_LOG(m_logger) << "Number of updated air targets : " << m_UpdateCount;
 }
 
 
@@ -32,7 +32,7 @@ GeoPairingImplAirTargetUpdater::GeoPairingImplAirTargetUpdater(std::vector<GeoPa
   : m_List(a_listTargets)
   , m_logger(CesGeoPairing::getLogger("Plugin.GeoPairing.GeoPairingImplAirTargetUpdater"))
 {
-  INFO_LOG() << "Construct Updater for " << a_listTargets->size()
+  INFO_LOG(m_logger) << "Construct Updater for " << a_listTargets->size()
                      << " air targets";
 }
 
@@ -57,7 +57,7 @@ void GeoPairingImplAirTargetUpdater::update(SInt32 a_playerID, Float64 a_positio
   // create new air target
   if (l_PlayerAirTarget == nullptr)
   {
-    INFO_LOG() << "Creating a new air target object for Player "
+    INFO_LOG(m_logger) << "Creating a new air target object for Player "
                        << a_playerID;
     l_PlayerAirTarget = new GeoPairingImplAirTarget(a_playerID);
     m_List->push_back(l_PlayerAirTarget);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImplFiredBullet.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImplFiredBullet.cpp
index 98b507b33..aa635c627 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImplFiredBullet.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/GeoPairingImplFiredBullet.cpp
@@ -90,21 +90,21 @@ GeoPairingImplFiredBullet::GeoPairingImplFiredBullet(const GeoPairingImplSensorD
   : m_SensorData(a_sensorData)
   , m_logger(CesGeoPairing::getLogger(loggerName ? loggerName : "Plugin.GeoPairing.GeoPairingImplFiredBullet"))
 {
-  INFO_LOG() <<  "---------- Setting Sensor Data ------------";
-  INFO_LOG() <<  "WeaponPositionLat    : " << m_SensorData.WeaponPositionLat;
-  INFO_LOG() <<  "WeaponPositionLong   : " << m_SensorData.WeaponPositionLong;
-  INFO_LOG() <<  "WeaponPositionHeight : " << m_SensorData.WeaponPositionHeight;
-  INFO_LOG() <<  "WeaponAzimuth        : " << m_SensorData.WeaponAzimuth << " (" << m_SensorData.WeaponAzimuth.getDegree() << ")" ;
-  INFO_LOG() <<  "WeaponAzimuthMin     : " << m_SensorData.WeaponAzimuthMin << " (" << m_SensorData.WeaponAzimuthMin.getDegree() << ")" ;
-  INFO_LOG() <<  "WeaponAzimuthMax     : " << m_SensorData.WeaponAzimuthMax << " (" << m_SensorData.WeaponAzimuthMax.getDegree() << ")" ;
-  INFO_LOG() <<  "WeaponElevation      : " << m_SensorData.WeaponElevation << " (" << m_SensorData.WeaponElevation.getDegree() << ")" ;
-  INFO_LOG() <<  "WeaponElevationMin   : " << m_SensorData.WeaponElevationMin << " (" << m_SensorData.WeaponElevationMin.getDegree() << ")" ;
-  INFO_LOG() <<  "WeaponElevationMax   : " << m_SensorData.WeaponElevationMax << " (" << m_SensorData.WeaponElevationMax.getDegree() << ")" ;
-  INFO_LOG() <<  "WeaponTemperature    : " << m_SensorData.WeaponTemperature;
-  INFO_LOG() <<  "AmmunitionType       : " << m_SensorData.AmmunitionType;
-  INFO_LOG() <<  "ChargeType           : " << m_SensorData.ChargeType;
-  INFO_LOG() <<  "IgnitionType         : " << m_SensorData.IgnitionType;
-  INFO_LOG() <<  "FireTime             : " << m_SensorData.FireTime;
+  INFO_LOG(m_logger) <<  "---------- Setting Sensor Data ------------";
+  INFO_LOG(m_logger) <<  "WeaponPositionLat    : " << m_SensorData.WeaponPositionLat;
+  INFO_LOG(m_logger) <<  "WeaponPositionLong   : " << m_SensorData.WeaponPositionLong;
+  INFO_LOG(m_logger) <<  "WeaponPositionHeight : " << m_SensorData.WeaponPositionHeight;
+  INFO_LOG(m_logger) <<  "WeaponAzimuth        : " << m_SensorData.WeaponAzimuth << " (" << m_SensorData.WeaponAzimuth.getDegree() << ")" ;
+  INFO_LOG(m_logger) <<  "WeaponAzimuthMin     : " << m_SensorData.WeaponAzimuthMin << " (" << m_SensorData.WeaponAzimuthMin.getDegree() << ")" ;
+  INFO_LOG(m_logger) <<  "WeaponAzimuthMax     : " << m_SensorData.WeaponAzimuthMax << " (" << m_SensorData.WeaponAzimuthMax.getDegree() << ")" ;
+  INFO_LOG(m_logger) <<  "WeaponElevation      : " << m_SensorData.WeaponElevation << " (" << m_SensorData.WeaponElevation.getDegree() << ")" ;
+  INFO_LOG(m_logger) <<  "WeaponElevationMin   : " << m_SensorData.WeaponElevationMin << " (" << m_SensorData.WeaponElevationMin.getDegree() << ")" ;
+  INFO_LOG(m_logger) <<  "WeaponElevationMax   : " << m_SensorData.WeaponElevationMax << " (" << m_SensorData.WeaponElevationMax.getDegree() << ")" ;
+  INFO_LOG(m_logger) <<  "WeaponTemperature    : " << m_SensorData.WeaponTemperature;
+  INFO_LOG(m_logger) <<  "AmmunitionType       : " << m_SensorData.AmmunitionType;
+  INFO_LOG(m_logger) <<  "ChargeType           : " << m_SensorData.ChargeType;
+  INFO_LOG(m_logger) <<  "IgnitionType         : " << m_SensorData.IgnitionType;
+  INFO_LOG(m_logger) <<  "FireTime             : " << m_SensorData.FireTime;
 }
 
 // ---------------------------------------------------------------
@@ -115,7 +115,7 @@ GeoPairingImplFiredBullet::E_CalcResult GeoPairingImplFiredBullet::calculate(con
 {
   Q_UNUSED(ballisticService)  // why?
 
-  INFO_LOG() << "----------- Calculating Impact -----------";
+  INFO_LOG(m_logger) << "----------- Calculating Impact -----------";
 
   N_Math::GeoCoord o_sensorUtm;
 
@@ -126,7 +126,7 @@ GeoPairingImplFiredBullet::E_CalcResult GeoPairingImplFiredBullet::calculate(con
   N_Types::Coord3 o_sensorPos(o_sensorUtm.utmEasting(),
                               o_sensorUtm.utmNorthing(),
                               o_sensorUtm.height());
-  INFO_LOG() << "o_sensorPos : " << o_sensorPos;
+  INFO_LOG(m_logger) << "o_sensorPos : " << o_sensorPos;
 
   GeoPairingImplTrajectoryData::TrajectoryPoint tpSensor;
   tpSensor.m_X = o_sensorPos.m_X;
@@ -138,18 +138,18 @@ GeoPairingImplFiredBullet::E_CalcResult GeoPairingImplFiredBullet::calculate(con
   N_Types::Angle3 o_sensorAngle(m_SensorData.WeaponAzimuth,
                                 m_SensorData.WeaponElevation,
                                 0);
-  INFO_LOG() << "o_sensorAngle : " << o_sensorAngle;
+  INFO_LOG(m_logger) << "o_sensorAngle : " << o_sensorAngle;
 
   // calculate a faked shot
   Float64 d_shootingDistance = 500.0 + (m_SensorData.AmmunitionType * 200) ;
-  INFO_LOG() << "d_shootingDistance : " << d_shootingDistance;
+  INFO_LOG(m_logger) << "d_shootingDistance : " << d_shootingDistance;
 
   N_Types::Coord3 o_shot(0, d_shootingDistance, 0);
-  INFO_LOG() << "o_shot : " << o_shot;
+  INFO_LOG(m_logger) << "o_shot : " << o_shot;
   o_shot = o_shot.rotate(o_sensorAngle);
   o_sensorPos += o_shot;
-  INFO_LOG() << "o_shot : " << o_shot;
-  INFO_LOG() << "impact : " << o_sensorPos;
+  INFO_LOG(m_logger) << "o_shot : " << o_shot;
+  INFO_LOG(m_logger) << "impact : " << o_sensorPos;
 
   N_Math::GeoCoord o_impactUtm;
   o_impactUtm.setTotalUtmPosition(o_sensorPos.m_X, o_sensorPos.m_Y, o_sensorPos.m_Z,
@@ -165,7 +165,7 @@ GeoPairingImplFiredBullet::E_CalcResult GeoPairingImplFiredBullet::calculate(con
   if (m_logger.isInfoEnabled())
   {
     for (const auto &tp : m_TrajectoryData.m_Points)
-      INFO_LOG() << tp.m_X << " " << tp.m_Y << " " << tp.m_Z << " " << tp.m_H;
+      INFO_LOG(m_logger) << tp.m_X << " " << tp.m_Y << " " << tp.m_Z << " " << tp.m_H;
   }
 
   m_ImpactData.AmmunitionType       = m_SensorData.AmmunitionType;
@@ -181,7 +181,7 @@ GeoPairingImplFiredBullet::E_CalcResult GeoPairingImplFiredBullet::calculateG5G6
                                                                                  double drift,
                                                                                  double flugzeit)
 {
-  INFO_LOG() << "----------- Calculating Impact -----------";
+  INFO_LOG(m_logger) << "----------- Calculating Impact -----------";
 
 
   Float64 xOutMgrs = 0.0;
@@ -207,7 +207,7 @@ GeoPairingImplFiredBullet::E_CalcResult GeoPairingImplFiredBullet::calculateG5G6
   xOutMgrs += xOut;
   yOutMgrs += yOut;
   LtsCoordTrans::UtmCoordinate tm2(utm.zone, xOutMgrs, yOutMgrs );
-  INFO_LOG() << "NEW POS "  << tm2.geographic().x() << "   " << tm2.geographic().y() ;
+  INFO_LOG(m_logger) << "NEW POS "  << tm2.geographic().x() << "   " << tm2.geographic().y() ;
 
   //LtsCoordTrans::MGRS2LonLat(xOutMgrs, yOutMgrs, xOutLon, yOutLat);
   LtsCoordTrans::geocentric2LonLatAlt(xOutMgrs, yOutMgrs, 0.0, xOutLon, yOutLat, zOutAlt);
@@ -218,7 +218,7 @@ GeoPairingImplFiredBullet::E_CalcResult GeoPairingImplFiredBullet::calculateG5G6
   m_ImpactData.ImpactPositionLong   = tm2.geographic().x() * (180 / M_PI);
   m_ImpactData.ImpactPositionHeight = 0;
 
-  INFO_LOG() << "m_SensorData.WeaponPositionLong=" << m_SensorData.WeaponPositionLong
+  INFO_LOG(m_logger) << "m_SensorData.WeaponPositionLong=" << m_SensorData.WeaponPositionLong
                        << " m_SensorData.WeaponPositionLat=" << m_SensorData.WeaponPositionLat
                        << "\n entfernung=" << entfernung
                        << "\n utm.x=" << utm.x
@@ -245,7 +245,7 @@ GeoPairingImplFiredBullet::E_CalcResult GeoPairingImplFiredBullet::calculateSalv
                                                                                   double &a_lengthField, double &a_duration,
                                                                                   double &a_heading)
 {
-  INFO_LOG() << "----------- Calculating Salve -----------";
+  INFO_LOG(m_logger) << "----------- Calculating Salve -----------";
 
   if (a_nbrRounds < 1)
     return GeoPairingImplFiredBullet::e_OUTOFRANGE;
@@ -259,7 +259,7 @@ GeoPairingImplFiredBullet::E_CalcResult GeoPairingImplFiredBullet::calculateSalv
   N_Types::Coord3 l_sensorPos(l_sensorUtm.utmEasting(),
                               l_sensorUtm.utmNorthing(),
                               l_sensorUtm.height());
-  INFO_LOG() << "l_sensorPos : " << l_sensorPos;
+  INFO_LOG(m_logger) << "l_sensorPos : " << l_sensorPos;
 
   Float64 l_TopPos = 0, l_BottomPos = 0, l_LeftPos = 0, l_RightPos = 0, l_BelowPos = 0, l_AbovePos = 0;
 
@@ -272,7 +272,7 @@ GeoPairingImplFiredBullet::E_CalcResult GeoPairingImplFiredBullet::calculateSalv
 
   for (int i = 0; i < a_nbrRounds; i++)
   {
-    INFO_LOG() << "========== Calculating Round " << i + 1 << " of " << a_nbrRounds << " =============";
+    INFO_LOG(m_logger) << "========== Calculating Round " << i + 1 << " of " << a_nbrRounds << " =============";
     prepareSensorData();
 
     if (calculate( ballisticService) != e_OK)
@@ -287,7 +287,7 @@ GeoPairingImplFiredBullet::E_CalcResult GeoPairingImplFiredBullet::calculateSalv
                                 l_impactUtm.utmNorthing(),
                                 l_impactUtm.height());
 
-    INFO_LOG() << "l_impactPos : " << l_impactPos;
+    INFO_LOG(m_logger) << "l_impactPos : " << l_impactPos;
 
     l_avgImpactPos += l_impactPos;
     l_avgImpactCount++;
@@ -314,18 +314,18 @@ GeoPairingImplFiredBullet::E_CalcResult GeoPairingImplFiredBullet::calculateSalv
     }
   }
 
-  INFO_LOG() << "========== Summarize Impact Data ==========";
+  INFO_LOG(m_logger) << "========== Summarize Impact Data ==========";
 
   a_widthField  = l_RightPos - l_LeftPos;
   a_lengthField = l_TopPos - l_BottomPos;
 
-  INFO_LOG() << "a_widthField  = " << a_widthField;
-  INFO_LOG() << "a_lengthField = " << a_lengthField;
+  INFO_LOG(m_logger) << "a_widthField  = " << a_widthField;
+  INFO_LOG(m_logger) << "a_lengthField = " << a_lengthField;
 
   // calculate average impact pos for this salve
   N_Types::Coord3 l_ImpactPos = l_avgImpactPos / std::max(1, l_avgImpactCount);
 
-  INFO_LOG() << "l_ImpactPos (Avg) : " << l_ImpactPos;
+  INFO_LOG(m_logger) << "l_ImpactPos (Avg) : " << l_ImpactPos;
 
   N_Math::GeoCoord l_impactUtm;
   l_impactUtm.setTotalUtmPosition(l_ImpactPos.m_X, l_ImpactPos.m_Y, l_ImpactPos.m_Z,
@@ -344,10 +344,10 @@ GeoPairingImplFiredBullet::E_CalcResult GeoPairingImplFiredBullet::calculateSalv
   Float64 l_RoundsPerMinute = l_config->getFloat(s_MK19, s_RoundsPerMinute, 350);
 
   a_duration = 60 * a_nbrRounds / l_RoundsPerMinute;
-  INFO_LOG() << "a_duration = " << a_duration;
+  INFO_LOG(m_logger) << "a_duration = " << a_duration;
 
   Float64 l_Distance = l_ImpactPos.length(l_sensorPos);
-  INFO_LOG() << "l_Distance = " << l_Distance;
+  INFO_LOG(m_logger) << "l_Distance = " << l_Distance;
 
   N_Types::Radian64 l_AvgHeading = m_SensorData.WeaponAzimuthMax - m_SensorData.WeaponAzimuthMin;
   l_AvgHeading /= 2.0;
@@ -355,7 +355,7 @@ GeoPairingImplFiredBullet::E_CalcResult GeoPairingImplFiredBullet::calculateSalv
   l_AvgHeading += M_PI_2; // rotate 90deg from east
 
   a_heading = l_AvgHeading.getZeroTo360();
-  INFO_LOG() << "a_heading [deg ] = " << a_heading;
+  INFO_LOG(m_logger) << "a_heading [deg ] = " << a_heading;
 
 
   return e_OK;
@@ -369,16 +369,16 @@ GeoPairingImplImpactData *GeoPairingImplFiredBullet::getImpactData()
 {
   if (m_ImpactData.ImpactTime == 0)
   {
-    ERROR_LOG() << "Impact Data not yet calculated";
+    ERROR_LOG(m_logger) << "Impact Data not yet calculated";
     return nullptr;
   }
 
-  INFO_LOG() <<  "---------- Getting Impact Data ------------";
-  INFO_LOG() <<  "ImpactPositionLat    : " << m_ImpactData.ImpactPositionLat;
-  INFO_LOG() <<  "ImpactPositionLong   : " << m_ImpactData.ImpactPositionLong;
-  INFO_LOG() <<  "ImpactPositionHeight : " << m_ImpactData.ImpactPositionHeight;
-  INFO_LOG() <<  "ImpactTime           : " << m_ImpactData.ImpactTime;
-  INFO_LOG()  << "AmmunitionType       : " << m_ImpactData.AmmunitionType;
+  INFO_LOG(m_logger) <<  "---------- Getting Impact Data ------------";
+  INFO_LOG(m_logger) <<  "ImpactPositionLat    : " << m_ImpactData.ImpactPositionLat;
+  INFO_LOG(m_logger) <<  "ImpactPositionLong   : " << m_ImpactData.ImpactPositionLong;
+  INFO_LOG(m_logger) <<  "ImpactPositionHeight : " << m_ImpactData.ImpactPositionHeight;
+  INFO_LOG(m_logger) <<  "ImpactTime           : " << m_ImpactData.ImpactTime;
+  INFO_LOG(m_logger)  << "AmmunitionType       : " << m_ImpactData.AmmunitionType;
 
   return &m_ImpactData;
 }
@@ -391,7 +391,7 @@ GeoPairingImplTrajectoryData *GeoPairingImplFiredBullet::getTrajectoryData()
 {
   if (m_ImpactData.ImpactTime == 0)
   {
-    ERROR_LOG() << "Impact Data not yet calculated";
+    ERROR_LOG(m_logger) << "Impact Data not yet calculated";
     return nullptr;
   }
 
@@ -406,11 +406,11 @@ void GeoPairingImplFiredBullet::setMeteoData(const GeoPairingImplMeteoData &a_me
 {
   m_MeteoData = a_meteoData;
 
-  INFO_LOG() <<  "---------- Setting Meteo Data ------------";
-  INFO_LOG() <<  "AirPressure   : " << m_MeteoData.AirPressure;
-  INFO_LOG() <<  "Temperature   : " << m_MeteoData.Temperature;
-  INFO_LOG() <<  "WindDirection : " << m_MeteoData.WindDirection;
-  INFO_LOG() <<  "WindSpeed     : " << m_MeteoData.WindSpeed;
+  INFO_LOG(m_logger) <<  "---------- Setting Meteo Data ------------";
+  INFO_LOG(m_logger) <<  "AirPressure   : " << m_MeteoData.AirPressure;
+  INFO_LOG(m_logger) <<  "Temperature   : " << m_MeteoData.Temperature;
+  INFO_LOG(m_logger) <<  "WindDirection : " << m_MeteoData.WindDirection;
+  INFO_LOG(m_logger) <<  "WindSpeed     : " << m_MeteoData.WindSpeed;
 }
 
 // ---------------------------------------------------------------
@@ -422,22 +422,22 @@ void GeoPairingImplFiredBullet::prepareSensorData()
   if (!m_SensorData.UseMinMax)
     return;
 
-  INFO_LOG() << "----------- Prepare Sensor Angles -----------";
+  INFO_LOG(m_logger) << "----------- Prepare Sensor Angles -----------";
 
   N_Types::Radian64 l_AzimuthMin = m_SensorData.WeaponAzimuthMin;
   N_Types::Radian64 l_AzimuthMax = m_SensorData.WeaponAzimuthMax;
 
-  INFO_LOG() << "WeaponAzimuthMin   [deg] = " << m_SensorData.WeaponAzimuthMin.getDegree();
-  INFO_LOG() << "WeaponAzimuthMax   [deg] = " << m_SensorData.WeaponAzimuthMax.getDegree();
-  INFO_LOG() << "WeaponElevationMin [deg] = " << m_SensorData.WeaponElevationMin.getDegree();
-  INFO_LOG() << "WeaponElevationMax [deg] = " << m_SensorData.WeaponElevationMax.getDegree();
+  INFO_LOG(m_logger) << "WeaponAzimuthMin   [deg] = " << m_SensorData.WeaponAzimuthMin.getDegree();
+  INFO_LOG(m_logger) << "WeaponAzimuthMax   [deg] = " << m_SensorData.WeaponAzimuthMax.getDegree();
+  INFO_LOG(m_logger) << "WeaponElevationMin [deg] = " << m_SensorData.WeaponElevationMin.getDegree();
+  INFO_LOG(m_logger) << "WeaponElevationMax [deg] = " << m_SensorData.WeaponElevationMax.getDegree();
 
   N_Types::Radian64 l_AzimuthDelta = fabs(l_AzimuthMax - l_AzimuthMin);
 
   // test the +/- 180 deg limit case
   if (l_AzimuthDelta > M_PI)
   {
-    INFO_LOG() << "Take short circle path";
+    INFO_LOG(m_logger) << "Take short circle path";
     l_AzimuthDelta -= M_PI;
   }
 
@@ -447,10 +447,10 @@ void GeoPairingImplFiredBullet::prepareSensorData()
   m_SensorData.WeaponElevation = m_SensorData.WeaponElevationMin + (drand48() * l_DeltaElevation);
   m_SensorData.WeaponAzimuth   = m_SensorData.WeaponAzimuthMin + (drand48() * l_DeltaAzimuth);
 
-  INFO_LOG() <<  "l_DeltaElevation   : " << l_DeltaElevation << " (" << l_DeltaElevation.getDegree() << ")";
-  INFO_LOG() <<  "l_DeltaAzimuth     : " << l_DeltaAzimuth << " (" << l_DeltaAzimuth.getDegree() << ")";
-  INFO_LOG() <<  "WeaponElevation    : " << m_SensorData.WeaponElevation << " (" << m_SensorData.WeaponElevation.getDegree() << ")" ;
-  INFO_LOG() <<  "WeaponAzimuth      : " << m_SensorData.WeaponAzimuth << " (" << m_SensorData.WeaponAzimuth.getDegree() << ")";
+  INFO_LOG(m_logger) <<  "l_DeltaElevation   : " << l_DeltaElevation << " (" << l_DeltaElevation.getDegree() << ")";
+  INFO_LOG(m_logger) <<  "l_DeltaAzimuth     : " << l_DeltaAzimuth << " (" << l_DeltaAzimuth.getDegree() << ")";
+  INFO_LOG(m_logger) <<  "WeaponElevation    : " << m_SensorData.WeaponElevation << " (" << m_SensorData.WeaponElevation.getDegree() << ")" ;
+  INFO_LOG(m_logger) <<  "WeaponAzimuth      : " << m_SensorData.WeaponAzimuth << " (" << m_SensorData.WeaponAzimuth.getDegree() << ")";
 
 }
 
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 8a6ebe106..49fce096b 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
@@ -53,38 +53,38 @@ HandlerGeoPairing::HandlerGeoPairing(const std::shared_ptr<CentralEffectSimulati
   ftcTab->enableSendCesHit();
 
   connect(m_timer, &QTimer::timeout, this, &HandlerGeoPairing::sendFtcCesHitRequestTimeout);
-  INFO_LOG() << "configPath = " << m_ballisticService->getConfigPath();
-  INFO_LOG() << "configFile = " << m_ballisticService->getConfigFile();
-  INFO_LOG() << "ammunitionFile = " << m_ballisticService->getAmmunitionFile();
+  INFO_LOG(m_logger) << "configPath = " << m_ballisticService->getConfigPath();
+  INFO_LOG(m_logger) << "configFile = " << m_ballisticService->getConfigFile();
+  INFO_LOG(m_logger) << "ammunitionFile = " << m_ballisticService->getAmmunitionFile();
 
   const QString s_configFile = Settings::cesGeopairingIniPath() + QStringLiteral("/") + Settings::cesGeopairingIniFile();
-  INFO_LOG() << "GeoPairing Config location : " << s_configFile;
+  INFO_LOG(m_logger) << "GeoPairing Config location : " << s_configFile;
 
   N_GeoPairingImpl::GeoPairingImpl *l_impl = new N_GeoPairingImpl::GeoPairingImplDted;
-  INFO_LOG() << "--> Installing GeoPairingImplDted...";
+  INFO_LOG(m_logger) << "--> Installing GeoPairingImplDted...";
   N_GeoPairingImpl::GeoPairingImplFactory::setImpl(l_impl);
 
   // initialize the GeoPairing implementation
   if (!N_GeoPairingImpl::GeoPairingImplFactory::initialize(Settings::cesGeopairingIniPath()))
   {
-    ERROR_LOG() << "Couldn't initialize GeoPairingImplFactory with GeoPairingImplDted!";
+    ERROR_LOG(m_logger) << "Couldn't initialize GeoPairingImplFactory with GeoPairingImplDted!";
 
     l_impl = new N_GeoPairingImpl::GeoPairingImplBalistic();
-    INFO_LOG() << "--> Installing GeoPairingImplBalistic...";
+    INFO_LOG(m_logger) << "--> Installing GeoPairingImplBalistic...";
     N_GeoPairingImpl::GeoPairingImplFactory::setImpl(l_impl);
     if (!N_GeoPairingImpl::GeoPairingImplFactory::initialize(s_configFile))
     {
-      ERROR_LOG() << "Couldn't initialize GeoPairingImplFactory with GeoPairingImplBalistic!";
+      ERROR_LOG(m_logger) << "Couldn't initialize GeoPairingImplFactory with GeoPairingImplBalistic!";
       abort();
     }
     else
-      INFO_LOG() << "GeoPairingImplBalistic correctly initialized";
+      INFO_LOG(m_logger) << "GeoPairingImplBalistic correctly initialized";
   }
   else
-    INFO_LOG() << "GeoPairingImplDted correctly initialized";
+    INFO_LOG(m_logger) << "GeoPairingImplDted correctly initialized";
 
 
-  INFO_LOG() << "Initialization finished";
+  INFO_LOG(m_logger) << "Initialization finished";
 
 } // end of ctor()
 //-----------------------------------------------------------------------------
@@ -96,7 +96,7 @@ HandlerGeoPairing::~HandlerGeoPairing()
 
 bool HandlerGeoPairing::init()
 {
-  DEBUG_LOG() << "init";
+  DEBUG_LOG(m_logger) << "init";
   auto dtcTab = m_ddsHandlerAes->dtcTab();
   auto dtcMdm = m_ddsHandlerAes->dtcMdm();
 
@@ -111,12 +111,12 @@ bool HandlerGeoPairing::init()
   // create GeoConfig for this process && initFilename, just one time, just here
   GeoConfig *o_config = GeoConfig::getInstance();
   const QString &fileName = Settings::cesGeopairingIniPath() + QStringLiteral("/") + Settings::cesGeopairingIniFile();
-  DEBUG_LOG() << "fileName= " << fileName;
+  DEBUG_LOG(m_logger) << "fileName= " << fileName;
   if (!o_config || !o_config->initFilename(fileName))
   {
     // Fehlerfall:
     const QFileInfo qFileInfo(fileName);
-    ERROR_LOG() << Q_FUNC_INFO << " initFilename failed: '" << qFileInfo.absoluteFilePath() << "'";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " initFilename failed: '" << qFileInfo.absoluteFilePath() << "'";
     return false;
   }
 
@@ -127,7 +127,7 @@ bool HandlerGeoPairing::init()
 
   QString s_filter         = o_config->getString(s_group, s_keyOfEntries, s_ammunition);
 
-  DEBUG_LOG() << "s_group=" << s_group
+  DEBUG_LOG(m_logger) << "s_group=" << s_group
                        << " n_numberOfAmmunitions=" << n_numberOfAmmunitions
                        << " s_keyOfEntries=" << s_keyOfEntries
                        << " s_ammunition=" << s_ammunition
@@ -139,7 +139,7 @@ bool HandlerGeoPairing::init()
     QString s_ammu_group = s_filter + QString::number(i + 1);
     QString s_unknown = QStringLiteral("<unknown>");
     QString s_ammu_value = o_config->getString(s_group, s_ammu_group, s_unknown);
-    DEBUG_LOG() << "s_ammu_value=" << s_ammu_value
+    DEBUG_LOG(m_logger) << "s_ammu_value=" << s_ammu_value
                          << " s_group=" << s_group
                          << " s_ammu_group=" << s_ammu_group;
   }
@@ -151,33 +151,33 @@ bool HandlerGeoPairing::init()
 void HandlerGeoPairing::onSendCesHitReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    WARNING_LOG() << "Can not send hit on participant to training area: " << replyObject();
+    WARNING_LOG(m_logger) << "Can not send hit on participant to training area: " << replyObject();
   else
-    DEBUG_LOG() << "onSendCesHitReply for id " << replyObject.id() << " success";
+    DEBUG_LOG(m_logger) << "onSendCesHitReply for id " << replyObject.id() << " success";
 }
 
 void HandlerGeoPairing::onSendCesHitInformationReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    WARNING_LOG() << "Can not send hit information on participant to training area: " << replyObject();
+    WARNING_LOG(m_logger) << "Can not send hit information on participant to training area: " << replyObject();
   else
-    DEBUG_LOG() << "onSendCesHitInformationReply for id " << replyObject.id() << " success";
+    DEBUG_LOG(m_logger) << "onSendCesHitInformationReply for id " << replyObject.id() << " success";
 }
 
 void HandlerGeoPairing::onExplosionSingleModifyReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    WARNING_LOG() << "Can not send ExplosionSingleModify: " << replyObject();
+    WARNING_LOG(m_logger) << "Can not send ExplosionSingleModify: " << replyObject();
   else
-    DEBUG_LOG() << "onExplosionSingleModifyReply for id " << replyObject.id() << " success";
+    DEBUG_LOG(m_logger) << "onExplosionSingleModifyReply for id " << replyObject.id() << " success";
 }
 
 void HandlerGeoPairing::onExplosionAreaModifyReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    WARNING_LOG() << "Can not send ExplosionAreaModify: " << replyObject();
+    WARNING_LOG(m_logger) << "Can not send ExplosionAreaModify: " << replyObject();
   else
-    DEBUG_LOG() << "onExplosionAreaModifyReply for id " << replyObject.id() << " success";
+    DEBUG_LOG(m_logger) << "onExplosionAreaModifyReply for id " << replyObject.id() << " success";
 }
 
 // ///////////////////////////////////
@@ -187,13 +187,13 @@ void HandlerGeoPairing::onMeteoDataChanged(const MeteoDataManagement::MeteoData
 {
   if (modType == DataModification::eRemoved)
   {
-    DEBUG_LOG() << "onMeteoDataChanged eRemoved";
+    DEBUG_LOG(m_logger) << "onMeteoDataChanged eRemoved";
     return;
   }
 
   m_meteoData = data;
 
-  DEBUG_LOG() << "Got onMeteoDataChanged "
+  DEBUG_LOG(m_logger) << "Got onMeteoDataChanged "
                        << " id=" << m_meteoData.id()
                        << " windSpeed=" << m_meteoData.windSpeed()
                        << " windDirection=" << m_meteoData.windDirection()
@@ -208,11 +208,11 @@ void HandlerGeoPairing::onMeteoDataChanged(const MeteoDataManagement::MeteoData
 //{
 //  if (modType == DataModification::eRemoved)
 //  {
-//    DEBUG_LOG() << "onGeoPairingDataChanged eRemoved";
+//    DEBUG_LOG(m_logger) << "onGeoPairingDataChanged eRemoved";
 //    return;
 //  }
 //  m_geoPairingPtr = new GeoPairing(m_ballisticService);
-//  DEBUG_LOG() << "Got onGeoPairingDataChanged "
+//  DEBUG_LOG(m_logger) << "Got onGeoPairingDataChanged "
 //                      << " equipmentNumber=" << data.equipmentNumber()
 //                      << " position lat=" << data.position().lat()
 //                      << " lon=" << data.position().lon()
@@ -236,7 +236,7 @@ void HandlerGeoPairing::onMeteoDataChanged(const MeteoDataManagement::MeteoData
 //  while (i.hasNext())
 //  {
 //    i.next();
-//    DEBUG_LOG() << i.key() << ": participantId=" << i.value().participantId()
+//    DEBUG_LOG(m_logger) << i.key() << ": participantId=" << i.value().participantId()
 //                        << " participantTypeId= " << i.value().participantTypeId();
 //  }
 
@@ -276,7 +276,7 @@ void HandlerGeoPairing::onMeteoDataChanged(const MeteoDataManagement::MeteoData
 
 //  if (areaFireToCtas.hit)
 //  {
-//    INFO_LOG() << "AreaFireToCtas"
+//    INFO_LOG(m_logger) << "AreaFireToCtas"
 //                       << " playerId=" << areaFireToCtas.playerId
 //                       << " impactTime=" << areaFireToCtas.impactTime
 //                       << " duration=" << areaFireToCtas.duration
@@ -319,7 +319,7 @@ void HandlerGeoPairing::onMeteoDataChanged(const MeteoDataManagement::MeteoData
 //  if (fireToAircaft.hit)
 //  {
 //    TrainingAreaBase::SendCesHitInformation chi;
-//    INFO_LOG() << "send CesHitInformation to Ctas "
+//    INFO_LOG(m_logger) << "send CesHitInformation to Ctas "
 //                       << " equipmentNumberGunner: " << fireToAircaft.equipmentNumberGunner
 //                       << " participantIdTarget: " << fireToAircaft.participantIdTarget
 //                       << " impactTime: " << fireToAircaft.impactTime
@@ -348,7 +348,7 @@ void HandlerGeoPairing::onMeteoDataChanged(const MeteoDataManagement::MeteoData
 //    gpd.equipmentNumber(data.equipmentNumber());
 //    gpd.participantId(participantId);
 //    gpd.payload(LtsUtils::convert<std::vector<uint8_t>>(reportTarget.sendData));
-//    INFO_LOG() << " send Geopairing-Data to Ctas"
+//    INFO_LOG(m_logger) << " send Geopairing-Data to Ctas"
 //                       << " equipmentNumber: " << data.equipmentNumber()
 //                       << " playerId: " << reportTarget.playerId
 //                       << " participantId: " << participantId
@@ -361,17 +361,17 @@ void HandlerGeoPairing::onMeteoDataChanged(const MeteoDataManagement::MeteoData
 
 void HandlerGeoPairing::onGeoPairingDataChanged(const TrainingAreaBase::GeopairingData &data, DataModification modType)
 {
-  DEBUG_LOG() << "Got onGeoPairingDataChanged ";
+  DEBUG_LOG(m_logger) << "Got onGeoPairingDataChanged ";
   if (modType == DataModification::eRemoved)
   {
-    DEBUG_LOG() << "onGeoPairingDataChanged eRemoved";
+    DEBUG_LOG(m_logger) << "onGeoPairingDataChanged eRemoved";
     return;
   }
   unsigned char msgType = 0xE3;
 
   if (static_cast<unsigned char>(data.payload().at(0)) != msgType)
   {
-    DEBUG_LOG() << "data.payload().at(0) != msgType";
+    DEBUG_LOG(m_logger) << "data.payload().at(0) != msgType";
     return;
   }
 
@@ -464,7 +464,7 @@ void HandlerGeoPairing::onGeoPairingDataChanged(const TrainingAreaBase::Geopairi
     v0 = Settings::moerserLoad_6();
 
 
-  DEBUG_LOG() << "Got onGeoPairingDataChanged "
+  DEBUG_LOG(m_logger) << "Got onGeoPairingDataChanged "
                        << "\nequipmentNumber=" << data.equipmentNumber()
                        << "\nposition lat=" << data.position().lat()
                        << "/" << data.position().lon()
@@ -487,7 +487,7 @@ void HandlerGeoPairing::onGeoPairingDataChanged(const TrainingAreaBase::Geopairi
   //QPointF distVector = calculateDistVector ( rw, azimut/10.0);
   QPointF explosionPosUtm = calculateExplosionPosUtm(rw, azimut / 10.0, posUtm);
 
-  DEBUG_LOG() << "Result: rw=" << rw
+  DEBUG_LOG(m_logger) << "Result: rw=" << rw
                        << " v0=" << v0
                        << "\n t1=" << t1
                        << "\n explosionPosUtm=" << explosionPosUtm.x() << "/" << explosionPosUtm.y();
@@ -511,7 +511,7 @@ void HandlerGeoPairing::onGeoPairingDataChanged(const TrainingAreaBase::Geopairi
   explosionSingleModifyRequest.partyId(partyId);
 
 
-  DEBUG_LOG() << "impactTime=" << data.sampleTime()
+  DEBUG_LOG(m_logger) << "impactTime=" << data.sampleTime()
                        << " name=" << name
                        << " m_ddsHandler->currentPartitionTime=" << m_ddsHandlerAes->currentPartitionTime()
                        << " participantId=" << participantId << " " << participantId
@@ -519,21 +519,21 @@ void HandlerGeoPairing::onGeoPairingDataChanged(const TrainingAreaBase::Geopairi
 
   if (impactTime > m_ddsHandlerAes->currentPartitionTime())
   {
-    DEBUG_LOG() << "Send explosionSingleModifyRequest";
+    DEBUG_LOG(m_logger) << "Send explosionSingleModifyRequest";
     auto ftcAes = m_ddsHandlerAes->ftcAes();
     ftcAes->explosionSingleModifyRequest(explosionSingleModifyRequest, this);
   }
   else
-    DEBUG_LOG() << "NOT Send explosionSingleModifyRequest impactTime is in the past";
+    DEBUG_LOG(m_logger) << "NOT Send explosionSingleModifyRequest impactTime is in the past";
 }
 
 
 void HandlerGeoPairing::onSendGeopairingDataReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    WARNING_LOG() << "Can not send GeopPairing Data participant : " << replyObject();
+    WARNING_LOG(m_logger) << "Can not send GeopPairing Data participant : " << replyObject();
   else
-    DEBUG_LOG() << "onSendGeopairingDataReply for id " << replyObject.id() << " success";
+    DEBUG_LOG(m_logger) << "onSendGeopairingDataReply for id " << replyObject.id() << " success";
 }
 
 void HandlerGeoPairing::sendFtcCesHitRequestTimeout()
@@ -541,7 +541,7 @@ void HandlerGeoPairing::sendFtcCesHitRequestTimeout()
   auto ftcTab = m_ddsHandlerAes->ftcTab();
   for (const TrainingAreaBase::SendCesHitRequest &hr : std::as_const(m_requestMap))
   {
-    DEBUG_LOG()  << "sendFtcCesHitRequest: " << hr;
+    DEBUG_LOG(m_logger)  << "sendFtcCesHitRequest: " << hr;
     ftcTab->sendCesHitRequest(hr, this);
   }
   m_requestMap.clear();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/handler_geopairing.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/handler_geopairing.h
index 314b9e1f6..1e695a6fe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/handler_geopairing.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/handler_geopairing.h
@@ -42,6 +42,7 @@ public:
     eElevationBelowZero = 3
   };
 private:
+NGL::INGLLogger &m_logger;
   struct GeoPCharge
   {
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/plugin.cpp
index cb0c4e72e..10fe12150 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/plugin.cpp
@@ -47,7 +47,7 @@ bool CesGeoPairingInterfaceImpl::init(int domainId, int exerciseId)
 {
   m_domainId = domainId;
   m_exerciseId = exerciseId;
-  INFO_LOG() << "CesGeoPairingInterfaceImpl::init()"
+  INFO_LOG(m_logger) << "CesGeoPairingInterfaceImpl::init()"
                      << " m_domainId=" << m_domainId
                      << " m_exerciseId=" << m_exerciseId;
 
@@ -66,11 +66,11 @@ bool CesGeoPairingInterfaceImpl::init(int domainId, int exerciseId)
 
   if (!m_handlerGeoPairing->init())
   {
-    ERROR_LOG() << "Initialisation m_handlerGeoPairing failed.";
+    ERROR_LOG(m_logger) << "Initialisation m_handlerGeoPairing failed.";
     return false;
   }
 
-  INFO_LOG() << "CesGeoPairingInterfaceImpl::init() return true";
+  INFO_LOG(m_logger) << "CesGeoPairingInterfaceImpl::init() return true";
   return true;
 }
 
@@ -78,8 +78,8 @@ QString CesGeoPairingInterfaceImpl::echo(const QString &message)
 {
 
   QString ret(QStringLiteral("<<<< %1 >>>> CesGeoPairingInterfaceImpl::echo").arg(message));
-  INFO_LOG() << "CesGeoPairingInterfaceImpl::echo return:" << ret;
-  DEBUG_LOG() << "DEBUG: CesGeoPairingInterfaceImpl::echo return:" << ret;
+  INFO_LOG(m_logger) << "CesGeoPairingInterfaceImpl::echo return:" << ret;
+  DEBUG_LOG(m_logger) << "DEBUG: CesGeoPairingInterfaceImpl::echo return:" << ret;
   return ret;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/plugin.h
index 91ea98a3f..0963025f7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/plugin.h
@@ -63,6 +63,7 @@ private Q_SLOTS:
   bool init(int domainId, int exerciseId) override;
 private:
 
+NGL::INGLLogger &m_logger;
 private:
   CentralEffectSimulation::Plugin::DataProvider                              *m_pdp{nullptr};
   std::shared_ptr<DDSConnector::DdsConnector>                                 m_ddsConnector;
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 f62cdacc2..a49f101ce 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
@@ -71,14 +71,14 @@ bool HandlerJamming::init()
            this, &HandlerJamming::onParticipantGearEventChanged);
 
 
-  DEBUG_LOG() << "HandlerJamming::init() finished.";
+  DEBUG_LOG(m_logger) << "HandlerJamming::init() finished.";
   return true;
 } // end of init()
 //-----------------------------------------------------------------------------
 
 void HandlerJamming::onParticipantGearEventChanged(const ParticipantManagement::ParticipantGearEvent &data, DataModification modType)
 {
-  ERROR_LOG() << "onParticipantGearEventChanged << modType=" << modType
+  ERROR_LOG(m_logger) << "onParticipantGearEventChanged << modType=" << modType
                        << " originatorId=" << data.participantId()
                        << " chargeTypeId=" << data.charge().chargeTypeId()
                        << " gearTypeId=" << data.charge().gearTypeId()
@@ -94,34 +94,34 @@ void HandlerJamming::onParticipantGearEventChanged(const ParticipantManagement::
   double radius = m_ddsHandler->dtcPdm()->getMaxRange(data.charge().chargeTypeId(), data.charge().gearTypeId());
 
   // int radius = 15;
-  DEBUG_LOG() << "Radius=" << radius;
+  DEBUG_LOG(m_logger) << "Radius=" << radius;
   for ( int uasId : uasIds)
   {
-    DEBUG_LOG() << "uasId=" << uasId;
+    DEBUG_LOG(m_logger) << "uasId=" << uasId;
     CentralEffectSimulation::HandlerParticipant::CesParticipantData cesParticipantData = m_handlerParticipant->position(uasId);
     if (!cesParticipantData.positionValid)
     {
-      DEBUG_LOG() << "continue !positionValid participantId=" << uasId;
+      DEBUG_LOG(m_logger) << "continue !positionValid participantId=" << uasId;
       continue;
     }
 
     if (LtsUtils::isPositionTimeOutdated(QDateTime::currentMSecsSinceEpoch(), cesParticipantData.sampleTime()))
     {
-      DEBUG_LOG() << "continue positionTime outdated participantId=" << uasId;
+      DEBUG_LOG(m_logger) << "continue positionTime outdated participantId=" << uasId;
       continue;
     }
 
     long distance = m_handlerParticipant->getDistance(data.participantId(), uasId);
-    DEBUG_LOG() << "distance = " << distance;
+    DEBUG_LOG(m_logger) << "distance = " << distance;
     if ( distance < radius)
     {
-      DEBUG_LOG() << " Send Jamming to TAB and destroy uasId";
+      DEBUG_LOG(m_logger) << " Send Jamming to TAB and destroy uasId";
       //sendCesHitRequest(data.charge().chargeTypeId(), data.participantId(),cesParticipantData);
       if (cesParticipantData.vulnerabilityState != ProjectDataManagement::VulnerabilityState_def::CatastrophicKill)
         jammedUasIds.append(uasId);
     }
     else
-      DEBUG_LOG() << "Not in Radius distance=" << distance
+      DEBUG_LOG(m_logger) << "Not in Radius distance=" << distance
                            << " radius=" << radius;
   }
   // [ETB UASETBUAS-33] Equal distribution of jamming failures
@@ -133,7 +133,7 @@ void HandlerJamming::onParticipantGearEventChanged(const ParticipantManagement::
   {
     // search for an id from the list with an algorithm that contains an equal distribution
     jammedUasId = jammedUasIds.at(QRandomGenerator::global()->bounded(jammedUasIds.size() - 1));
-    DEBUG_LOG() << "jammedUasId=" << jammedUasId
+    DEBUG_LOG(m_logger) << "jammedUasId=" << jammedUasId
                          << " jammedUasIds.size()=" << jammedUasIds.size();
   }
 
@@ -145,21 +145,21 @@ void HandlerJamming::onParticipantGearEventChanged(const ParticipantManagement::
 
 void HandlerJamming::onSendCesHitReply(const Core::FunctionReplyObject &replyObject)
 {
-  DEBUG_LOG() << "onSendCesHitReply for id " << replyObject.id() << " success= " << replyObject.error();
+  DEBUG_LOG(m_logger) << "onSendCesHitReply for id " << replyObject.id() << " success= " << replyObject.error();
 
   if (replyObject.error())
-    WARNING_LOG() << "Can not send enter/leave Area to participant in training area: " << replyObject();
+    WARNING_LOG(m_logger) << "Can not send enter/leave Area to participant in training area: " << replyObject();
 
   // Send next Request, if available
   if (!m_sendCesHitRequestQueue.isEmpty())
   {
-    DEBUG_LOG() << "m_sendCesAreaActionRequestQueue.size()=" << m_sendCesHitRequestQueue.size();
+    DEBUG_LOG(m_logger) << "m_sendCesAreaActionRequestQueue.size()=" << m_sendCesHitRequestQueue.size();
     m_sendCesHitRequestQueue.dequeue();
     // Send next Message
     if (!m_sendCesHitRequestQueue.isEmpty())
     {
       const auto &hr = m_sendCesHitRequestQueue.head();
-      DEBUG_LOG() << "sendCesHitRequest: " << hr;
+      DEBUG_LOG(m_logger) << "sendCesHitRequest: " << hr;
       m_ddsHandler->ftcTab()->sendCesHitRequest(hr, this);
     }
   }
@@ -182,20 +182,20 @@ void HandlerJamming::sendCesHitRequest(const int chargeTypeId,
   if (remaining < 0)
     return;
 
-  DEBUG_LOG() << "sendCesHitRequest Settings::calculateCentralAes="
+  DEBUG_LOG(m_logger) << "sendCesHitRequest Settings::calculateCentralAes="
                       << " insideWlsArea=" << std::boolalpha << participantData.insideWlsArea()
                       << " participantId=" << 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() << " ftc sendCESHit to Participant participantId = " << participantData.participantId()
+  DEBUG_LOG(m_logger) << " ftc sendCESHit to Participant participantId = " << participantData.participantId()
                       << " equipNo = " << equipNo
                       << " chargeTypeId =" << chargeTypeId;
 
   if (participantData.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill)
   {
-    DEBUG_LOG() << "participantPosition.participantId == 0 CatastrophicKill)";
+    DEBUG_LOG(m_logger) << "participantPosition.participantId == 0 CatastrophicKill)";
     return;
   }
 
@@ -220,13 +220,13 @@ void HandlerJamming::sendCesHitRequest(const int chargeTypeId,
     originatorPartyId,               // originPartyId
     mineId
   );
-  DEBUG_LOG() << " participantId=" << participantData.participantId()
+  DEBUG_LOG(m_logger) << " participantId=" << participantData.participantId()
                       << " chargeTypeId=" << chargeTypeId;
 
   m_sendCesHitRequestQueue.enqueue(requestTab);
   if (m_sendCesHitRequestQueue.size() == 1)
   {
-    DEBUG_LOG() << "SendCesHitRequest: " << requestTab;
+    DEBUG_LOG(m_logger) << "SendCesHitRequest: " << requestTab;
     m_ddsHandler->ftcTab()->sendCesHitRequest(requestTab, this);
   }
 } // sendCesHitRequest
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.h
index 1ec78b94f..c13b68038 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.h
@@ -57,6 +57,7 @@ public:
   bool init();
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onSendCesHitReply(const Core::FunctionReplyObject &replyObject) override final;
 
 private Q_SLOTS:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/plugin.cpp
index 58d74a6f7..b6be3987c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/plugin.cpp
@@ -48,7 +48,7 @@ bool CES_JammingInterfaceImpl::init(int domainId, int exerciseId)
 {
   m_domainId = domainId;
   m_exerciseId = exerciseId;
-  INFO_LOG() << "CES_JammingInterfaceImpl::init()"
+  INFO_LOG(m_logger) << "CES_JammingInterfaceImpl::init()"
                      << " m_domainId=" << m_domainId
                      << " m_exerciseId=" << m_exerciseId;
 
@@ -62,11 +62,11 @@ bool CES_JammingInterfaceImpl::init(int domainId, int exerciseId)
 
   if (!m_handlerJamming->init())
   {
-    ERROR_LOG() << "Initialisation m_handlerFunctionalArea failed.";
+    ERROR_LOG(m_logger) << "Initialisation m_handlerFunctionalArea failed.";
     return false;
   }
 
-  INFO_LOG() << "CES_JammingInterfaceImpl::init() return true";
+  INFO_LOG(m_logger) << "CES_JammingInterfaceImpl::init() return true";
   return true;
 }
 
@@ -74,8 +74,8 @@ QString CES_JammingInterfaceImpl::echo(const QString &message)
 {
 
   QString ret(QStringLiteral("<<<< %1 >>>> CES_JammingInterfaceImpl::echo").arg(message));
-  INFO_LOG() << "CES_JammingInterfaceImpl::echo return:" << ret;
-  DEBUG_LOG() << "DEBUG: CES_JammingInterfaceImpl::echo return:" << ret;
+  INFO_LOG(m_logger) << "CES_JammingInterfaceImpl::echo return:" << ret;
+  DEBUG_LOG(m_logger) << "DEBUG: CES_JammingInterfaceImpl::echo return:" << ret;
   return ret;
 }
 
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 36009b5f9..6857ae483 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
@@ -70,7 +70,7 @@ HandlerMineAreas::HandlerMineAreas(const std::shared_ptr<CentralEffectSimulation
   , m_handlerParticipant(participantHandler)
   , m_logger(CentralEffectSimulation::getLogger("Plugin.MineAreas.HandlerMineAreas"))
 {
-  DEBUG_LOG() << "HandlerMineAreas::HandlerMineAreas";
+  DEBUG_LOG(m_logger) << "HandlerMineAreas::HandlerMineAreas";
   m_aesItemViews.clear();
 } // end of ctor()
 //-----------------------------------------------------------------------------
@@ -93,7 +93,7 @@ bool HandlerMineAreas::init()
   dtcAes->waitForHistoricalDataMineArea(2000);
   dtcAes->waitForHistoricalDataMineCorridor(2000);
 
-  DEBUG_LOG() << "HandlerMineAreas::init";
+  DEBUG_LOG(m_logger) << "HandlerMineAreas::init";
 
   dtcAes->enableTriggeredImpacts();
   connect(dtcAes.get(), &AreaEffectSimulation::Interface::Dtc::triggeredImpactsChanged,
@@ -109,7 +109,7 @@ bool HandlerMineAreas::init()
           this, &HandlerMineAreas::onAesItemViewChanged);
 
 
-  DEBUG_LOG() << " m_aesItemViews.size=" << m_aesItemViews.size();
+  DEBUG_LOG(m_logger) << " m_aesItemViews.size=" << m_aesItemViews.size();
   // Get 'static' data for all onAesItemView
   {
     auto cb = [this](const AreaEffectSimulation::AesItemView & aiv)
@@ -119,7 +119,7 @@ bool HandlerMineAreas::init()
     if (!dtcAes->aesItemViews(cb))
       return false;
   }
-  DEBUG_LOG() << " m_aesItemViews.size=" << m_aesItemViews.size();
+  DEBUG_LOG(m_logger) << " m_aesItemViews.size=" << m_aesItemViews.size();
 
   connect(m_handlerParticipant.get(), &CentralEffectSimulation::HandlerParticipant::newOutdoorPosition,
           this, &HandlerMineAreas::onNewOutdoorPosition);
@@ -127,28 +127,28 @@ bool HandlerMineAreas::init()
   connect(m_handlerParticipant.get(), &CentralEffectSimulation::HandlerParticipant::newParticipantState,
           this, &HandlerMineAreas::onNewParticipantState);
 
-  INFO_LOG() << "HandlerParticipantArea::init() finished.";
+  INFO_LOG(m_logger) << "HandlerParticipantArea::init() finished.";
   return true;
 } // end of init()
 //-----------------------------------------------------------------------------
 
 void HandlerMineAreas::onSendCesHitReply(const Core::FunctionReplyObject &replyObject)
 {
-  DEBUG_LOG() << "onSendCesHitReply for id " << replyObject.id() << " success= " << replyObject.error();
+  DEBUG_LOG(m_logger) << "onSendCesHitReply for id " << replyObject.id() << " success= " << replyObject.error();
 
   if (replyObject.error())
-    WARNING_LOG() << "Can not send enter/leave FunctionsArea to participant in training area: " << replyObject();
+    WARNING_LOG(m_logger) << "Can not send enter/leave FunctionsArea to participant in training area: " << replyObject();
 
   // Send next Request, if available
   if (!m_sendCesHitRequestQueue.isEmpty())
   {
-    DEBUG_LOG() << "m_sendCesAreaActionRequestQueue.size()=" << m_sendCesHitRequestQueue.size();
+    DEBUG_LOG(m_logger) << "m_sendCesAreaActionRequestQueue.size()=" << m_sendCesHitRequestQueue.size();
     m_sendCesHitRequestQueue.dequeue();
     // Send next Message
     if (!m_sendCesHitRequestQueue.isEmpty())
     {
       const auto &hr = m_sendCesHitRequestQueue.head();
-      DEBUG_LOG() << "sendCesHitRequest: " << hr;
+      DEBUG_LOG(m_logger) << "sendCesHitRequest: " << hr;
       m_ddsHandler->ftcTab()->sendCesHitRequest(hr, this);
     }
   }
@@ -157,9 +157,9 @@ void HandlerMineAreas::onSendCesHitReply(const Core::FunctionReplyObject &replyO
 void HandlerMineAreas::onMineTriggeredReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    ERROR_LOG() << "Can not send MineTriggerReply: " << replyObject();
+    ERROR_LOG(m_logger) << "Can not send MineTriggerReply: " << replyObject();
   else
-    DEBUG_LOG() << "MineTriggerReply for id " << replyObject.id() << " success";
+    DEBUG_LOG(m_logger) << "MineTriggerReply for id " << replyObject.id() << " success";
 }
 // ///////////////////////////////////
 // A E S (AreaEffectSimulation)
@@ -170,12 +170,12 @@ void HandlerMineAreas::onAesItemViewChanged(const AreaEffectSimulation::AesItemV
       && data.aesTypeId() != AreaEffectSimulation::AesType_def::AtMineArea
       && data.aesTypeId() != AreaEffectSimulation::AesType_def::AtMineCorridor)
   {
-    DEBUG_LOG() << "AesItemView return";
+    DEBUG_LOG(m_logger) << "AesItemView return";
     return;
   }
 
   const AreaEffectSimulation::MineArea &ma = m_ddsHandler->dtcAes()->mineArea(data.aesItemId());
-  DEBUG_LOG() << "aesItemId=" << data.aesItemId()
+  DEBUG_LOG(m_logger) << "aesItemId=" << data.aesItemId()
                       << " chargeTypeId=" << data.chargeStruct().chargeTypeId()
                       << " isCentral=" << ma.isCentral();
 
@@ -186,29 +186,29 @@ void HandlerMineAreas::onAesItemViewChanged(const AreaEffectSimulation::AesItemV
 
   if (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired)
   {
-    DEBUG_LOG() << "AesItemView expired return id=" << data.aesItemId();
+    DEBUG_LOG(m_logger) << "AesItemView expired return id=" << data.aesItemId();
     aesItemViewRemoved(data.aesItemId());
     return;
   }
 
   if (m_ddsHandler->isDus(data.chargeStruct()))
   {
-    DEBUG_LOG() << "isDus aesItemId=" << data.aesItemId()
+    DEBUG_LOG(m_logger) << "isDus aesItemId=" << data.aesItemId()
                         << " chargeTypeId=" << data.chargeStruct().chargeTypeId() << " do not consider";
     return;
   }
 
   const int aesItemId = data.aesItemId();
 
-  DEBUG_LOG() << "Got AesItemView id: " << aesItemId
+  DEBUG_LOG(m_logger) << "Got AesItemView id: " << aesItemId
                       << ", type: " << data.aesTypeId()
                       << ", effectState: " << data.effectStateId()
                       << ", modType: " << modType;
-  DEBUG_LOG() << " m_aesItemViews.size=" << m_aesItemViews.size();
+  DEBUG_LOG(m_logger) << " m_aesItemViews.size=" << m_aesItemViews.size();
 
   if (modType == DataModification::eRemoved)
   {
-    DEBUG_LOG() << " aesItemViewRemoved aesItemId=" << aesItemId;
+    DEBUG_LOG(m_logger) << " aesItemViewRemoved aesItemId=" << aesItemId;
     aesItemViewRemoved(aesItemId);
     return;
   }
@@ -217,15 +217,15 @@ void HandlerMineAreas::onAesItemViewChanged(const AreaEffectSimulation::AesItemV
   {
     if (!m_aesItemViews.contains(aesItemId))
     {
-      DEBUG_LOG() << " !m_aesItemViews.contains aesItemId=" << aesItemId;
+      DEBUG_LOG(m_logger) << " !m_aesItemViews.contains aesItemId=" << aesItemId;
       return;
     }
     // build Polygon Mines:
-    DEBUG_LOG() << " m_aesItemViews.size=" << m_aesItemViews.size();
+    DEBUG_LOG(m_logger) << " m_aesItemViews.size=" << m_aesItemViews.size();
     auto &formMines = m_aesItemViews[data.aesItemId()].formMines;
-    DEBUG_LOG() << " m_aesItemViews.size=" << m_aesItemViews.size();
+    DEBUG_LOG(m_logger) << " m_aesItemViews.size=" << m_aesItemViews.size();
     int &zone = m_aesItemViews[data.aesItemId()].zone;
-    DEBUG_LOG() << " m_aesItemViews.size=" << m_aesItemViews.size();
+    DEBUG_LOG(m_logger) << " m_aesItemViews.size=" << m_aesItemViews.size();
     formMines.clear();
     formMines.reserve(data.form().size());
     for (const Core::GeoPosition2D &pointGeo : data.form())
@@ -235,7 +235,7 @@ void HandlerMineAreas::onAesItemViewChanged(const AreaEffectSimulation::AesItemV
 
   const AreaEffectSimulation::AesEffectState &effectState = data.effectStateId();
   const double impactRadius = m_ddsHandler->chargeTypeRadius(data.chargeStruct());
-  DEBUG_LOG() << "impactRadius=" << impactRadius;
+  DEBUG_LOG(m_logger) << "impactRadius=" << impactRadius;
   switch (effectState.underlying())
   {
   case AreaEffectSimulation::AesEffectState_def::EsPrepared:
@@ -246,10 +246,10 @@ void HandlerMineAreas::onAesItemViewChanged(const AreaEffectSimulation::AesItemV
   {
     const auto aesItemViewUtm(CentralEffectSimulation::AesItemViewUtm::create(data, m_aesItemViews[data.aesItemId()], impactRadius));
 
-    DEBUG_LOG() << "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);
-    DEBUG_LOG() << " m_aesItemViews.size=" << m_aesItemViews.size();
+    DEBUG_LOG(m_logger) << " m_aesItemViews.size=" << m_aesItemViews.size();
 
     printAesItemViews();
     break;
@@ -266,7 +266,7 @@ void HandlerMineAreas::onAesItemViewChanged(const AreaEffectSimulation::AesItemV
     // do nothing
     break;
   } // switch effectStateId
-  DEBUG_LOG() << " m_aesItemViews.size=" << m_aesItemViews.size();
+  DEBUG_LOG(m_logger) << " m_aesItemViews.size=" << m_aesItemViews.size();
   printAesItemViews();
 } // onAesItemViewChanged
 
@@ -279,7 +279,7 @@ void HandlerMineAreas::onNewOutdoorPosition(const CentralEffectSimulation::Handl
 
   if (m_handlerParticipant->getEquipmentNumber(participantPosition.participantId()) == 0)
   {
-    DEBUG_LOG() << "Not handle position: participant has no equipment number";
+    DEBUG_LOG(m_logger) << "Not handle position: participant has no equipment number";
     return;
   }
 
@@ -292,7 +292,7 @@ void HandlerMineAreas::onNewOutdoorPosition(const CentralEffectSimulation::Handl
       typeClass == ParticipantManagement::TypeClass_def::Vessel ||
       typeClass == ParticipantManagement::TypeClass_def::Unknown)
   {
-    DEBUG_LOG() << "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;
   }
@@ -300,7 +300,7 @@ void HandlerMineAreas::onNewOutdoorPosition(const CentralEffectSimulation::Handl
   int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantPosition.participantId());
   if (equipmentNumber <= 0)
   {
-    TRACE_LOG() << "return New Position - participant has no equipment number"
+    TRACE_LOG(m_logger) << "return New Position - participant has no equipment number"
                         << " participantId=" << participantPosition.participantId()
                         << " typeClass=" << typeClass;
     return;
@@ -308,21 +308,21 @@ void HandlerMineAreas::onNewOutdoorPosition(const CentralEffectSimulation::Handl
 
   if (participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill)
   {
-    DEBUG_LOG() << "New Position CatastrophicKill return";
+    DEBUG_LOG(m_logger) << "New Position CatastrophicKill return";
     return;
   }
 
   if (m_mineLists.contains(participantPosition.participantId()))
   {
-    DEBUG_LOG() << "Naechste Mine schicken ohne Bounding-Box-Check... return"
+    DEBUG_LOG(m_logger) << "Naechste Mine schicken ohne Bounding-Box-Check... return"
                         << " Anzahl Minen in Liste:" << m_mineLists[participantPosition.participantId()].size()
                         << " cesMaxPeriodForCashedMines=" << Settings::cesPeriodStoredMinesOutdated();
-    //DEBUG_LOG() << "Settings::cesMaxPeriodForCashedMines() =" << Settings::cesMaxPeriodForCashedMines();
+    //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()))
     {
-      DEBUG_LOG() << "Send Stored mines";
+      DEBUG_LOG(m_logger) << "Send Stored mines";
       // Search mine with the next no distance
       int distance =  m_mineLists[participantPosition.participantId()][0].distance;
       int index = 0;
@@ -344,7 +344,7 @@ void HandlerMineAreas::onNewOutdoorPosition(const CentralEffectSimulation::Handl
       sendEffectTypeEvent(m_aesItemViews[aesItemId], participantPosition, EffectType::EffectiveMineRangeEnter, mineIndex - 1, -1);
       CentralEffectSimulation::HandlerParticipant::CesParticipantData minePosition = participantPosition;
       // TODO convert minePos to geographic and set minePosGeo
-      //    DEBUG_LOG() << "minePosGeo lat=" << minePosGeo.lat()
+      //    DEBUG_LOG(m_logger) << "minePosGeo lat=" << minePosGeo.lat()
       //                         << " lon=" << minePosGeo.lon()
       //                         << " z=" << minePosGeo.z();
       sendParticipantEvent(m_aesItemViews[aesItemId], minePosition, ProjectDataManagement::EventType_def::HitMine);
@@ -360,7 +360,7 @@ void HandlerMineAreas::onNewOutdoorPosition(const CentralEffectSimulation::Handl
     }
     else
     {
-      DEBUG_LOG() << "Stored mines are outdated!"
+      DEBUG_LOG(m_logger) << "Stored mines are outdated!"
                           << " actTime=" <<   QDateTime::currentMSecsSinceEpoch()
                           << " Settings::cesPeriodStoredMinesOutdated()="   <<  Settings::cesPeriodStoredMinesOutdated();
       m_mineLists[participantPosition.participantId()].clear();
@@ -369,7 +369,7 @@ void HandlerMineAreas::onNewOutdoorPosition(const CentralEffectSimulation::Handl
   }
 
 
-  DEBUG_LOG() << "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);
@@ -377,7 +377,7 @@ void HandlerMineAreas::onNewOutdoorPosition(const CentralEffectSimulation::Handl
   for (const CentralEffectSimulation::AesItemViewUtm &itemView : std::as_const(m_aesItemViews))
   {
     int remaining = m_ddsHandler->remainingTasCode(itemView.chargeStruct);
-    DEBUG_LOG() << " itemView: " << itemView.aesItemId << ", " << itemView.aesTypeId
+    DEBUG_LOG(m_logger) << " itemView: " << itemView.aesItemId << ", " << itemView.aesTypeId
                         << " remainingTasCode=" << remaining;
 
     if (itemView.effectStateId != AreaEffectSimulation::AesEffectState_def::EsActivated)
@@ -385,7 +385,7 @@ void HandlerMineAreas::onNewOutdoorPosition(const CentralEffectSimulation::Handl
 
     if (typeClass == ParticipantManagement::TypeClass_def::Human && remaining > 50)
     {
-      DEBUG_LOG() << "ParticipantManagement::TypeClass_def::Human && remaining > 50 continue";
+      DEBUG_LOG(m_logger) << "ParticipantManagement::TypeClass_def::Human && remaining > 50 continue";
       continue;
     }
 
@@ -402,31 +402,31 @@ void HandlerMineAreas::onNewOutdoorPosition(const CentralEffectSimulation::Handl
         bool intersectsBoundingBox = intersectsBoundingBoxCheck(itemView, participantPosition.participantId());
         if (!intersectsBoundingBox)
         {
-          DEBUG_LOG() << "Continue nach Bounding BoxCheck itemView: " << itemView.aesItemId << ", "
+          DEBUG_LOG(m_logger) << "Continue nach Bounding BoxCheck itemView: " << itemView.aesItemId << ", "
                               << " paricipantId=" << participantPosition.participantId();
           continue;
         }
       }
-      DEBUG_LOG() << "Weiter nach Bounding BoxCheck itemView: " << itemView.aesItemId << ", "
+      DEBUG_LOG(m_logger) << "Weiter nach Bounding BoxCheck itemView: " << itemView.aesItemId << ", "
                           << " paricipantId=" << participantPosition.participantId();
 
       bool inFormCheckResult = inFormCheck(itemView, participantPosition);
       if (!inFormCheckResult)
       {
-        DEBUG_LOG() << "!inForm";
+        DEBUG_LOG(m_logger) << "!inForm";
         if (!intersectFormCheck(itemView, participantPosition.participantId()))
         {
-          DEBUG_LOG() << "!intersectForm continue";
+          DEBUG_LOG(m_logger) << "!intersectForm continue";
           continue;
         }
       }
-      DEBUG_LOG() << "Weiter nach inFormCheck und intersectFormCheck";
+      DEBUG_LOG(m_logger) << "Weiter nach inFormCheck und intersectFormCheck";
       sendParticipantEventEnterLeave(itemView, participantPosition, inFormCheckResult);
 
-      DEBUG_LOG() << "intersectMineRadiusCheck ";
+      DEBUG_LOG(m_logger) << "intersectMineRadiusCheck ";
       if (intersectMineRadiusCheck(itemView, participantPosition))
       {
-        DEBUG_LOG() << "intersectMineRadiusCheck=true return";
+        DEBUG_LOG(m_logger) << "intersectMineRadiusCheck=true return";
         return;
       }
     } // if AtMineArea
@@ -435,17 +435,17 @@ void HandlerMineAreas::onNewOutdoorPosition(const CentralEffectSimulation::Handl
 
 void HandlerMineAreas::onNewParticipantState(const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPos)
 {
-  DEBUG_LOG() << "onNewParticipantState ";
+  DEBUG_LOG(m_logger) << "onNewParticipantState ";
   if (participantPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CombatReady)
   {
-    DEBUG_LOG() << "m_mineLists.contains(participantPos.participantId():" << 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() << "onNewParticipantState CombatReady, loesche Minenliste Eintrag";
+      DEBUG_LOG(m_logger) << "onNewParticipantState CombatReady, loesche Minenliste Eintrag";
       m_mineLists[participantPos.participantId()].clear();
       m_mineLists.remove(participantPos.participantId());
     }
-    DEBUG_LOG() << "onNewParticipantState CombatReady, loesche Minenliste";
+    DEBUG_LOG(m_logger) << "onNewParticipantState CombatReady, loesche Minenliste";
   }
 }
 
@@ -468,7 +468,7 @@ bool HandlerMineAreas::intersectMineRadiusCheck(const CentralEffectSimulation::A
   const QPolygonF utmStep = m_handlerParticipant->getParticipantStep(participantPosition.participantId(), itemView.zone);
   for (const auto &itPos : itemView.formMines)
   {
-    DEBUG_LOG() << " itemId=" << itemView.aesItemId
+    DEBUG_LOG(m_logger) << " itemId=" << itemView.aesItemId
                         << " chargeTypeId=" << itemView.chargeStruct.chargeTypeId()
                         << ", MinePosUtm: " << CentralEffectSimulation::debug(itPos)
                         << " utmStep:" << utmStep[0].x() << utmStep[0].y()
@@ -481,7 +481,7 @@ bool HandlerMineAreas::intersectMineRadiusCheck(const CentralEffectSimulation::A
       if (!LtsUtils::BitArray::testBit(triggeredImpact.bitfield(), bitFieldIdx))
       {
         ++bitFieldIdx;
-        DEBUG_LOG() << "Mine is active continue bitFieldIdx=" << bitFieldIdx;
+        DEBUG_LOG(m_logger) << "Mine is active continue bitFieldIdx=" << bitFieldIdx;
         continue;
       }
     }
@@ -491,10 +491,10 @@ bool HandlerMineAreas::intersectMineRadiusCheck(const CentralEffectSimulation::A
 
     // Check, if participant is inside danger-radius of the mine
     distance = crossCircle(itPos, impactRadius, participantPosition.participantId(), itemView.zone);
-    DEBUG_LOG() << "distance=" << distance;
+    DEBUG_LOG(m_logger) << "distance=" << distance;
     if (distance < 0.0)
     {
-      DEBUG_LOG() << "distance < 0.0 continue";
+      DEBUG_LOG(m_logger) << "distance < 0.0 continue";
       ++bitFieldIdx;
       continue;
     }
@@ -509,12 +509,12 @@ bool HandlerMineAreas::intersectMineRadiusCheck(const CentralEffectSimulation::A
     mineListItem.time = QDateTime::currentMSecsSinceEpoch();
     m_mineLists[participantPosition.participantId()].append(mineListItem);
     mineListIndex++;
-    DEBUG_LOG() << " m_mineLists[" << participantPosition.participantId()
+    DEBUG_LOG(m_logger) << " m_mineLists[" << participantPosition.participantId()
                         << "].length=" <<  m_mineLists[participantPosition.participantId()].length();
 
     if (distance < lastDistance)
     {
-      DEBUG_LOG() << " distance < lastDistance crossCircle for aesItemId: " << itemView.aesItemId
+      DEBUG_LOG(m_logger) << " distance < lastDistance crossCircle for aesItemId: " << itemView.aesItemId
                           << ", mineIdx: " << mineIdx
                           << ", impactRadius:" << impactRadius
                           << ", participantId: " << participantPosition.participantId()
@@ -528,19 +528,19 @@ bool HandlerMineAreas::intersectMineRadiusCheck(const CentralEffectSimulation::A
     bitFieldIdx++;
   } // for each mine
 
-  DEBUG_LOG() << "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() << "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);
     sendEffectTypeEvent(itemView, participantPosition, EffectType::EffectiveMineRangeEnter, mineIndex - 1, -1);
     CentralEffectSimulation::HandlerParticipant::CesParticipantData minePosition = participantPosition;
     // TODO convert minePos to geographic and set minePosGeo
-    //    DEBUG_LOG() << "minePosGeo lat=" << minePosGeo.lat()
+    //    DEBUG_LOG(m_logger) << "minePosGeo lat=" << minePosGeo.lat()
     //                         << " lon=" << minePosGeo.lon()
     //                         << " z=" << minePosGeo.z();
     sendParticipantEvent(itemView, minePosition, ProjectDataManagement::EventType_def::HitMine);
@@ -555,17 +555,17 @@ bool HandlerMineAreas::intersectsBoundingBoxCheck(const CentralEffectSimulation:
                                                   const int participantId)
 {
   bool result = false;
-  DEBUG_LOG() << "intersectsBoundingBoxCheck participantId=" << participantId
+  DEBUG_LOG(m_logger) << "intersectsBoundingBoxCheck participantId=" << participantId
                       << " itemViewId=" << itemView.aesItemId
                       << " zone=" << itemView.zone;
   const QPolygonF stepPoly = m_handlerParticipant->getParticipantStep(participantId, itemView.zone);
   if (stepPoly.size() < 2)
     return false;
 
-  DEBUG_LOG() << "utmStep von=" << stepPoly.at(0).x() << "/" << stepPoly.at(0).y()
+  DEBUG_LOG(m_logger) << "utmStep von=" << stepPoly.at(0).x() << "/" << stepPoly.at(0).y()
                       << " bis=" << stepPoly.at(1).x() << "/" << stepPoly.at(1).y()
                       << " zone=" << itemView.zone;
-  DEBUG_LOG() << "ItemView Bounding Box BottomLeft=" << itemView.boundingBoxBottomLeft.x() << "/" << itemView.boundingBoxBottomLeft.y()
+  DEBUG_LOG(m_logger) << "ItemView Bounding Box BottomLeft=" << itemView.boundingBoxBottomLeft.x() << "/" << itemView.boundingBoxBottomLeft.y()
                       << " boundingBoxTopRight=" << itemView.boundingBoxTopRight.x() << "/" << itemView.boundingBoxTopRight.y();
 
 #if QT_VERSION < QT_VERSION_CHECK(5,10,0)
@@ -573,7 +573,7 @@ bool HandlerMineAreas::intersectsBoundingBoxCheck(const CentralEffectSimulation:
 #else
   result =  itemView.boundingBox.intersects(stepPoly);
 #endif
-  DEBUG_LOG() << "HandlerMineAreas::intersectsBoundingBoxCheck result =" << result;
+  DEBUG_LOG(m_logger) << "HandlerMineAreas::intersectsBoundingBoxCheck result =" << result;
   return result;
 
 }
@@ -594,7 +594,7 @@ bool HandlerMineAreas::inBoundingBoxCheck(const CentralEffectSimulation::AesItem
   QPointF boundingBoxBottomLeft = QPointF(boundingBoxBottomLeftX, boundingBoxBottomLeftY);
   QPointF boundingBoxTopRight = QPointF(boundingBoxTopRightX, boundingBoxTopRightY);
 
-  DEBUG_LOG() << " impactRadius=" << impactRadius
+  DEBUG_LOG(m_logger) << " impactRadius=" << impactRadius
                       << " itemView.boundingBoxBottomLeft" << itemView.boundingBoxBottomLeft.x() << "/" << itemView.boundingBoxBottomLeft.y()
                       << " itemView.boundingBoxTopRight" << itemView.boundingBoxTopRight.x() << "/" << itemView.boundingBoxTopRight.y()
                       << " boundingBoxBottomLeft=" << boundingBoxBottomLeft.x() << "/" <<  boundingBoxBottomLeft.y()
@@ -608,11 +608,11 @@ bool HandlerMineAreas::inBoundingBoxCheck(const CentralEffectSimulation::AesItem
   const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantPosition.pos(), itemView.zone);
   if (boundingBoxImpact.contains(participantPosUtmPoint))
   {
-    DEBUG_LOG() << "inBoundingBoxCheck Paricipant " << participantPosition.participantId()
+    DEBUG_LOG(m_logger) << "inBoundingBoxCheck Paricipant " << participantPosition.participantId()
                         << " inside AesItemView:" << itemView.aesItemId << " return true";
     return true;
   }
-  DEBUG_LOG() << "inBoundingBoxCheck Paricipant " << participantPosition.participantId()
+  DEBUG_LOG(m_logger) << "inBoundingBoxCheck Paricipant " << participantPosition.participantId()
                       << " outside AesItemView:" << itemView.aesItemId << " return false";
   return false;
 }
@@ -623,14 +623,14 @@ bool HandlerMineAreas::inFormCheck(const CentralEffectSimulation::AesItemViewUtm
 {
 
   const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantPosition.pos(), itemView.zone);
-  DEBUG_LOG() << "inFormCheck start, paricipantId: " << participantPosition.participantId()
+  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() << "inside AES form, paricipantId: " << participantPosition.participantId()
+    DEBUG_LOG(m_logger) << "inside AES form, paricipantId: " << participantPosition.participantId()
                         << ", aesItemId: " << itemView.aesItemId;
     return true;
   } // if inside
@@ -644,7 +644,7 @@ bool HandlerMineAreas::intersectFormCheck(const CentralEffectSimulation::AesItem
 {
   const QPolygonF utmStep = m_handlerParticipant->getParticipantStep(participantId, itemView.zone);
 
-  DEBUG_LOG() << "intersectFormCheck start, paricipantId: " << participantId
+  DEBUG_LOG(m_logger) << "intersectFormCheck start, paricipantId: " << participantId
                       << ", aesItemId: " << itemView.aesItemId
                       << ", aesTypeId: " << itemView.aesTypeId
                       << ", form.size: " << itemView.form.size();
@@ -655,7 +655,7 @@ bool HandlerMineAreas::intersectFormCheck(const CentralEffectSimulation::AesItem
   if (itemView.form.intersects(utmStep))
 #endif
   {
-    DEBUG_LOG() << "intersect AES form, paricipantId: " << participantId
+    DEBUG_LOG(m_logger) << "intersect AES form, paricipantId: " << participantId
                         << ", aesItemId: " << itemView.aesItemId;
     return true;
   } // if inside
@@ -669,7 +669,7 @@ void HandlerMineAreas::onTriggeredImpactsChanged(const AreaEffectSimulation::Tri
       modType != DataModification::eModified)
     return;
 
-  DEBUG_LOG() << "Got TriggeredImpacts: ";
+  DEBUG_LOG(m_logger) << "Got TriggeredImpacts: ";
   switch (data.aesTypeId().underlying())
   {
   case AreaEffectSimulation::AesType_def::AtExplosionArea:
@@ -702,7 +702,7 @@ void HandlerMineAreas::calculateImpacts(const AreaEffectSimulation::TriggeredImp
   auto it = m_aesItemViews.find(data.aesItemId());
   if (it == m_aesItemViews.end())
   {
-    WARNING_LOG() << "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;
@@ -729,7 +729,7 @@ void HandlerMineAreas::calculateImpacts(const AreaEffectSimulation::TriggeredImp
     // already checked (bit is already 0)
     if (!LtsUtils::BitArray::testBit(aesItemView.handledImpacts, bitFieldIdx))
       continue;
-    DEBUG_LOG() << "New impact at idx " << bitFieldIdx;
+    DEBUG_LOG(m_logger) << "New impact at idx " << bitFieldIdx;
     bitsToCheck += bitFieldIdx;
   }
 
@@ -740,7 +740,7 @@ void HandlerMineAreas::calculateImpacts(const AreaEffectSimulation::TriggeredImp
   const auto participantPositions = m_handlerParticipant->positions();
   for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : participantPositions)
   {
-    DEBUG_LOG() << "pos participantId=" << pPos.participantId()
+    DEBUG_LOG(m_logger) << "pos participantId=" << pPos.participantId()
                          << " buildingId=" << pPos.buildingId()
                          << " insideBuilding=" << pPos.insideBuilding()
                          << " positionValid=" << pPos.positionValid;
@@ -787,24 +787,24 @@ void HandlerMineAreas::sendCesHitRequest(const CentralEffectSimulation::AesItemV
 {
   int remaining = m_ddsHandler->remainingTasCode(itemView.chargeStruct);
 
-  DEBUG_LOG() << "sendCesHitRequest "
+  DEBUG_LOG(m_logger) << "sendCesHitRequest "
                       << " insideWlsArea=" << std::boolalpha << participantPosition.insideWlsArea()
                       << " participantId=" << participantPosition.participantId();
   const int equipNo = m_ddsHandler->participantId2EquipNo(participantPosition.participantId());
-  DEBUG_LOG() << " ftc sendCESHit to Participant participantId = " << 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)
   {
-    DEBUG_LOG() << "participantPosition.participantId != 0 && equipNo <= 0" ;
+    DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 && equipNo <= 0" ;
     return;
   }
   if (participantPosition.participantId() != 0 &&
       participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill)
   {
-    DEBUG_LOG() << "participantPosition.participantId != 0 CatastrophicKill)";
+    DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 CatastrophicKill)";
     return;
   }
 
@@ -831,13 +831,13 @@ void HandlerMineAreas::sendCesHitRequest(const CentralEffectSimulation::AesItemV
     itemView.partyId,               // originPartyId
     mineFieldBitIndex
   );
-  DEBUG_LOG() << " participantId=" << participantPosition.participantId()
+  DEBUG_LOG(m_logger) << " participantId=" << participantPosition.participantId()
                        << " chargeTypeId=" << itemView.chargeStruct.chargeTypeId();
 
   m_sendCesHitRequestQueue.enqueue(requestTab);
   if (m_sendCesHitRequestQueue.size() == 1)
   {
-    DEBUG_LOG() << "SendCesHitRequest: " << requestTab;
+    DEBUG_LOG(m_logger) << "SendCesHitRequest: " << requestTab;
     m_ddsHandler->ftcTab()->sendCesHitRequest(requestTab, this);
   }
 }
@@ -851,25 +851,25 @@ void HandlerMineAreas::sendCesHitRequest(const AreaEffectSimulation::AesItemView
 
   int32_t legacyChargeTypeId = 0;
   legacyChargeTypeId =  m_ddsHandler->getLegacyIdFromChargeTypeId(itemView.chargeStruct());
-  DEBUG_LOG() << "sendCesHitRequest"
+  DEBUG_LOG(m_logger) << "sendCesHitRequest"
                       << " insideWlsArea=" << std::boolalpha << participantPosition.insideWlsArea()
                       << " participantId=" << participantPosition.participantId();
 
   const int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantPosition.participantId());
-  DEBUG_LOG() << " ftc sendCESHit to Participant participantId = " << 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)
   {
-    DEBUG_LOG() << "participantPosition.participantId != 0 && equipNo <= 0" ;
+    DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 && equipNo <= 0" ;
     return;
   } // if
 
   if (participantPosition.participantId() != 0 &&
       participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill)
   {
-    DEBUG_LOG() << "participantPosition.participantId != 0 CatastrophicKill)";
+    DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 CatastrophicKill)";
     return;
   } // if
 
@@ -885,13 +885,13 @@ void HandlerMineAreas::sendCesHitRequest(const AreaEffectSimulation::AesItemView
     equipmentNumber, participantPosition.participantId(), legacyChargeTypeId, itemView.aesItemId(), originatorEquipmentNumber,
     remaining, pos, effectTime, eventType, itemView.partyId().get(), mineFieldBitIndex
   );
-  DEBUG_LOG() << " participantId=" << participantPosition.participantId() << " chargeTypeId=" << itemView.chargeStruct().chargeTypeId()
+  DEBUG_LOG(m_logger) << " participantId=" << participantPosition.participantId() << " chargeTypeId=" << itemView.chargeStruct().chargeTypeId()
                       << " legacyChargeTypeId=" << legacyChargeTypeId;
 
   m_sendCesHitRequestQueue.enqueue(requestTab);
   if (m_sendCesHitRequestQueue.size() == 1)
   {
-    DEBUG_LOG() << "SendCesHitRequest: " << requestTab;
+    DEBUG_LOG(m_logger) << "SendCesHitRequest: " << requestTab;
     m_ddsHandler->ftcTab()->sendCesHitRequest(requestTab, this);
   } // if
 }
@@ -938,7 +938,7 @@ void HandlerMineAreas::sendParticipantEvent(const CentralEffectSimulation::AesIt
 {
 
 
-  DEBUG_LOG() << "sendParticipantEvent " << itemView.aesItemId
+  DEBUG_LOG(m_logger) << "sendParticipantEvent " << itemView.aesItemId
                       << " participantId=" << participantPosition.participantId()
                       << " eventType=" << eventType
                       << " pos=" << participantPosition.pos().lat()
@@ -977,7 +977,7 @@ void HandlerMineAreas::sendFtcMineTrigger(int aesItemId, int mineIndex)
   tr.mineAreaId(aesItemId);
   tr.mineId(mineIndex);
   tr.chargeTypeId(ma.chargeStruct().chargeTypeId());
-  DEBUG_LOG()  << "send  sendFtcMineTrigger: aesItemId=" << tr.mineAreaId()
+  DEBUG_LOG(m_logger)  << "send  sendFtcMineTrigger: aesItemId=" << tr.mineAreaId()
                        << " MineIndex=" << tr.mineId();
   ftcAes->mineTriggeredRequest(tr, this);
 }
@@ -988,7 +988,7 @@ void HandlerMineAreas::sendEffectTypeEvent(const CentralEffectSimulation::AesIte
                                            int mineFieldBitIndex,
                                            qint64 effectTime)
 {
-  DEBUG_LOG() << "sendEffectTypeEvent aesItemId=" << itemView.aesItemId
+  DEBUG_LOG(m_logger) << "sendEffectTypeEvent aesItemId=" << itemView.aesItemId
                       << " participantId=" << participantPosition.participantId()
                       << " effectType=" << effectTime
                       << " mineFieldBitIndex=" << mineFieldBitIndex;
@@ -1000,7 +1000,7 @@ void HandlerMineAreas::sendEffectTypeEvent(const CentralEffectSimulation::AesIte
   if (mineFieldBitIndex >= 0)
     mfb = ", mineFieldBitIndex: " + QByteArray::number(mineFieldBitIndex);
   const int ctasEffectType = static_cast<int>(effectType) & 0xffff;
-  DEBUG_LOG() << "Sending EffectType event " << toString(effectType)
+  DEBUG_LOG(m_logger) << "Sending EffectType event " << toString(effectType)
                       << ", participant: " << participantPosition.participantId()
                       << ", aesItemId: " << itemView.aesItemId
                       << mfb
@@ -1039,7 +1039,7 @@ qreal HandlerMineAreas::crossCircle(const QPointF &centerUtm, const double radiu
     QLineF line;
     line.setP1(stepPoly[0]);
     line.setP2(centerUtm);
-    DEBUG_LOG() << "crossCircle distance =" << line.length();
+    DEBUG_LOG(m_logger) << "crossCircle distance =" << line.length();
     return line.length();
   }
   return result;
@@ -1051,13 +1051,13 @@ bool HandlerMineAreas::inCircle(const QPointF &centerUtm, const double radius, c
 {
   double squareDist = CentralEffectSimulation::getSquareDistance(centerUtm, pointUtm);
   double squareRadius = radius * radius;
-  DEBUG_LOG() << "squareDist: " << squareDist << ", squareRadius: " << squareRadius;
+  DEBUG_LOG(m_logger) << "squareDist: " << squareDist << ", squareRadius: " << squareRadius;
   return (squareDist < squareRadius);
 } // inCircle
 
 void HandlerMineAreas::aesItemViewRemoved(int aesItemId)
 {
-  DEBUG_LOG() << "HandlerMineAreas::aesItemViewRemoved aesItemId=" << aesItemId;
+  DEBUG_LOG(m_logger) << "HandlerMineAreas::aesItemViewRemoved aesItemId=" << aesItemId;
 
   m_effectTypeStates.remove(aesItemId);
   m_effectTypeBitFieldIndexes.remove(aesItemId);
@@ -1072,7 +1072,7 @@ void HandlerMineAreas::printAesItemViews()
   while (i.hasNext())
   {
     i.next();
-    DEBUG_LOG() << "printAesItemViews key=" << i.key() << ": "
+    DEBUG_LOG(m_logger) << "printAesItemViews key=" << i.key() << ": "
                         << " aesItemId=" << i.value().aesItemId
                         << " aesTypeId=" << i.value().aesTypeId;
   }
@@ -1088,7 +1088,7 @@ bool HandlerMineAreas::inExtededFormCheck(const CentralEffectSimulation::AesItem
   ///////////////////////////////////////////////////////////
   // Check whether the position is within an expanded form //
   ///////////////////////////////////////////////////////////
-  DEBUG_LOG() << "itemView.form.size=" << itemView.form.size();
+  DEBUG_LOG(m_logger) << "itemView.form.size=" << itemView.form.size();
   for (int i = 0; i < itemView.form.size() ; i++)
   {
     int nextPoint = i + 1;
@@ -1098,17 +1098,17 @@ bool HandlerMineAreas::inExtededFormCheck(const CentralEffectSimulation::AesItem
     const QPointF l1(itemView.form[i].x(), itemView.form[i].y());
     const QPointF l2(itemView.form[nextPoint].x(), itemView.form[nextPoint].y());
     double distancePointLineValue = distancePointLine(participantPosUtmPoint, l1, l2);
-    DEBUG_LOG() << "distancePointLineValue=" << distancePointLineValue
+    DEBUG_LOG(m_logger) << "distancePointLineValue=" << distancePointLineValue
                         << " ParticipantPos =" << participantPosUtmPoint.x() << "/" << participantPosUtmPoint.y()
                         << " Line=" << l1.x() << "/" << l1.y()
                         << "   " << l2.x() << "/" << l2.y();
     if (distancePointLineValue < distance)
     {
-      DEBUG_LOG() << "posInExtendedForm return true";
+      DEBUG_LOG(m_logger) << "posInExtendedForm return true";
       return true;
     }
   }
-  DEBUG_LOG() << "posInExtendedForm return false";
+  DEBUG_LOG(m_logger) << "posInExtendedForm return false";
   return false;
 }
 
@@ -1126,7 +1126,7 @@ double HandlerMineAreas::distancePointLine(const QPointF &p, const QPointF &l1,
     qreal length2 = pToP2.length();
     if (length1 < length2)
     {
-      DEBUG_LOG() << "a distancePointLine p=" << p.x() << "/" << p.y()
+      DEBUG_LOG(m_logger) << "a distancePointLine p=" << p.x() << "/" << p.y()
                           << " line: p1=" << l1.x() << "/" << l1.y()
                           << " p2=" << l2.x() << "/" << l2.y()
                           << " distance=" << length1
@@ -1135,7 +1135,7 @@ double HandlerMineAreas::distancePointLine(const QPointF &p, const QPointF &l1,
     }
     else
     {
-      DEBUG_LOG() << "b distancePointLine p=" << p.x() << "/" << p.y()
+      DEBUG_LOG(m_logger) << "b distancePointLine p=" << p.x() << "/" << p.y()
                           << " line: p1=" << l1.x() << "/" << l1.y()
                           << " p2=" << l2.x() << "/" << l2.y()
                           << " distance=" << length2
@@ -1149,7 +1149,7 @@ double HandlerMineAreas::distancePointLine(const QPointF &p, const QPointF &l1,
 
   /*  double distance = sqrt(squareLen(p, intersectPnt));
 
-    DEBUG_LOG() << "c distancePointLine p=" << p.x() << "/" << p.y()
+    DEBUG_LOG(m_logger) << "c distancePointLine p=" << p.x() << "/" << p.y()
                         << " line: p1=" << l1.x() << "/" << l1.y()
                         << " p2=" << l2.x() << "/" << l2.y()
                         << " distance=" << distance;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/plugin.cpp
index c9d6aa97d..5ada233dd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/plugin.cpp
@@ -48,7 +48,7 @@ bool CesMineAreasInterfaceImpl::init(int domainId, int exerciseId)
 {
   m_domainId = domainId;
   m_exerciseId = exerciseId;
-  INFO_LOG() << "CesMineAreasInterfaceImpl::init()"
+  INFO_LOG(m_logger) << "CesMineAreasInterfaceImpl::init()"
                      << " m_domainId=" << m_domainId
                      << " m_exerciseId=" << m_exerciseId;
 
@@ -59,11 +59,11 @@ bool CesMineAreasInterfaceImpl::init(int domainId, int exerciseId)
 
   if (!m_handlerMineAreas->init())
   {
-    ERROR_LOG() << "Initialisation handlerMineAreas failed.";
+    ERROR_LOG(m_logger) << "Initialisation handlerMineAreas failed.";
     return false;
   }
 
-  INFO_LOG() << "CesMineAreasInterfaceImpl::init() return true";
+  INFO_LOG(m_logger) << "CesMineAreasInterfaceImpl::init() return true";
   return true;
 }
 
@@ -71,8 +71,8 @@ QString CesMineAreasInterfaceImpl::echo(const QString &message)
 {
 
   QString ret(QStringLiteral("<<<< %1 >>>> CesMineAreasInterfaceImpl::echo").arg(message));
-  INFO_LOG() << "CesMineAreasInterfaceImpl::echo return:" << ret;
-  DEBUG_LOG() << "DEBUG: CesMineAreasInterfaceImpl::echo return:" << ret;
+  INFO_LOG(m_logger) << "CesMineAreasInterfaceImpl::echo return:" << ret;
+  DEBUG_LOG(m_logger) << "DEBUG: CesMineAreasInterfaceImpl::echo return:" << ret;
   return ret;
 }
 
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 ace9a753e..cabf4d7ca 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
@@ -23,16 +23,16 @@ HandlerMineLayingArtillery::HandlerMineLayingArtillery(const std::shared_ptr<Cen
     , m_ddsHandler(ddsHandler)
     , m_logger(CentralEffectSimulation::getLogger("Plugin.MineLayingArtillery.HandlerMineLayingArtillery"))
 {
-  INFO_LOG() << "HandlerMineLayingArtillery::HandlerMineLayingArtillery";
+  INFO_LOG(m_logger) << "HandlerMineLayingArtillery::HandlerMineLayingArtillery";
 
   m_effectClusterTimer->setInterval(500);
 }
 
-HandlerMineLayingArtillery::~HandlerMineLayingArtillery() { INFO_LOG() << "HandlerMineLayingArtillery::~HandlerMineLayingArtillery"; }
+HandlerMineLayingArtillery::~HandlerMineLayingArtillery() { INFO_LOG(m_logger) << "HandlerMineLayingArtillery::~HandlerMineLayingArtillery"; }
 
 bool HandlerMineLayingArtillery::init()
 {
-  INFO_LOG() << "HandlerMineLayingArtillery::init";
+  INFO_LOG(m_logger) << "HandlerMineLayingArtillery::init";
 
   m_dtcAes = m_ddsHandler->dtcAes();
   m_ftcAes = m_ddsHandler->ftcAes();
@@ -87,7 +87,7 @@ std::vector<AreaEffectSimulation::MineData> HandlerMineLayingArtillery::calculat
   const double armingTimeOffset = mineLayingPattern[QStringLiteral("armingTimeOffset")].toDouble();
   const double armingJitter = mineLayingPattern[QStringLiteral("armingJitter")].toDouble();
 
-  DEBUG_LOG() << "[calculateImpacts] ## \n\tappearanceTimeOffset: " << appearanceTimeOffset << "\n\tappearanceJitter: " << appearanceJitter << "\n\tarmingTimeOffset: " << armingTimeOffset<<"\n\ttime: "<<time;
+  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()));
 
@@ -117,7 +117,7 @@ std::vector<AreaEffectSimulation::MineData> HandlerMineLayingArtillery::calculat
     const double appearenceTime = time + appearanceTimeOffset + QRandomGenerator::global()->bounded(0, appearanceJitter * 2) - appearanceJitter;
     const double armingTime = time + armingTimeOffset + QRandomGenerator::global()->bounded(0, armingJitter * 2) - armingJitter;
 
-    DEBUG_LOG() <<"[calculateImpacts] patternCount: "<<patternCounter<< " appearenceTime: " << appearenceTime << " armingTime: " << armingTime;
+    DEBUG_LOG(m_logger) <<"[calculateImpacts] patternCount: "<<patternCounter<< " appearenceTime: " << appearenceTime << " armingTime: " << armingTime;
 
     mineData.position(Core::GeoPosition2D(transformedImpactPosition.x(), transformedImpactPosition.y()));
     mineData.appearenceTime(appearenceTime);
@@ -126,7 +126,7 @@ std::vector<AreaEffectSimulation::MineData> HandlerMineLayingArtillery::calculat
     transformedImpacts.push_back(mineData);
   }
 
-  DEBUG_LOG()<<"[calculateImpacts] ### pattern patterCount:  "<< patternCounter <<" patternsArray.size(): "<<patternsArray.size();
+  DEBUG_LOG(m_logger)<<"[calculateImpacts] ### pattern patterCount:  "<< patternCounter <<" patternsArray.size(): "<<patternsArray.size();
 
   return transformedImpacts;
 }
@@ -155,7 +155,7 @@ void HandlerMineLayingArtillery::onChargeTypeChanged(const ProjectDataManagement
 void HandlerMineLayingArtillery::onChargeEffectModifyReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    ERROR_LOG()<<"[CES ChargeEffectModifyReply]: "<<replyObject.str();
+    ERROR_LOG(m_logger)<<"[CES ChargeEffectModifyReply]: "<<replyObject.str();
 }
 
 void HandlerMineLayingArtillery::onEffectClusterTimerTimeout()
@@ -185,11 +185,11 @@ void HandlerMineLayingArtillery::onEffectClusterTimerTimeout()
   const QJsonObject &mineLayingProperties = m_mineLayingChargeTypes[chargeTypeId];
   const int mineChargeTypeId = mineLayingProperties[QStringLiteral("mineChargeTypeId")].toInt();
   AreaEffectSimulation::EffectCluster ec = m_dtcAes->effectCluster(chargeEffect.originatorId());
-  DEBUG_LOG()<<" [onChargeEffectChanged]  effectClusterId: "<<ec.id()<<" mineChargeTypeId: "<<mineChargeTypeId;
+  DEBUG_LOG(m_logger)<<" [onChargeEffectChanged]  effectClusterId: "<<ec.id()<<" mineChargeTypeId: "<<mineChargeTypeId;
 
   if (mineChargeTypeId <= 0)
   {
-    ERROR_LOG()<<" [onChargeEffectChanged]  mineChargeTypeId invalid!!! chargeEffectId: "<<chargeEffectId;
+    ERROR_LOG(m_logger)<<" [onChargeEffectChanged]  mineChargeTypeId invalid!!! chargeEffectId: "<<chargeEffectId;
     return;
   }
 
@@ -221,7 +221,7 @@ void HandlerMineLayingArtillery::onEffectClusterTimerTimeout()
     request.effectDurationMsec(chargeEffectPropsObj[QStringLiteral("effectDurationMsec")].toInt(3 * 60 * 60 * 1000));
 
     const int ret = m_ftcAes->mineAreaReferenceModifyRequest(request);
-    DEBUG_LOG()<<"[onChargeEffectChanged] ****** mineAreaReferenceModifyRequest \n\tret id: "<< ret
+    DEBUG_LOG(m_logger)<<"[onChargeEffectChanged] ****** mineAreaReferenceModifyRequest \n\tret id: "<< ret
                        << "\n\tchargeTypeId: " << chargeTypeId
                        << "\n\tchargeEffectId: " << chargeEffectId << "\n\ttrajectoryId: " << trajectory.id()
                        << "\n\tangle: " << angle << "\n\ttimeFromLastTrajectoryPointAbsolute: " << timeFromLastTrajectoryPointAbsolute;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineLayingArtillery/plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineLayingArtillery/plugin.cpp
index 4af715cf8..a95886ca5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineLayingArtillery/plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineLayingArtillery/plugin.cpp
@@ -35,8 +35,8 @@ MineLayingArtilleryPluginInterfaceImpl::MineLayingArtilleryPluginInterfaceImpl(C
 QString MineLayingArtilleryPluginInterfaceImpl::echo(const QString &message)
 {
   QString ret(QStringLiteral("<<<< %1 >>>> MineLayingArtilleryPluginInterfaceImpl::echo").arg(message));
-  INFO_LOG() << "MineLayingArtilleryPluginInterfaceImpl::echo return:" << ret;
-  DEBUG_LOG() << "DEBUG: MineLayingArtilleryPluginInterfaceImpl::echo return:" << ret;
+  INFO_LOG(m_logger) << "MineLayingArtilleryPluginInterfaceImpl::echo return:" << ret;
+  DEBUG_LOG(m_logger) << "DEBUG: MineLayingArtilleryPluginInterfaceImpl::echo return:" << ret;
   return ret;
 }
 
@@ -45,7 +45,7 @@ bool MineLayingArtilleryPluginInterfaceImpl::init(int domainId, int exerciseId)
   m_domainId = domainId;
   m_exerciseId = exerciseId;
 
-  INFO_LOG() << "MineLayingArtilleryPluginInterfaceImpl::init()"
+  INFO_LOG(m_logger) << "MineLayingArtilleryPluginInterfaceImpl::init()"
                      << " m_domainId=" << m_domainId << " m_exerciseId=" << m_exerciseId;
 
   // initialize handlerMineLayingArtillery
@@ -53,7 +53,7 @@ bool MineLayingArtilleryPluginInterfaceImpl::init(int domainId, int exerciseId)
 
   if (!m_handlerMineLayingArtillery->init())
   {
-    ERROR_LOG() << "Initialisation m_handlerMineLayingArtillery failed.";
+    ERROR_LOG(m_logger) << "Initialisation m_handlerMineLayingArtillery failed.";
     return false;
   }
 
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 11f801eba..c8660b765 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
@@ -65,7 +65,7 @@ bool CesMissionPlanHandler::init()
            this, &CesMissionPlanHandler::onMissionPlanChanged);
 
 
-  DEBUG_LOG() << " -- MissionPlanHandler::init() finished.";
+  DEBUG_LOG(m_logger) << " -- MissionPlanHandler::init() finished.";
   return true;
 }
 
@@ -80,11 +80,11 @@ void CesMissionPlanHandler::updateMissionPlanList(const ParticipantManagement::M
   }
 
   // check if mission start is in the future before proceeding..
-  DEBUG_LOG()<<" -- [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())
   {
-    WARNING_LOG() << " -- updateMissionPlanList mission startTime ("<<data.missionStart()<<") in the past ignore mission plan id: "<<data.id()
+    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;
   }
@@ -96,7 +96,7 @@ void CesMissionPlanHandler::updateMissionPlanList(const ParticipantManagement::M
   const int planId = obj->planId();
   std::function<void(void)> onDeleteObj = [this, planId]()
   {
-    DEBUG_LOG()<<" --  remove ces mission object from container planId: "<<planId;
+    DEBUG_LOG(m_logger)<<" --  remove ces mission object from container planId: "<<planId;
     m_missionPlanObjects.remove(planId);
   };
   connect(obj, &CesMissionPlanObject::destroyed, this, onDeleteObj);
@@ -107,7 +107,7 @@ void CesMissionPlanHandler::updateMissionPlanList(const ParticipantManagement::M
 void CesMissionPlanHandler::onUasChanged(const ParticipantManagement::UAS &data, DataModification modType)
 {
   Q_UNUSED(modType)
-  DEBUG_LOG()<<" -- 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_def::Manual && modType != DataModification::eRemoved)
@@ -127,7 +127,7 @@ void CesMissionPlanHandler::onUasChanged(const ParticipantManagement::UAS &data,
 
 void CesMissionPlanHandler::onMissionPlanChanged(const ParticipantManagement::MissionPlan &data, DataModification modType)
 {
-  DEBUG_LOG()<<" -- onMissionPlanChanged : missionPlanName: "<<data.name() << ", modType: " << (int)modType;
+  DEBUG_LOG(m_logger)<<" -- onMissionPlanChanged : missionPlanName: "<<data.name() << ", modType: " << (int)modType;
   if (data.id() <= 0)
     return;
   switch (modType)
@@ -159,11 +159,11 @@ bool CesMissionPlanHandler::isUasInAutoMode(int participantId)
 
   if (uas.id() < 1)
   {
-    ERROR_LOG() << "no uas for pid " << participantId;
+    ERROR_LOG(m_logger) << "no uas for pid " << participantId;
     return false;
   }
 
-  DEBUG_LOG() << "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().underlying();
 
   return (uas.uasState() == ProjectDataManagement::UasState::Auto);
 }
@@ -181,7 +181,7 @@ bool CesMissionPlanHandler::isUasCombatReady(int participantId)
   }
 
   //Current State
-  DEBUG_LOG() << "stateHistory count" << data.stateHistory().size();
+  DEBUG_LOG(m_logger) << "stateHistory count" << data.stateHistory().size();
   if (data.stateHistory().empty())
   {
     return false;
@@ -196,7 +196,7 @@ bool CesMissionPlanHandler::isUasCombatReady(int participantId)
   youngestState.stateTime(0);
   for (const auto &si : history)
   {
-    DEBUG_LOG() << "StateInformation "
+    DEBUG_LOG(m_logger) << "StateInformation "
                          << " time=" << si.stateTime()
                          << " vulnerabilityBits=" << si.vulnerabilityBits()
                          << " vulnerabilityKindId=" << si.vulnerabilityKindId();
@@ -212,7 +212,7 @@ void CesMissionPlanHandler::onSendNextMissionAction(const ParticipantManagement:
   auto missionPlan = m_missionPlanObjects.value(msa.planId(), nullptr);
   if (!missionPlan)
   {
-    DEBUG_LOG()<<" -- [SEND NEXT MISSION] Object not found. PlanId: "<<msa.planId();
+    DEBUG_LOG(m_logger)<<" -- [SEND NEXT MISSION] Object not found. PlanId: "<<msa.planId();
     return;
   }
 
@@ -223,7 +223,7 @@ void CesMissionPlanHandler::onSendNextMissionAction(const ParticipantManagement:
 
   if (!participant.equipmentNumber())
   {
-    ERROR_LOG() << "unable to send next mission action to uav without equipment number";
+    ERROR_LOG(m_logger) << "unable to send next mission action to uav without equipment number";
     return;
   }
 
@@ -232,7 +232,7 @@ void CesMissionPlanHandler::onSendNextMissionAction(const ParticipantManagement:
 
   if (!isUasInAutoMode(participantId))
   {
-    ERROR_LOG() << "unable to send next mission action to uav that is not in auto mode";
+    ERROR_LOG(m_logger) << "unable to send next mission action to uav that is not in auto mode";
     //TODO: fulfill all other missions or mark as incomplete
     return;
   }
@@ -240,7 +240,7 @@ void CesMissionPlanHandler::onSendNextMissionAction(const ParticipantManagement:
 
   if (!isUasCombatReady(participantId))
   {
-    ERROR_LOG() << "unable to send next mission action to uav that is not combat ready";
+    ERROR_LOG(m_logger) << "unable to send next mission action to uav that is not combat ready";
     //TODO: fulfill all other missions or mark as incomplete
     return;
   }
@@ -255,7 +255,7 @@ void CesMissionPlanHandler::onSendNextMissionAction(const ParticipantManagement:
   }
   catch (const std::exception &ex)
   {
-    ERROR_LOG() << "unable to send next mission action to uav: " << ex.what();
+    ERROR_LOG(m_logger) << "unable to send next mission action to uav: " << ex.what();
     return;
   }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_handler.h
index 1add76772..ca98ec577 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_handler.h
@@ -43,6 +43,7 @@ public:
   bool init();
   void updateMissionPlanList(const ParticipantManagement::MissionPlan &data);
 protected:
+  NGL::INGLLogger &m_logger;
   void sendNextMissionAction();
 private Q_SLOTS:
 
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 6049c2660..f0e8109ef 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
@@ -32,7 +32,7 @@ CesMissionPlanObject::CesMissionPlanObject(const ParticipantManagement::MissionP
   if (missionPlan.missionStart() > m_ddsHandler->currentPartitionTime())
   {
     const int time = m_missionPlan.missionStart() - m_ddsHandler->currentPartitionTime();
-    // DEBUG_LOG()<<" -- [CesMissionPlanObject] start mission after << "<<time/1000<<" sec.";
+    // DEBUG_LOG(m_logger)<<" -- [CesMissionPlanObject] start mission after << "<<time/1000<<" sec.";
     m_missionStartimer->start(time);
   }
 
@@ -51,7 +51,7 @@ void CesMissionPlanObject::setMissionActionFulfilled(const ParticipantManagement
   ///4- if no actions left send misson plan completed signal
   ///5- else send next mission action to TAB
 
-  //DEBUG_LOG()<<" -- [setMissionActionFullfiled] -> msa.number: "<<msa.actionNumber()<<" planId: "<<msa.planId();
+  //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)
   {
@@ -60,21 +60,21 @@ void CesMissionPlanObject::setMissionActionFulfilled(const ParticipantManagement
                                                                      -1,
                                                                      -1);
     if ( !m_ddsHandler->ftcPpm()->setMissionActionFulfilledRequest(abortReq))
-        WARNING_LOG() << " -- 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()) )
   {
-    //WARNING_LOG()<<" -- [setMissionActionFulfilled] item size invalid !!";
+    //WARNING_LOG(m_logger)<<" -- [setMissionActionFulfilled] item size invalid !!";
     return;
   }
 
   const int actionCount = m_missionPlan.items()[msa.itemNumber()].actions().size();
   if (msa.actionNumber() >= actionCount)
   {
-    //WARNING_LOG()<<" -- [setMissionActionFulfilled] actions size invalid !!";
+    //WARNING_LOG(m_logger)<<" -- [setMissionActionFulfilled] actions size invalid !!";
     return;
   }
 
@@ -87,7 +87,7 @@ void CesMissionPlanObject::setMissionActionFulfilled(const ParticipantManagement
   req.missionId(m_missionPlan.id());
 
   if (!m_ddsHandler->ftcPpm()->setMissionActionFulfilledRequest(req))
-    WARNING_LOG() << " -- unable to setMissionActionFulfilledRequest: planId:"<<req.missionId();
+    WARNING_LOG(m_logger) << " -- unable to setMissionActionFulfilledRequest: planId:"<<req.missionId();
 
 }
 
@@ -110,7 +110,7 @@ bool CesMissionPlanObject::isMissionFulfilled(const ParticipantManagement::Missi
     actionCount = 0;
     for (const auto &a : item.actions())
     {
-      //DEBUG_LOG()<<" -- [setMissionPlan] action.Num : "<<a.actionNumber()<<" itemNum: "<<a.itemNumber()<<" fulfilled: "<<a.fulfilled();
+      //DEBUG_LOG(m_logger)<<" -- [setMissionPlan] action.Num : "<<a.actionNumber()<<" itemNum: "<<a.itemNumber()<<" fulfilled: "<<a.fulfilled();
       if (a.fulfilled() > 0)
         actionCount++;
       else
@@ -130,7 +130,7 @@ void CesMissionPlanObject::sendActionAttact()
   //3- setActionFulfilled
   int ret = m_ddsHandler->ftcAes()->explosionClusterSingleEffectOnlyModifyRequest(getExplosionCluster());
   if (!ret)
-    WARNING_LOG()<<" -- sendActionAttact ret error for planId: "<<m_missionPlan.id();
+    WARNING_LOG(m_logger)<<" -- sendActionAttact ret error for planId: "<<m_missionPlan.id();
 
   setMissionActionFulfilled(getNextAction());
 }
@@ -177,12 +177,12 @@ void CesMissionPlanObject::sendNextMissionAction()
 
   ParticipantManagement::MissionAction action = getNextAction();
 
-  //DEBUG_LOG()<<" -- ########## ###### SEND NEXT ACTION ###### #############";
+  //DEBUG_LOG(m_logger)<<" -- ########## ###### SEND NEXT ACTION ###### #############";
 
   // set mission plan completed! or aborted
   if (isMissionFulfilled(m_missionPlan) || m_missionPlan.aborted())
   {
-    DEBUG_LOG()<<" -- [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;
   }
@@ -217,14 +217,14 @@ void CesMissionPlanObject::setMissionPlan(const ParticipantManagement::MissionPl
   m_missionPlan = plan;
   if (plan.missionStart() > m_ddsHandler->currentPartitionTime())
   {
-    //DEBUG_LOG()<<" -- [setMissionPlan] restart Timer for plan.id: "<<plan.id();
+    //DEBUG_LOG(m_logger)<<" -- [setMissionPlan] restart Timer for plan.id: "<<plan.id();
     m_missionStartimer->start(m_missionPlan.missionStart() - m_ddsHandler->currentPartitionTime());
     return;
   }  
 
   if (isMissionFulfilled(plan) || plan.aborted())
   {
-    DEBUG_LOG() << "setMissionPlan deleteMissionPlanObject";
+    DEBUG_LOG(m_logger) << "setMissionPlan deleteMissionPlanObject";
     deleteMissionPlanObject();
     return;
   }
@@ -240,7 +240,7 @@ ParticipantManagement::MissionPlan &CesMissionPlanObject::missionPlan()
 const ParticipantManagement::MissionAction CesMissionPlanObject::getNextAction()
 {
 
-  DEBUG_LOG()<<" -- [getNextAction]: planId: "<<m_missionPlan.id()<<" itemSize: "<<m_missionPlan.items().size();
+  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()); });
@@ -253,7 +253,7 @@ const ParticipantManagement::MissionAction CesMissionPlanObject::getNextAction()
       {
         continue;
       }
-      DEBUG_LOG()<<" -- [getNextActopm]mission with planId: " << m_missionPlan.id() << " // action_number " << msa.actionNumber()
+      DEBUG_LOG(m_logger)<<" -- [getNextActopm]mission with planId: " << m_missionPlan.id() << " // action_number " << msa.actionNumber()
                            << " // action_type " << msa.actionType();
 
       return msa;
@@ -277,7 +277,7 @@ void CesMissionPlanObject::setMissionCompleted()
   req.repeat(msp.repeat());
 
   if (!m_ddsHandler->ftcPpm()->modifyMissionPlanRequest(req))
-    ERROR_LOG()<<" -- couldn't modify mission plan ";
+    ERROR_LOG(m_logger)<<" -- couldn't modify mission plan ";
 
   // delete object object is connected with handler
   // it will be automatically removed from object list in handler
@@ -292,7 +292,7 @@ void CesMissionPlanObject::setMissionCompleted()
  */
 void CesMissionPlanObject::abortMission()
 {
-  DEBUG_LOG()<<" -- [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);
@@ -301,7 +301,7 @@ void CesMissionPlanObject::abortMission()
 
 void CesMissionPlanObject::deleteMissionPlanObject()
 {
-  DEBUG_LOG()<<" -- [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/MissionPlan/ces_mission_plan_object.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_object.h
index 29ff7d7e6..3d988a7fc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_object.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_object.h
@@ -36,6 +36,7 @@ public:
   int participantId() const; /// uas participantId
   bool isMissionFulfilled(const ParticipantManagement::MissionPlan &mission);
 protected:
+  NGL::INGLLogger &m_logger;
   void sendActionAttact();
   AreaEffectSimulation::ExplosionClusterSingleEffectOnlyRequest getExplosionCluster();
   ParticipantManagement::MissionPlan &missionPlan();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/plugin.cpp
index 70ee99fb7..8b3f55190 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/plugin.cpp
@@ -36,7 +36,7 @@ CES_MissionPlanInterfaceImpl::CES_MissionPlanInterfaceImpl(CentralEffectSimulati
 {
   Q_UNUSED(settings)
 
-  ERROR_LOG() << " >>> constructor CES_MissionPlanInterfaceImpl";
+  ERROR_LOG(m_logger) << " >>> constructor CES_MissionPlanInterfaceImpl";
 }
 
 CES_MissionPlanInterfaceImpl::~CES_MissionPlanInterfaceImpl()
@@ -49,7 +49,7 @@ bool CES_MissionPlanInterfaceImpl::init(int domainId, int exerciseId)
 {
   m_domainId = domainId;
   m_exerciseId = exerciseId;
-  ERROR_LOG() << "CES_MissionPlanInterfaceImpl::init()"
+  ERROR_LOG(m_logger) << "CES_MissionPlanInterfaceImpl::init()"
                      << " m_domainId=" << m_domainId
                      << " m_exerciseId=" << m_exerciseId;
 
@@ -62,11 +62,11 @@ bool CES_MissionPlanInterfaceImpl::init(int domainId, int exerciseId)
 
   if (!m_missionPlanHandler->init())
   {
-    ERROR_LOG() << "Initialisation m_handlerFunctionalArea failed.";
+    ERROR_LOG(m_logger) << "Initialisation m_handlerFunctionalArea failed.";
     return false;
   }
 
-  INFO_LOG() << "CES_MissionPlanInterfaceImpl::init() return true";
+  INFO_LOG(m_logger) << "CES_MissionPlanInterfaceImpl::init() return true";
   return true;
 }
 
@@ -74,8 +74,8 @@ QString CES_MissionPlanInterfaceImpl::echo(const QString &message)
 {
 
   QString ret(QStringLiteral("<<<< %1 >>>> CES_MissionPlanInterfaceImpl::echo").arg(message));
-  INFO_LOG() << "CES_MissionPlanInterfaceImpl::echo return:" << ret;
-  DEBUG_LOG() << "DEBUG: CES_MissionPlanInterfaceImpl::echo return:" << ret;
+  INFO_LOG(m_logger) << "CES_MissionPlanInterfaceImpl::echo return:" << ret;
+  DEBUG_LOG(m_logger) << "DEBUG: CES_MissionPlanInterfaceImpl::echo return:" << ret;
   return ret;
 }
 
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 1c4f26524..5f7425674 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
@@ -133,28 +133,28 @@ bool HandlerNBC::init()
       return false;
   }
 
-  INFO_LOG() << "HandlerParticipantArea::init() finished.";
+  INFO_LOG(m_logger) << "HandlerParticipantArea::init() finished.";
   return true;
 } // end of init()
 //-----------------------------------------------------------------------------
 
 void HandlerNBC::onSendCesHitReply(const Core::FunctionReplyObject &replyObject)
 {
-  DEBUG_LOG() << "onSendCesHitReply for id " << replyObject.id() << " success= " << replyObject.error();
+  DEBUG_LOG(m_logger) << "onSendCesHitReply for id " << replyObject.id() << " success= " << replyObject.error();
 
   if (replyObject.error())
-    WARNING_LOG() << "Can not send enter/leave Area to participant in training area: " << replyObject();
+    WARNING_LOG(m_logger) << "Can not send enter/leave Area to participant in training area: " << replyObject();
 
   // Send next Request, if available
   if (!m_sendCesHitRequestQueue.isEmpty())
   {
-    DEBUG_LOG() << "m_sendCesAreaActionRequestQueue.size()=" << m_sendCesHitRequestQueue.size();
+    DEBUG_LOG(m_logger) << "m_sendCesAreaActionRequestQueue.size()=" << m_sendCesHitRequestQueue.size();
     m_sendCesHitRequestQueue.dequeue();
     // Send next Message
     if (!m_sendCesHitRequestQueue.isEmpty())
     {
       const auto &hr = m_sendCesHitRequestQueue.head();
-      DEBUG_LOG() << "sendCesHitRequest: " << hr;
+      DEBUG_LOG(m_logger) << "sendCesHitRequest: " << hr;
       m_ddsHandler->ftcTab()->sendCesHitRequest(hr, this);
     }
   }
@@ -170,7 +170,7 @@ void HandlerNBC::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &d
   double upperOffset = 0;
   double lowerOffset = 0;
   bool offsetIsSet = false;
-  TRACE_LOG() << "onAesItemViewChanged"
+  TRACE_LOG(m_logger) << "onAesItemViewChanged"
                       << " aesItemId=" << data.aesItemId();
 
 
@@ -190,7 +190,7 @@ void HandlerNBC::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &d
     const AreaEffectSimulation::BCContamination &bc = m_ddsHandler->dtcAes()->bCContamination(data.aesItemId());
     if (!bc.isCentral())
     {
-      DEBUG_LOG() << "!Central BCContamination id: " << aesItemId;
+      DEBUG_LOG(m_logger) << "!Central BCContamination id: " << aesItemId;
       return;
     }
     offsetIsSet = true;
@@ -202,7 +202,7 @@ void HandlerNBC::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &d
     const AreaEffectSimulation::DangerArea &da = m_ddsHandler->dtcAes()->dangerArea(data.aesItemId());
     if (!da.isCentral())
     {
-      DEBUG_LOG() << "!Central DangerArea id: " << aesItemId;
+      DEBUG_LOG(m_logger) << "!Central DangerArea id: " << aesItemId;
       return;
     }
   }
@@ -211,20 +211,20 @@ void HandlerNBC::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &d
     const AreaEffectSimulation::NContamination &nc = m_ddsHandler->dtcAes()->nContamination(data.aesItemId());
     if (!nc.isCentral())
     {
-      DEBUG_LOG() << "!Central NContamination id: " << aesItemId;
+      DEBUG_LOG(m_logger) << "!Central NContamination id: " << aesItemId;
       return;
     }
   }
 
 
-  TRACE_LOG() << "Got AesItemView id: " << aesItemId
+  TRACE_LOG(m_logger) << "Got AesItemView id: " << aesItemId
                       << ", type: " << data.aesTypeId()
                       << ", effectState: " << data.effectStateId()
                       << ", modType: " << modType;
 
 
   const double impactRadius = m_ddsHandler->chargeTypeRadius(data.chargeStruct());
-  DEBUG_LOG() << "impactRadius=" << impactRadius;
+  DEBUG_LOG(m_logger) << "impactRadius=" << impactRadius;
   switch (effectState.underlying())
   {
   case AreaEffectSimulation::AesEffectState_def::EsPrepared:
@@ -271,13 +271,13 @@ void HandlerNBC::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &d
       // if new field for this participant send sendCesHitRequest
       calculateBcContamination(aesItemViewUtm);
       m_aesItemViews.insert(data.aesItemId(), aesItemViewUtm);
-//      DEBUG_LOG() << "insert AtBCContamination oder AtNContamination AesItemView id: " << aesItemId
+//      DEBUG_LOG(m_logger) << "insert AtBCContamination oder AtNContamination AesItemView id: " << aesItemId
 //                          << ", type: " << data.aesTypeId();
       break;
     case AreaEffectSimulation::AesType_def::AtDangerArea:
       calculateDangerArea(aesItemViewUtm);
       m_aesItemViews.insert(data.aesItemId(), aesItemViewUtm);
-      DEBUG_LOG() << "insert AtDangerArea AesItemView id: " << aesItemId
+      DEBUG_LOG(m_logger) << "insert AtDangerArea AesItemView id: " << aesItemId
                           << ", type: " << data.aesTypeId();
       break;
     default:
@@ -336,7 +336,7 @@ void HandlerNBC::onBCContaminationChanged(const AreaEffectSimulation::BCContamin
 void HandlerNBC::onNContaminationChanged(const AreaEffectSimulation::NContamination &data, DataModification modType)
 {
 
-  DEBUG_LOG() << "onNContaminationChanged"
+  DEBUG_LOG(m_logger) << "onNContaminationChanged"
                       << " id=" << data.id();
   switch (modType)
   {
@@ -359,7 +359,7 @@ void HandlerNBC::onNContaminationChanged(const AreaEffectSimulation::NContaminat
       {
         if (m_handlerParticipant->isOutdated(participantPos))
           continue;
-        DEBUG_LOG() << "onNContaminationChanged participantId=" << participantPos.participantId()
+        DEBUG_LOG(m_logger) << "onNContaminationChanged participantId=" << participantPos.participantId()
                             << "  insideBuilding=" << participantPos.insideBuilding()
                             << " buildingId=" << participantPos.buildingId();
 
@@ -368,7 +368,7 @@ void HandlerNBC::onNContaminationChanged(const AreaEffectSimulation::NContaminat
 
         const EffectType effectType = CES_NBC::EffectType::NContaminationDetonation;
         const int ctasEffectType = static_cast<int>(effectType) & 0xffff;
-        DEBUG_LOG() << "onNContaminationChanged isInCircle=" << isInCircle
+        DEBUG_LOG(m_logger) << "onNContaminationChanged isInCircle=" << isInCircle
                             << " aesItemId=" << data.id();
         if ( isInCircle)
         {
@@ -389,7 +389,7 @@ void HandlerNBC::onNContaminationChanged(const AreaEffectSimulation::NContaminat
           m_effectTypeStates.insert(data.id(), effectTypeStatesFromAesItem);
 
 
-          DEBUG_LOG() << "m_participantAes.insert  participantId=" << participantPos.participantId()
+          DEBUG_LOG(m_logger) << "m_participantAes.insert  participantId=" << participantPos.participantId()
                                << " aesId=" << data.id();
         sendCesHitRequest(ref,
                           participantPos,
@@ -410,13 +410,13 @@ void HandlerNBC::onNContaminationChanged(const AreaEffectSimulation::NContaminat
 
 void HandlerNBC::calculateBcContamination(const CentralEffectSimulation::AesItemViewUtm &itemView)
 {
-  TRACE_LOG() << "HandlerParticipantArea::calculateBcContamination aesItemId =" << itemView.aesItemId;
+  TRACE_LOG(m_logger) << "HandlerParticipantArea::calculateBcContamination aesItemId =" << itemView.aesItemId;
   const auto participantsMap = m_handlerParticipant->positions();
   for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPos : participantsMap)
   {
     if (m_handlerParticipant->isOutdated(participantPos))
       continue;
-    DEBUG_LOG() << "participantId=" << participantPos.participantId()
+    DEBUG_LOG(m_logger) << "participantId=" << participantPos.participantId()
                         << "  insideBuilding=" << participantPos.insideBuilding()
                         << " buildingId=" << participantPos.buildingId()
                         << " roomId=" << participantPos.roomId();
@@ -427,7 +427,7 @@ void HandlerNBC::calculateBcContamination(const CentralEffectSimulation::AesItem
 
 void HandlerNBC::calculateDangerArea(const CentralEffectSimulation::AesItemViewUtm &itemView)
 {
-  DEBUG_LOG() << "HandlerParticipantArea::calculateDangerArea aesItemId =" << itemView.aesItemId;
+  DEBUG_LOG(m_logger) << "HandlerParticipantArea::calculateDangerArea aesItemId =" << itemView.aesItemId;
   const auto partPosMap = m_handlerParticipant->positions();
   for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPos : partPosMap)
     inFormCheck(itemView, participantPos);
@@ -436,20 +436,20 @@ void HandlerNBC::calculateDangerArea(const CentralEffectSimulation::AesItemViewU
 void HandlerNBC::deleteDangerArea(const int aesItemId)
 {
   CentralEffectSimulation::AesItemViewUtm itemView =  m_aesItemViews.value(aesItemId);
-  DEBUG_LOG() << "delete " << itemView.aesItemId << ", aesItemId: " << aesItemId;
+  DEBUG_LOG(m_logger) << "delete " << itemView.aesItemId << ", aesItemId: " << aesItemId;
 
   const auto partPosMap = m_handlerParticipant->positions();
   for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPos : partPosMap)
   {
     sendParticipantEvent(aesItemId, participantPos, ProjectDataManagement::EventType_def::LeaveDangerArea);
-    DEBUG_LOG() << "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() << "++++++++ onNewOutdoorParticipantPosition participantId="  << participantData.participantId()
+  DEBUG_LOG(m_logger) << "++++++++ onNewOutdoorParticipantPosition participantId="  << participantData.participantId()
                       << " buildingId=" << participantData.buildingId()
                       << " roomId=" << participantData.roomId()
                       << " reportingSource=" << participantData.reportingSource()
@@ -460,13 +460,13 @@ void HandlerNBC::onNewOutdoorParticipantPosition(const CentralEffectSimulation::
 
   if (m_handlerParticipant->getEquipmentNumber(participantData.participantId()) == 0)
   {
-    DEBUG_LOG() << "Not handle position: participant has no equipment number";
+    DEBUG_LOG(m_logger) << "Not handle position: participant has no equipment number";
     return;
   }
 
   if (m_lastRoomId.value(participantData.participantId()) > 0)
   {
-    DEBUG_LOG() << "Leave Building m_isInContaminatedRoom.contains participantId=" <<  participantData.participantId()
+    DEBUG_LOG(m_logger) << "Leave Building m_isInContaminatedRoom.contains participantId=" <<  participantData.participantId()
                         << " m_isInContaminatedRoom.\nremove!!!";
 
 
@@ -476,32 +476,32 @@ void HandlerNBC::onNewOutdoorParticipantPosition(const CentralEffectSimulation::
     if (aesIsAvailable
         && (aesItemView.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated))
     {
-      DEBUG_LOG() << "Feld ist nicht mehr da. id=" << aesItemView.aesItemId();
+      DEBUG_LOG(m_logger) << "Feld ist nicht mehr da. id=" << aesItemView.aesItemId();
       m_isInContaminatedRoom.remove(participantData.participantId());
 
     }
     else
     {
-      DEBUG_LOG() << "Feld ist nicht mehr da. id=" << aesItemView.aesItemId();
+      DEBUG_LOG(m_logger) << "Feld ist nicht mehr da. id=" << aesItemView.aesItemId();
       sendLeaveEvent(aesItemView.aesItemId(),participantData );
     }
     leave = true;
   }
   else
   {
-    DEBUG_LOG() << "m_lastRoomId.contains(" << m_lastRoomId.contains(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);
 
 
-  DEBUG_LOG() << "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))
   {
-    DEBUG_LOG() << " xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
-    DEBUG_LOG() << " itemView: " << itemView.aesItemId << ", " << itemView.aesTypeId;
+    DEBUG_LOG(m_logger) << " xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+    DEBUG_LOG(m_logger) << " itemView: " << itemView.aesItemId << ", " << itemView.aesTypeId;
     if (leave)
     {
       QHash<int, QSet<EffectType>> effectTypeHash = m_effectTypeStates.value(itemView.aesItemId);
@@ -527,12 +527,12 @@ void HandlerNBC::onNewOutdoorParticipantPosition(const CentralEffectSimulation::
 
 void HandlerNBC::onParticipantDecontaminated(const int participantId)
 {
-  DEBUG_LOG() << "onParticipantDecontaminated participantId=" << participantId;
+  DEBUG_LOG(m_logger) << "onParticipantDecontaminated participantId=" << participantId;
   m_participantAes.remove(participantId);
 
   for (auto i = m_effectTypeStates.cbegin(), end = m_effectTypeStates.cend(); i != end; ++i)
   {
-    DEBUG_LOG() << "aesItemId=" << i.key();
+    DEBUG_LOG(m_logger) << "aesItemId=" << i.key();
     QHash<int, QSet<EffectType>> value = i.value();
     value.remove(participantId);
     m_effectTypeStates.insert(i.key(), value);
@@ -541,12 +541,12 @@ void HandlerNBC::onParticipantDecontaminated(const int participantId)
 
 void HandlerNBC::onRestoreRadioReadinessChanged(const int participantId)
 {
-  DEBUG_LOG() << "HandlerNBC::onRestoreRadioReadinessChanged participantId=" << participantId
+  DEBUG_LOG(m_logger) << "HandlerNBC::onRestoreRadioReadinessChanged participantId=" << participantId
                       << " m_participantAes.size=" << m_participantAes.size();
 
   if (!m_participantAes.contains(participantId) )
   {
-    DEBUG_LOG() << "HandlerNBC::onRestoreRadioReadinessChanged !m_participantAes.contains( participantId=" << participantId << ")";
+    DEBUG_LOG(m_logger) << "HandlerNBC::onRestoreRadioReadinessChanged !m_participantAes.contains( participantId=" << participantId << ")";
     return;
   }
 
@@ -556,7 +556,7 @@ void HandlerNBC::onRestoreRadioReadinessChanged(const int participantId)
   while (i.hasNext())
   {
     i.next();
-    DEBUG_LOG() << "HandlerNBC::onRestoreRadioReadinessChanged remove aesId=" << i.key();
+    DEBUG_LOG(m_logger) << "HandlerNBC::onRestoreRadioReadinessChanged remove aesId=" << i.key();
     m_participantAes.remove(i.key());
     m_eventStates.remove(i.key());
     m_effectTypeStates.remove(i.key());
@@ -581,11 +581,11 @@ bool HandlerNBC::inBoundingBoxCheck(const CentralEffectSimulation::AesItemViewUt
   const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantData.pos(), itemView.zone);
   if (boundingBoxImpact.contains(participantPosUtmPoint))
   {
-    DEBUG_LOG() << "inBoundingBoxCheck Paricipant " << participantData.participantId()
+    DEBUG_LOG(m_logger) << "inBoundingBoxCheck Paricipant " << participantData.participantId()
                         << " inside AesItemView:" << itemView.aesItemId;
     return true;
   }
-  TRACE_LOG() << "inBoundingBoxCheck Paricipant " << participantData.participantId()
+  TRACE_LOG(m_logger) << "inBoundingBoxCheck Paricipant " << participantData.participantId()
                       << " outside AesItemView:" << itemView.aesItemId;
   return false;
 }
@@ -597,7 +597,7 @@ void HandlerNBC::sendEnterEvent(const int aesItemId, const AreaEffectSimulation:
   m_ddsHandler->dtcAes()->aesItemViewFromEntityId(aesItemId,AreaEffectSimulation::AesType::AtUnknown, aesItemView );
 
 
-  DEBUG_LOG() << "sendEnterEvent, paricipantId: " << participantData.participantId()
+  DEBUG_LOG(m_logger) << "sendEnterEvent, paricipantId: " << participantData.participantId()
                       << ", aesItemId: " << aesItemId
                       << ", aesType=" << aesTypeId
                       << ", isIndoor=" << isIndoor;
@@ -611,7 +611,7 @@ void HandlerNBC::sendEnterEvent(const int aesItemId, const AreaEffectSimulation:
     zone =  m_aesItemViews.value(aesItemId).zone;
   else
   {
-    ERROR_LOG() << "No m_aesItemViews.contains aesItemId=" << aesItemId;
+    ERROR_LOG(m_logger) << "No m_aesItemViews.contains aesItemId=" << aesItemId;
   }
 
   const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantData.pos(), zone);
@@ -638,7 +638,7 @@ void HandlerNBC::sendEnterEvent(const int aesItemId, const AreaEffectSimulation:
   case AreaEffectSimulation::AesType_def::AtFunctionalArea:
   case AreaEffectSimulation::AesType_def::AtMineArea:
   default:
-    INFO_LOG() << "sendEvent Unhandled AES-Type" << aesTypeId;
+    INFO_LOG(m_logger) << "sendEvent Unhandled AES-Type" << aesTypeId;
     break;
   }
 } // END sendEvent
@@ -649,7 +649,7 @@ void HandlerNBC::sendLeaveEvent(const int aesItemId, const CentralEffectSimulati
   AreaEffectSimulation::AesItemView aesItemView;
   m_ddsHandler->dtcAes()->aesItemViewFromEntityId(aesItemId, AreaEffectSimulation::AesType_def::AtUnknown, aesItemView);
 
-  DEBUG_LOG() << "sendLeaveEvent"
+  DEBUG_LOG(m_logger) << "sendLeaveEvent"
                       << " aesId=" << aesItemId
                       << " participantId=" << participantData.participantId()
                       << " aesTypeId=" << aesItemView.aesTypeId();
@@ -689,7 +689,7 @@ bool HandlerNBC::inFormCheck(const CentralEffectSimulation::AesItemViewUtm &item
                                  itemView.boundingBoxTopRight);
   const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantData.pos(), itemView.zone);
   const QString  participantPosMgrs = CentralEffectSimulation::geographic2mgrs(participantData.pos(), itemView.zone);
-  TRACE_LOG() << "inFormCheck start, paricipantId: " << participantData.participantId()
+  TRACE_LOG(m_logger) << "inFormCheck start, paricipantId: " << participantData.participantId()
                       << ", aesItemId: " << itemView.aesItemId
                       << ", aesTypeId: " << itemView.aesTypeId
                       << ", form.size: " << itemView.form.size()
@@ -699,7 +699,7 @@ bool HandlerNBC::inFormCheck(const CentralEffectSimulation::AesItemViewUtm &item
   if (boundingBoxImpact.contains(participantPosUtmPoint) &&
       itemView.form.containsPoint(participantPosUtmPoint, Qt::FillRule::OddEvenFill))
   {
-    DEBUG_LOG() << "Participant id=" << participantData.participantId()
+    DEBUG_LOG(m_logger) << "Participant id=" << participantData.participantId()
                          << " inside Area"
                          << " inside Building:" << participantData.insideBuilding()
                          << " roomId=" << participantData.roomId();
@@ -709,7 +709,7 @@ bool HandlerNBC::inFormCheck(const CentralEffectSimulation::AesItemViewUtm &item
       InfrastructureManagement::StructureElement structureElement;
       bool roomFound = m_ddsHandler->dtcIsm()->getStructureElementById(participantData.roomId(), structureElement);
 
-      DEBUG_LOG() << "Participant id=" << participantData.participantId()
+      DEBUG_LOG(m_logger) << "Participant id=" << participantData.participantId()
                             << " pos.z=" << participantData.pos().z()
                             << " upperOffset =" << itemView.upperOffset
                             << " lowerOffset=" << itemView.lowerOffset
@@ -721,7 +721,7 @@ bool HandlerNBC::inFormCheck(const CentralEffectSimulation::AesItemViewUtm &item
           && (    ( structureElement.relPosition().offsetZ() + 1.5 > itemView.upperOffset )
                || ( structureElement.relPosition().offsetZ() + 1.5 < itemView.lowerOffset)))
       {
-        DEBUG_LOG() << "Participant id=" << participantData.participantId()
+        DEBUG_LOG(m_logger) << "Participant id=" << participantData.participantId()
                               << " pos.z=" << participantData.pos().z()
                               << " not between upperOffset =" << itemView.upperOffset
                               << " and lowerOffset=" << itemView.lowerOffset
@@ -741,10 +741,10 @@ bool HandlerNBC::inFormCheck(const CentralEffectSimulation::AesItemViewUtm &item
 #if 0
   if (m_logger.isDebugEnabled())
   {
-    DEBUG_LOG() << "inFormCheck: Paricipant " << participantPosition.participantId << " outside AesItemView " << itemView.aesItemId;
-    DEBUG_LOG() << "ParticipantPos = " << debug(participantPosUtmPoint);
+    DEBUG_LOG(m_logger) << "inFormCheck: Paricipant " << participantPosition.participantId << " outside AesItemView " << itemView.aesItemId;
+    DEBUG_LOG(m_logger) << "ParticipantPos = " << debug(participantPosUtmPoint);
     for (const auto &itPos : itemView.form)
-      DEBUG_LOG() << "itemView =" << debug(itPos);
+      DEBUG_LOG(m_logger) << "itemView =" << debug(itPos);
   }
 #endif
   return false;
@@ -760,20 +760,20 @@ void HandlerNBC::sendCesHitRequest(const CentralEffectSimulation::AesItemViewUtm
   if (remaining < 0)
     return;
 
-  DEBUG_LOG() << "sendCesHitRequest Settings::calculateCentralAes="
+  DEBUG_LOG(m_logger) << "sendCesHitRequest Settings::calculateCentralAes="
                       << " insideWlsArea=" << std::boolalpha << participantData.insideWlsArea()
                       << " isSmartChargeType=" << std::boolalpha  << m_ddsHandler->isSmartChargeType(itemView.chargeStruct)
                       << " participantId=" << participantData.participantId();
 
   const int equipNo = m_ddsHandler->participantId2EquipNo(participantData.participantId());
-  DEBUG_LOG() << " ftc sendCESHit to Participant participantId = " << 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)
   {
-    DEBUG_LOG() << "participantPosition.participantId != 0 && equipNo <= 0" ;
+    DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 && equipNo <= 0" ;
     return;
   }
 
@@ -799,14 +799,14 @@ void HandlerNBC::sendCesHitRequest(const CentralEffectSimulation::AesItemViewUtm
     itemView.partyId,               // originPartyId
     mineFieldBitIndex
   );
-  DEBUG_LOG() << " participantId=" << participantData.participantId()
+  DEBUG_LOG(m_logger) << " participantId=" << participantData.participantId()
                       << " chargeTypeId=" << itemView.chargeStruct.chargeTypeId();
 
 
   m_sendCesHitRequestQueue.enqueue(requestTab);
   if (m_sendCesHitRequestQueue.size() == 1)
   {
-    DEBUG_LOG() << "SendCesHitRequest: " << requestTab;
+    DEBUG_LOG(m_logger) << "SendCesHitRequest: " << requestTab;
     m_ddsHandler->ftcTab()->sendCesHitRequest(requestTab, this);
   }
 }
@@ -829,7 +829,7 @@ void HandlerNBC::sendCesHitRequest(const int aesItemId,
   if ( aesItem.partyId().is_set())
     partyId = aesItem.partyId().get();
   legacyChargeTypeId =  m_ddsHandler->getLegacyIdFromChargeTypeId(aesItem.chargeStruct());
-  DEBUG_LOG() << "sendCesHitRequest Settings::calculateCentralAes="
+  DEBUG_LOG(m_logger) << "sendCesHitRequest Settings::calculateCentralAes="
                       << " insideWlsArea=" << std::boolalpha << participantData.insideWlsArea()
                       << " isSmartChargeType=" << std::boolalpha  << m_ddsHandler->isSmartChargeType(aesItem.chargeStruct())
                       << " participantId=" << participantData.participantId()
@@ -838,30 +838,30 @@ void HandlerNBC::sendCesHitRequest(const int aesItemId,
                       << " remaining=" << remaining;
 
   const int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantData.participantId());
-  DEBUG_LOG() << " ftc sendCESHit to Participant participantId = " << 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)
   {
-    DEBUG_LOG() << "participantPosition.participantId != 0 && equipNo <= 0" ;
+    DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 && equipNo <= 0" ;
     return;
   } // if
 
   // Check Protection by buildings
   else if (effectType ==  CES_NBC::EffectType::NContaminationEnterArea1)
   {
-    DEBUG_LOG() << "NContaminationEnterArea1";
+    DEBUG_LOG(m_logger) << "NContaminationEnterArea1";
     if (participantData.buildingId() > 0)
     {
-      DEBUG_LOG() << "NContaminationEnterArea1 Protection by buildings"
+      DEBUG_LOG(m_logger) << "NContaminationEnterArea1 Protection by buildings"
                            << " remaining vorher=" << remaining
                            << " remaining nachher=2";
       remaining = 2;
     }
     else
     {
-      DEBUG_LOG() << "NContaminationEnterArea1 NO Protection by buildings"
+      DEBUG_LOG(m_logger) << "NContaminationEnterArea1 NO Protection by buildings"
                            << " remaining vorher="<< remaining
                            << " remaining nachher=1";
       remaining = 1;
@@ -869,10 +869,10 @@ void HandlerNBC::sendCesHitRequest(const int aesItemId,
   }
   else if (effectType ==  CES_NBC::EffectType::NContaminationEnterArea2)
   {
-    DEBUG_LOG() << "NContaminationEnterArea2 NO Protection by buildings"
+    DEBUG_LOG(m_logger) << "NContaminationEnterArea2 NO Protection by buildings"
                          << " remaining vorher="<< remaining
                          << " remaining nachher=2";
-    DEBUG_LOG() << "NContaminationEnterArea2";
+    DEBUG_LOG(m_logger) << "NContaminationEnterArea2";
     remaining = 2;
   }
 
@@ -887,13 +887,13 @@ void HandlerNBC::sendCesHitRequest(const int aesItemId,
     equipmentNumber, participantData.participantId(), legacyChargeTypeId, aesItemId, originatorEquipmentNumber,
     remaining, pos, effectTime, eventType, partyId, mineFieldBitIndex
   );
-  DEBUG_LOG() << " participantId=" << participantData.participantId() << " chargeTypeId=" << aesItem.chargeStruct().chargeTypeId()
+  DEBUG_LOG(m_logger) << " participantId=" << participantData.participantId() << " chargeTypeId=" << aesItem.chargeStruct().chargeTypeId()
                       << " legacyChargeTypeId=" << legacyChargeTypeId;
 
   m_sendCesHitRequestQueue.enqueue(requestTab);
   if (m_sendCesHitRequestQueue.size() == 1)
   {
-    DEBUG_LOG() << "SendCesHitRequest: " << requestTab;
+    DEBUG_LOG(m_logger) << "SendCesHitRequest: " << requestTab;
     m_ddsHandler->ftcTab()->sendCesHitRequest(requestTab, this);
   } // if
 }
@@ -911,7 +911,7 @@ void HandlerNBC::sendParticipantEvent(const int aesItemId,
       typeClass == ParticipantManagement::TypeClass_def::Vessel ||
       typeClass == ParticipantManagement::TypeClass_def::Unknown)
   {
-    DEBUG_LOG() << "Participant with id " << participantData.participantId()
+    DEBUG_LOG(m_logger) << "Participant with id " << participantData.participantId()
                         << " has invalid typeClass: " << typeClass
                         << " eventType: " << eventType;
     return;
@@ -921,11 +921,11 @@ void HandlerNBC::sendParticipantEvent(const int aesItemId,
   {
     if ( m_isInContaminatedRoom.contains(participantData.participantId()) && participantData.roomId() == 0) // Tln leaves Building
     {
-      DEBUG_LOG() << "Sending Event because Participant leaves Building";
+      DEBUG_LOG(m_logger) << "Sending Event because Participant leaves Building";
     }
     else
     {
-      DEBUG_LOG() << "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,19 +939,19 @@ void HandlerNBC::sendParticipantEvent(const int aesItemId,
       || eventType == ProjectDataManagement::EventType_def::HitMine
       || eventType == ProjectDataManagement::EventType_def::HitN)
   {
-    DEBUG_LOG() << "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());
   if (equipmentNumber <= 0)
   {
-    WARNING_LOG() << "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() << "sendParticipantEvent" << eventType
+  DEBUG_LOG(m_logger) << "sendParticipantEvent" << eventType
                       << " participantId=" << participantData.participantId()
                       << " AesItemId=" << aesItemId;
 
@@ -1002,7 +1002,7 @@ void HandlerNBC::sendParticipantEvent(const int aesItemId,
   else
     pe.friendlyFire(false);
 
-  INFO_LOG() << "sendParticipantEvent: " << pe
+  INFO_LOG(m_logger) << "sendParticipantEvent: " << pe
                      << ", currentMSecsSinceEpoch = " << QDateTime::currentMSecsSinceEpoch()
                      << ", time difference = " << QDateTime::currentMSecsSinceEpoch() - pe.eventTime();
   m_ddsHandler->dtsCes()->publish(pe);
@@ -1022,14 +1022,14 @@ void HandlerNBC::sendEffectTypeEvent(const int aesItemId,
                             participantData.participantId(),
                             effectType))
   {
-    DEBUG_LOG() << "Not sending EffectType event " << toString(effectType)
+    DEBUG_LOG(m_logger) << "Not sending EffectType event " << toString(effectType)
                         << ", participant: " << participantData.participantId()
                         << ", aesItemId: " << aesItemId
                         << " - already sent";
     return;
   }
   const int ctasEffectType = static_cast<int>(effectType) & 0xffff;
-  DEBUG_LOG() << "Sending EffectType event " << toString(effectType)
+  DEBUG_LOG(m_logger) << "Sending EffectType event " << toString(effectType)
                       << ", participant: " << participantData.participantId()
                       << ", aesItemId: " << aesItemId
                       << ", ctasEffectType: " << ctasEffectType;
@@ -1051,7 +1051,7 @@ bool HandlerNBC::eventMustBeSend(int aesItemId,
   // - only send event if it was not already sent
   if (activeEvents.contains(eventType))
   {
-    DEBUG_LOG() << "activeEvents=" << eventType
+    DEBUG_LOG(m_logger) << "activeEvents=" << eventType
                         << " return false";
     return false;
   }
@@ -1084,7 +1084,7 @@ bool HandlerNBC::eventMustBeSend(int aesItemId,
   default:
     break;
   }
-  DEBUG_LOG() << "eventMustBeSend=true";
+  DEBUG_LOG(m_logger) << "eventMustBeSend=true";
   return true;
 }
 
@@ -1092,7 +1092,7 @@ bool HandlerNBC::effectTypeMustBeSend(int aesItemId,
                                       int participantId,
                                       EffectType effectType)
 {
-  DEBUG_LOG() << "effectTypeMustBeSend"
+  DEBUG_LOG(m_logger) << "effectTypeMustBeSend"
                       << " aesItemId= " << aesItemId
                       << " participantId=" << participantId
                       << " effectType=" << CES_NBC::toString(effectType);
@@ -1102,7 +1102,7 @@ bool HandlerNBC::effectTypeMustBeSend(int aesItemId,
   // - only send event if it was not already sent
   if (activeEffects.contains(effectType))
   {
-    //DEBUG_LOG() << "effectTypeStates already contains aesItemId " << aesItemId;
+    //DEBUG_LOG(m_logger) << "effectTypeStates already contains aesItemId " << aesItemId;
     return false;
   }
   if (   (effectType ==  EffectType::NContaminationEnterArea1)
@@ -1110,7 +1110,7 @@ bool HandlerNBC::effectTypeMustBeSend(int aesItemId,
   {
     if (activeEffects.contains(EffectType::NContaminationDetonation))
     {
-      DEBUG_LOG() << "effectTypeStates.contains(NContaminationDetonation) " << aesItemId
+      DEBUG_LOG(m_logger) << "effectTypeStates.contains(NContaminationDetonation) " << aesItemId
                            << " return false";
       return false;
     }
@@ -1188,7 +1188,7 @@ bool HandlerNBC::inCircle(const QPointF &centerUtm, const double radius, const Q
 {
   double squareDist = CentralEffectSimulation::getSquareDistance(centerUtm, pointUtm);
   double squareRadius = radius * radius;
-  DEBUG_LOG() << "squareDist: " << squareDist << ", squareRadius: " << squareRadius
+  DEBUG_LOG(m_logger) << "squareDist: " << squareDist << ", squareRadius: " << squareRadius
                       << " centerUtm=" << centerUtm.x() << "/" << centerUtm.y()
                       << " pointUtm=" << pointUtm.x() << "/" << pointUtm.y()
                       << " radius = " << radius
@@ -1235,59 +1235,59 @@ EffectType HandlerNBC::effectTypeForNContaminationArea(const CentralEffectSimula
   const AreaEffectSimulation::NContamination &nc = m_ddsHandler->dtcAes()->nContamination(itemView.aesItemId);
   auto utm = LtsCoordTrans::UtmCoordinate::fromGeographic(nc.impactPosition().lon(), nc.impactPosition().lat(), itemView.zone);
   QPointF impactPositionUtm = QPointF(utm.x, utm.y);
-  DEBUG_LOG() << "HandlerNBC::effectTypeForNContaminationArea itemView.radials.size()=" << itemView.radials.size();
+  DEBUG_LOG(m_logger) << "HandlerNBC::effectTypeForNContaminationArea itemView.radials.size()=" << itemView.radials.size();
   if (itemView.radials.size() != 3)
     return EffectType::NContaminationEnterArea2;  // not yet known, we only know we're inside the area
 
-  DEBUG_LOG() <<  "impactPositionUtm=" << impactPositionUtm.x() << "/" << impactPositionUtm.y()
+  DEBUG_LOG(m_logger) <<  "impactPositionUtm=" << impactPositionUtm.x() << "/" << impactPositionUtm.y()
                        << " participantPosUtmPoint=" << participantPosUtmPoint.x() << "/" << participantPosUtmPoint.y();
 
   const double squareDist = CentralEffectSimulation::getSquareDistance(impactPositionUtm, participantPosUtmPoint);
   if (squareDist <= pow(itemView.radials.at(0), 2))
   {
     // 5s delay
-    DEBUG_LOG() << "partPosSampleTime: " << partPosSampleTime
+    DEBUG_LOG(m_logger) << "partPosSampleTime: " << partPosSampleTime
                         << ", itemView.effectStart: " << itemView.effectStart;
     if (partPosSampleTime < itemView.effectStart + 5000)
     {
-      DEBUG_LOG() << "return EffectType::NContaminationDetonation";
+      DEBUG_LOG(m_logger) << "return EffectType::NContaminationDetonation";
       return EffectType::NContaminationDetonation;
     }
-    DEBUG_LOG() << "return EffectType::NContaminationEnterArea2";
+    DEBUG_LOG(m_logger) << "return EffectType::NContaminationEnterArea2";
     return EffectType::NContaminationEnterArea2;
   }
-  DEBUG_LOG() <<  "squareDist=" << squareDist
+  DEBUG_LOG(m_logger) <<  "squareDist=" << squareDist
                       <<  " pow(itemView.radials.at(1), 2)=" << pow(itemView.radials.at(1), 2)
                        << " itemView.radials.at(1)="  << itemView.radials.at(1);
   // Bereich 1
   if (squareDist <= pow(itemView.radials.at(1), 2))
   {
-    DEBUG_LOG() << "-------------- NContamination Bereich 1 ---------------------";
+    DEBUG_LOG(m_logger) << "-------------- NContamination Bereich 1 ---------------------";
     if ( isIndoor)
     {
-      DEBUG_LOG() << "NContaminationEnterArea1 indoor => NContaminationEnterArea2";
+      DEBUG_LOG(m_logger) << "NContaminationEnterArea1 indoor => NContaminationEnterArea2";
       return EffectType::NContaminationEnterArea2;
     }
-    DEBUG_LOG() << "NContaminationEnterArea1";
+    DEBUG_LOG(m_logger) << "NContaminationEnterArea1";
     return EffectType::NContaminationEnterArea1;
   }
-  DEBUG_LOG() << "squareDist=" << squareDist
+  DEBUG_LOG(m_logger) << "squareDist=" << squareDist
                       << " Dist=" << sqrt (squareDist )
                       << " pow(itemView.radials.at(2), 2)=" << pow(itemView.radials.at(2), 2)
                       << " itemView.radials.at(2)="  << itemView.radials.at(2);
   // Bereich 2
   if (squareDist <= pow(itemView.radials.at(2), 2))
   {
-    DEBUG_LOG() << "-------------- NContamination Bereich 2 ---------------------";
+    DEBUG_LOG(m_logger) << "-------------- NContamination Bereich 2 ---------------------";
     if ( isIndoor)
     {
-      DEBUG_LOG() << "NContaminationEnterArea2 indoor => NContaminationLeave";
+      DEBUG_LOG(m_logger) << "NContaminationEnterArea2 indoor => NContaminationLeave";
       return EffectType::NContaminationLeave;
     }
-    DEBUG_LOG() << "NContaminationEnterArea2";
+    DEBUG_LOG(m_logger) << "NContaminationEnterArea2";
     return EffectType::NContaminationEnterArea2;
   }
-  DEBUG_LOG() << "NContaminationLeave";
+  DEBUG_LOG(m_logger) << "NContaminationLeave";
   return EffectType::NContaminationLeave;
 }
 
@@ -1318,12 +1318,12 @@ void HandlerNBC::aesItemViewRemoved(int aesItemId)
     const auto effectTypLeave = leaveEffectTypeForAesType(aiv.aesTypeId);
     if (effectTypLeave != EffectType::Unknown)
     {
-      DEBUG_LOG() << "aesItemViewRemoved, leaveEffectType: " << toString(effectTypLeave);
+      DEBUG_LOG(m_logger) << "aesItemViewRemoved, leaveEffectType: " << toString(effectTypLeave);
       auto it = m_effectTypeStates.find(aesItemId);
       if (it != m_effectTypeStates.end())
       {
         const QHash<int, QSet<EffectType>> &participants = it.value();
-        DEBUG_LOG() << "aesItemViewRemoved, sending leave events to " << participants.size()
+        DEBUG_LOG(m_logger) << "aesItemViewRemoved, sending leave events to " << participants.size()
                             << " participants";
         for (auto itP = participants.begin(); itP != participants.end(); ++ itP)
           sendEffectTypeEvent(aesItemId, m_handlerParticipant->position(itP.key()), effectTypLeave);
@@ -1332,12 +1332,12 @@ void HandlerNBC::aesItemViewRemoved(int aesItemId)
     const auto eventTypeLeave = leaveEventTypeForAesType(aiv.aesTypeId);
     if (eventTypeLeave != ProjectDataManagement::EventType::Unknown)
     {
-      DEBUG_LOG() << "aesItemViewRemoved, leaveEventType: " << eventTypeLeave;
+      DEBUG_LOG(m_logger) << "aesItemViewRemoved, leaveEventType: " << eventTypeLeave;
       auto it = m_eventStates.find(aesItemId);
       if (it != m_eventStates.end())
       {
         const QHash<int, QSet<ProjectDataManagement::EventType>> &participants = it.value();
-        DEBUG_LOG() << "aesItemViewRemoved, sending leave events to " << participants.size()
+        DEBUG_LOG(m_logger) << "aesItemViewRemoved, sending leave events to " << participants.size()
                             << " participants";
         for (auto itP = participants.begin(); itP != participants.end(); ++ itP)
           sendParticipantEvent(aiv.aesItemId, m_handlerParticipant->position(itP.key()), eventTypeLeave);
@@ -1357,7 +1357,7 @@ void HandlerNBC::aesItemViewRemoved(int aesItemId)
 
 int HandlerNBC::getContaminationFromBuildingRoom(const int buildingId, const int roomId) const
 {
-  DEBUG_LOG() << "getContaminationFromBuildingRoom buildingId=" << buildingId
+  DEBUG_LOG(m_logger) << "getContaminationFromBuildingRoom buildingId=" << buildingId
                       << " roomId=" << roomId;
 
   Buildings::BuildingState buildingState = m_ddsHandler->dtcBld()->buildingState(buildingId);
@@ -1386,7 +1386,7 @@ void HandlerNBC::onBuildingStateChanged(const Buildings::BuildingState &data, Da
     return;
   }
 
-  DEBUG_LOG() << "Got BuildingState originatorParticipantId=" << data.originatorParticipantId()
+  DEBUG_LOG(m_logger) << "Got BuildingState originatorParticipantId=" << data.originatorParticipantId()
                       << ", aesId = " << data.aesId()
                       << ", data.contaminationStates().size()=" << data.contaminationStates().size();
   // Check each participant
@@ -1415,7 +1415,7 @@ void HandlerNBC::onNewIndoorParticipantPosition(const CentralEffectSimulation::H
   bool enterBuilding  = false;
   if (  m_lastRoomId.value(participantData.participantId()) == 0)
   {
-    DEBUG_LOG() << "m_lastRoomId Enter Building m_isInContaminatedRoom.contains participantId=" <<  participantData.participantId()
+    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());
@@ -1424,12 +1424,12 @@ void HandlerNBC::onNewIndoorParticipantPosition(const CentralEffectSimulation::H
   }
   else
   {
-    DEBUG_LOG() << "m_lastRoomId.contains(" << m_lastRoomId.contains(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() << "++++++++ onNewIndoorParticipantPosition participantId="  << participantData.participantId()
+  DEBUG_LOG(m_logger) << "++++++++ onNewIndoorParticipantPosition participantId="  << participantData.participantId()
                       << " buildingId=" << participantData.buildingId()
                       << " roomId=" << participantData.roomId()
                       << " reportingSource=" << participantData.reportingSource()
@@ -1452,11 +1452,11 @@ void HandlerNBC::onNewIndoorParticipantPosition(const CentralEffectSimulation::H
   }
 
 
-  DEBUG_LOG() << "aesId=" << aesId;
+  DEBUG_LOG(m_logger) << "aesId=" << aesId;
 
   if (aesId > 0 && !m_aesItemViews.contains(aesId))
   {
-    DEBUG_LOG() << "m_isInContaminatedRoom insert participantId=" << participantData.participantId()
+    DEBUG_LOG(m_logger) << "m_isInContaminatedRoom insert participantId=" << participantData.participantId()
                         << " aesId=" << aesId;
     m_isInContaminatedRoom.insert(participantData.participantId(), aesId);
   }
@@ -1468,7 +1468,7 @@ void HandlerNBC::onNewIndoorParticipantPosition(const CentralEffectSimulation::H
 
     AreaEffectSimulation::AesType aesTypeId =  aesItemView.aesTypeId();
 
-    DEBUG_LOG() << "onNewIndoorParticipantPosition sendEnterEvent aesTypeId=" << aesTypeId;
+    DEBUG_LOG(m_logger) << "onNewIndoorParticipantPosition sendEnterEvent aesTypeId=" << aesTypeId;
     sendEnterEvent(aesId,aesTypeId,  participantData, true);
   }
   else
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/plugin.cpp
index 0d0903348..af66badd8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/plugin.cpp
@@ -48,7 +48,7 @@ bool CES_NBCInterfaceImpl::init(int domainId, int exerciseId)
 
   m_domainId = domainId;
   m_exerciseId = exerciseId;
-  INFO_LOG() << "CES_NBCInterfaceImpl::init()"
+  INFO_LOG(m_logger) << "CES_NBCInterfaceImpl::init()"
                      << " m_domainId=" << m_domainId
                      << " m_exerciseId=" << m_exerciseId;
 
@@ -61,11 +61,11 @@ bool CES_NBCInterfaceImpl::init(int domainId, int exerciseId)
 
   if (!m_handlerNBC->init())
   {
-    ERROR_LOG() << "Initialisation m_handlerNBC failed.";
+    ERROR_LOG(m_logger) << "Initialisation m_handlerNBC failed.";
     return false;
   }
 
-  INFO_LOG() << "CES_NBCInterfaceImpl::init() return true";
+  INFO_LOG(m_logger) << "CES_NBCInterfaceImpl::init() return true";
   return true;
 }
 
@@ -73,8 +73,8 @@ QString CES_NBCInterfaceImpl::echo(const QString &message)
 {
 
   QString ret(QStringLiteral("<<<< %1 >>>> CES_NBCInterfaceImpl::echo").arg(message));
-  INFO_LOG() << "CES_NBCInterfaceImpl::echo return:" << ret;
-  DEBUG_LOG() << "DEBUG: CES_NBCInterfaceImpl::echo return:" << ret;
+  INFO_LOG(m_logger) << "CES_NBCInterfaceImpl::echo return:" << ret;
+  DEBUG_LOG(m_logger) << "DEBUG: CES_NBCInterfaceImpl::echo return:" << ret;
   return ret;
 }
 
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 2747bd21a..9833a1b60 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
@@ -33,7 +33,7 @@ HandlerBlockedAreas::~HandlerBlockedAreas()
 
 bool HandlerBlockedAreas::init()
 {
-  DEBUG_LOG() << "init";
+  DEBUG_LOG(m_logger) << "init";
   connect(m_handlerParticipant.get(), &CentralEffectSimulation::HandlerParticipant::newIndoorPosition,
           this, &HandlerBlockedAreas::onParticipantPositionChanged);
   connect(m_handlerParticipant.get(), &CentralEffectSimulation::HandlerParticipant::newOutdoorPosition,
@@ -48,16 +48,16 @@ bool HandlerBlockedAreas::init()
 void HandlerBlockedAreas::onSendParticipantBlockedAreaReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    WARNING_LOG() << "Can not send blocked Area to participant : " << replyObject();
+    WARNING_LOG(m_logger) << "Can not send blocked Area to participant : " << replyObject();
   else
-    DEBUG_LOG() << "onSendParticipantBlockedAreaReply for id " << replyObject.id() << " success";
+    DEBUG_LOG(m_logger) << "onSendParticipantBlockedAreaReply for id " << replyObject.id() << " success";
 }
 
 void HandlerBlockedAreas::onParticipantPositionChanged(const CentralEffectSimulation::HandlerParticipant::CesParticipantData &partPos)
 {
   const int participantId = partPos.participantId();
   int damagePercentBlockedAreas = 90; // From the percentage damage, blocked area applies Todo Config Value
-  DEBUG_LOG() << "HandlerBlockedAreas onParticipantPositionChanged participantId=" << participantId;
+  DEBUG_LOG(m_logger) << "HandlerBlockedAreas onParticipantPositionChanged participantId=" << participantId;
 
   TrainingAreaBase::SendParticipantBlockedAreaRequest pba;
   pba.equipmentNumber(m_ddsHandler->participantId2EquipNo(partPos.participantId()));
@@ -70,7 +70,7 @@ void HandlerBlockedAreas::onParticipantPositionChanged(const CentralEffectSimula
     auto it = m_blockedAreas.find(participantId);
     if (it != m_blockedAreas.end())
     {
-      DEBUG_LOG() << "Blocked Area Leave equipment-No. =" << pba.equipmentNumber();
+      DEBUG_LOG(m_logger) << "Blocked Area Leave equipment-No. =" << pba.equipmentNumber();
       pba.blockedAreaMode(TrainingAreaBase::BlockedAreaMode_def::Leave);
       m_ddsHandler->ftcTab()->sendParticipantBlockedAreaRequest(pba, this);
       m_blockedAreas.erase(it);
@@ -83,7 +83,7 @@ void HandlerBlockedAreas::onParticipantPositionChanged(const CentralEffectSimula
     if (m_blockedAreas.contains(participantId) &&
         (m_handlerParticipantBuilding->getDamagePercentFromRoom(partPos.roomId())  < damagePercentBlockedAreas))
     {
-      DEBUG_LOG() << "Blocked Area Leave equipment-No. =" << pba.equipmentNumber();
+      DEBUG_LOG(m_logger) << "Blocked Area Leave equipment-No. =" << pba.equipmentNumber();
       pba.blockedAreaMode(TrainingAreaBase::BlockedAreaMode_def::Leave);
       m_ddsHandler->ftcTab()->sendParticipantBlockedAreaRequest(pba, this);
       m_blockedAreas.remove(participantId);
@@ -92,9 +92,9 @@ void HandlerBlockedAreas::onParticipantPositionChanged(const CentralEffectSimula
   }
 
 
-  DEBUG_LOG() << "Room ="  << partPos.roomId()
+  DEBUG_LOG(m_logger) << "Room ="  << partPos.roomId()
                       << " DamagePercentRoom=" << m_handlerParticipantBuilding->getDamagePercentFromRoom(partPos.roomId());
-  DEBUG_LOG() << "1: " << 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"
                       << "m_blockedAreas.contains(participantId) = " << m_blockedAreas.contains(participantId) ;
@@ -105,7 +105,7 @@ void HandlerBlockedAreas::onParticipantPositionChanged(const CentralEffectSimula
        ||  m_handlerParticipantBuilding->getDamagePercentFromBuilding(partPos.buildingId()) == 100)
       && !m_blockedAreas.contains(participantId))
   {
-    DEBUG_LOG() << "Send Enter Blocked Area to Participant:" << participantId;
+    DEBUG_LOG(m_logger) << "Send Enter Blocked Area to Participant:" << participantId;
     pba.blockedAreaMode(TrainingAreaBase::BlockedAreaMode_def::Enter);
     m_ddsHandler->ftcTab()->sendParticipantBlockedAreaRequest(pba, this);
     m_blockedAreas.insert(participantId, partPos.roomId());
@@ -115,7 +115,7 @@ void HandlerBlockedAreas::onParticipantPositionChanged(const CentralEffectSimula
 
 void HandlerBlockedAreas::onBuildingStateChanged(const int32_t buildingId)
 {
-  DEBUG_LOG() << "onBuildingStateChanged buildingId:" << buildingId;
+  DEBUG_LOG(m_logger) << "onBuildingStateChanged buildingId:" << buildingId;
   int damagePercent = m_handlerParticipantBuilding->getDamagePercentFromBuilding(buildingId);
   if (damagePercent == 0 && !m_blockedAreas.isEmpty()) // init
   {
@@ -124,7 +124,7 @@ void HandlerBlockedAreas::onBuildingStateChanged(const int32_t buildingId)
     {
       if (m_blockedAreas.contains(participantId))
       {
-        DEBUG_LOG() << "remove participantId: " << participantId;
+        DEBUG_LOG(m_logger) << "remove participantId: " << participantId;
         TrainingAreaBase::SendParticipantBlockedAreaRequest pba;
         pba.equipmentNumber(m_ddsHandler->participantId2EquipNo(participantId));
         pba.participantId(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 1229b7e3b..08aca44f4 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
@@ -63,7 +63,7 @@ bool HandlerParticipantBuilding::init()
 //-----------------------------------------------------------------------------
 int HandlerParticipantBuilding::getDamagePercentFromBuilding(const int buildingId) const
 {
-  DEBUG_LOG() << "getDamagePercentFromBuilding buildingId=" << buildingId;
+  DEBUG_LOG(m_logger) << "getDamagePercentFromBuilding buildingId=" << buildingId;
   auto it = m_buildingStates.find(buildingId);
   return it != m_buildingStates.end() ? it.value().damagePercent() : 0;
 }
@@ -78,14 +78,14 @@ int HandlerParticipantBuilding::getDamagePercentFromRoom(const int roomId) const
 
   // Exception:
   // if a building has failed completely, not all individual rooms are set as failed
-  DEBUG_LOG() << "getDamagePercentFromBuilding=" << getDamagePercentFromBuilding(buildingId)
+  DEBUG_LOG(m_logger) << "getDamagePercentFromBuilding=" << getDamagePercentFromBuilding(buildingId)
                       << " buildingId=" << buildingId
                       << " roomId=" << roomId;
   if (buildingId < 0)
     return -1;
   if (getDamagePercentFromBuilding(buildingId) == PERCENT_100)
   {
-    DEBUG_LOG() << "return PERCENT_100:" << PERCENT_100;
+    DEBUG_LOG(m_logger) << "return PERCENT_100:" << PERCENT_100;
     return PERCENT_100;
   }
   return it != m_roomIdDamageState.end() ? it.value().damagePercent : 0;
@@ -94,10 +94,10 @@ int HandlerParticipantBuilding::getDamagePercentFromRoom(const int roomId) const
 void HandlerParticipantBuilding::onSendCesHitReply(const Core::FunctionReplyObject &replyObject)
 {
   //if (replyObject.error())
-  //  WARNING_LOG() << "Can not send hit on participant to training area: " << replyObject();
+  //  WARNING_LOG(m_logger) << "Can not send hit on participant to training area: " << replyObject();
   //else
   m_requestMap.remove(replyObject.id());
-  DEBUG_LOG() << "onSendCesHitReply for id " << replyObject.id() << " success"
+  DEBUG_LOG(m_logger) << "onSendCesHitReply for id " << replyObject.id() << " success"
                       << " m_requestMap.remove(" << replyObject.id() << ")"
                       << " m_requestMap.size=" << m_requestMap.size();
 
@@ -114,7 +114,7 @@ void HandlerParticipantBuilding::onBuildingStateChanged(const Buildings::Buildin
     return;
   }
 
-  DEBUG_LOG() << "Got BuildingState originatorParticipantId=" << data.originatorParticipantId()
+  DEBUG_LOG(m_logger) << "Got BuildingState originatorParticipantId=" << data.originatorParticipantId()
                       << ", aesId = " << data.aesId()
                       << ", chargeTypeId = " << data.chargeTypeId()
                       << ", sampleTime = " << data.sampleTime()
@@ -126,7 +126,7 @@ void HandlerParticipantBuilding::onBuildingStateChanged(const Buildings::Buildin
 
   if ( (data.originatorParticipantId() == 0) && (data.aesId() == 0) && (data.chargeTypeId()==0))
   {
-    DEBUG_LOG() << "Not valid return ";
+    DEBUG_LOG(m_logger) << "Not valid return ";
     return;
   }
 
@@ -134,7 +134,7 @@ void HandlerParticipantBuilding::onBuildingStateChanged(const Buildings::Buildin
   RoomState rs;
   rs.buildingId = data.id();
   m_buildingStates.insert(data.id(), data);
-  DEBUG_LOG() << "m_buildingStates.insert id=" << data.id()
+  DEBUG_LOG(m_logger) << "m_buildingStates.insert id=" << data.id()
                       << " aesId=" << data.aesId()
                       << " name=" << data.name();
 
@@ -142,7 +142,7 @@ void HandlerParticipantBuilding::onBuildingStateChanged(const Buildings::Buildin
   {
     rs.damagePercent = roomState.damagePercent();
     m_roomIdDamageState.insert(roomState.id(), rs);
-    DEBUG_LOG() << "m_roomIdDamageState.insert"
+    DEBUG_LOG(m_logger) << "m_roomIdDamageState.insert"
                         << " RoomId = " << roomState.id()
                         << ", BuildingId = " << data.id()
                         << ", destruction = " << roomState.damagePercent();
@@ -170,7 +170,7 @@ void HandlerParticipantBuilding::onBuildingStateChanged(const Buildings::Buildin
     if (roomState.remainingEffectPercent() == 0)
       continue;
 
-    DEBUG_LOG() << "    RoomId[" << roomState.id() << "]:"
+    DEBUG_LOG(m_logger) << "    RoomId[" << roomState.id() << "]:"
                         << " remainingEffectPercent = " << roomState.remainingEffectPercent()
                         << " roomState.damagePercent()=" << roomState.damagePercent()
                         << " roomState.remainingEffectPercent()=" << roomState.remainingEffectPercent();
@@ -190,14 +190,14 @@ void HandlerParticipantBuilding::onBuildingStateChanged(const Buildings::Buildin
       if (m_handlerParticipant->isOutdated(participantPos))
         continue;
 
-      DEBUG_LOG() << " participantId = " << participantId
+      DEBUG_LOG(m_logger) << " participantId = " << participantId
                           << " roomId = " << participantPos.roomId()
                           << " roomState.id=" << roomState.id()
                           << " participantPos.vulnerabilityState=" << participantPos.vulnerabilityState
                           << " equipNo=" << m_ddsHandler->participantId2EquipNo(participantId)
                           << " isOutdated=" << m_handlerParticipant->isOutdated(participantPos);
 
-      DEBUG_LOG() << "sendCesHitToParticipant";
+      DEBUG_LOG(m_logger) << "sendCesHitToParticipant";
       sendCesHitToParticipant(data, participantId, roomState.remainingEffectPercent());
     }
   }
@@ -228,7 +228,7 @@ void HandlerParticipantBuilding::sendCesHitToParticipant(const Buildings::Buildi
 
   bool itemAvailable = m_ddsHandler->dtcAes()->aesItemFromId(data.aesId(), aesItem);
   if (itemAvailable)
-    DEBUG_LOG() << "partyId=" << aesItem.partyId()
+    DEBUG_LOG(m_logger) << "partyId=" << aesItem.partyId()
                          << " chargeTypeId=" << aesItem.chargeStruct().chargeTypeId()
                          << " duration=" << aesItem.effectDuration();
 
@@ -245,7 +245,7 @@ void HandlerParticipantBuilding::sendCesHitToParticipant(const Buildings::Buildi
   if (itemAvailable) chargeStruct = aesItem.chargeStruct();
   int remainTasCodeIndirect = m_ddsHandler->remainingTasCode(chargeStruct);
 
-  DEBUG_LOG() << " ftc sendCESHit to Participant equipNo = " << equipNo
+  DEBUG_LOG(m_logger) << " ftc sendCESHit to Participant equipNo = " << equipNo
                       << " participantId=" << participantId
                       << " chargeTypeId=" << data.chargeTypeId()
                       << " originatorEquipNo=" << originatorEquipNo
@@ -293,7 +293,7 @@ void HandlerParticipantBuilding::sendCesHitToParticipant(const Buildings::Buildi
 //  }
 //  else
   {
-    DEBUG_LOG() << "direkter Beschuss remainEffectPercent=" << remainingEffectPercent;
+    DEBUG_LOG(m_logger) << "direkter Beschuss remainEffectPercent=" << remainingEffectPercent;
     requestTab.remainEffectPercent(remainingEffectPercent);
   }
 
@@ -305,7 +305,7 @@ void HandlerParticipantBuilding::sendFtcCesHitRequestTimeout()
   auto ftcTab = m_ddsHandler->ftcTab();
   for (const TrainingAreaBase::SendCesHitRequest &hr : std::as_const(m_requestMap))
   {
-    DEBUG_LOG()  << "sendFtcCesHitRequest: " << hr;
+    DEBUG_LOG(m_logger)  << "sendFtcCesHitRequest: " << hr;
     ftcTab->sendCesHitRequest(hr, this);
   }
   m_requestMap.clear();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/plugin.cpp
index 028153926..4625a5fc2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/plugin.cpp
@@ -51,12 +51,12 @@ bool CesParticipantBuildingsInterfaceImpl::init(int domainId, int exerciseId)
 {
   m_domainId = domainId;
   m_exerciseId = exerciseId;
-  INFO_LOG() << "CesParticipantBuildingsInterfaceImpl::init()"
+  INFO_LOG(m_logger) << "CesParticipantBuildingsInterfaceImpl::init()"
                      << " m_domainId=" << m_domainId
                      << " m_exerciseId=" << m_exerciseId;
 
 
-  INFO_LOG() << "initialize HandlerParticipantBuilding ----------------------------";
+  INFO_LOG(m_logger) << "initialize HandlerParticipantBuilding ----------------------------";
   m_handlerParticipantBuilding = std::make_shared<HandlerParticipantBuilding>(m_ddsHandler,
                                                                               m_handlerParticipant,
                                                                               m_handlerBuildingData,
@@ -64,15 +64,15 @@ bool CesParticipantBuildingsInterfaceImpl::init(int domainId, int exerciseId)
 
   if (!m_handlerParticipantBuilding->init())
   {
-    ERROR_LOG() << "Initialisation HandlerParticipantData failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerParticipantData failed.";
     return false;
   }
-  INFO_LOG() << "end initialize HandlerParticipantBuilding ----------------------------";
+  INFO_LOG(m_logger) << "end initialize HandlerParticipantBuilding ----------------------------";
 
 
   if (Settings::handleBlockedAreas())
   {
-    INFO_LOG() << "initialize HandlerBlockedAreas ----------------------------";
+    INFO_LOG(m_logger) << "initialize HandlerBlockedAreas ----------------------------";
     // initialize HandlerBlockedAreas
     m_handlerBlockedAreas = std::make_shared<HandlerBlockedAreas>(m_ddsHandler,
                                                                   m_handlerParticipant,
@@ -82,11 +82,11 @@ bool CesParticipantBuildingsInterfaceImpl::init(int domainId, int exerciseId)
     // Blocked Areas
     if (!m_handlerBlockedAreas->init())
     {
-      ERROR_LOG() << "Initialisation m_handlerBlockedAreas failed.";
+      ERROR_LOG(m_logger) << "Initialisation m_handlerBlockedAreas failed.";
       return false;
     }
   }
-  INFO_LOG() << "CesParticipantBuildingsInterfaceImpl::init() return true";
+  INFO_LOG(m_logger) << "CesParticipantBuildingsInterfaceImpl::init() return true";
   return true;
 }
 
@@ -94,8 +94,8 @@ QString CesParticipantBuildingsInterfaceImpl::echo(const QString &message)
 {
 
   QString ret(QStringLiteral("<<<< %1 >>>> CES_FUNCTIONAL_AREAInterfaceImpl::echo").arg(message));
-  INFO_LOG() << "CES_FUNCTIONAL_AREAInterfaceImpl::echo return:" << ret;
-  DEBUG_LOG() << "DEBUG: CesParticipantBuildingsInterfaceImpl::echo return:" << ret;
+  INFO_LOG(m_logger) << "CES_FUNCTIONAL_AREAInterfaceImpl::echo return:" << ret;
+  DEBUG_LOG(m_logger) << "DEBUG: CesParticipantBuildingsInterfaceImpl::echo return:" << ret;
   return ret;
 }
 } //namespace CesParticipantBuildings
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 f6d6d2675..2b0b14da8 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
@@ -13,19 +13,18 @@
 namespace TargetAreas
 {
 
-DdsHandlerTargetAreas::DdsHandlerTargetAreas(int domainId, int exerciseId)
-  : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise, exerciseId))
+DdsHandlerTargetAreas::DdsHandlerTargetAreas(int domainId, int exerciseId) : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise, exerciseId))
   , m_participantEventId(0)
-  , m_exerciseId(exerciseId)
-{
-  DEBUG_LOG() << "DdsHandlerTargetAreas(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  , m_exerciseId(exerciseId),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  DEBUG_LOG(m_logger) << "DdsHandlerTargetAreas(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandlerTargetAreas::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -46,28 +45,28 @@ bool DdsHandlerTargetAreas::init(const QStringList &qosFileList)
       !m_ftcTab->enableSendParticipantBeStillWarning() ||
       !m_ftcTab->enableSendControlData())
   {
-    ERROR_LOG() << "Could not enable SendCesHit";
+    ERROR_LOG(m_logger) << "Could not enable SendCesHit";
     return false;
   }
   m_dtcPpm = ParticipantManagement::Interface::Dtc::create(m_ddsConnector);
   if (!m_dtcPpm->enableDynamicParticipantData())
   {
-    ERROR_LOG() << "Could not initialize ParticipantManagement enableDynamicParticipantData data topic client";
+    ERROR_LOG(m_logger) << "Could not initialize ParticipantManagement enableDynamicParticipantData data topic client";
     return false;
   }
   if (!m_dtcPpm->enableParticipantPosition())
   {
-    ERROR_LOG() << "Could not initialize ParticipantManagement enableParticipantPosition data topic client";
+    ERROR_LOG(m_logger) << "Could not initialize ParticipantManagement enableParticipantPosition data topic client";
     return false;
   }
   if (!m_dtcPpm->enableParticipant())
   {
-    ERROR_LOG() << "Could not initialize ParticipantManagement enableParticipant data topic client";
+    ERROR_LOG(m_logger) << "Could not initialize ParticipantManagement enableParticipant data topic client";
     return false;
   }
   if (!m_dtcPpm->enableType())
   {
-    ERROR_LOG() << "Could not initialize ParticipantManagement enableType data topic client";
+    ERROR_LOG(m_logger) << "Could not initialize ParticipantManagement enableType data topic client";
     return false;
   }
 
@@ -100,7 +99,7 @@ void DdsHandlerTargetAreas::onParticipantChanged(const ParticipantManagement::Pa
   {
     for (auto i = m_partId2EquipNoMap.begin(); i != m_partId2EquipNoMap.end(); ++i)
     {
-      TRACE_LOG() << " partId2EquipNoMap.size(): " << m_partId2EquipNoMap.size()
+      TRACE_LOG(m_logger) << " partId2EquipNoMap.size(): " << m_partId2EquipNoMap.size()
                           << " partId: " << i.key()
                           << " eqNo: " << i.value();
     }
@@ -117,7 +116,7 @@ int DdsHandlerTargetAreas::participantId2EquipNo(const int participantId) const
 {
   int ret = m_partId2EquipNoMap.value(participantId, 0);
   if (ret > 0)
-    INFO_LOG() << "participantId2EquipNo participantId=" << participantId
+    INFO_LOG(m_logger) << "participantId2EquipNo participantId=" << participantId
                        << " EquipmentNumber=" << ret;
   return ret;
 } // end of participantId2EquipNo()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/dds_handler.h
index 1a208730d..466a10d42 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/dds_handler.h
@@ -53,6 +53,8 @@ private Q_SLOTS:
   void onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType);
 
 private:
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<Core::TopicLockMaster>      m_topicLockMaster;
   std::shared_ptr<Core::Interface::Dtc>       m_dtcCore;
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 8f9fab8a8..c872d8c41 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
@@ -75,7 +75,7 @@ bool HandlerTargetAreas::init()
     };
     dtcPpm->targetInformations(cb);
   }
-  INFO_LOG() << "HandlerTargetAreas::init() finished. "
+  INFO_LOG(m_logger) << "HandlerTargetAreas::init() finished. "
                      << " m_positionsMap.size(): " << m_positionsMap.size();
   return true;
 } // end of init()
@@ -83,10 +83,10 @@ bool HandlerTargetAreas::init()
 
 void HandlerTargetAreas::onParticipantPositionChanged(const ParticipantManagement::ParticipantPosition &data, DataModification modType)
 {
-  DEBUG_LOG() << "onParticipantPositionChanged: " << data;
+  DEBUG_LOG(m_logger) << "onParticipantPositionChanged: " << data;
   if (modType == DataModification::eRemoved)
   {
-    DEBUG_LOG() << "m_participantsOutsideMap.remove participantId: " << data.participantId();
+    DEBUG_LOG(m_logger) << "m_participantsOutsideMap.remove participantId: " << data.participantId();
     //m_participantsOutsideMap.remove(data.participantId());
   }
   else
@@ -101,11 +101,11 @@ void HandlerTargetAreas::onParticipantPositionChanged(const ParticipantManagemen
       partPos.lastGeoPosition = partPosOld.pos(); // save previous position
       // replace
       *it = partPos;
-      DEBUG_LOG() << "m_positionsMap.replace=" << data.participantId();
+      DEBUG_LOG(m_logger) << "m_positionsMap.replace=" << data.participantId();
     }
     else
     {
-      DEBUG_LOG() << "m_positionsMap.insert=" << data.participantId();
+      DEBUG_LOG(m_logger) << "m_positionsMap.insert=" << data.participantId();
       m_positionsMap.insert(data.participantId(), partPos);
     }
 
@@ -113,9 +113,9 @@ void HandlerTargetAreas::onParticipantPositionChanged(const ParticipantManagemen
     if (equipmentNumber > 0)
       checkShootbackAreaPosition(data);
     else
-      INFO_LOG() << "Teilnehmer hat keine Ausstattungsnummer";
+      INFO_LOG(m_logger) << "Teilnehmer hat keine Ausstattungsnummer";
 
-    INFO_LOG() << "onParticipantPositionChanged()"
+    INFO_LOG(m_logger) << "onParticipantPositionChanged()"
                        << " participantId; " << data.participantId()
                        << " participantTypeId: " << data.participantTypeId()
                        << " partyId: " << data.partyId()
@@ -130,7 +130,7 @@ void HandlerTargetAreas::onParticipantChanged(const ParticipantManagement::Parti
   // Remove Participant:
   if (modType == DataModification::eRemoved || data.isDeleted())
   {
-    DEBUG_LOG() << "onParticipantChanged m_positionsMap.remove id=" << data.id();
+    DEBUG_LOG(m_logger) << "onParticipantChanged m_positionsMap.remove id=" << data.id();
     m_participantData.remove(data.id());
     m_positionsMap.remove(data.id());
     return;
@@ -148,12 +148,12 @@ void HandlerTargetAreas::onParticipantChanged(const ParticipantManagement::Parti
   pos.partyId(data.partyId());
   pos.participantId(data.id());
   pos.participantTypeId(data.typeId());
-  DEBUG_LOG() << "onParticipantChanged"
+  DEBUG_LOG(m_logger) << "onParticipantChanged"
                       << " id=" << data.id()
                       << " typeId=" << data.typeId()
                       << " designator=" << data.designator();
   if (typeClass == ParticipantManagement::TypeClass_def::Target)
-    DEBUG_LOG() << "Typeclass = Target";
+    DEBUG_LOG(m_logger) << "Typeclass = Target";
 }
 
 void HandlerTargetAreas::onTypeChanged(const ParticipantManagement::Type &data, DataModification modType)
@@ -161,20 +161,20 @@ void HandlerTargetAreas::onTypeChanged(const ParticipantManagement::Type &data,
   if (modType == DataModification::eRemoved)
     return;
   m_typeMap.insert(data.id(), data.typeClass());
-  DEBUG_LOG() << "m_typeMap.size()" << m_typeMap.size()
+  DEBUG_LOG(m_logger) << "m_typeMap.size()" << m_typeMap.size()
                       << "  equipmentTypeId=" << data.id()
                       << "  typeClass=" << data.typeClass();
 }
 
 void HandlerTargetAreas::onTargetInformationChanged(const ParticipantManagement::TargetInformation &data, DataModification modType)
 {
-  DEBUG_LOG() << "onTargetInformationChanged"
+  DEBUG_LOG(m_logger) << "onTargetInformationChanged"
                       << " participantId=" << data.participantId()
                       << " data.shootbackAreas().size()=" << data.shootbackAreas().size();
 
   if (modType == DataModification::eRemoved)
   {
-    DEBUG_LOG() << "m_participantsOutsideMap.remove participantId: " << data.participantId();
+    DEBUG_LOG(m_logger) << "m_participantsOutsideMap.remove participantId: " << data.participantId();
     m_shootbackTargets.remove(data.participantId());
     return;
   }
@@ -189,7 +189,7 @@ void HandlerTargetAreas::onTargetInformationChanged(const ParticipantManagement:
   // assign shootbackAreasUtm
   for (unsigned int i = 0; i < data.shootbackAreas().size(); i++)
   {
-    DEBUG_LOG() << " shootbackAreas i=" << i;
+    DEBUG_LOG(m_logger) << " shootbackAreas i=" << i;
     ParticipantManagement::ShootbackArea shootbackArea = data.shootbackAreas().at(i);
     QPolygonF shootbackAreaUtm;
 
@@ -202,7 +202,7 @@ void HandlerTargetAreas::onTargetInformationChanged(const ParticipantManagement:
 
     for (int i = 0; i < shootbackAreaUtm.size(); i++)
     {
-      DEBUG_LOG() << "i=" << i
+      DEBUG_LOG(m_logger) << "i=" << i
                           << " x=" << shootbackAreaUtm[i].x()
                           << " y=" << shootbackAreaUtm[i].y()
                           << " zone=" << m_zone;
@@ -211,7 +211,7 @@ void HandlerTargetAreas::onTargetInformationChanged(const ParticipantManagement:
   }
 
   m_shootbackTargets.insert(data.participantId(), shootbackTarget);
-  DEBUG_LOG() << "newShootbackTarget participantId=" << data.participantId()
+  DEBUG_LOG(m_logger) << "newShootbackTarget participantId=" << data.participantId()
                       << " shootbackTarget.participantId=" << shootbackTarget.participantId
                       << " shootbackTarget.targetInformation.participantId()=" << shootbackTarget.targetInformation.participantId()
                       << " shootbackTarget.targetInformation.prewarningInterval()=" << shootbackTarget.targetInformation.prewarningInterval()
@@ -237,10 +237,10 @@ int HandlerTargetAreas::getParticipantId(int equipentNumber)
 
 void HandlerTargetAreas::printQPolygon(const QPolygonF polygon)
 {
-  DEBUG_LOG() << "printQPolygon polygon.size()=" << polygon.size();
+  DEBUG_LOG(m_logger) << "printQPolygon polygon.size()=" << polygon.size();
   for (int i = 0; i < polygon.size(); i++)
   {
-    DEBUG_LOG() << "printQPolygon i=" << i
+    DEBUG_LOG(m_logger) << "printQPolygon i=" << i
                         << " x=" << polygon[i].x()
                         << " y=" << polygon[i].y();
   }
@@ -248,7 +248,7 @@ void HandlerTargetAreas::printQPolygon(const QPolygonF polygon)
 
 void HandlerTargetAreas::printShootbackTarget(const ShootbackTarget &shootbackTarget)
 {
-  DEBUG_LOG() << "ShootbackTarget "
+  DEBUG_LOG(m_logger) << "ShootbackTarget "
                       << ", targetParticipantId=" << shootbackTarget.participantId
                       << ", shootbackAreasUtm.size=" <<  shootbackTarget.shootbackAreasUtm.size();
   for (int i = 0; i < shootbackTarget.shootbackAreasUtm.size(); i++)
@@ -261,7 +261,7 @@ void HandlerTargetAreas::printShootbackTarget(const ShootbackTarget &shootbackTa
 
 void HandlerTargetAreas::printShootbackAreas()
 {
-  DEBUG_LOG() << "printShootbackAreas--------------------";
+  DEBUG_LOG(m_logger) << "printShootbackAreas--------------------";
   QHashIterator<int, ShootbackTarget> it(m_shootbackTargets);
   while (it.hasNext())
   {
@@ -269,14 +269,14 @@ void HandlerTargetAreas::printShootbackAreas()
     ShootbackTarget shootbackTarget = it.value();
     printShootbackTarget(shootbackTarget);
   }
-  DEBUG_LOG() << "ENDE printShootbackAreas--------------------";
+  DEBUG_LOG(m_logger) << "ENDE printShootbackAreas--------------------";
 }
 
 bool HandlerTargetAreas::checkPosInShootbackTarget(const ShootbackTarget &shootbackTarget,
                                                    const QPointF &participantPosUtm)
 {
   bool inside = false;
-  DEBUG_LOG() << "checkPosInShootbackTarget ShootbackTarget "
+  DEBUG_LOG(m_logger) << "checkPosInShootbackTarget ShootbackTarget "
                       << ", targetParticipantId=" << shootbackTarget.participantId
                       << ", shootbackAreasUtm.size=" <<  shootbackTarget.shootbackAreasUtm.size();
   for (int i = 0; i < shootbackTarget.shootbackAreasUtm.size(); i++)
@@ -285,7 +285,7 @@ bool HandlerTargetAreas::checkPosInShootbackTarget(const ShootbackTarget &shootb
     printQPolygon(shootbackTarget.shootbackAreasUtm.at(i));
     if (shootbackTarget.shootbackAreasUtm.at(i).containsPoint(participantPosUtm, Qt::OddEvenFill))
     {
-      DEBUG_LOG() << "inside = true";
+      DEBUG_LOG(m_logger) << "inside = true";
       inside = true;
     }
   }
@@ -296,7 +296,7 @@ void HandlerTargetAreas::checkShootbackAreaPosition(const ParticipantManagement:
 {
   int participantId = data.participantId();
   int equipmentNumber = m_ddsHandler->participantId2EquipNo(data.participantId());
-  DEBUG_LOG() << "checkShootbackAreaPosition id= " << data.participantId()
+  DEBUG_LOG(m_logger) << "checkShootbackAreaPosition id= " << data.participantId()
                       << ", equipmentNumber=" << equipmentNumber
                       << ", sampleTime=" << data.sampleTime()
                       << ", time difference = " << QDateTime::currentMSecsSinceEpoch() - data.sampleTime();
@@ -308,7 +308,7 @@ void HandlerTargetAreas::checkShootbackAreaPosition(const ParticipantManagement:
 
   printShootbackAreas();
 
-  DEBUG_LOG() << "Participant pos=" << posActual.pos().lat() << "/" << posActual.pos().lon()
+  DEBUG_LOG(m_logger) << "Participant pos=" << posActual.pos().lat() << "/" << posActual.pos().lon()
                       << ", Utm=" << participantPosUtm.x() << "/" << participantPosUtm.y()
                       << " m_zone=" << m_zone;
 
@@ -322,20 +322,20 @@ void HandlerTargetAreas::checkShootbackAreaPosition(const ParticipantManagement:
     int targetPreWarningInterval = shootbackTarget.targetInformation.prewarningInterval() * 1000;
     int targetTimeToEffectInterval = shootbackTarget.targetInformation.takedownInterval() * 1000;
 
-    DEBUG_LOG() << "ShootbackArea ParticipantID=" << shootbackTarget.participantId
+    DEBUG_LOG(m_logger) << "ShootbackArea ParticipantID=" << shootbackTarget.participantId
                         << " shootbackTarget.shootbackAreasUtm.size()=" << shootbackTarget.shootbackAreasUtm.size()
                         << " size= " << it.value().shootbackAreasUtm.size();
     printShootbackTarget(shootbackTarget);
     if (checkPosInShootbackTarget(shootbackTarget, participantPosUtm))
     {
       // START TARGET TIMER
-      DEBUG_LOG() << "Participant ist in ShootbackArea"
+      DEBUG_LOG(m_logger) << "Participant ist in ShootbackArea"
                           << ", ParticipantId= " << participantId
                           << ", ShootbackTargetId=" << shootbackTarget.participantId;
       if (m_targetTimers.contains(participantId))
         if (m_targetTimers.value(participantId)->getTimerState() != TargetTimer::TimerState::NOT_ACTIVE)
           return;
-      DEBUG_LOG() << "START TIMER PARTICIPANT_ID=" << participantId
+      DEBUG_LOG(m_logger) << "START TIMER PARTICIPANT_ID=" << participantId
                           << " targetPreWarningInterval=" << targetPreWarningInterval
                           << " targetTimeToEffectInterval=" << targetTimeToEffectInterval
                           << " m_targetTimers.insert(" << participantId << ")";
@@ -355,14 +355,14 @@ void HandlerTargetAreas::checkShootbackAreaPosition(const ParticipantManagement:
     else
     {
       // STOP TARGET TIMER
-      DEBUG_LOG() << "Participant ist nicht in ShootbackArea"
+      DEBUG_LOG(m_logger) << "Participant ist nicht in ShootbackArea"
                           << ", ParticipantId= " << data.participantId()
                           << ", ShootbackTargetId=" << shootbackTarget.participantId
                           << ", m_targetTimers.size=" << m_targetTimers.size()
                           << ", m_targetTimers.contains(participantId)=" << m_targetTimers.contains(participantId);
       if (!m_targetTimers.contains(participantId))
       {
-        DEBUG_LOG() << "continue";
+        DEBUG_LOG(m_logger) << "continue";
         continue;
       }
       else
@@ -372,7 +372,7 @@ void HandlerTargetAreas::checkShootbackAreaPosition(const ParticipantManagement:
         {
           targetTimer->deleteLater();
           m_targetTimers.remove(participantId);
-          DEBUG_LOG() << "STOP TIMER PARTICIPANT_ID=" << participantId
+          DEBUG_LOG(m_logger) << "STOP TIMER PARTICIPANT_ID=" << participantId
                               << " m_targetTimers.remove(" << participantId << ")";
         }
       }
@@ -383,17 +383,17 @@ void HandlerTargetAreas::checkShootbackAreaPosition(const ParticipantManagement:
 void HandlerTargetAreas::onSendControlDataReply(const Core::FunctionReplyObject &replyObject)
 {
   //if (replyObject.error())
-  //  WARNING_LOG() << "Can not send hit on participant to training area: " << replyObject();
+  //  WARNING_LOG(m_logger) << "Can not send hit on participant to training area: " << replyObject();
   //else
-  DEBUG_LOG() << "onSendControlDataReply for id " << replyObject.id() << " success";
+  DEBUG_LOG(m_logger) << "onSendControlDataReply for id " << replyObject.id() << " success";
 }
 
 void HandlerTargetAreas::onSendCesHitInformationReply(const Core::FunctionReplyObject &replyObject)
 {
   //if (replyObject.error())
-  //  WARNING_LOG() << "Can not send hit on participant to training area: " << replyObject();
+  //  WARNING_LOG(m_logger) << "Can not send hit on participant to training area: " << replyObject();
   //else
-  DEBUG_LOG() << "onSendCesHitInformationReply for id " << replyObject.id() << " success";
+  DEBUG_LOG(m_logger) << "onSendCesHitInformationReply for id " << replyObject.id() << " success";
 }
 
 
@@ -402,7 +402,7 @@ void HandlerTargetAreas::sendRequestsToTab(int participantId,
                                            int countBlink,
                                            int effectPercent)
 {
-  DEBUG_LOG() << "MainWindow::on_Timer1finished participantId=" << participantId
+  DEBUG_LOG(m_logger) << "MainWindow::on_Timer1finished participantId=" << participantId
                       << " targetParticipantId =" << targetParticipantId;
   ParticipantManagement::Participant participant = m_participantData.value(participantId);
   //ShootbackTarget shootbackTarget = m_shootbackTargets.value(participantId);
@@ -454,14 +454,14 @@ void HandlerTargetAreas::sendRequestsToTab(int participantId,
   TrainingAreaBase::SendCesHitRequest hr;
   hr.aesId(1);
 
-  INFO_LOG()  << "sendCesHitRequest: " << hr;
+  INFO_LOG(m_logger)  << "sendCesHitRequest: " << hr;
   ftcTab->sendCesHitRequest(hr, this);
 
 }
 
 void HandlerTargetAreas::on_preWarningIntervalFinished(int participantId, int targetParticipantId)
 {
-  DEBUG_LOG() << "MainWindow::on_Timer1finished participantId=" << participantId
+  DEBUG_LOG(m_logger) << "MainWindow::on_Timer1finished participantId=" << participantId
                       << " targetParticipantId =" << targetParticipantId;
   ParticipantManagement::Participant participant = m_participantData.value(participantId);
   ShootbackTarget shootbackTarget = m_shootbackTargets.value(targetParticipantId);
@@ -500,17 +500,17 @@ void HandlerTargetAreas::on_preWarningIntervalFinished(int participantId, int ta
 
 void HandlerTargetAreas::on_TimeToEffectFinished(int participantId, int targetParticipantId)
 {
-  DEBUG_LOG() << "HandlerTargetAreas::on_TimeToEffectFinished participantId=" << participantId
+  DEBUG_LOG(m_logger) << "HandlerTargetAreas::on_TimeToEffectFinished participantId=" << participantId
                       << " targetParticipantId=" << targetParticipantId;
 
-  DEBUG_LOG() << "MainWindow::on_Timer1finished participantId=" << participantId
+  DEBUG_LOG(m_logger) << "MainWindow::on_Timer1finished participantId=" << participantId
                       << " targetParticipantId =" << targetParticipantId;
   ParticipantManagement::Participant participant = m_participantData.value(participantId);
   ShootbackTarget shootbackTarget = m_shootbackTargets.value(targetParticipantId);
   uint8_t countBlink = 1;
   int32_t effectPercent = 0;
 
-  DEBUG_LOG() << " shootbackTarget.participantId=" << shootbackTarget.participantId
+  DEBUG_LOG(m_logger) << " shootbackTarget.participantId=" << shootbackTarget.participantId
                       << " shootbackTarget.targetInformation.participantId()=" << shootbackTarget.targetInformation.participantId()
                       << " shootbackTarget.targetInformation.prewarningInterval()=" << shootbackTarget.targetInformation.prewarningInterval()
                       << " prewarningEffect=" << shootbackTarget.targetInformation.prewarningEffect()
@@ -540,11 +540,11 @@ void HandlerTargetAreas::on_TimeToEffectFinished(int participantId, int targetPa
 
 void HandlerTargetAreas::onSendCesHitReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "HandlerTargetAreas::onSendCesHitReply";
+  INFO_LOG(m_logger) << "HandlerTargetAreas::onSendCesHitReply";
   //if (replyObject.error())
-  //  WARNING_LOG() << "Can not send hit on participant to training area: " << replyObject();
+  //  WARNING_LOG(m_logger) << "Can not send hit on participant to training area: " << replyObject();
   //else
-  DEBUG_LOG() << "onSendCesHitReply for id " << replyObject.id() << " success";
+  DEBUG_LOG(m_logger) << "onSendCesHitReply for id " << replyObject.id() << " success";
 }
 
 } // namespace TargetAreas
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 7aa17bb99..15b182dbb 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
@@ -62,6 +62,7 @@ public:
 
   };
 protected:
+  NGL::INGLLogger &m_logger;
   void onSendControlDataReply(const Core::FunctionReplyObject &reply) override final;
   void onSendCesHitInformationReply(const Core::FunctionReplyObject &reply) override final;
   void onSendCesHitReply(const Core::FunctionReplyObject &replyObject) override final;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/plugin.cpp
index 9817b5156..4293465b7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/plugin.cpp
@@ -41,7 +41,7 @@ bool TargetAreasInterfaceImpl::init(int domain_id, int exerciseId)
 {
   m_domainId = domain_id;
   m_exerciseId = exerciseId;
-  INFO_LOG() << "TargetAreasInterfaceImpl::init()"
+  INFO_LOG(m_logger) << "TargetAreasInterfaceImpl::init()"
                      << " m_domainId=" << m_domainId
                      << " m_exerciseId=" << m_exerciseId;
 
@@ -49,7 +49,7 @@ bool TargetAreasInterfaceImpl::init(int domain_id, int exerciseId)
   m_ddsHandlerTargetAreas = std::make_shared<DdsHandlerTargetAreas>(m_domainId, m_exerciseId);
   if (!m_ddsHandlerTargetAreas->init())
   {
-    ERROR_LOG() << "Initialisation DdsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
     return false;
   }
 
@@ -57,11 +57,11 @@ bool TargetAreasInterfaceImpl::init(int domain_id, int exerciseId)
 
   if (!m_handlerTargetAreas->init())
   {
-    ERROR_LOG() << "Initialisation HandlerTargetAreas failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerTargetAreas failed.";
     return false;
   }
 
-  INFO_LOG() << "TargetAreasInterfaceImpl::init() return true";
+  INFO_LOG(m_logger) << "TargetAreasInterfaceImpl::init() return true";
   return true;
 }
 
@@ -69,8 +69,8 @@ QString TargetAreasInterfaceImpl::echo(const QString &message)
 {
 
   QString ret(QStringLiteral("<<<< %1 >>>> TargetAreasInterfaceImpl::echo").arg(message));
-  INFO_LOG() << "TargetAreasInterfaceImpl::echo return:" << ret;
-  DEBUG_LOG() << "DEBUG: TargetAreasInterfaceImpl::echo return:" << ret;
+  INFO_LOG(m_logger) << "TargetAreasInterfaceImpl::echo return:" << ret;
+  DEBUG_LOG(m_logger) << "DEBUG: TargetAreasInterfaceImpl::echo return:" << ret;
   return ret;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/plugin.h
index ed48f8251..867f3b9b0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/plugin.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/plugin.h
@@ -48,6 +48,7 @@ private Q_SLOTS:
   bool init(int domain_id, int exerciseId) override;
 private:
 
+NGL::INGLLogger &m_logger;
 private:
   CentralEffectSimulation::Plugin::DataProvider *m_pdp;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
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 c853381bc..f7d178846 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
@@ -28,7 +28,7 @@ HandlerParticipantBoobyTrap::HandlerParticipantBoobyTrap(const std::shared_ptr<C
   , m_timer(new QTimer(this))
   , m_logger(CentralEffectSimulation::getLogger("Plugin.VirtualMines.HandlerParticipantBoobyTrap"))
 {
-  INFO_LOG() << "HandlerParticipantBoobyTrap::HandlerParticipantBoobyTrap";
+  INFO_LOG(m_logger) << "HandlerParticipantBoobyTrap::HandlerParticipantBoobyTrap";
   m_timer->setSingleShot(true);
   connect(m_timer, &QTimer::timeout, this, &HandlerParticipantBoobyTrap::sendFtcCesHitRequestTimeout);
 } // end of ctor()
@@ -36,13 +36,13 @@ HandlerParticipantBoobyTrap::HandlerParticipantBoobyTrap(const std::shared_ptr<C
 
 HandlerParticipantBoobyTrap::~HandlerParticipantBoobyTrap()
 {
-  INFO_LOG() << "HandlerParticipantBoobyTrap::~HandlerParticipantBoobyTrap";
+  INFO_LOG(m_logger) << "HandlerParticipantBoobyTrap::~HandlerParticipantBoobyTrap";
 } // end of dtor()
 //-----------------------------------------------------------------------------
 
 bool HandlerParticipantBoobyTrap::init()
 {
-  INFO_LOG() << "HandlerParticipantBoobyTrap::init";
+  INFO_LOG(m_logger) << "HandlerParticipantBoobyTrap::init";
   auto dtcAes = m_ddsHandler->dtcAes();
   auto ftcAes = m_ddsHandler->ftcAes();
   auto dtcCes = m_ddsHandler->dtsCes();
@@ -72,7 +72,7 @@ bool HandlerParticipantBoobyTrap::init()
       return false;
   }
 
-  INFO_LOG() << "HandlerParticipantBoobyTrap::init() finished. ";
+  INFO_LOG(m_logger) << "HandlerParticipantBoobyTrap::init() finished. ";
   return true;
 } // end of init()
 //-----------------------------------------------------------------------------
@@ -95,13 +95,13 @@ void HandlerParticipantBoobyTrap::onBoobyTrapChanged(const AreaEffectSimulation:
     m_boobyTrapItemsSecondary.remove(data.id());
     return;
   }
-  INFO_LOG() << "HandlerParticipantBoobyTrap::onBoobyTrapChanged"
+  INFO_LOG(m_logger) << "HandlerParticipantBoobyTrap::onBoobyTrapChanged"
                      << " data.sampleTime=" << data.sampleTime()
                      << " m_ddsHandler->currentPartitionTime=" << m_ddsHandler->currentPartitionTime()
                      << " diff=" << m_ddsHandler->currentPartitionTime() - data.sampleTime();
   if ((m_ddsHandler->currentPartitionTime() - data.sampleTime()) > 2000)
   {
-    INFO_LOG() << "onBoobyTrap outdated";
+    INFO_LOG(m_logger) << "onBoobyTrap outdated";
     return;
   }
   m_boobyTraps.insert(data.id(), data);
@@ -120,7 +120,7 @@ void HandlerParticipantBoobyTrap::onBoobyTrapChanged(const AreaEffectSimulation:
 //    m_boobyTrapItems.insert(data.aesItemId(), boobyTrapUtm);
 //  if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary)
 //    m_boobyTrapItemsSecondary.insert(data.aesItemId(), boobyTrapUtm);
-//  DEBUG_LOG() << "Check each participant"
+//  DEBUG_LOG(m_logger) << "Check each participant"
 //                      << " aesTypeId=" << data.aesTypeId();
 
   // Check each participant
@@ -129,21 +129,21 @@ void HandlerParticipantBoobyTrap::onBoobyTrapChanged(const AreaEffectSimulation:
   {
     if (m_handlerParticipant->isOutdated(participantPos))
     {
-      TRACE_LOG() << "isOutdated participantId=" << participantPos.participantId() << " continue";
+      TRACE_LOG(m_logger) << "isOutdated participantId=" << participantPos.participantId() << " continue";
       continue;
     }
-    DEBUG_LOG() << "Check each actuell participant participantId=" << participantPos.participantId();
+    DEBUG_LOG(m_logger) << "Check each actuell participant participantId=" << participantPos.participantId();
     if (participantPos.insideBuilding())
     {
-      DEBUG_LOG() << "inside Building participantId=" << participantPos.participantId() << " continue";
+      DEBUG_LOG(m_logger) << "inside Building participantId=" << participantPos.participantId() << " continue";
       continue;
     }
     if (participantPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::inner_enum::CatastrophicKill)
     {
-      DEBUG_LOG() << "CatastrophicKill participantId=" << participantPos.participantId() << " continue";
+      DEBUG_LOG(m_logger) << "CatastrophicKill participantId=" << participantPos.participantId() << " continue";
       continue;
     }
-    DEBUG_LOG() << "pos participantId=" << participantPos.participantId()
+    DEBUG_LOG(m_logger) << "pos participantId=" << participantPos.participantId()
                         << " buildingId=" << participantPos.buildingId()
                         << " insideBuilding=" << participantPos.insideBuilding()
                         << " positionValid=" << participantPos.positionValid;
@@ -157,8 +157,8 @@ void HandlerParticipantBoobyTrap::onBoobyTrapChanged(const AreaEffectSimulation:
 
 void HandlerParticipantBoobyTrap::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &data, DataModification modType)
 {
-  INFO_LOG() << "---------------------------------------------------------------------------";
-  INFO_LOG() << "HandlerParticipantBoobyTrap::onAesItemViewChanged"
+  INFO_LOG(m_logger) << "---------------------------------------------------------------------------";
+  INFO_LOG(m_logger) << "HandlerParticipantBoobyTrap::onAesItemViewChanged"
                      << " aesTypeId=" << data.aesTypeId()
                      << " data.effectStateId()=" << data.effectStateId();
 
@@ -173,7 +173,7 @@ void HandlerParticipantBoobyTrap::onAesItemViewChanged(const AreaEffectSimulatio
       m_boobyTrapItemsSecondary.remove(data.id());
       m_triggeredMineParticipant.remove(data.id());
 
-      DEBUG_LOG() << "onBoobyTrapChanged remove aesId=" << data.id()
+      DEBUG_LOG(m_logger) << "onBoobyTrapChanged remove aesId=" << data.id()
                           << " m_triggeredMineParticipant.remove(" << data.id() ;
     }
     return;
@@ -185,7 +185,7 @@ void HandlerParticipantBoobyTrap::onAesItemViewChanged(const AreaEffectSimulatio
     return;
 
   const int aesItemId = data.aesItemId();
-  DEBUG_LOG() << "Got AesItemView id: " << aesItemId
+  DEBUG_LOG(m_logger) << "Got AesItemView id: " << aesItemId
                       << ", type: " << data.aesTypeId()
                       << ", effectState: " << data.effectStateId()
                       << ", modType: " << modType;
@@ -208,7 +208,7 @@ void HandlerParticipantBoobyTrap::onAesItemViewChanged(const AreaEffectSimulatio
         m_boobyTrapItems.insert(data.aesItemId(), boobyTrapUtm);
       if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary)
         m_boobyTrapItemsSecondary.insert(data.aesItemId(), boobyTrapUtm);
-      DEBUG_LOG() << "Check each participant"
+      DEBUG_LOG(m_logger) << "Check each participant"
                           << " aesTypeId=" << data.aesTypeId();
       // Check each participant
 //      const auto partPosMap = m_handlerParticipant->positions();
@@ -216,31 +216,31 @@ void HandlerParticipantBoobyTrap::onAesItemViewChanged(const AreaEffectSimulatio
 //      {
 //        if (m_handlerParticipant->isOutdated(participantPos))
 //        {
-//          TRACE_LOG() << "isOutdated participantId=" << participantPos.participantId() << " continue";
+//          TRACE_LOG(m_logger) << "isOutdated participantId=" << participantPos.participantId() << " continue";
 //          continue;
 //        }
-//        DEBUG_LOG() << "Check each actuell participant participantId=" << participantPos.participantId();
+//        DEBUG_LOG(m_logger) << "Check each actuell participant participantId=" << participantPos.participantId();
 //        if (participantPos.insideBuilding())
 //        {
-//          DEBUG_LOG() << "inside Building participantId=" << participantPos.participantId() << " continue";
+//          DEBUG_LOG(m_logger) << "inside Building participantId=" << participantPos.participantId() << " continue";
 //          continue;
 //        }
 //        if (participantPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::inner_enum::CatastrophicKill)
 //        {
-//          DEBUG_LOG() << "CatastrophicKill participantId=" << participantPos.participantId() << " continue";
+//          DEBUG_LOG(m_logger) << "CatastrophicKill participantId=" << participantPos.participantId() << " continue";
 //          continue;
 //        }
 //        // Nur Positionsmeldungen, die neuer sind als die Mine koennen sie ausloesen!
 //        if ((participantPos.sampleTime() < data.sampleTime())
 //            && (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtBoobyTrap))
 //        {
-//          DEBUG_LOG() << " the time of the participant is older than the BoobyTrap participantId=" << participantPos.participantId()
+//          DEBUG_LOG(m_logger) << " the time of the participant is older than the BoobyTrap participantId=" << participantPos.participantId()
 //                              << " participantPos.sampleTime()=" << participantPos.sampleTime()
 //                              << " data.sampleTime()=" << data.sampleTime()
 //                              << " diff =" << participantPos.sampleTime() - data.sampleTime();
 //          continue;
 //        }
-//        DEBUG_LOG() << "pos participantId=" << participantPos.participantId()
+//        DEBUG_LOG(m_logger) << "pos participantId=" << participantPos.participantId()
 //                            << " buildingId=" << participantPos.buildingId()
 //                            << " insideBuilding=" << participantPos.insideBuilding()
 //                            << " positionValid=" << participantPos.positionValid
@@ -252,7 +252,7 @@ void HandlerParticipantBoobyTrap::onAesItemViewChanged(const AreaEffectSimulatio
     }
     default:
     {
-      DEBUG_LOG() << "default";
+      DEBUG_LOG(m_logger) << "default";
     }
     }
 
@@ -264,28 +264,28 @@ void HandlerParticipantBoobyTrap::onAesItemViewChanged(const AreaEffectSimulatio
 
 void HandlerParticipantBoobyTrap::calculateBoobyTrapParticipantsSecondary(int aesItemId, int participantId)
 {
-  DEBUG_LOG() << "calculateBoobyTrapParticipantsSecondary : aesItemId=" << aesItemId;
+  DEBUG_LOG(m_logger) << "calculateBoobyTrapParticipantsSecondary : aesItemId=" << aesItemId;
   const auto partPosMap = m_handlerParticipant->positions();
   for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPos : partPosMap)
   {
     if (participantPos.participantId() == participantId)
     {
-      DEBUG_LOG() << "is already handled participantId=" << participantId;
+      DEBUG_LOG(m_logger) << "is already handled participantId=" << participantId;
       continue;
     }
     if (m_handlerParticipant->isOutdated(participantPos))
     {
-      // DEBUG_LOG() << "isOutdated participantId=" << participantPos.participantId();
+      // DEBUG_LOG(m_logger) << "isOutdated participantId=" << participantPos.participantId();
       continue;
     }
     if (participantPos.insideBuilding())
     {
-      DEBUG_LOG() << "inside Building participantId=" << participantPos.participantId() << " continue";
+      DEBUG_LOG(m_logger) << "inside Building participantId=" << participantPos.participantId() << " continue";
       continue;
     }
     if (participantPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::inner_enum::CatastrophicKill)
     {
-      DEBUG_LOG() << "CatastrophicKill participantId=" << participantPos.participantId() << " continue";
+      DEBUG_LOG(m_logger) << "CatastrophicKill participantId=" << participantPos.participantId() << " continue";
       continue;
     }
     const CentralEffectSimulation::AesItemViewUtm aesItemView = m_boobyTrapItemsSecondary.value(aesItemId);
@@ -295,7 +295,7 @@ void HandlerParticipantBoobyTrap::calculateBoobyTrapParticipantsSecondary(int ae
 
 bool HandlerParticipantBoobyTrap::insideSecondaryArea(const QPolygonF &polygonf, const QPointF &participantPos) const
 {
-  DEBUG_LOG() << "pos to check: " << CentralEffectSimulation::debug(participantPos) ;
+  DEBUG_LOG(m_logger) << "pos to check: " << CentralEffectSimulation::debug(participantPos) ;
   return  polygonf.containsPoint(participantPos, Qt::OddEvenFill);
 }
 
@@ -306,19 +306,19 @@ bool HandlerParticipantBoobyTrap::enteredOrCrossedArea(const QPolygonF &polygonf
 #else
   bool result = polygonf.intersects(participantStep);
 #endif
-  DEBUG_LOG() << "enteredOrCrossedArea : " << CentralEffectSimulation::debug(participantStep[0])
+  DEBUG_LOG(m_logger) << "enteredOrCrossedArea : " << CentralEffectSimulation::debug(participantStep[0])
                       << " to " << CentralEffectSimulation::debug(participantStep[1])
                       << " result = " << result;
   for (int i = 0; i < polygonf.size(); i++)
   {
     const QPointF point = polygonf[i];
-    DEBUG_LOG() << "polygonf[" << i << "]="
+    DEBUG_LOG(m_logger) << "polygonf[" << i << "]="
                         << point.x() << "/" << point.y();
   }
   for (int i = 0; i < participantStep.size(); i++)
   {
     const QPointF point = participantStep[i];
-    DEBUG_LOG() << "participantStep[" << i << "]="
+    DEBUG_LOG(m_logger) << "participantStep[" << i << "]="
                         << point.x() << "/" << point.y();
   }
   //return  polygonf.containsPoint(participantStep, Qt::OddEvenFill);
@@ -335,10 +335,10 @@ void HandlerParticipantBoobyTrap::calculateBoobyTrapParticipantSecondary(const C
   const QPointF impactPosGeo = QPointF(boobyTrap.impactPosition().lon(), boobyTrap.impactPosition().lat());
 
 
-  DEBUG_LOG() << "calculateBoobyTrapParticipantSecondary itemView.id=" << aesItemView.aesItemId
+  DEBUG_LOG(m_logger) << "calculateBoobyTrapParticipantSecondary itemView.id=" << aesItemView.aesItemId
                       << " participantId=" << participantPos.participantId();
 
-  DEBUG_LOG() << "BoobyTrap id = " << aesItemView.aesItemId
+  DEBUG_LOG(m_logger) << "BoobyTrap id = " << aesItemView.aesItemId
                       << ", Box bottomLeft = " << CentralEffectSimulation::debug(aesItemView.boundingBoxBottomLeft)
                       << ", topRight = " << CentralEffectSimulation::debug(aesItemView.boundingBoxTopRight);
   bool completeEnclosed = false;
@@ -352,30 +352,30 @@ void HandlerParticipantBoobyTrap::calculateBoobyTrapParticipantSecondary(const C
       //dtcIsm.get()->getBuildingByPolygon(exerciseId, polygonGeo, completeEnclosed, isGroundLevel);
   if ( buildingIds.size() > 0)
   {
-    DEBUG_LOG() << "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() << "not in boundingBox " << participantPos.participantId();
+    DEBUG_LOG(m_logger) << "not in boundingBox " << participantPos.participantId();
   else
-    DEBUG_LOG() << "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() << "insideSecondaryArea : "
+  DEBUG_LOG(m_logger) << "insideSecondaryArea : "
                       << " participantId=" << participantPos.participantId()
                       << " aesItemId=" << aesItemView.aesItemId
                       << " result=" << result;
   // const bool result = enteredOrCrossedArea(aesItemView.form, partPosGeo);
-  DEBUG_LOG() << "result BoobyTrap Explosion = " << result;
+  DEBUG_LOG(m_logger) << "result BoobyTrap Explosion = " << result;
   if (result)
   {
-    DEBUG_LOG() << "sendParticipantEvent";
+    DEBUG_LOG(m_logger) << "sendParticipantEvent";
     sendParticipantEvent(aesItemView, participantPos, ProjectDataManagement::EventType_def::HitMine);
-    DEBUG_LOG() << "sendParticipantHit";
+    DEBUG_LOG(m_logger) << "sendParticipantHit";
     sendParticipantHit(aesItemView, participantPos, ProjectDataManagement::EventType_def::HitMine);
   }
 } // calculateBoobyTrapParticipantSecondary
@@ -385,7 +385,7 @@ bool HandlerParticipantBoobyTrap::intersectsBoundingBoxCheck(const CentralEffect
                                                              const int participantId)
 {
   bool result = false;
-  DEBUG_LOG() << "intersectsBoundingBoxCheck participantId=" << participantId
+  DEBUG_LOG(m_logger) << "intersectsBoundingBoxCheck participantId=" << participantId
                       << " itemViewId=" << itemView.aesItemId
                       << " m_zone=" << itemView.zone;
   const QPolygonF stepPoly = m_handlerParticipant->getParticipantStep(participantId, itemView.zone);
@@ -393,10 +393,10 @@ bool HandlerParticipantBoobyTrap::intersectsBoundingBoxCheck(const CentralEffect
     return false;
 
 
-  DEBUG_LOG() << "stepPoly von=" << stepPoly.at(0).x() << "/" << stepPoly.at(0).y()
+  DEBUG_LOG(m_logger) << "stepPoly von=" << stepPoly.at(0).x() << "/" << stepPoly.at(0).y()
                       << " bis=" << stepPoly.at(1).x() << "/" << stepPoly.at(1).y()
                       << " m_zone=" << itemView.zone;
-  DEBUG_LOG() << "ItemView Bounding Box BottomLeft=" << itemView.boundingBoxBottomLeft.x() << "/" << itemView.boundingBoxBottomLeft.y()
+  DEBUG_LOG(m_logger) << "ItemView Bounding Box BottomLeft=" << itemView.boundingBoxBottomLeft.x() << "/" << itemView.boundingBoxBottomLeft.y()
                       << " boundingBoxTopRight=" << itemView.boundingBoxTopRight.x() << "/" << itemView.boundingBoxTopRight.y();
 
 #if QT_VERSION < QT_VERSION_CHECK(5,10,0)
@@ -404,7 +404,7 @@ bool HandlerParticipantBoobyTrap::intersectsBoundingBoxCheck(const CentralEffect
 #else
   result =  itemView.boundingBox.intersects(stepPoly);
 #endif
-  DEBUG_LOG() << "HandlerMineAreas::intersectsBoundingBoxCheck result =" << result;
+  DEBUG_LOG(m_logger) << "HandlerMineAreas::intersectsBoundingBoxCheck result =" << result;
   return result;
 
 }
@@ -413,7 +413,7 @@ bool HandlerParticipantBoobyTrap::calculateBoobyTrapParticipant(const CentralEff
                                                                 const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPos)
 {
 
-  DEBUG_LOG() << "calculateBoobyTrapParticipant itemView.id=" << aesItemView.aesItemId
+  DEBUG_LOG(m_logger) << "calculateBoobyTrapParticipant itemView.id=" << aesItemView.aesItemId
                       << " participantId=" << participantPos.participantId();
 
   // Check coverage by a building
@@ -433,28 +433,28 @@ bool HandlerParticipantBoobyTrap::calculateBoobyTrapParticipant(const CentralEff
 
   if (buildingIds.size() > 0)
   {
-    DEBUG_LOG() << "coverage by building id =" << buildingIds[0];
+    DEBUG_LOG(m_logger) << "coverage by building id =" << buildingIds[0];
     return false;
   }
 
   const QPointF partPosUtm = CentralEffectSimulation::geographic2Utm(participantPos.pos(), -1);
-  DEBUG_LOG() << "BoobyTrap id = " << aesItemView.aesItemId
+  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() << "not in boundingBox " << participantPos.participantId();
+    DEBUG_LOG(m_logger) << "not in boundingBox " << participantPos.participantId();
     bool intersectsBoundingBox = intersectsBoundingBoxCheck(aesItemView, participantPos.participantId());
     if (!intersectsBoundingBox)
     {
-      DEBUG_LOG() << "Continue nach Bounding BoxCheck itemView: " << aesItemView.aesItemId << ", "
+      DEBUG_LOG(m_logger) << "Continue nach Bounding BoxCheck itemView: " << aesItemView.aesItemId << ", "
                           << " paricipantId=" << participantPos.participantId();
       return false;
     }
   }
   else
-    DEBUG_LOG() << "in boundingBox participantId=" << participantPos.participantId();
+    DEBUG_LOG(m_logger) << "in boundingBox participantId=" << participantPos.participantId();
   const QPolygonF posStepPoly = m_handlerParticipant->getParticipantStep(participantPos.participantId(), aesItemView.zone);
 
 
@@ -462,19 +462,19 @@ bool HandlerParticipantBoobyTrap::calculateBoobyTrapParticipant(const CentralEff
     return false;
 
   const bool result = enteredOrCrossedArea(aesItemView.form, posStepPoly);
-  DEBUG_LOG() << "enteredOrCrossedArea : "
+  DEBUG_LOG(m_logger) << "enteredOrCrossedArea : "
                       << " participantId=" << participantPos.participantId()
                       << " aesItemId=" << aesItemView.aesItemId
                       << " result=" << result;
   // const bool result = enteredOrCrossedArea(aesItemView.form, partPosGeo);
-  DEBUG_LOG() << "result BoobyTrap Explosion = " << result;
+  DEBUG_LOG(m_logger) << "result BoobyTrap Explosion = " << result;
   if (result)
   {
-    DEBUG_LOG() << "sendFtcBoobyTrapTrigger id=" << aesItemView.aesItemId;
+    DEBUG_LOG(m_logger) << "sendFtcBoobyTrapTrigger id=" << aesItemView.aesItemId;
     sendFtcBoobyTrapTrigger(aesItemView.aesItemId);
-    DEBUG_LOG() << "sendParticipantEvent";
+    DEBUG_LOG(m_logger) << "sendParticipantEvent";
     sendParticipantEvent(aesItemView, participantPos, ProjectDataManagement::EventType_def::HitMine);
-    DEBUG_LOG() << "sendParticipantHit";
+    DEBUG_LOG(m_logger) << "sendParticipantHit";
     sendParticipantHit(aesItemView, participantPos, ProjectDataManagement::EventType_def::HitMine);
     //calculateBoobyTrapParticipantsSecondary(aesItemView.aesItemId, participantPos.participantId() );
   }
@@ -484,7 +484,7 @@ bool HandlerParticipantBoobyTrap::calculateBoobyTrapParticipant(const CentralEff
 void HandlerParticipantBoobyTrap::onParticipantPositionChanged(const CentralEffectSimulation::HandlerParticipant::CesParticipantData &partPos)
 {
   // Bounding Box von der Linie
-  DEBUG_LOG() << "ParicipantPos "
+  DEBUG_LOG(m_logger) << "ParicipantPos "
                       << " participantId=" << partPos.participantId()
                       << " participantTypeId=" << partPos.participantTypeId()
                       << " participantPos: lat=" << partPos.pos().lat()
@@ -493,13 +493,13 @@ void HandlerParticipantBoobyTrap::onParticipantPositionChanged(const CentralEffe
 
   if (partPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::inner_enum::CatastrophicKill)
   {
-    DEBUG_LOG() << "Not handle position: participant has vulnerability state CatastrophicKill";
+    DEBUG_LOG(m_logger) << "Not handle position: participant has vulnerability state CatastrophicKill";
     return;
   }
 
   if (m_handlerParticipant->getEquipmentNumber(partPos.participantId()) == 0)
   {
-    DEBUG_LOG() << "Not handle position: participant has no equipment number";
+    DEBUG_LOG(m_logger) << "Not handle position: participant has no equipment number";
     return;
   }
 
@@ -508,7 +508,7 @@ void HandlerParticipantBoobyTrap::onParticipantPositionChanged(const CentralEffe
     if (!calculateBoobyTrapParticipant(boobyTrap, partPos))
       continue;
 
-    DEBUG_LOG() << "boobyTrap id = " << boobyTrap.aesItemId
+    DEBUG_LOG(m_logger) << "boobyTrap id = " << boobyTrap.aesItemId
                         << ", Box bottomLeft = " << CentralEffectSimulation::debug(boobyTrap.boundingBoxBottomLeft)
                         << ", topRight = " << CentralEffectSimulation::debug(boobyTrap.boundingBoxTopRight);
 
@@ -518,7 +518,7 @@ void HandlerParticipantBoobyTrap::onParticipantPositionChanged(const CentralEffe
       return;
 
     const bool result = enteredOrCrossedArea(boobyTrap.form, posStepPoly);
-    DEBUG_LOG() << "result BoobyTrap Explosion = " << result;
+    DEBUG_LOG(m_logger) << "result BoobyTrap Explosion = " << result;
     if (result)
       sendParticipantEvent(boobyTrap, partPos, ProjectDataManagement::EventType_def::HitMine);
   }
@@ -536,13 +536,13 @@ void HandlerParticipantBoobyTrap::sendParticipantEvent(const CentralEffectSimula
                                                        const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
                                                        const ProjectDataManagement::EventType eventType)
 {
-  DEBUG_LOG() << "sendParticipantEvent aesItemId=" << boobyTrapItem.aesItemId
+  DEBUG_LOG(m_logger) << "sendParticipantEvent aesItemId=" << boobyTrapItem.aesItemId
                       << " participantId=" << participantPosition.participantId();
 
   if ((m_triggeredMineParticipant.contains(boobyTrapItem.aesItemId))
       && (m_triggeredMineParticipant.value(boobyTrapItem.aesItemId) == participantPosition.participantId()))
   {
-    DEBUG_LOG() << "m_triggeredMineParticipant already sent "
+    DEBUG_LOG(m_logger) << "m_triggeredMineParticipant already sent "
                         << " aesItemId=" << boobyTrapItem.aesItemId
                         << " participantId=" << participantPosition.participantId();
     return;
@@ -563,7 +563,7 @@ void HandlerParticipantBoobyTrap::sendParticipantEvent(const CentralEffectSimula
   CentralEffectSimulation::ParticipantEvent pe;
   if (m_boobyTraps.contains(boobyTrapItem.aesItemId))
   {
-    INFO_LOG() << "BoobyTrap Position found";
+    INFO_LOG(m_logger) << "BoobyTrap Position found";
     AreaEffectSimulation::BoobyTrap boobyTrap = m_boobyTraps.value(boobyTrapItem.aesItemId);
 
     pe.position().lat(boobyTrap.impactPosition().lat());
@@ -571,14 +571,14 @@ void HandlerParticipantBoobyTrap::sendParticipantEvent(const CentralEffectSimula
   }
   else
   {
-    INFO_LOG() << "No BoobyTrap Position found";
+    INFO_LOG(m_logger) << "No BoobyTrap Position found";
     pe.position(participantPosition.pos());
   }
 
   const AreaEffectSimulation::BoobyTrap &bt = m_ddsHandler->dtcAes()->boobyTrap(boobyTrapItem.aesItemId);
 
 
-  DEBUG_LOG() << "sendParticipantEvent participantId=" << participantPosition.participantId()
+  DEBUG_LOG(m_logger) << "sendParticipantEvent participantId=" << participantPosition.participantId()
                       << " lat= " << participantPosition.pos().lat()
                       << " lon= " << participantPosition.pos().lon()
                       << " equipmentNumber=" << equipmentNumber
@@ -622,7 +622,7 @@ void HandlerParticipantBoobyTrap::sendParticipantHit(const CentralEffectSimulati
   //pos.position(position);
   //pos.reportingSource(participantPosition.reportingSource());
 
-  DEBUG_LOG() << "sendParticipantHit participantId=" << participantId
+  DEBUG_LOG(m_logger) << "sendParticipantHit participantId=" << participantId
                       << " equipmentNumber=" <<  equipNo
                       << " chargeTypeId=" << boobyTrap.chargeStruct.chargeTypeId()
                       << " eventType=" << eventType
@@ -649,17 +649,17 @@ void HandlerParticipantBoobyTrap::sendParticipantHit(const CentralEffectSimulati
 void HandlerParticipantBoobyTrap::onSendCesHitReply(const Core::FunctionReplyObject &replyObject)
 {
   //if (replyObject.error())
-  //  WARNING_LOG() << "Can not send hit on participant to training area: " << replyObject();
+  //  WARNING_LOG(m_logger) << "Can not send hit on participant to training area: " << replyObject();
   //else
-  DEBUG_LOG() << "onSendCesHitReply for id " << replyObject.id() << " success";
+  DEBUG_LOG(m_logger) << "onSendCesHitReply for id " << replyObject.id() << " success";
 }
 
 void HandlerParticipantBoobyTrap::onBoobyTrapTriggerReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    ERROR_LOG() << "Can not send BoobyTrapTriggerReply: " << replyObject();
+    ERROR_LOG(m_logger) << "Can not send BoobyTrapTriggerReply: " << replyObject();
   else
-    DEBUG_LOG() << "onBoobyTrapTriggerReply for id " << replyObject.id() << " success";
+    DEBUG_LOG(m_logger) << "onBoobyTrapTriggerReply for id " << replyObject.id() << " success";
 }
 
 
@@ -669,7 +669,7 @@ void HandlerParticipantBoobyTrap::sendFtcBoobyTrapTrigger(int aesItemId)
   AreaEffectSimulation::BoobyTrapTriggerRequest hr;
   hr.id(aesItemId);
   hr.triggered(true);
-  DEBUG_LOG()  << "sendFtcAesRemoveBoobyTrap: id=" << hr;
+  DEBUG_LOG(m_logger)  << "sendFtcAesRemoveBoobyTrap: id=" << hr;
   ftcAes->boobyTrapTriggerRequest(hr, this);
 }
 
@@ -678,7 +678,7 @@ void HandlerParticipantBoobyTrap::sendFtcCesHitRequestTimeout()
   auto ftcTab = m_ddsHandler->ftcTab();
   for (const TrainingAreaBase::SendCesHitRequest &hr : std::as_const(m_requestMap))
   {
-    DEBUG_LOG()  << "sendFtcCesHitRequestTimeout: " << hr;
+    DEBUG_LOG(m_logger)  << "sendFtcCesHitRequestTimeout: " << hr;
     ftcTab->sendCesHitRequest(hr, this);
   }
   m_requestMap.clear();
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 6c004d596..55c551327 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
@@ -28,7 +28,7 @@ HandlerParticipantOffRouteMine::HandlerParticipantOffRouteMine(const std::shared
   , m_timer(new QTimer(this))
   , m_logger(CentralEffectSimulation::getLogger("Plugin.VirtualMines.HandlerParticipantOffRouteMine"))
 {
-  INFO_LOG() << "HandlerParticipantOffRouteMine::HandlerParticipantOffRouteMine";
+  INFO_LOG(m_logger) << "HandlerParticipantOffRouteMine::HandlerParticipantOffRouteMine";
   m_timer->setSingleShot(true);
   connect(m_timer, &QTimer::timeout, this, &HandlerParticipantOffRouteMine::sendFtcCesHitRequestTimeout);
 } // end of ctor()
@@ -36,13 +36,13 @@ HandlerParticipantOffRouteMine::HandlerParticipantOffRouteMine(const std::shared
 
 HandlerParticipantOffRouteMine::~HandlerParticipantOffRouteMine()
 {
-  INFO_LOG() << "HandlerParticipantOffRouteMine::~HandlerParticipantOffRouteMine";
+  INFO_LOG(m_logger) << "HandlerParticipantOffRouteMine::~HandlerParticipantOffRouteMine";
 } // end of dtor()
 //-----------------------------------------------------------------------------
 
 bool HandlerParticipantOffRouteMine::init()
 {
-  INFO_LOG() << "HandlerParticipantOffRouteMine::init";
+  INFO_LOG(m_logger) << "HandlerParticipantOffRouteMine::init";
   auto dtcAes = m_ddsHandler->dtcAes();
   auto ftcAes = m_ddsHandler->ftcAes();
   auto dtcCes = m_ddsHandler->dtsCes();
@@ -72,7 +72,7 @@ bool HandlerParticipantOffRouteMine::init()
   }
 
 
-  INFO_LOG() << "HandlerParticipantOffRouteMine::init() finished. ";
+  INFO_LOG(m_logger) << "HandlerParticipantOffRouteMine::init() finished. ";
   return true;
 } // end of init()
 //-----------------------------------------------------------------------------
@@ -94,13 +94,13 @@ void HandlerParticipantOffRouteMine::onOffRouteMineChanged(const AreaEffectSimul
     m_offRouteMineItemsSecondary.remove(data.id());
     return;
   }
-  INFO_LOG() << "HandlerParticipantOffRouteMine::onOffRouteMineChanged";
+  INFO_LOG(m_logger) << "HandlerParticipantOffRouteMine::onOffRouteMineChanged";
   m_offRouteMines.insert(data.id(), data);
 }
 
 void HandlerParticipantOffRouteMine::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &data, DataModification modType)
 {
-  INFO_LOG() << "HandlerParticipantOffRouteMine::onAesItemViewChanged";
+  INFO_LOG(m_logger) << "HandlerParticipantOffRouteMine::onAesItemViewChanged";
   if (   data.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired
       || data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved
       || modType == DataModification::eRemoved)
@@ -114,7 +114,7 @@ void HandlerParticipantOffRouteMine::onAesItemViewChanged(const AreaEffectSimula
     return;
 
   const int aesItemId = data.aesItemId();
-  DEBUG_LOG() << "Got AesItemView id: " << aesItemId
+  DEBUG_LOG(m_logger) << "Got AesItemView id: " << aesItemId
                       << ", type: " << data.aesTypeId()
                       << ", effectState: " << data.effectStateId()
                       << ", modType: " << modType;
@@ -137,32 +137,32 @@ void HandlerParticipantOffRouteMine::onAesItemViewChanged(const AreaEffectSimula
         m_offRouteMineItems.insert(data.aesItemId(), aesItemViewUtm);
       if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary)
         m_offRouteMineItemsSecondary.insert(data.aesItemId(), aesItemViewUtm);
-//      DEBUG_LOG() << "Check each participant";
+//      DEBUG_LOG(m_logger) << "Check each participant";
 //      // Check each participant
 //      const auto partPosMap = m_handlerParticipant->positions();
 //      for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPos : partPosMap)
 //      {
 //        if (m_handlerParticipant->isOutdated(participantPos))
 //        {
-//          DEBUG_LOG() << "isOutdated participantId=" << participantPos.participantId() << " continue";
+//          DEBUG_LOG(m_logger) << "isOutdated participantId=" << participantPos.participantId() << " continue";
 //          continue;
 //        }
 //        if (participantPos.insideBuilding())
 //        {
-//          DEBUG_LOG() << "inside Building participantId=" << participantPos.participantId() << " continue";
+//          DEBUG_LOG(m_logger) << "inside Building participantId=" << participantPos.participantId() << " continue";
 //          continue;
 //        }
 //        if (participantPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::inner_enum::CatastrophicKill)
 //        {
-//          DEBUG_LOG() << "CatastrophicKill participantId=" << participantPos.participantId() << " continue";
+//          DEBUG_LOG(m_logger) << "CatastrophicKill participantId=" << participantPos.participantId() << " continue";
 //          continue;
 //        }
 ////        if (participantPos.sampleTime() < data.sampleTime())
 ////        {
-////          DEBUG_LOG() << " the time of the participant is older than the OffRouteMine participantId=" << participantPos.participantId();
+////          DEBUG_LOG(m_logger) << " the time of the participant is older than the OffRouteMine participantId=" << participantPos.participantId();
 ////          continue;
 ////        }
-//        DEBUG_LOG() << "pos participantId=" << participantPos.participantId()
+//        DEBUG_LOG(m_logger) << "pos participantId=" << participantPos.participantId()
 //                            << " buildingId=" << participantPos.buildingId()
 //                            << " insideBuilding=" << participantPos.insideBuilding()
 //                            << " positionValid=" << participantPos.positionValid;
@@ -173,7 +173,7 @@ void HandlerParticipantOffRouteMine::onAesItemViewChanged(const AreaEffectSimula
     }
     default:
     {
-      DEBUG_LOG() << "remove OffRouteMine";
+      DEBUG_LOG(m_logger) << "remove OffRouteMine";
       m_offRouteMineItems.remove(aesItemId);
     }
     }
@@ -186,13 +186,13 @@ void HandlerParticipantOffRouteMine::onAesItemViewChanged(const AreaEffectSimula
 
 void HandlerParticipantOffRouteMine::calculateOffRouteMineParticipantsSecondary(int aesItemId)
 {
-  DEBUG_LOG() << "calculateOffRouteMineParticipantsSecondary : aesItemId=" << aesItemId;
+  DEBUG_LOG(m_logger) << "calculateOffRouteMineParticipantsSecondary : aesItemId=" << aesItemId;
   const auto partPosMap = m_handlerParticipant->positions();
   for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPos : partPosMap)
   {
     if (m_handlerParticipant->isOutdated(participantPos))
     {
-      // DEBUG_LOG() << "isOutdated participantId=" << participantPos.participantId();
+      // DEBUG_LOG(m_logger) << "isOutdated participantId=" << participantPos.participantId();
       continue;
     }
     const CentralEffectSimulation::AesItemViewUtm aesItemView = m_offRouteMineItemsSecondary.value(aesItemId);
@@ -202,7 +202,7 @@ void HandlerParticipantOffRouteMine::calculateOffRouteMineParticipantsSecondary(
 
 bool HandlerParticipantOffRouteMine::insideSecondaryArea(const QPolygonF &polygonf, const QPointF &participantPos) const
 {
-  DEBUG_LOG() << "pos to check: " << CentralEffectSimulation::debug(participantPos) ;
+  DEBUG_LOG(m_logger) << "pos to check: " << CentralEffectSimulation::debug(participantPos) ;
   return  polygonf.containsPoint(participantPos, Qt::OddEvenFill);
 }
 
@@ -213,19 +213,19 @@ bool HandlerParticipantOffRouteMine::enteredOrCrossedArea(const QPolygonF &polyg
 #else
   bool result = polygonf.intersects(participantStep);
 #endif
-  DEBUG_LOG() << "enteredOrCrossedArea : " << CentralEffectSimulation::debug(participantStep[0])
+  DEBUG_LOG(m_logger) << "enteredOrCrossedArea : " << CentralEffectSimulation::debug(participantStep[0])
                       << " to " << CentralEffectSimulation::debug(participantStep[1])
                       << " result = " << result;
   for (int i = 0; i < polygonf.size(); i++)
   {
     const QPointF point = polygonf[i];
-    DEBUG_LOG() << "polygonf[" << i << "]="
+    DEBUG_LOG(m_logger) << "polygonf[" << i << "]="
                         << point.x() << "/" << point.y();
   }
   for (int i = 0; i < participantStep.size(); i++)
   {
     const QPointF point = participantStep[i];
-    DEBUG_LOG() << "participantStep[" << i << "]="
+    DEBUG_LOG(m_logger) << "participantStep[" << i << "]="
                         << point.x() << "/" << point.y();
   }
   //return  polygonf.containsPoint(participantStep, Qt::OddEvenFill);
@@ -239,10 +239,10 @@ void HandlerParticipantOffRouteMine::calculateOffRouteMineParticipantSecondary(c
   bool result;
   const QPointF partPosGeo = CentralEffectSimulation::geographic2Utm(participantPos.pos(), aesItemView.zone);
 
-  DEBUG_LOG() << "calculateOffRouteMineParticipantSecondary itemView.id=" << aesItemView.aesItemId
+  DEBUG_LOG(m_logger) << "calculateOffRouteMineParticipantSecondary itemView.id=" << aesItemView.aesItemId
                       << " participantId=" << participantPos.participantId();
 
-  DEBUG_LOG() << "OffRouteMine id = " << aesItemView.aesItemId
+  DEBUG_LOG(m_logger) << "OffRouteMine id = " << aesItemView.aesItemId
                       << ", Box bottomLeft = " << CentralEffectSimulation::debug(aesItemView.boundingBoxBottomLeft)
                       << ", topRight = " << CentralEffectSimulation::debug(aesItemView.boundingBoxTopRight);
 
@@ -257,23 +257,23 @@ void HandlerParticipantOffRouteMine::calculateOffRouteMineParticipantSecondary(c
                                          });
 //  if (!boundingBoxAesItemView.containsPoint(partPosGeo, Qt::OddEvenFill))
 //  {
-//    DEBUG_LOG() << "not in boundingBox";
+//    DEBUG_LOG(m_logger) << "not in boundingBox";
 //    return;
 //  }
 
 
   result = insideSecondaryArea(aesItemView.form, partPosGeo);
-  DEBUG_LOG() << "insideSecondaryArea : "
+  DEBUG_LOG(m_logger) << "insideSecondaryArea : "
                       << " participantId=" << participantPos.participantId()
                       << " aesItemId=" << aesItemView.aesItemId
                       << " result=" << result;
   // const bool result = enteredOrCrossedArea(aesItemView.form, partPosGeo);
-  DEBUG_LOG() << "result OffRouteMine Explosion = " << result;
+  DEBUG_LOG(m_logger) << "result OffRouteMine Explosion = " << result;
   if (result)
   {
-    DEBUG_LOG() << "sendParticipantEvent";
+    DEBUG_LOG(m_logger) << "sendParticipantEvent";
     sendParticipantEvent(aesItemView, participantPos, ProjectDataManagement::EventType_def::HitMine); //69
-    DEBUG_LOG() << "sendParticipantHit";
+    DEBUG_LOG(m_logger) << "sendParticipantHit";
     sendParticipantHit(aesItemView, participantPos, ProjectDataManagement::EventType_def::HitMine); // 49
   }
 } // calculateOffRouteMineParticipantSecondary
@@ -283,10 +283,10 @@ void HandlerParticipantOffRouteMine::calculateOffRouteMineParticipant(const Cent
                                                                       const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPos)
 {
 
-  DEBUG_LOG() << "calculateOffRouteMineParticipant itemView.id=" << aesItemView.aesItemId
+  DEBUG_LOG(m_logger) << "calculateOffRouteMineParticipant itemView.id=" << aesItemView.aesItemId
                       << " participantId=" << participantPos.participantId();
 
-  DEBUG_LOG() << "OffRouteMine id = " << aesItemView.aesItemId
+  DEBUG_LOG(m_logger) << "OffRouteMine id = " << aesItemView.aesItemId
                       << ", Box bottomLeft = " << CentralEffectSimulation::debug(aesItemView.boundingBoxBottomLeft)
                       << ", topRight = " << CentralEffectSimulation::debug(aesItemView.boundingBoxTopRight);
 
@@ -296,19 +296,19 @@ void HandlerParticipantOffRouteMine::calculateOffRouteMineParticipant(const Cent
     return;
 
   const bool result = enteredOrCrossedArea(aesItemView.form, posStepPoly);
-  DEBUG_LOG() << "enteredOrCrossedArea : "
+  DEBUG_LOG(m_logger) << "enteredOrCrossedArea : "
                       << " participantId=" << participantPos.participantId()
                       << " aesItemId=" << aesItemView.aesItemId
                       << " result=" << result;
   // const bool result = enteredOrCrossedArea(aesItemView.form, partPosGeo);
-  DEBUG_LOG() << "result OffRouteMine Explosion = " << result;
+  DEBUG_LOG(m_logger) << "result OffRouteMine Explosion = " << result;
   if (result)
   {
-    DEBUG_LOG() << "sendFtcOffRouteMineTrigger id=" << aesItemView.aesItemId;
+    DEBUG_LOG(m_logger) << "sendFtcOffRouteMineTrigger id=" << aesItemView.aesItemId;
     sendFtcOffRouteMineTrigger(aesItemView.aesItemId);
-    DEBUG_LOG() << "sendParticipantEvent";
+    DEBUG_LOG(m_logger) << "sendParticipantEvent";
     sendParticipantEvent(aesItemView, participantPos, ProjectDataManagement::EventType_def::HitMine);
-    DEBUG_LOG() << "sendParticipantHit";
+    DEBUG_LOG(m_logger) << "sendParticipantHit";
     sendParticipantHit(aesItemView, participantPos, ProjectDataManagement::EventType_def::HitMine);
     calculateOffRouteMineParticipantsSecondary(aesItemView.aesItemId);
   }
@@ -319,7 +319,7 @@ void HandlerParticipantOffRouteMine::onParticipantPositionChanged(const CentralE
   ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(partPos.participantTypeId());
 
   // Bounding Box von der Linie
-  DEBUG_LOG() << "ParicipantPos "
+  DEBUG_LOG(m_logger) << "ParicipantPos "
                       << " participantId=" << partPos.participantId()
                       << " participantTypeId=" << partPos.participantTypeId()
                       << " typeClass=" << typeClass
@@ -329,7 +329,7 @@ void HandlerParticipantOffRouteMine::onParticipantPositionChanged(const CentralE
 
   if (partPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::inner_enum::CatastrophicKill)
   {
-    DEBUG_LOG() << "Not handle position: participant has vulnerability state CatastrophicKill";
+    DEBUG_LOG(m_logger) << "Not handle position: participant has vulnerability state CatastrophicKill";
     return;
   }
 
@@ -337,13 +337,13 @@ void HandlerParticipantOffRouteMine::onParticipantPositionChanged(const CentralE
       && typeClass != ParticipantManagement::TypeClass_def::WeaponSystem
       && typeClass != ParticipantManagement::TypeClass_def::VehicleWithGear)
   {
-    INFO_LOG() << "Not handle position: No type vehicle ";
+    INFO_LOG(m_logger) << "Not handle position: No type vehicle ";
     return;
   }
 
   if (m_handlerParticipant->getEquipmentNumber(partPos.participantId()) == 0)
   {
-    DEBUG_LOG() << "Not handle position: participant has no equipment number";
+    DEBUG_LOG(m_logger) << "Not handle position: participant has no equipment number";
     return;
   }
 
@@ -351,7 +351,7 @@ void HandlerParticipantOffRouteMine::onParticipantPositionChanged(const CentralE
   {
     calculateOffRouteMineParticipant(offRouteMine, partPos);
 
-    DEBUG_LOG() << "offRouteMine id = " << offRouteMine.aesItemId
+    DEBUG_LOG(m_logger) << "offRouteMine id = " << offRouteMine.aesItemId
                         << ", Box bottomLeft = " << CentralEffectSimulation::debug(offRouteMine.boundingBoxBottomLeft)
                         << ", topRight = " << CentralEffectSimulation::debug(offRouteMine.boundingBoxTopRight);
 
@@ -376,7 +376,7 @@ void HandlerParticipantOffRouteMine::onParticipantPositionChanged(const CentralE
     posStepPoly.append(utmStepPoly[0]);
     posStepPoly.append(utmStepPoly[1]);
     const bool result = enteredOrCrossedArea(offRouteMine.form, posStepPoly);
-    DEBUG_LOG() << "result offRouteMine Explosion = " << result;
+    DEBUG_LOG(m_logger) << "result offRouteMine Explosion = " << result;
     if (result)
       sendParticipantEvent(offRouteMine, partPos, ProjectDataManagement::EventType_def::HitMine);
   }
@@ -409,7 +409,7 @@ void HandlerParticipantOffRouteMine::sendParticipantEvent(const CentralEffectSim
   CentralEffectSimulation::ParticipantEvent pe;
   if (m_offRouteMines.contains(offRouteItem.aesItemId))
   {
-    INFO_LOG() << "OffRouteMine Position found";
+    INFO_LOG(m_logger) << "OffRouteMine Position found";
     AreaEffectSimulation::OffRouteMine offRouteMine = m_offRouteMines.value(offRouteItem.aesItemId);
 
     pe.position().lat(offRouteMine.area().cornerBottomLeft().lat());
@@ -417,13 +417,13 @@ void HandlerParticipantOffRouteMine::sendParticipantEvent(const CentralEffectSim
   }
   else
   {
-    INFO_LOG() << "No OffRouteMine Position found";
+    INFO_LOG(m_logger) << "No OffRouteMine Position found";
     pe.position(participantPosition.pos());
   }
 
   const AreaEffectSimulation::OffRouteMine &of = m_ddsHandler->dtcAes()->offRouteMine(offRouteItem.aesItemId);
 
-  DEBUG_LOG() << "sendParticipantEvent participantId=" << participantPosition.participantId()
+  DEBUG_LOG(m_logger) << "sendParticipantEvent participantId=" << participantPosition.participantId()
                       << " lat= " << participantPosition.pos().lat()
                       << " lon= " << participantPosition.pos().lon()
                       << " equipmentNumber=" << equipmentNumber
@@ -453,7 +453,7 @@ void HandlerParticipantOffRouteMine::sendParticipantHit(const CentralEffectSimul
   const int participantId = participantPosition.participantId();
   const int originatorEquipNo = 0;
 
-  DEBUG_LOG() << "sendParticipantHit participantId=" << participantId
+  DEBUG_LOG(m_logger) << "sendParticipantHit participantId=" << participantId
                       << " equipmentNumber=" <<  equipNo;
 
   Core::GeoPosition position;
@@ -492,17 +492,17 @@ void HandlerParticipantOffRouteMine::sendParticipantHit(const CentralEffectSimul
 void HandlerParticipantOffRouteMine::onSendCesHitReply(const Core::FunctionReplyObject &replyObject)
 {
   //if (replyObject.error())
-  //  WARNING_LOG() << "Can not send hit on participant to training area: " << replyObject();
+  //  WARNING_LOG(m_logger) << "Can not send hit on participant to training area: " << replyObject();
   //else
-  DEBUG_LOG() << "onSendCesHitReply for id " << replyObject.id() << " success";
+  DEBUG_LOG(m_logger) << "onSendCesHitReply for id " << replyObject.id() << " success";
 }
 
 void HandlerParticipantOffRouteMine::onOffRouteMineTriggerReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    ERROR_LOG() << "Can not send OffRouteMineTriggerReply: " << replyObject();
+    ERROR_LOG(m_logger) << "Can not send OffRouteMineTriggerReply: " << replyObject();
   else
-    DEBUG_LOG() << "onOffRouteMineTriggerReply for id " << replyObject.id() << " success";
+    DEBUG_LOG(m_logger) << "onOffRouteMineTriggerReply for id " << replyObject.id() << " success";
 }
 
 
@@ -512,7 +512,7 @@ void HandlerParticipantOffRouteMine::sendFtcOffRouteMineTrigger(int aesItemId)
   AreaEffectSimulation::OffRouteMineTriggerRequest hr;
   hr.id(aesItemId);
   hr.triggered(true);
-  DEBUG_LOG()  << "send  OffRouteMineTriggerRequest: id=" << hr;
+  DEBUG_LOG(m_logger)  << "send  OffRouteMineTriggerRequest: id=" << hr;
   ftcAes->offRouteMineTriggerRequest(hr, this);
 }
 
@@ -521,7 +521,7 @@ void HandlerParticipantOffRouteMine::sendFtcCesHitRequestTimeout()
   auto ftcTab = m_ddsHandler->ftcTab();
   for (const TrainingAreaBase::SendCesHitRequest &hr : std::as_const(m_requestMap))
   {
-    DEBUG_LOG()  << "sendFtcCesHitRequestTimeout: " << hr;
+    DEBUG_LOG(m_logger)  << "sendFtcCesHitRequestTimeout: " << hr;
     ftcTab->sendCesHitRequest(hr, this);
   }
   m_requestMap.clear();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/plugin.cpp
index d9433cc30..d3a6d3861 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/plugin.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/plugin.cpp
@@ -49,7 +49,7 @@ bool CesVirtualMinesInterfaceImpl::init(int domainId, int exerciseId)
 {
   m_domainId = domainId;
   m_exerciseId = exerciseId;
-  INFO_LOG() << "CesVirtualMinesInterfaceImpl::init()"
+  INFO_LOG(m_logger) << "CesVirtualMinesInterfaceImpl::init()"
                      << " m_domainId=" << m_domainId
                      << " m_exerciseId=" << m_exerciseId;
 
@@ -62,7 +62,7 @@ bool CesVirtualMinesInterfaceImpl::init(int domainId, int exerciseId)
 
   if (!m_handlerParticipantBoobyTrap->init())
   {
-    ERROR_LOG() << "Initialisation m_handlerParticipantBoobyTrap failed.";
+    ERROR_LOG(m_logger) << "Initialisation m_handlerParticipantBoobyTrap failed.";
     return false;
   }
 
@@ -74,7 +74,7 @@ bool CesVirtualMinesInterfaceImpl::init(int domainId, int exerciseId)
 
   if (!m_handlerParticipantOffRouteMine->init())
   {
-    ERROR_LOG() << "Initialisation m_handlerParticipantOffRouteMine failed.";
+    ERROR_LOG(m_logger) << "Initialisation m_handlerParticipantOffRouteMine failed.";
     return false;
   }
 
@@ -85,8 +85,8 @@ QString CesVirtualMinesInterfaceImpl::echo(const QString &message)
 {
 
   QString ret(QStringLiteral("<<<< %1 >>>> CesVirtualMinesInterfaceImpl::echo").arg(message));
-  INFO_LOG() << "CesVirtualMinesInterfaceImpl::echo return:" << ret;
-  DEBUG_LOG() << "DEBUG: CesVirtualMinesInterfaceImpl::echo return:" << ret;
+  INFO_LOG(m_logger) << "CesVirtualMinesInterfaceImpl::echo return:" << ret;
+  DEBUG_LOG(m_logger) << "DEBUG: CesVirtualMinesInterfaceImpl::echo return:" << ret;
   return ret;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/dds_handler.cpp
index 600d14feb..cc2bf11fc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/dds_handler.cpp
@@ -18,14 +18,14 @@ DdsHandler::DdsHandler(int domainId, int exerciseId)
   , m_participantEventId(0)
   , m_exerciseId(exerciseId)
 {
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -60,24 +60,24 @@ bool DdsHandler::init(const QStringList &qosFileList)
       !m_ftcTab->enableSendParticipantBeStillWarning() ||
       !m_ftcTab->enableDemandInit())
   {
-    ERROR_LOG() << "Could not enable SendCesHit";
+    ERROR_LOG(m_logger) << "Could not enable SendCesHit";
     return false;
   }
 
   m_ftcBld = Buildings::Interface::Ftc::create(m_ddsConnector);
   if (!m_ftcBld->enableSendCesHitOnBuilding())
   {
-    ERROR_LOG() << "Could not enable SendCesHitOnBuilding";
+    ERROR_LOG(m_logger) << "Could not enable SendCesHitOnBuilding";
     return false;
   }
   if (!m_ftcBld->enableSendCesHit3DonBuilding())
   {
-    ERROR_LOG() << "Could not enable SendCesHit3DonBuilding";
+    ERROR_LOG(m_logger) << "Could not enable SendCesHit3DonBuilding";
     return false;
   }
   if (!m_ftcBld->enableSetBuildingStates())
   {
-    ERROR_LOG() << "Could not enable SetBuildingStates";
+    ERROR_LOG(m_logger) << "Could not enable SetBuildingStates";
     return false;
   }
 
@@ -86,7 +86,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
   if (!m_dtcIsm->enableMainFootprint()        ||
       !m_dtcIsm->enableMainStructureElement())
   {
-    ERROR_LOG() << "Could not enable ISM data topics";
+    ERROR_LOG(m_logger) << "Could not enable ISM data topics";
     return false;
   } // if
   m_dtcIsm->waitForHistoricalDataMainFootprint(20000);
@@ -106,16 +106,16 @@ bool DdsHandler::init(const QStringList &qosFileList)
       !m_dtcAes->enableDangerArea() ||
       !m_dtcAes->enableDusSingleMine())
   {
-    ERROR_LOG() << "Could not initialize AES data topics";
+    ERROR_LOG(m_logger) << "Could not initialize AES data topics";
     return false;
   }
 
-  DEBUG_LOG() << "create FTC AES";
+  DEBUG_LOG(m_logger) << "create FTC AES";
   m_ftcAes = AreaEffectSimulation::Interface::Ftc::create(m_ddsConnector);
-  DEBUG_LOG() << "init FTC AES";
+  DEBUG_LOG(m_logger) << "init FTC AES";
   if (!m_ftcAes->enableAll())
   {
-    ERROR_LOG() << "Could not initialize AreaEffectSimulation enableType function topic";
+    ERROR_LOG(m_logger) << "Could not initialize AreaEffectSimulation enableType function topic";
     return false;
   }
 
@@ -125,71 +125,71 @@ bool DdsHandler::init(const QStringList &qosFileList)
 
   if (!m_dtcPdm->enableChargeType())
   {
-    ERROR_LOG() << "Could not initialize ProjectDataManagement enableChargeType data topic client";
+    ERROR_LOG(m_logger) << "Could not initialize ProjectDataManagement enableChargeType data topic client";
     return false;
   }
 
   m_dtcPpm = ParticipantManagement::Interface::Dtc::create(m_ddsConnector);
   if (!m_dtcPpm->enableDynamicParticipantData())
   {
-    ERROR_LOG() << "Could not initialize ParticipantManagement enableDynamicParticipantData data topic client";
+    ERROR_LOG(m_logger) << "Could not initialize ParticipantManagement enableDynamicParticipantData data topic client";
     return false;
   }
   if (!m_dtcPpm->enableParticipantPosition())
   {
-    ERROR_LOG() << "Could not initialize ParticipantManagement enableParticipantPosition data topic client";
+    ERROR_LOG(m_logger) << "Could not initialize ParticipantManagement enableParticipantPosition data topic client";
     return false;
   }
   if (!m_dtcPpm->enableParticipant())
   {
-    ERROR_LOG() << "Could not initialize ParticipantManagement enableParticipant data topic client";
+    ERROR_LOG(m_logger) << "Could not initialize ParticipantManagement enableParticipant data topic client";
     return false;
   }
   if (!m_dtcPpm->enableType())
   {
-    ERROR_LOG() << "Could not initialize ParticipantManagement enableType data topic client";
+    ERROR_LOG(m_logger) << "Could not initialize ParticipantManagement enableType data topic client";
     return false;
   }
 
-  DEBUG_LOG() << "create FTC PPM";
+  DEBUG_LOG(m_logger) << "create FTC PPM";
   m_ftcPpm = ParticipantManagement::Interface::Ftc::create(m_ddsConnector);
-  DEBUG_LOG() << "init FTC PPM";
+  DEBUG_LOG(m_logger) << "init FTC PPM";
   if (!m_ftcPpm->enableAll())
   {
-    ERROR_LOG() << "Could not initialize ParticipantManagement enableType function topic";
+    ERROR_LOG(m_logger) << "Could not initialize ParticipantManagement enableType function topic";
     return false;
   }
 
   m_dtsTab = TrainingAreaBase::Interface::Dts::create(m_ddsConnector);
   if (!m_dtsTab->enableEquipmentPosition())
   {
-    ERROR_LOG() << "Could not initialize TrainingAreaBase enableEquipmentPosition data topic server";
+    ERROR_LOG(m_logger) << "Could not initialize TrainingAreaBase enableEquipmentPosition data topic server";
     return false;
   }
   if (!m_ftcTab->enableSendParticipantBlockedArea())
   {
-    ERROR_LOG() << "Could not initialize TrainingAreaBase enableSendParticipantBlockedArea function";
+    ERROR_LOG(m_logger) << "Could not initialize TrainingAreaBase enableSendParticipantBlockedArea function";
     return false;
   }
 
   m_dtcBld = Buildings::Interface::Dtc::create(m_ddsConnector);
   if (!m_dtcBld->enableBuildingState())
   {
-    ERROR_LOG() << "Could not initialize Buildings data topic client";
+    ERROR_LOG(m_logger) << "Could not initialize Buildings data topic client";
     return false;
   }
 
   m_dtcTab = TrainingAreaBase::Interface::Dtc::create(m_ddsConnector);
   if (!m_dtcTab->enableGeopairingData())
   {
-    ERROR_LOG() << "Could not initialize TrainingAreaBase data topic client";
+    ERROR_LOG(m_logger) << "Could not initialize TrainingAreaBase data topic client";
     return false;
   }
 
   m_dtcMdm = MeteoDataManagement::Interface::Dtc::create(m_ddsConnector);
   if (!m_dtcMdm->enableMeteoData())
   {
-    ERROR_LOG() << "Could not initialize MeteoData data topic client";
+    ERROR_LOG(m_logger) << "Could not initialize MeteoData data topic client";
     return false;
   }
 
@@ -227,56 +227,56 @@ int DdsHandler::equipNo2ParticipantId(const int equipmentNumber) const
 double DdsHandler::chargeTypeRadius(const AreaEffectSimulation::ChargeStruct &chargeStruct)
 {
   const double radius = m_dtcPdm->impactRadius(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
-  DEBUG_LOG() << "chargeTypeRadius = " << radius;
+  DEBUG_LOG(m_logger) << "chargeTypeRadius = " << radius;
   return radius;
 } // getRadiusOfMunition
 
 double DdsHandler::chargeHeight(const AreaEffectSimulation::ChargeStruct &chargeStruct)
 {
   const double height = m_dtcPdm->height(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
-  DEBUG_LOG() << "chargeHeight = " << height;
+  DEBUG_LOG(m_logger) << "chargeHeight = " << height;
   return height;
 }
 
 bool DdsHandler::isSmartChargeType(const AreaEffectSimulation::ChargeStruct &chargeStruct)
 {
   const bool isSmart = m_dtcPdm->isSmart(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
-  DEBUG_LOG() << "isSmartChargeType = " << isSmart;
+  DEBUG_LOG(m_logger) << "isSmartChargeType = " << isSmart;
   return isSmart;
 } // isSmartType
 
 bool DdsHandler::isSmoke(const AreaEffectSimulation::ChargeStruct &chargeStruct)
 {
   const bool isSmoke = m_dtcPdm->isSmoke(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
-  DEBUG_LOG() << "isSmoke = " << isSmoke;
+  DEBUG_LOG(m_logger) << "isSmoke = " << isSmoke;
   return isSmoke;
 } // isSmoke
 
 bool DdsHandler::isLaserGuidable(const AreaEffectSimulation::ChargeStruct &chargeStruct)
 {
   const bool isLaserGuidable = m_dtcPdm->isLaserGuidable(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
-  DEBUG_LOG() << "isLaserGuidable = " << isLaserGuidable;
+  DEBUG_LOG(m_logger) << "isLaserGuidable = " << isLaserGuidable;
   return isLaserGuidable;
 }
 
 bool DdsHandler::isJamming(const AreaEffectSimulation::ChargeStruct &chargeStruct)
 {
   const bool isJamming = m_dtcPdm->isJamming(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
-  DEBUG_LOG() << "isJamming = " << isJamming;
+  DEBUG_LOG(m_logger) << "isJamming = " << isJamming;
   return isJamming;
 }
 
 bool DdsHandler::isDus(const AreaEffectSimulation::ChargeStruct &chargeStruct)
 {
   const bool isDus = m_dtcPdm->mineClass(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId())== AreaEffectSimulation::MineClass::Concrete;
-  DEBUG_LOG() << "isDus = " << isDus;
+  DEBUG_LOG(m_logger) << "isDus = " << isDus;
   return isDus;
 }
 
 bool DdsHandler::isAtMine(const AreaEffectSimulation::ChargeStruct &chargeStruct)
 {
   const bool isAtMine = m_dtcPdm->isAtMine(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
-  DEBUG_LOG() << "isAtMine = " << isAtMine;
+  DEBUG_LOG(m_logger) << "isAtMine = " << isAtMine;
   return isAtMine;
 }
 
@@ -285,7 +285,7 @@ ProjectDataManagement::VolatilityType DdsHandler::volatilityTypeId(const AreaEff
   const ProjectDataManagement::VolatilityType volatilityType= m_dtcPdm->volatilityTypeId(chargeStruct.chargeTypeId(),
                                                                                          chargeStruct.igniterTypeId(),
                                                                                          chargeStruct.igniterFunctionId());
-  DEBUG_LOG() << "volatilityType=" << volatilityType;
+  DEBUG_LOG(m_logger) << "volatilityType=" << volatilityType;
   return volatilityType;
 }
 
@@ -329,14 +329,14 @@ int32_t DdsHandler::getLegacyIdFromChargeTypeId(const AreaEffectSimulation::Char
 {
   int32_t legacyId = 0;
   legacyId = m_dtcPdm->getChargeTypeIgniterTypeIgniterFunction(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId()).chargeLegacyId();
-  DEBUG_LOG() << "legacyId = " << legacyId;
+  DEBUG_LOG(m_logger) << "legacyId = " << legacyId;
   return legacyId;
 }
 
 int DdsHandler::searchRadius(const AreaEffectSimulation::ChargeStruct &chargeStruct)
 {
   const int searchRadius = m_dtcPdm->searchRadius(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId());
-  DEBUG_LOG() << "searchRadius = " << searchRadius;
+  DEBUG_LOG(m_logger) << "searchRadius = " << searchRadius;
   return searchRadius;
 } // searchRadius
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_building_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_building_data.cpp
index bd5781a27..88f942bf0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_building_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_building_data.cpp
@@ -24,7 +24,7 @@ HandlerBuildingData::HandlerBuildingData(const std::shared_ptr<CentralEffectSimu
   , m_ddsHandler(ddsHandler)
   , m_logger(CentralEffectSimulation::getLogger("HandlerBuildingData"))
 {
-  INFO_LOG() << "HandlerBuildingData::HandlerBuildingData()";
+  INFO_LOG(m_logger) << "HandlerBuildingData::HandlerBuildingData()";
 } // end of ctor()
 //-----------------------------------------------------------------------------
 
@@ -34,7 +34,7 @@ HandlerBuildingData::~HandlerBuildingData()
 //-----------------------------------------------------------------------------
 bool HandlerBuildingData::init()
 {
-  INFO_LOG() << "HandlerBuildingData::init()";
+  INFO_LOG(m_logger) << "HandlerBuildingData::init()";
   auto dtcIsm = m_ddsHandler->dtcIsm();
 
   dtcIsm->waitForHistoricalDataMainStructureElement(1000);
@@ -67,18 +67,18 @@ bool HandlerBuildingData::init()
 // ///////////////////////////////////
 void HandlerBuildingData::onMainStructureElementChanged(const InfrastructureManagement::MainStructureElement &data, DataModification modType)
 {
-  INFO_LOG() << "HandlerBuildingData::onMainStructureElementChanged() id=" << data.id();
+  INFO_LOG(m_logger) << "HandlerBuildingData::onMainStructureElementChanged() id=" << data.id();
   if (modType == DataModification::eRemoved
       || !m_ddsHandler->dtcIsm()->isElementAssignedToExercise(data, m_ddsHandler->getExerciseId()))
   {
-    INFO_LOG() << "HandlerBuildingData::onMainStructureElementChanged() id=" << data.id() << " remove";
+    INFO_LOG(m_logger) << "HandlerBuildingData::onMainStructureElementChanged() id=" << data.id() << " remove";
     m_mainStructureElements.remove(data.id());
     m_footprints.remove(data.id());
     return;
   }
 
   m_mainStructureElements.insert(data.id(), data);
-  DEBUG_LOG() << "Got MainStructureElement: " << data;
+  DEBUG_LOG(m_logger) << "Got MainStructureElement: " << data;
   for (const InfrastructureManagement::StructureElement &ele : std::as_const(data.elements()))
   {
     if (ele.structureElementTypeId() == InfrastructureManagement::StructureElementType_def::Room)
@@ -89,7 +89,7 @@ void HandlerBuildingData::onMainStructureElementChanged(const InfrastructureMana
       const int structureElementId = path.at(0);
       const int floorId = path.at(1);
       const int roomId = path.at(2);
-      DEBUG_LOG() << "ele.id=" << ele.id() << " name =" << ele.name()
+      DEBUG_LOG(m_logger) << "ele.id=" << ele.id() << " name =" << ele.name()
                           << " ele.StructureElementType=" << ele.structureElementTypeId()
                           << " buildingId = " << structureElementId
                           << " floorId =" << floorId
@@ -102,7 +102,7 @@ void HandlerBuildingData::onMainStructureElementChanged(const InfrastructureMana
     {
       if (ele.mountingPointTypeId() == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit)
       {
-        DEBUG_LOG() << "EGCU id=" << ele.id()
+        DEBUG_LOG(m_logger) << "EGCU id=" << ele.id()
                             << " displayName=" << ele.displayName()
                             << " name=" << ele.name()
                             << " type=" << ele.mountingPointTypeId();
@@ -121,7 +121,7 @@ void HandlerBuildingData::onMainStructureElementChanged(const InfrastructureMana
         //QString hostname = QString::fromStdString(ele.hostname());
         //assetPosition.hostname = hostname;
         m_assetPositions.insert(assetPosition.structureElementId, assetPosition);
-        DEBUG_LOG() << "assetPosition.insert StructureElementId= " << assetPosition.structureElementId
+        DEBUG_LOG(m_logger) << "assetPosition.insert StructureElementId= " << assetPosition.structureElementId
                             << " geoPosition=" << assetPosition.geoPosition
                             << " relPosition=" << assetPosition.relPosition
                             << " hostname=" << assetPosition.hostname
@@ -141,7 +141,7 @@ void HandlerBuildingData::onMountingPointAssetChanged(const InfrastructureManage
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG() << "onMountingPointAssetChanged id=" << data.id()
+  DEBUG_LOG(m_logger) << "onMountingPointAssetChanged id=" << data.id()
                       << " assetId=" << data.assetId()
                       << " structureElementId=" << data.structureElementId();
   m_mountingPointAsset.insert(data.structureElementId(), m_assetMountingPoint.value(data.assetId()));
@@ -155,7 +155,7 @@ void HandlerBuildingData::onInstrumentationAssetChanged(const InfrastructureMana
 
   if (data.mountingPointTypeId() == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit)
   {
-    DEBUG_LOG() << "onInstrumentationAssetChanged id=" << data.id()
+    DEBUG_LOG(m_logger) << "onInstrumentationAssetChanged id=" << data.id()
                         << " hostname=" << data.hostname();
     QString hostname = QString::fromStdString(data.hostname());
     m_instrumentationAssets.insert(data.id(), hostname);
@@ -163,7 +163,7 @@ void HandlerBuildingData::onInstrumentationAssetChanged(const InfrastructureMana
     {
       int assetId = data.id();
       int mountpointId = m_assetMountingPoint.value(assetId);
-      DEBUG_LOG() << "m_instrumentationAsset.contains(" << assetId << ")"
+      DEBUG_LOG(m_logger) << "m_instrumentationAsset.contains(" << assetId << ")"
                           << " assetId=" << assetId
                           << " mountpointId=" << mountpointId;
       if (m_assetPositions.contains(mountpointId))
@@ -172,7 +172,7 @@ void HandlerBuildingData::onInstrumentationAssetChanged(const InfrastructureMana
         assetPosition.hostname = hostname;
         assetPosition.mountingPointType = data.mountingPointTypeId();
         m_assetPositions.insert(assetPosition.structureElementId, assetPosition);
-        DEBUG_LOG() << "m_assetPositions.insert assetPosition structureElementId= " << assetPosition.structureElementId
+        DEBUG_LOG(m_logger) << "m_assetPositions.insert assetPosition structureElementId= " << assetPosition.structureElementId
                             << " type=" << assetPosition.mountingPointType
                             << " geoPosition=" << assetPosition.geoPosition
                             << " relPosition=" << assetPosition.relPosition
@@ -186,7 +186,7 @@ void HandlerBuildingData::onInstrumentationAssetChanged(const InfrastructureMana
 
 QVector<int> HandlerBuildingData::getFloorsFromStructureElementId(int structureElementId) const
 {
-  DEBUG_LOG() << "getFloorsFromStructureElementId structureElementId=" << structureElementId;
+  DEBUG_LOG(m_logger) << "getFloorsFromStructureElementId structureElementId=" << structureElementId;
   QVector<int> result;
   result.reserve(m_structureElementToFloor.size());
   for (auto i = m_structureElementToFloor.begin();  i != m_structureElementToFloor.end(); ++i)
@@ -194,13 +194,13 @@ QVector<int> HandlerBuildingData::getFloorsFromStructureElementId(int structureE
     if (i.value() == structureElementId)
       result.append(i.key());
   }
-  DEBUG_LOG() << "result.size()" << result.size();
+  DEBUG_LOG(m_logger) << "result.size()" << result.size();
   return result;
 }
 
 QVector<int> HandlerBuildingData::getFloorsFromBuilding(int buildingId) const
 {
-  DEBUG_LOG() << "getFloorsFromBuilding buildingId=" << buildingId;
+  DEBUG_LOG(m_logger) << "getFloorsFromBuilding buildingId=" << buildingId;
   QVector<int> result;
   result.reserve(m_buildingFloor.size());
   for (auto i = m_buildingFloor.begin();  i != m_buildingFloor.end(); ++i)
@@ -208,18 +208,18 @@ QVector<int> HandlerBuildingData::getFloorsFromBuilding(int buildingId) const
     if (i.value() == buildingId)
       result.append(i.key());
   }
-  DEBUG_LOG() << "result.size()" << result.size();
+  DEBUG_LOG(m_logger) << "result.size()" << result.size();
   return result;
 }
 
 void HandlerBuildingData::printAssetPositions()
 {
-  DEBUG_LOG() << "printAssetPositions: ";
+  DEBUG_LOG(m_logger) << "printAssetPositions: ";
   QHashIterator<int, AssetPosition> i(m_assetPositions);
   while (i.hasNext())
   {
     i.next();
-    DEBUG_LOG() << "printAssetPositions: "
+    DEBUG_LOG(m_logger) << "printAssetPositions: "
                         << i.key() << ": " << i.value().structureElementId
                         << " type = " << i.value().mountingPointType
                         << " hostname =" << i.value().hostname
@@ -237,24 +237,24 @@ int HandlerBuildingData::getBuildingIdFromRoomId(const int roomId)
     buildingId = -1;
   else
     buildingId = getBuildingIdFromFloorId(floorId);
-  DEBUG_LOG() << "getBuildingIdFromRoomId roomId=" << roomId
+  DEBUG_LOG(m_logger) << "getBuildingIdFromRoomId roomId=" << roomId
                       << " buildingId=" << buildingId;
   return buildingId;
 }
 
 QVector<int> HandlerBuildingData::polygonEncloseBuildings(const QPolygonF &polygon)
 {
-  DEBUG_LOG() << "polygonEncloseBuildings";
+  DEBUG_LOG(m_logger) << "polygonEncloseBuildings";
   int exerciseId = m_ddsHandler->getExerciseId();
   bool completeEnclosed = true;
 
-  DEBUG_LOG() << "Vor getBuildingByPolygon";
+  DEBUG_LOG(m_logger) << "Vor getBuildingByPolygon";
   bool isGroundLevel = false;
   QVector<int> buildingsInside = m_ddsHandler->dtcIsm()->getBuildingByPolygon(exerciseId, polygon, completeEnclosed, isGroundLevel);
-  DEBUG_LOG() << "Nach getBuildingByPolygon";
+  DEBUG_LOG(m_logger) << "Nach getBuildingByPolygon";
 
   //int buildingId = m_ddsHandler->dtcIsm()->getSurroundingBuildingByPolygon(exerciseId, polygon);
-  //DEBUG_LOG() << "getSurroundingBuildingByPolygon buildingId= "  << buildingId;
+  //DEBUG_LOG(m_logger) << "getSurroundingBuildingByPolygon buildingId= "  << buildingId;
   return buildingsInside;
 }
 
@@ -269,7 +269,7 @@ void HandlerBuildingData::getFootprintsByExercise()
   while (i.hasNext())
   {
     i.next();
-    DEBUG_LOG() << "Key=" << i.key() << ": " << i.value().size();
+    DEBUG_LOG(m_logger) << "Key=" << i.key() << ": " << i.value().size();
     Footprint footprint;
     footprint.mseId = i.key();
     footprint.polyUtm = i.value();
@@ -279,7 +279,7 @@ void HandlerBuildingData::getFootprintsByExercise()
     // for concealment calculation (Verdeckung)
     if (!footprint.boundingBoxPolyUtm.isValid())
     {
-      WARNING_LOG() << "mseId=" << footprint.mseId
+      WARNING_LOG(m_logger) << "mseId=" << footprint.mseId
                             << " boundingBoxPolyUtm not valid";
       continue;
     }
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 3e227ce54..11ddadb91 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
@@ -42,7 +42,7 @@ bool HandlerParticipant::init()
 
 
 
-  INFO_LOG() << "m_cheatingDistanceVehicle=" << m_cheatingDistanceVehicle
+  INFO_LOG(m_logger) << "m_cheatingDistanceVehicle=" << m_cheatingDistanceVehicle
                      << " m_cheatingDistanceSoldier=" << m_cheatingDistanceSoldier;
 
   // waitForHistorical...
@@ -101,7 +101,7 @@ bool HandlerParticipant::init()
   connect(dtcTab.get(), &TrainingAreaBase::Interface::Dtc::restoreRadioReadinessChanged,
           this, &HandlerParticipant::onRestoreRadioReadinessChanged);
 
-  INFO_LOG() << "HandlerParticipant::init() finished. "
+  INFO_LOG(m_logger) << "HandlerParticipant::init() finished. "
                      << " m_positionsMap.size(): " << m_positionsMap.size();
   return true;
 } // end of init()
@@ -110,10 +110,10 @@ bool HandlerParticipant::init()
 void HandlerParticipant::onParticipantPositionChanged(const ParticipantManagement::ParticipantPosition &data, DataModification modType)
 {
 
-  DEBUG_LOG() << "onParticipantPositionChanged: " << data;
+  DEBUG_LOG(m_logger) << "onParticipantPositionChanged: " << data;
   if (modType == DataModification::eRemoved)
   {
-    DEBUG_LOG() << "m_participantsOutsideMap.remove participantId: " << data.participantId();
+    DEBUG_LOG(m_logger) << "m_participantsOutsideMap.remove participantId: " << data.participantId();
     //m_participantsOutsideMap.remove(data.participantId());
   }
   else
@@ -133,10 +133,10 @@ void HandlerParticipant::onParticipantPositionChanged(const ParticipantManagemen
 
     //    ltsPosRef.setGeoPosition(data.pos(), 0.0);  // hier wird 0.0 zu NaN umgewandelt ...
     //    ltsPosRef.setZValueAccordingElevation(0.0); // hier wird implizit der LtsElevationManager genutzt
-    //    DEBUG_LOG() << "-   ltsPosRef: " << ltsPosRef;
+    //    DEBUG_LOG(m_logger) << "-   ltsPosRef: " << ltsPosRef;
 
     ltsCoordRef.replaceZValueByElevationIfValue(0.0);
-    DEBUG_LOG() << "-   ltsCoordRef: " << ltsCoordRef;
+    DEBUG_LOG(m_logger) << "-   ltsCoordRef: " << ltsCoordRef;
 
 
     bool lastGeoPositionValid = false;
@@ -160,7 +160,7 @@ void HandlerParticipant::onParticipantPositionChanged(const ParticipantManagemen
     }
     else
     {
-      INFO_LOG() << "m_positionsMap.insert="
+      INFO_LOG(m_logger) << "m_positionsMap.insert="
                          << partPos;
 
       m_positionsMap.insert(data.participantId(), partPos);
@@ -172,7 +172,7 @@ void HandlerParticipant::onParticipantPositionChanged(const ParticipantManagemen
       {
         partPos.buildingId(0);
         partPos.roomId(0);
-        DEBUG_LOG() << "emit and insert newOutdoorPosition:"
+        DEBUG_LOG(m_logger) << "emit and insert newOutdoorPosition:"
                             << partPos;
         m_positionsMap.insert(data.participantId(), partPos);
         emit newOutdoorPosition(partPos);
@@ -185,26 +185,26 @@ void HandlerParticipant::onParticipantPositionChanged(const ParticipantManagemen
       }
     }
 
-    DEBUG_LOG() << "checkCheating m_positionsCheatingMap.size=" << m_positionsCheatingMap.size();
+    DEBUG_LOG(m_logger) << "checkCheating m_positionsCheatingMap.size=" << m_positionsCheatingMap.size();
     QHashIterator<int, CesParticipantData> i(m_positionsCheatingMap);
     while (i.hasNext())
     {
       i.next();
-      DEBUG_LOG() << i.key() << ": " << i.value().participantId();
+      DEBUG_LOG(m_logger) << i.key() << ": " << i.value().participantId();
     }
     if (m_positionsCheatingMap.contains(data.participantId()))
     {
-      DEBUG_LOG() << "checkCheatingPosition participantId=" << data.participantId();
+      DEBUG_LOG(m_logger) << "checkCheatingPosition participantId=" << data.participantId();
       checkCheatingPosition(data.participantId());
     }
 
-    INFO_LOG() << "onParticipantPositionChanged()"
+    INFO_LOG(m_logger) << "onParticipantPositionChanged()"
                        << " participantId; " << data.participantId()
                        << " participantTypeId: " << data.participantTypeId()
                        << " partyId: " << data.partyId()
                        << " vulnerabilityState: " << partPos.vulnerabilityState
                        << " insideBuilding: " << partPos.insideBuilding();
-    INFO_LOG() << partPos;
+    INFO_LOG(m_logger) << partPos;
 
   }
 } // end of onParticipantPositionChanged()
@@ -213,7 +213,7 @@ void HandlerParticipant::onParticipantPositionChanged(const ParticipantManagemen
 void HandlerParticipant::onDynamicParticipantDataChanged(const ParticipantManagement::DynamicParticipantData &data, DataModification modType)
 {
 
-  DEBUG_LOG() << "onDynamicParticipantDataChanged";
+  DEBUG_LOG(m_logger) << "onDynamicParticipantDataChanged";
   if (modType == DataModification::eRemoved)
     return;
 
@@ -224,12 +224,12 @@ void HandlerParticipant::onDynamicParticipantDataChanged(const ParticipantManage
   {
     const ParticipantManagement::StateInformation &vul = ParticipantManagement::youngestStateInformation(data.stateHistory());
     newVulnerabilityState = vul.vulnerabilityState();
-    DEBUG_LOG() << "newVulnerabilityState" << vul.vulnerabilityState();
+    DEBUG_LOG(m_logger) << "newVulnerabilityState" << vul.vulnerabilityState();
 
     if (newVulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CombatReady)
     {
       emit participantDecontaminated(participantPosition.participantId());
-      DEBUG_LOG() << "emit participantDecontaminated id=" << participantPosition.participantId();
+      DEBUG_LOG(m_logger) << "emit participantDecontaminated id=" << participantPosition.participantId();
     }
   }
   if (participantPosition.vulnerabilityState != newVulnerabilityState)
@@ -246,7 +246,7 @@ void HandlerParticipant::onParticipantChanged(const ParticipantManagement::Parti
   // Remove Participant:
   if (modType == DataModification::eRemoved || data.isDeleted())
   {
-    DEBUG_LOG() << "onParticipantChanged m_positionsMap.remove id=" << data.id();
+    DEBUG_LOG(m_logger) << "onParticipantChanged m_positionsMap.remove id=" << data.id();
     m_participantData.remove(data.id());
     m_positionsMap.remove(data.id());
     return;
@@ -265,7 +265,7 @@ void HandlerParticipant::onParticipantChanged(const ParticipantManagement::Parti
   pos.partyId(data.partyId());
   pos.participantId(data.id());
   pos.participantTypeId(data.typeId());
-  DEBUG_LOG() << "onParticipantChanged"
+  DEBUG_LOG(m_logger) << "onParticipantChanged"
                       << " id=" << data.id()
                       << " typeId=" << data.typeId()
                       << " designator=" << data.designator();
@@ -277,7 +277,7 @@ void HandlerParticipant::onTypeChanged(const ParticipantManagement::Type &data,
   if (modType == DataModification::eRemoved)
     return;
   m_typeMap.insert(data.id(), data.typeClass());
-  DEBUG_LOG() << "m_typeMap.size()" << m_typeMap.size()
+  DEBUG_LOG(m_logger) << "m_typeMap.size()" << m_typeMap.size()
                       << "  equipmentTypeId=" << data.id()
                       << "  typeClass=" << data.typeClass();
 }
@@ -292,7 +292,7 @@ void HandlerParticipant::onRestoreRadioReadinessChanged(const TrainingAreaBase::
 
   auto dtcPpm = m_ddsHandler->dtcPpm();
   int participantId = dtcPpm->participantIdByEquipmentNumber(data.equipmentNumber());
-  DEBUG_LOG() << "onRestoreRadioReadinessChanged"
+  DEBUG_LOG(m_logger) << "onRestoreRadioReadinessChanged"
                       << " data.equipmentNumber=" << data.equipmentNumber()
                       << " participantId=" << participantId;
   emit restoreRadioReadinessChanged(participantId);
@@ -360,12 +360,12 @@ QHash<int, HandlerParticipant::CesParticipantData> HandlerParticipant::positions
 QVector<int32_t> HandlerParticipant::getParticipantsBuilding(const int32_t buildingId) const
 {
   QVector<int32_t> result;
-  DEBUG_LOG() << "getParticipantsBuilding:" << buildingId;
+  DEBUG_LOG(m_logger) << "getParticipantsBuilding:" << buildingId;
   for (const HandlerParticipant::CesParticipantData &pos : m_positionsMap)
   {
     if (buildingId == pos.buildingId())
     {
-      DEBUG_LOG() << "result.append " << pos.participantId();
+      DEBUG_LOG(m_logger) << "result.append " << pos.participantId();
       result.append(pos.participantId());
     }
   }
@@ -375,17 +375,17 @@ QVector<int32_t> HandlerParticipant::getParticipantsBuilding(const int32_t build
 bool HandlerParticipant::handleCheating(const ParticipantManagement::TypeClass typeClass,
                                         const ProjectDataManagement::VulnerabilityState newVulnerabilityState)
 {
-  DEBUG_LOG() << "handleCheating typeClass=" << typeClass
+  DEBUG_LOG(m_logger) << "handleCheating typeClass=" << typeClass
                       << " newVulnerabilityState=" << newVulnerabilityState;
   // unknown is necessary for the initialization phase
   if (typeClass == ParticipantManagement::TypeClass::Unknown)
   {
-    DEBUG_LOG() << "handle Cheating for Unknown";
+    DEBUG_LOG(m_logger) << "handle Cheating for Unknown";
     return true;
   }
   if (typeClass == ParticipantManagement::TypeClass::Human)
   {
-    DEBUG_LOG() << "handle Cheating for Human";
+    DEBUG_LOG(m_logger) << "handle Cheating for Human";
     if (newVulnerabilityState >= ProjectDataManagement::VulnerabilityState::MediumDamage)
       return true;
   }
@@ -393,7 +393,7 @@ bool HandlerParticipant::handleCheating(const ParticipantManagement::TypeClass t
       || typeClass == ParticipantManagement::TypeClass::WeaponSystem
       || typeClass == ParticipantManagement::TypeClass::VehicleWithGear)
   {
-    DEBUG_LOG() << "handle Cheating for Vehicle";
+    DEBUG_LOG(m_logger) << "handle Cheating for Vehicle";
     if (newVulnerabilityState == ProjectDataManagement::VulnerabilityState::MobilityKill
         || newVulnerabilityState == ProjectDataManagement::VulnerabilityState::VisibleMobilityKill)
       return true;
@@ -406,17 +406,17 @@ void HandlerParticipant::checkCheating(const int participantId,
                                        const CesParticipantData &participantPosition,
                                        const ProjectDataManagement::VulnerabilityState newVulnerabilityState)
 {
-  DEBUG_LOG() << "checkCheating state =" <<  newVulnerabilityState
+  DEBUG_LOG(m_logger) << "checkCheating state =" <<  newVulnerabilityState
                       << " participantId=" << participantId;
   if (!m_typeMap.contains(participantPosition.participantTypeId()))
-    WARNING_LOG() << "!m_typeMap.contains(" << participantPosition.participantTypeId() << ")";
+    WARNING_LOG(m_logger) << "!m_typeMap.contains(" << participantPosition.participantTypeId() << ")";
   ParticipantManagement::TypeClass typeClass =  m_typeMap[participantPosition.participantTypeId()];
 
   if (handleCheating(typeClass, newVulnerabilityState))
   {
     if (!m_positionsCheatingMap.contains(participantId))
     {
-      DEBUG_LOG() << "checkCheating insert id= " << participantId;
+      DEBUG_LOG(m_logger) << "checkCheating insert id= " << participantId;
       m_positionsCheatingMap.insert(participantId, participantPosition);
     }
   }
@@ -424,7 +424,7 @@ void HandlerParticipant::checkCheating(const int participantId,
   {
     if (newVulnerabilityState == ProjectDataManagement::VulnerabilityState::CombatReady)
     {
-      DEBUG_LOG() << "checkCheating remove id= " << participantId;
+      DEBUG_LOG(m_logger) << "checkCheating remove id= " << participantId;
       m_positionsCheatingMap.remove(participantId);
     }
   }
@@ -432,29 +432,29 @@ void HandlerParticipant::checkCheating(const int participantId,
 
 void HandlerParticipant::checkCheatingPosition(const int participantId)
 {
-  DEBUG_LOG() << "checkCheatingPosition id= " << participantId;
+  DEBUG_LOG(m_logger) << "checkCheatingPosition id= " << participantId;
   CesParticipantData posMobilityKill = m_positionsCheatingMap[participantId];
   CesParticipantData posActual = m_positionsMap[participantId];
   ParticipantManagement::TypeClass typeClass =  m_typeMap[participantId];
 
   if (!posActual.insideWlsArea())
   {
-    DEBUG_LOG() << "position participantId=" << participantId << " not insideWlsArea";
+    DEBUG_LOG(m_logger) << "position participantId=" << participantId << " not insideWlsArea";
     return;
   }
 
   // Check, if valid position is available
   if (posMobilityKill.participantId() == 0)
   {
-    DEBUG_LOG() << "position participantId=" << participantId << " not valid";
+    DEBUG_LOG(m_logger) << "position participantId=" << participantId << " not valid";
     m_positionsCheatingMap.insert(participantId, posActual);
     return;
   }
 
   QPointF posUtmMobilityKill = CentralEffectSimulation::geographic2Utm(posMobilityKill.pos());
   QPointF posUtmActual = CentralEffectSimulation::geographic2Utm(posActual.pos());
-  DEBUG_LOG() << "posUtmMobilityKill=" << posUtmMobilityKill.rx() << "/" << posUtmMobilityKill.ry();
-  DEBUG_LOG() << "posUtmActual=" << posUtmActual.rx() << "/" << posUtmActual.ry();
+  DEBUG_LOG(m_logger) << "posUtmMobilityKill=" << posUtmMobilityKill.rx() << "/" << posUtmMobilityKill.ry();
+  DEBUG_LOG(m_logger) << "posUtmActual=" << posUtmActual.rx() << "/" << posUtmActual.ry();
 
   qreal distance = QLineF(posUtmMobilityKill,  posUtmActual).length();
   int cheatingDistance;
@@ -462,10 +462,10 @@ void HandlerParticipant::checkCheatingPosition(const int participantId)
     cheatingDistance = m_cheatingDistanceSoldier;
   else
     cheatingDistance = m_cheatingDistanceVehicle;
-  DEBUG_LOG() << "distance=" << distance;
+  DEBUG_LOG(m_logger) << "distance=" << distance;
   if (distance > cheatingDistance)
   {
-    DEBUG_LOG() << " Send Manipulation to id= and save new Cheating Position" << participantId;
+    DEBUG_LOG(m_logger) << " Send Manipulation to id= and save new Cheating Position" << participantId;
     m_positionsCheatingMap.insert(participantId, posActual);
     sendBeStillWarning(participantId);
   }
@@ -475,9 +475,9 @@ void HandlerParticipant::checkCheatingPosition(const int participantId)
 void HandlerParticipant::onSendParticipantBeStillWarningReply(const Core::FunctionReplyObject &replyObject)
 {
   //if (replyObject.error())
-  //  WARNING_LOG() << "Can not send hit on participant to training area: " << replyObject();
+  //  WARNING_LOG(m_logger) << "Can not send hit on participant to training area: " << replyObject();
   //else
-  DEBUG_LOG() << "onSendParticipantBeStillWarningReply for id " << replyObject.id() << " success";
+  DEBUG_LOG(m_logger) << "onSendParticipantBeStillWarningReply for id " << replyObject.id() << " success";
 }
 
 void HandlerParticipant::sendBeStillWarning(const int32_t participantId)
@@ -492,9 +492,9 @@ void HandlerParticipant::sendBeStillWarning(const int32_t participantId)
 void HandlerParticipant::onModifyStateReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "onModifyStateReply for id " << reply.id() << " failure";
+    ERROR_LOG(m_logger) << "onModifyStateReply for id " << reply.id() << " failure";
   else
-    DEBUG_LOG() << "onModifyStateReply for id " << reply.id() << " success";
+    DEBUG_LOG(m_logger) << "onModifyStateReply for id " << reply.id() << " success";
 }
 
 void HandlerParticipant::modifyStateRequest(
@@ -523,10 +523,10 @@ long HandlerParticipant::getDirection(int originatorParticipantId, int targetPar
   const QPointF originatorPosUtm = CentralEffectSimulation::geographic2Utm(originatorGeoPos, &zone);
   const QPointF targetPosUtm = CentralEffectSimulation::geographic2Utm(targetGeoPos, zone);
   const QLineF line(originatorPosUtm, targetPosUtm);
-  DEBUG_LOG() << "originatorPosUtm=" << originatorPosUtm.x() << " / " << originatorPosUtm.y();
-  DEBUG_LOG() << "targetPosUtm=" << targetPosUtm.x() << " / " << targetPosUtm.y();
+  DEBUG_LOG(m_logger) << "originatorPosUtm=" << originatorPosUtm.x() << " / " << originatorPosUtm.y();
+  DEBUG_LOG(m_logger) << "targetPosUtm=" << targetPosUtm.x() << " / " << targetPosUtm.y();
 
-  DEBUG_LOG() << "getDirection=" << (static_cast<int>(line.angle()) + 270) % 360 * 100;
+  DEBUG_LOG(m_logger) << "getDirection=" << (static_cast<int>(line.angle()) + 270) % 360 * 100;
 
 
   return (static_cast<long>(line.angle()) + 270) % 360 * 100;
@@ -545,7 +545,7 @@ long HandlerParticipant::getDistance(int originatorParticipantId, int targetPart
   const QPointF targetPosUtm = CentralEffectSimulation::geographic2Utm(targetGeoPos, zone);
   const QLineF line(originatorPosUtm,  targetPosUtm);
 
-  DEBUG_LOG() << "getDistance=" << line.length();
+  DEBUG_LOG(m_logger) << "getDistance=" << line.length();
 
   return static_cast<int>(line.length());
 }
@@ -573,7 +573,7 @@ void HandlerParticipant::setNotfightMode ( const int participantId, const bool n
 {
   CesParticipantData participantData = m_positionsMap.value(participantId);
   participantData.notfightMode = notfightMode;
-  INFO_LOG() << "setNotfightMode m_positionsMap.insert="
+  INFO_LOG(m_logger) << "setNotfightMode m_positionsMap.insert="
                      << participantData;
   m_positionsMap.insert ( participantId,participantData );
   emit newNotfightMode(participantData);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/main_handler.cpp
index fe82e99da..7c0ddd98c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/main_handler.cpp
@@ -23,7 +23,7 @@ MainHandler::MainHandler(QObject *parent)
   : QObject(parent)
   , m_logger(CentralEffectSimulation::getLogger("MainHandler"))
 {
-  INFO_LOG() << "MainHandler::MainHandler";
+  INFO_LOG(m_logger) << "MainHandler::MainHandler";
 } // end of ctor()
 //-----------------------------------------------------------------------------
 
@@ -34,47 +34,47 @@ MainHandler::~MainHandler()
   m_handlerParticipant.reset();
   m_handlerBuildingData.reset();
 
-  INFO_LOG() << "MainHandler::~MainHandler";
+  INFO_LOG(m_logger) << "MainHandler::~MainHandler";
 } // end of dtor()
 //-----------------------------------------------------------------------------
 
 
 bool MainHandler::loadPlugin(const LtsPluginManager::PluginInstance &pi)
 {
-  DEBUG_LOG() << "Trying to load ces plugin '" << pi.fullFileName << "'...";
+  DEBUG_LOG(m_logger) << "Trying to load ces plugin '" << pi.fullFileName << "'...";
 
   Plugin::Plugin *cesPlugin = qobject_cast<Plugin::Plugin *>(pi.plugin);
   if (!cesPlugin)
   {
-    WARNING_LOG() << "failed loading a ces plugin - not a CentralEffectSimulation object!";
+    WARNING_LOG(m_logger) << "failed loading a ces plugin - not a CentralEffectSimulation object!";
     return false;
   }
-  DEBUG_LOG() << "... success";
+  DEBUG_LOG(m_logger) << "... success";
   std::shared_ptr<Plugin::Interface> ifc = cesPlugin->createInterface(this,
                                                                       // m_ddsHandler->dds(),
                                                                       nullptr,
                                                                       Settings::settings(),
                                                                       this);
 
-  DEBUG_LOG() << "Vorher: m_interfaces.size=" << m_interfaces.size();
+  DEBUG_LOG(m_logger) << "Vorher: m_interfaces.size=" << m_interfaces.size();
 
 
   if (!ifc || !ifc->init(m_domainId, m_exerciseId))
   {
-    WARNING_LOG() << "Could not initialize CentralEffectSimulation plugin";
+    WARNING_LOG(m_logger) << "Could not initialize CentralEffectSimulation plugin";
     return false;
   }
 
   static int counter = 0;
-  INFO_LOG() << "Loading and init of ces_plugin successfull: "
+  INFO_LOG(m_logger) << "Loading and init of ces_plugin successfull: "
                        << ++counter
                        << " pluginName = '" << pi.pluginName << "'"
                        << ", filename '" << pi.fullFileName << "'";
 
   m_interfaces.push_back(ifc);
-  DEBUG_LOG() << "Nachher: m_interfaces.size=" << m_interfaces.size();
+  DEBUG_LOG(m_logger) << "Nachher: m_interfaces.size=" << m_interfaces.size();
 
-  DEBUG_LOG() << "ECHO!" << ifc->echo(QStringLiteral("TEST"));
+  DEBUG_LOG(m_logger) << "ECHO!" << ifc->echo(QStringLiteral("TEST"));
 
   return true;
 }
@@ -88,7 +88,7 @@ bool MainHandler::init(int domainId, int exerciseId)
 {
   m_domainId = domainId;
   m_exerciseId = exerciseId;
-  INFO_LOG() << "Start MessageDataManagement MainHandler. domainId =" << domainId
+  INFO_LOG(m_logger) << "Start MessageDataManagement MainHandler. domainId =" << domainId
                        << " exerciseId=" << exerciseId;
 
   // initialize database
@@ -96,18 +96,18 @@ bool MainHandler::init(int domainId, int exerciseId)
 
   if (!m_dbHandler->init(exerciseId, Settings::settings()))
   {
-    ERROR_LOG() << "Initialisation DbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation DbHandler failed.";
     return false;
   }
   m_db = m_dbHandler->db();
-  INFO_LOG() << "MainHandler::init DbHandler initialized. ";
+  INFO_LOG(m_logger) << "MainHandler::init DbHandler initialized. ";
 
 
   // initialize DDS
   m_ddsHandler = std::make_shared<DdsHandler>(domainId, exerciseId);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation DdsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
     if (m_ddsHandler->pacemaker())
       m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
@@ -126,7 +126,7 @@ bool MainHandler::init(int domainId, int exerciseId)
     // So the logMsg 'Finished reading elevation map of file' will be shown with a delay.
     // This is no error.
     ltsElevationManager->waitForInitialization();
-    DEBUG_LOG() << Q_FUNC_INFO << " LtsElevationManager... waitForInitialization DONE";
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " LtsElevationManager... waitForInitialization DONE";
 
     // using elevationCbFunc = std::function<double(double, double, double, bool*)>;
     using namespace std::placeholders;
@@ -138,7 +138,7 @@ bool MainHandler::init(int domainId, int exerciseId)
   }
 
 
-  DEBUG_LOG() << Q_FUNC_INFO << " LtsElevationManager... DONE ";
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " LtsElevationManager... DONE ";
 
 
 
@@ -147,7 +147,7 @@ bool MainHandler::init(int domainId, int exerciseId)
 
   if (!m_handlerBuildingData->init())
   {
-    ERROR_LOG() << "Initialisation HandlerBuildingData failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerBuildingData failed.";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
   }
@@ -168,7 +168,7 @@ bool MainHandler::init(int domainId, int exerciseId)
 
   if (!m_handlerParticipant->init())
   {
-    ERROR_LOG() << "Initialisation HandlerParticipant failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerParticipant failed.";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
   }
@@ -194,13 +194,13 @@ bool MainHandler::init(int domainId, int exerciseId)
 
   if (m_interfaces.empty())
   {
-    WARNING_LOG() << "Could not load any Central Effect Simulation plugin";
+    WARNING_LOG(m_logger) << "Could not load any Central Effect Simulation plugin";
     return false;
   }
-  INFO_LOG() << "m_interfaces size=" << m_interfaces.size();
+  INFO_LOG(m_logger) << "m_interfaces size=" << m_interfaces.size();
 
   //  for (/*std::shared_ptr<*/Plugin::EchoInterface/*> &*/   *ifc : m_interfaces)
-  //    INFO_LOG() << "ECHO! " << ifc->echo(QStringLiteral("TEST"));
+  //    INFO_LOG(m_logger) << "ECHO! " << ifc->echo(QStringLiteral("TEST"));
   //m_txHandler->addTxHandler(ifc->sendToTab());
   ///////////////////
   /// End Plugins ///
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/proxy_building.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/proxy_building.cpp
index b9691cb55..2c9cb024c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/proxy_building.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/proxy_building.cpp
@@ -15,7 +15,7 @@
 namespace CentralEffectSimulation
 {
 
-#define LOG_ERROR_NO_HNDL_BLDG_MDL ERROR_LOG() << Q_FUNC_INFO << " no handlerBuildingModel"
+#define LOG_ERROR_NO_HNDL_BLDG_MDL ERROR_LOG(m_logger) << Q_FUNC_INFO << " no handlerBuildingModel"
 #define CHECK_HNDL_BLDG_MDL_RETVAL if (!(isSet_handlerBuildingModel())) { LOG_ERROR_NO_HNDL_BLDG_MDL; return {}; }
 
 
@@ -39,24 +39,24 @@ ProxyBuilding::ProxyBuilding(QObject *parent)
   , d(new Private)
   , m_logger(CentralEffectSimulation::getLogger("ProxyBuilding"))
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 //-----------------------------------------------------------------------------
 
 ProxyBuilding::~ProxyBuilding()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   delete d;
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void ProxyBuilding::set_handlerBuildingModel(std::shared_ptr<CesBuildings::HandlerBuildingModelInterface> handlerBuildingModel)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  INFO_LOG() << Q_FUNC_INFO << " set handlerBuildingModel to: " << handlerBuildingModel;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " set handlerBuildingModel to: " << handlerBuildingModel;
   d->m_handlerBuildingModel_wPtr = handlerBuildingModel;
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 void ProxyBuilding::clear_handlerBuildingModel()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/dds_handler.cpp
index 1c50d2883..9330bbb25 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/dds_handler.cpp
@@ -13,17 +13,17 @@ using namespace CodificationManagement;
 DdsHandler::DdsHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
   : m_ddsConnector(ddsConnector)
 {
-  DEBUG_LOG() << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
 } // end of ctor()
 //-----------------------------------------------------------------------------
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
-  INFO_LOG() << "--- Start CodificationManagement DDSHandler.";
+  INFO_LOG(m_logger) << "--- Start CodificationManagement DDSHandler.";
 
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -35,12 +35,12 @@ bool DdsHandler::init(const QStringList &qosFileList)
   // DTS
   m_ddsDts = CodificationManagement::Interface::Dts::create(m_ddsConnector);
   bool bRet = m_ddsDts->enableAll();
-  INFO_LOG() << "Dts initialised";
+  INFO_LOG(m_logger) << "Dts initialised";
 
   // FTS
   m_ddsFts = CodificationManagement::Interface::Fts::create(m_ddsConnector);
   bRet &= m_ddsFts->enableAll();
-  INFO_LOG() << "Fts initialised";
+  INFO_LOG(m_logger) << "Fts initialised";
 
   return bRet;
 } // end of init()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/dds_handler.h
index 05cf9c96a..ce7de3398 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/dds_handler.h
@@ -33,6 +33,7 @@ public:
   int exerciseId() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector>              m_ddsConnector;
   std::shared_ptr<Core::TopicLockMaster>                   m_topicLockMaster;
   std::shared_ptr<CodificationManagement::Interface::Dts>  m_ddsDts;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/handler_codification_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/handler_codification_data.cpp
index 081865489..e162051d3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/handler_codification_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/handler_codification_data.cpp
@@ -34,7 +34,7 @@ bool HandlerCodificationData::init()
   // read all CodificationDatas from database
   if (!m_dbHandler->db()->select(dataVec))
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return true;
   }
 
@@ -47,13 +47,13 @@ bool HandlerCodificationData::init()
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       return false;
     }
     m_codificationdataObjMap.insert(ifs->getId(), ifs);
   }
 
-  DEBUG_LOG() << "m_codificationdataObjMap.size() = " << m_codificationdataObjMap.size();
+  DEBUG_LOG(m_logger) << "m_codificationdataObjMap.size() = " << m_codificationdataObjMap.size();
 
   return true;
 } // end of init()
@@ -62,10 +62,10 @@ bool HandlerCodificationData::init()
 void HandlerCodificationData::onCodificationDataModifyRequest(const rti::core::SampleIdentity &cookie,
                                                               const CodificationData &request)
 {
-  DEBUG_LOG() << "onCodificationDataModifyRequest: " << request;
+  DEBUG_LOG(m_logger) << "onCodificationDataModifyRequest: " << request;
   auto ret = request.id() > 0 ? codificationDataModifyRequest(request) : codificationDataCreateRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_ddsHandler->fts()->codificationDataModifyReply(cookie, ret);
 } // end of onCodificationDataModifyRequest()
 //-----------------------------------------------------------------------------
@@ -96,14 +96,14 @@ Core::FunctionReplyObject HandlerCodificationData::codificationDataModifyRequest
 void HandlerCodificationData::onCodificationDataRemoveRequest(const rti::core::SampleIdentity &cookie,
                                                               const Core::RemoveElementRequest &request)
 {
-  DEBUG_LOG() << "onCodificationDataRemoveRequest: " << request;
+  DEBUG_LOG(m_logger) << "onCodificationDataRemoveRequest: " << request;
 
 
   ObjectCodificationData *ifs = m_codificationdataObjMap.value(request.id());
   if (ifs == nullptr)
   {
     Core::FunctionReplyObject ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "Codification table with id %1 not found")).arg(request.id());
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
     m_ddsHandler->fts()->codificationDataRemoveReply(cookie, ret);
     return;
   }
@@ -117,7 +117,7 @@ void HandlerCodificationData::onCodificationDataRemoveRequest(const rti::core::S
 
   Core::FunctionReplyObject ret = ifs->removeObject();
   if (ret.error())
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
   else
   {
     // delete codification object
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/handler_codification_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/handler_codification_data.h
index 6ec473da3..8c4c912f7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/handler_codification_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/handler_codification_data.h
@@ -30,6 +30,9 @@ public:
 
 
 private: // FTS methods
+
+
+NGL::INGLLogger &m_logger;
   void onCodificationDataModifyRequest(const rti::core::SampleIdentity &cookie,
                                        const CodificationData &request) override final;
   Core::FunctionReplyObject codificationDataCreateRequest(const CodificationData &request);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/initialization.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/initialization.cpp
index 446754265..879c753d7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/initialization.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/initialization.cpp
@@ -33,13 +33,13 @@ Initialization::~Initialization()
 bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector,
                                 const QSqlDatabase &sqlDb)
 {
-  INFO_LOG() << "Start CodificationManagement Initialization.";
+  INFO_LOG(m_logger) << "Start CodificationManagement Initialization.";
 
   // initialize DDS
   m_ddsHandler = std::make_shared<DdsHandler>(ddsConnector);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation DdsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
     return false;
   }
 
@@ -47,14 +47,14 @@ bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector
   m_dbHandler = std::make_shared<DbHandler>();
   if (!m_dbHandler->init(ddsConnector->getPartitionId(), sqlDb))
   {
-    ERROR_LOG() << "Initialisation DbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation DbHandler failed.";
     return false;
   }
 
   // create HandlerCodificationData
   m_handlerCodificationData.reset(new HandlerCodificationData(m_ddsHandler, m_dbHandler));
 
-  INFO_LOG() << "CodificationManagement Initialization initialized. pacemakerState: Running ";
+  INFO_LOG(m_logger) << "CodificationManagement Initialization initialized. pacemakerState: Running ";
 
   return true;
 } // end of init()
@@ -66,7 +66,7 @@ bool Initialization::loadFromDatabase()
     return false;
   if (!m_handlerCodificationData->init())
   {
-    ERROR_LOG() << "Initialisation HandlerCodificationData failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerCodificationData failed.";
     return false;
   }
   return true;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/initialization.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/initialization.h
index 8fec5520f..fa3e78197 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/initialization.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/initialization.h
@@ -30,6 +30,8 @@ public:
   bool loadFromDatabase();
 
 private: // attributes
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>                m_ddsHandler;                ///< Pointer to DDS handler
   std::shared_ptr<DbHandler>                 m_dbHandler;                 ///< Pointer to DB handler
   std::shared_ptr<HandlerCodificationData>   m_handlerCodificationData;   ///< Pointer to codification data handler
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/object_codification_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/object_codification_data.cpp
index 634acd398..ffaa2060c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/object_codification_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/object_codification_data.cpp
@@ -27,7 +27,7 @@ ObjectCodificationData::~ObjectCodificationData()
 
 Core::FunctionReplyObject ObjectCodificationData::createObject(const CodificationData &ddsData)
 {
-  DEBUG_LOG() << "ObjectCodificationData::createObject()";
+  DEBUG_LOG(m_logger) << "ObjectCodificationData::createObject()";
 
   m_ddsData = ddsData;
   if (m_ddsData.id() <= 0)
@@ -41,7 +41,7 @@ Core::FunctionReplyObject ObjectCodificationData::createObject(const Codificatio
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting codification_table data into database"));
 
     m_ddsData.id(dbData.id);
-    DEBUG_LOG() << "New codificationTable id: " << m_ddsData.id();
+    DEBUG_LOG(m_logger) << "New codificationTable id: " << m_ddsData.id();
   }
 
   // Publish Data via DTS
@@ -53,7 +53,7 @@ Core::FunctionReplyObject ObjectCodificationData::createObject(const Codificatio
 
 Core::FunctionReplyObject ObjectCodificationData::updateObject(const CodificationManagement::CodificationData &ddsData)
 {
-  DEBUG_LOG() << "ObjectCodificationData::updateObject()";
+  DEBUG_LOG(m_logger) << "ObjectCodificationData::updateObject()";
 
   if (!isValid())
     return Core::FunctionReplyObject(ddsData.id(), tr_lts("dds", "Object not valid/blocked"));
@@ -66,7 +66,7 @@ Core::FunctionReplyObject ObjectCodificationData::updateObject(const Codificatio
     return Core::FunctionReplyObject(ddsData.id(), tr_lts("dds", "Error updating codification_table data in database"));
   // update internal objectdata
   m_ddsData = ddsData;
-  DEBUG_LOG() << "Data changed for codification_table id: " << m_ddsData.id();
+  DEBUG_LOG(m_logger) << "Data changed for codification_table id: " << m_ddsData.id();
 
   // Publish Data via DTS
   onPublishData();
@@ -78,7 +78,7 @@ Core::FunctionReplyObject ObjectCodificationData::updateObject(const Codificatio
 
 Core::FunctionReplyObject ObjectCodificationData::removeObject()
 {
-  DEBUG_LOG() << "ObjectCodificationData::removeObject()";
+  DEBUG_LOG(m_logger) << "ObjectCodificationData::removeObject()";
 
   if (isUsed())
     return Core::FunctionReplyObject(m_ddsData.id(), tr_lts("dds", "codification_table data still in use"));
@@ -86,7 +86,7 @@ Core::FunctionReplyObject ObjectCodificationData::removeObject()
   if (!m_dbHandler->db()->removeCodCodificationTable(m_ddsData.id()))
     return Core::FunctionReplyObject(m_ddsData.id(), tr_lts("dds", "codification_table with id %1 can not be removed")).arg(m_ddsData.id());
 
-  DEBUG_LOG() << "Removed codification_table id " << m_ddsData.id();
+  DEBUG_LOG(m_logger) << "Removed codification_table id " << m_ddsData.id();
   m_ddsHandler->dts()->removeCodificationDataByKey(m_ddsData.id());
 
   return Core::FunctionReplyObject(m_ddsData.id());
@@ -95,10 +95,10 @@ Core::FunctionReplyObject ObjectCodificationData::removeObject()
 
 void ObjectCodificationData::onPublishData()
 {
-  INFO_LOG() << "Publish CodificationData data to dds (" << m_ddsData.id() << ") ...";
+  INFO_LOG(m_logger) << "Publish CodificationData data to dds (" << m_ddsData.id() << ") ...";
 
   if (!m_ddsHandler->dts()->publish(m_ddsData))
-    ERROR_LOG() << "Error publishing CodificationData data to dds";
+    ERROR_LOG(m_logger) << "Error publishing CodificationData data to dds";
 } // end of onPublishData()
 //-----------------------------------------------------------------------------
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/object_codification_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/object_codification_data.h
index 2e41ce762..c94748e26 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/object_codification_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/object_codification_data.h
@@ -40,6 +40,7 @@ public:
   static Database::CodCodificationTable toDbData(const CodificationManagement::CodificationData &ddsData);  // dds -> db
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onPublishData();
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_serial.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_serial.cpp
index 74697cdc7..f84836b2e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_serial.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_serial.cpp
@@ -14,15 +14,14 @@
 namespace EffectShowClient
 {
 
-ConnectionHandlerSerial::ConnectionHandlerSerial(QObject *parent)
-  : QObject(parent)
+ConnectionHandlerSerial::ConnectionHandlerSerial(QObject *parent) : QObject(parent)
   , m_spQuerry(new LtsSerialPortQuerry::LtsSerialPortQuerry(this))
   , m_serialPort(nullptr)
   , m_receiveTimeoutTimer(new QTimer(this))
   , m_currentDataRead(QByteArray())
   , m_portName(QStringLiteral("COM5"))
-  , m_readBuffer(new QByteArray())
-{
+  , m_readBuffer(new QByteArray()),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_receiveTimeoutTimer->setInterval(1700);
   connect(m_spQuerry, &LtsSerialPortQuerry::LtsSerialPortQuerry::connectionEstablished, this, &ConnectionHandlerSerial::open);
   m_spQuerry->restartQuerry();
@@ -33,7 +32,7 @@ ConnectionHandlerSerial::ConnectionHandlerSerial(QObject *parent)
 
 ConnectionHandlerSerial::~ConnectionHandlerSerial()
 {
-  DEBUG_LOG() << "ConnectionHandlerSerial::~ConnectionHandlerSerial";
+  DEBUG_LOG(m_logger) << "ConnectionHandlerSerial::~ConnectionHandlerSerial";
 }
 
 bool ConnectionHandlerSerial::init()
@@ -47,35 +46,35 @@ bool ConnectionHandlerSerial::send(const QByteArray &binaryData)
 
   if (!m_serialPort)
   {
-    DEBUG_LOG() << "Port is not initialized!";
+    DEBUG_LOG(m_logger) << "Port is not initialized!";
     return false;
   }
 
   if (!m_serialPort->isOpen())
   {
-    DEBUG_LOG() << "Port is not opened!";
+    DEBUG_LOG(m_logger) << "Port is not opened!";
     return false;
   }
 
   // Sending data ---------------------------------------------
 
   const QByteArray writeThis = LtsUtils::byteStreamFromEscMessage(binaryData);
-  DEBUG_LOG() << "Send HEX:" << writeThis.toHex(' ');
+  DEBUG_LOG(m_logger) << "Send HEX:" << writeThis.toHex(' ');
   qint64 byteswritten = m_serialPort->write(writeThis);
-  DEBUG_LOG() << "Binary data:" << binaryData.size();
-  DEBUG_LOG() << "Try sending: " << writeThis.size();
+  DEBUG_LOG(m_logger) << "Binary data:" << binaryData.size();
+  DEBUG_LOG(m_logger) << "Try sending: " << writeThis.size();
 
 
   // Check for errors ---------------------------------------------
 
   if (byteswritten == -1)
   {
-    DEBUG_LOG() << "Failed to write data to port " << m_serialPort->portName() << " error: " << m_serialPort->errorString();
+    DEBUG_LOG(m_logger) << "Failed to write data to port " << m_serialPort->portName() << " error: " << m_serialPort->errorString();
     return false;
   }
   else if (byteswritten != writeThis.size())
   {
-    DEBUG_LOG() << "Failed to write all data to port " << m_serialPort->portName() << " error: " << m_serialPort->errorString();
+    DEBUG_LOG(m_logger) << "Failed to write all data to port " << m_serialPort->portName() << " error: " << m_serialPort->errorString();
     return false;
   }
 
@@ -89,7 +88,7 @@ bool ConnectionHandlerSerial::open()
 
   m_currentDataRead.clear();
   m_receiveTimeoutTimer->start();
-  DEBUG_LOG() << "(Re)openend serial port " << m_serialPort->portName() << " baudrate: " << m_serialPort->baudRate();
+  DEBUG_LOG(m_logger) << "(Re)openend serial port " << m_serialPort->portName() << " baudrate: " << m_serialPort->baudRate();
 
   emit connectedToSerialConverter();
   return true;
@@ -105,8 +104,8 @@ void ConnectionHandlerSerial::read()
   const QByteArray ba = m_serialPort->readAll();
   m_currentDataRead.append(ba);
 
-  //DEBUG_LOG() << "Binary data from sfm: " << ba.toHex(' ');
-  DEBUG_LOG() << "Data size" << ba.size();
+  //DEBUG_LOG(m_logger) << "Binary data from sfm: " << ba.toHex(' ');
+  DEBUG_LOG(m_logger) << "Data size" << ba.size();
   int idxStart = -1;
   int idxEnd = -1;
   while ((idxStart = m_currentDataRead.indexOf(0x02)) >= 0 &&
@@ -118,27 +117,27 @@ void ConnectionHandlerSerial::read()
 
     QByteArray message = m_currentDataRead.mid(idxStart, (idxEnd - idxStart) + 1);
     m_currentDataRead = m_currentDataRead.mid(idxEnd + 1);
-    DEBUG_LOG() << "Data Message found: " << message.toHex(' ');
+    DEBUG_LOG(m_logger) << "Data Message found: " << message.toHex(' ');
     message = LtsUtils::byteStreamToEscMessage(message);
 
     if (message.size() > 2)
     {
-      ERROR_LOG() << "Message to long: " << message.size();
+      ERROR_LOG(m_logger) << "Message to long: " << message.size();
       continue;
     }
 
-    DEBUG_LOG() << "Frame from sfm as binary " << message.toHex();
+    DEBUG_LOG(m_logger) << "Frame from sfm as binary " << message.toHex();
     //got message now remove frame
 
 
     unsigned int byte = 0;
     byte = message.at(0) & 0xFF;
-    DEBUG_LOG() << "ConnectionHandlerSerial::read var byte is" << byte;
+    DEBUG_LOG(m_logger) << "ConnectionHandlerSerial::read var byte is" << byte;
 
 
     if (!isValidCommandByte(byte))
     {
-      ERROR_LOG() << "ConnectionHandlerSerial::read Commandbyte is invalid. Returning";
+      ERROR_LOG(m_logger) << "ConnectionHandlerSerial::read Commandbyte is invalid. Returning";
       return;
     }
 
@@ -149,30 +148,30 @@ void ConnectionHandlerSerial::read()
       if (message.size() > 1 &&
           !isValidPayloadByte(message.at(1)))
       {
-        ERROR_LOG() << "ConnectionHandlerSerial::read Payloadbyte is invalid. Returning";
+        ERROR_LOG(m_logger) << "ConnectionHandlerSerial::read Payloadbyte is invalid. Returning";
         continue;
       }
     }
 
     if (message.size() != 2)
     {
-      ERROR_LOG() << "ConnectionHandlerSerial::read No 2nd byte was appended (QByteArray has bad size). Returning.";
+      ERROR_LOG(m_logger) << "ConnectionHandlerSerial::read No 2nd byte was appended (QByteArray has bad size). Returning.";
       continue;
     }
 
-    DEBUG_LOG() << "Binary data from serial port: " << message.toHex(' ');
+    DEBUG_LOG(m_logger) << "Binary data from serial port: " << message.toHex(' ');
     m_receiveTimeoutTimer->start();
 
     emit received(message);
   }
 
   if (m_serialPort->bytesAvailable() > 0)
-    DEBUG_LOG() << "Still " << m_serialPort->bytesAvailable() << " available to be read";
+    DEBUG_LOG(m_logger) << "Still " << m_serialPort->bytesAvailable() << " available to be read";
 }
 
 bool ConnectionHandlerSerial::isValidCommandByte(const unsigned char command)
 {
-  DEBUG_LOG() << "ConnectionHandlerSerial::isValidCommandByte" << command << (command == 192 ||
+  DEBUG_LOG(m_logger) << "ConnectionHandlerSerial::isValidCommandByte" << command << (command == 192 ||
                                                                                       command == 240 ||
                                                                                       command == 244 ||
                                                                                       command == 255 ||
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_serial.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_serial.h
index cb19b4773..ef87aa4eb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_serial.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_serial.h
@@ -47,6 +47,7 @@ private slots:
   void read();
 
 private:
+  NGL::INGLLogger &m_logger;
   bool isValidCommandByte(const unsigned char command);
   bool isValidPayloadByte(const unsigned char payload);
   LtsSerialPortQuerry::LtsSerialPortQuerry *m_spQuerry;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_tcp.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_tcp.cpp
index 6ce097c77..b6719bc43 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_tcp.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_tcp.cpp
@@ -15,12 +15,11 @@
 namespace EffectShowClient
 {
 
-ConnectionHandlerTcp::ConnectionHandlerTcp(QObject *parent)
-  : QObject(parent)
+ConnectionHandlerTcp::ConnectionHandlerTcp(QObject *parent) : QObject(parent)
   , m_socket(nullptr)
   , m_timer(new QTimer(this))
-  , m_currentDataRead(QByteArray())
-{
+  , m_currentDataRead(QByteArray()),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_timer->setInterval(5000);
   connect(m_timer, &QTimer::timeout, this, &ConnectionHandlerTcp::open);
 
@@ -54,27 +53,27 @@ bool ConnectionHandlerTcp::send(const QByteArray &message)
 
   if (!m_socket->isOpen())
   {
-    ERROR_LOG() << "Port is not opened!";
+    ERROR_LOG(m_logger) << "Port is not opened!";
     return false;
   }
 
   const QByteArray writeThis = LtsUtils::byteStreamFromEscMessage(message);
-  DEBUG_LOG() << "Send HEX:" << writeThis.toHex(' ');
+  DEBUG_LOG(m_logger) << "Send HEX:" << writeThis.toHex(' ');
   qint64 byteswritten = m_socket->write(writeThis);
-  DEBUG_LOG() << "Binary data:" << message.size();
-  DEBUG_LOG() << "Try sending: " << message.size();
+  DEBUG_LOG(m_logger) << "Binary data:" << message.size();
+  DEBUG_LOG(m_logger) << "Try sending: " << message.size();
 
   // Check for errors ---------------------------------------------
 
   if (byteswritten == -1)
   {
-    ERROR_LOG() << "Failed to write data to port " << m_socket->peerPort() << " error: " << m_socket->errorString();
+    ERROR_LOG(m_logger) << "Failed to write data to port " << m_socket->peerPort() << " error: " << m_socket->errorString();
     m_timer->start();
     return false;
   }
   else if (byteswritten != writeThis.size())
   {
-    ERROR_LOG() << "Failed to write all data to port " << m_socket->peerPort() << " error: " << m_socket->errorString();
+    ERROR_LOG(m_logger) << "Failed to write all data to port " << m_socket->peerPort() << " error: " << m_socket->errorString();
     return false;
   }
 
@@ -87,10 +86,10 @@ bool ConnectionHandlerTcp::open()
   m_socket->connectToHost(Settings::hostName(), Settings::port());
   if (!m_socket->waitForConnected())
   {
-    ERROR_LOG() << "Could not (re)open tcp destination " << m_socket->peerName() << ":" << m_socket->peerPort() << ", error: " << m_socket->errorString();
+    ERROR_LOG(m_logger) << "Could not (re)open tcp destination " << m_socket->peerName() << ":" << m_socket->peerPort() << ", error: " << m_socket->errorString();
     return false;
   }
-  INFO_LOG() << "(Re)openend tcp destination " << m_socket->peerName() << ":" << m_socket->peerPort();
+  INFO_LOG(m_logger) << "(Re)openend tcp destination " << m_socket->peerName() << ":" << m_socket->peerPort();
   return true;
 }
 
@@ -109,8 +108,8 @@ void ConnectionHandlerTcp::read()
   const QByteArray ba = m_socket->readAll();
   m_currentDataRead.append(ba);
 
-  //DEBUG_LOG() << "Binary data from sfm: " << ba.toHex(' ');
-  DEBUG_LOG() << "Data size" << ba.size();
+  //DEBUG_LOG(m_logger) << "Binary data from sfm: " << ba.toHex(' ');
+  DEBUG_LOG(m_logger) << "Data size" << ba.size();
   int idxStart = -1;
   int idxEnd = -1;
   while ((idxStart = m_currentDataRead.indexOf(0x02)) >= 0 &&
@@ -122,27 +121,27 @@ void ConnectionHandlerTcp::read()
 
     QByteArray message = m_currentDataRead.mid(idxStart, (idxEnd - idxStart) + 1);
     m_currentDataRead = m_currentDataRead.mid(idxEnd + 1);
-    DEBUG_LOG() << "Data Message found: " << message.toHex(' ');
+    DEBUG_LOG(m_logger) << "Data Message found: " << message.toHex(' ');
     message = LtsUtils::byteStreamToEscMessage(message);
 
     if (message.size() > 2)
     {
-      ERROR_LOG() << "Message to long: " << message.size();
+      ERROR_LOG(m_logger) << "Message to long: " << message.size();
       continue;
     }
 
-    DEBUG_LOG() << "Frame from sfm as binary " << message.toHex();
+    DEBUG_LOG(m_logger) << "Frame from sfm as binary " << message.toHex();
     //got message now remove frame
 
 
     unsigned int byte = 0;
     byte = message.at(0) & 0xFF;
-    DEBUG_LOG() << "ConnectionHandler::read var byte is" << byte;
+    DEBUG_LOG(m_logger) << "ConnectionHandler::read var byte is" << byte;
 
 
     if (!isValidCommandByte(byte))
     {
-      ERROR_LOG() << "ConnectionHandler::read Commandbyte is invalid. Returning";
+      ERROR_LOG(m_logger) << "ConnectionHandler::read Commandbyte is invalid. Returning";
       return;
     }
 
@@ -153,29 +152,29 @@ void ConnectionHandlerTcp::read()
       if (message.size() > 1 &&
           !isValidPayloadByte(message.at(1)))
       {
-        ERROR_LOG() << "ConnectionHandler::read Payloadbyte is invalid. Returning";
+        ERROR_LOG(m_logger) << "ConnectionHandler::read Payloadbyte is invalid. Returning";
         continue;
       }
     }
 
     if (message.size() != 2)
     {
-      ERROR_LOG() << "ConnectionHandler::read No 2nd byte was appended (QByteArray has bad size). Returning.";
+      ERROR_LOG(m_logger) << "ConnectionHandler::read No 2nd byte was appended (QByteArray has bad size). Returning.";
       continue;
     }
 
-    DEBUG_LOG() << "Binary data from serial port: " << message.toHex(' ');
+    DEBUG_LOG(m_logger) << "Binary data from serial port: " << message.toHex(' ');
 
     emit received(message);
   }
 
   if (m_socket->bytesAvailable() > 0)
-    DEBUG_LOG() << "Still " << m_socket->bytesAvailable() << " available to be read";
+    DEBUG_LOG(m_logger) << "Still " << m_socket->bytesAvailable() << " available to be read";
 }
 
 void ConnectionHandlerTcp::handleError(QAbstractSocket::SocketError error)
 {
-  DEBUG_LOG() << "Spontaneous error " << error << " doesn't have to be an error ...";
+  DEBUG_LOG(m_logger) << "Spontaneous error " << error << " doesn't have to be an error ...";
 
   const QString errStr(QStringLiteral("QTcpSocket::SocketError ") + QString::number(error) +
                        QStringLiteral(" from tcp port ") + QString::number(m_socket->peerPort()) +
@@ -187,20 +186,20 @@ void ConnectionHandlerTcp::handleError(QAbstractSocket::SocketError error)
   case QTcpSocket::SocketError::SocketAccessError:
   case QTcpSocket::SocketError::SocketResourceError:
   {
-    ERROR_LOG() << "Closing port WITHOUT trying to reopen it.";
+    ERROR_LOG(m_logger) << "Closing port WITHOUT trying to reopen it.";
     close();
     m_timer->start();
     Q_FALLTHROUGH();
   }
   case QTcpSocket::SocketError::RemoteHostClosedError:
   {
-    ERROR_LOG() << errStr;
+    ERROR_LOG(m_logger) << errStr;
     m_timer->start();
     break;
   }
   default:
   {
-    ERROR_LOG() << errStr;
+    ERROR_LOG(m_logger) << errStr;
     close();
     m_timer->start();
     break;
@@ -210,7 +209,7 @@ void ConnectionHandlerTcp::handleError(QAbstractSocket::SocketError error)
 
 bool ConnectionHandlerTcp::isValidCommandByte(const unsigned char command)
 {
-  DEBUG_LOG() << "ConnectionHandler::isValidCommandByte" << command << (command == 192 ||
+  DEBUG_LOG(m_logger) << "ConnectionHandler::isValidCommandByte" << command << (command == 192 ||
                                                                                 command == 240 ||
                                                                                 command == 244 ||
                                                                                 command == 255 ||
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_tcp.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_tcp.h
index bc0971067..d25b58542 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_tcp.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_tcp.h
@@ -49,6 +49,7 @@ private slots:
 
 
 private:
+  NGL::INGLLogger &m_logger;
   bool isValidCommandByte(const unsigned char command);
   bool isValidPayloadByte(const unsigned char payload);
   QTcpSocket *m_socket;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/control_unit_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/control_unit_handler.cpp
index bf747463a..06fe95411 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/control_unit_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/control_unit_handler.cpp
@@ -12,12 +12,11 @@
 namespace EffectShowClient
 {
 
-ControlUnitHandler::ControlUnitHandler(QObject *parent)
-  : QObject(parent)
+ControlUnitHandler::ControlUnitHandler(QObject *parent) : QObject(parent)
   , m_connectionHandler(new ConnectionHandler(this))
   , m_timer(new QTimer(this))
-  , m_feature(EffectShowManagement::Feature_e::NotSpecified)
-{
+  , m_feature(EffectShowManagement::Feature_e::NotSpecified),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_timer->setInterval(10000);
   connect(m_timer, &QTimer::timeout, this, &ControlUnitHandler::onConnectedToSerialConveter);
   m_timer->start();
@@ -32,7 +31,7 @@ bool ControlUnitHandler::init()
 {
   if (!m_connectionHandler->init())
   {
-    DEBUG_LOG() << "Could not init ConnectionHandler";
+    DEBUG_LOG(m_logger) << "Could not init ConnectionHandler";
     return false;
   }
 
@@ -59,7 +58,7 @@ bool ControlUnitHandler::send(const CommandSignal command, const unsigned int ro
       commandByte = command + roundCount;
     else
     {
-      DEBUG_LOG() << "Bad round count for command FT_SE_CB_WERFER_STATUS";
+      DEBUG_LOG(m_logger) << "Bad round count for command FT_SE_CB_WERFER_STATUS";
       return false;
     }
     break;
@@ -70,7 +69,7 @@ bool ControlUnitHandler::send(const CommandSignal command, const unsigned int ro
       commandByte = command + roundCount;
     else
     {
-      DEBUG_LOG() << "Bad round count for command FT_SE_CB_WERFER_MUNITION";
+      DEBUG_LOG(m_logger) << "Bad round count for command FT_SE_CB_WERFER_MUNITION";
       return false;
     }
     break;
@@ -82,7 +81,7 @@ bool ControlUnitHandler::send(const CommandSignal command, const unsigned int ro
   }
   }
 
-  DEBUG_LOG() << "Sending int/byte to connectionHandler: " << commandByte << QString::number(commandByte, 2); // todorm
+  DEBUG_LOG(m_logger) << "Sending int/byte to connectionHandler: " << commandByte << QString::number(commandByte, 2); // todorm
   //  emit sending(QString(QStringLiteral("%1 - %2")).arg(QString::number(commandByte, 2).rightJustified(8, QLatin1Char('0'))).arg(commandByte));
 
   QByteArray data;
@@ -97,24 +96,24 @@ void ControlUnitHandler::onDataReceived(const QByteArray &ba)
 {
   if (ba.size() >= 1)
   {
-    TRACE_LOG() << "ControlUnitHandler::onDataReceived ba.at(0)        " << (ba.at(0));
-    TRACE_LOG() << "ControlUnitHandler::onDataReceived ba.at(0) & 0xFF " << (ba.at(0) & 0xFF);
+    TRACE_LOG(m_logger) << "ControlUnitHandler::onDataReceived ba.at(0)        " << (ba.at(0));
+    TRACE_LOG(m_logger) << "ControlUnitHandler::onDataReceived ba.at(0) & 0xFF " << (ba.at(0) & 0xFF);
   }
   else
   {
-    DEBUG_LOG() << "ControlUnitHandler::onDataReceived ba is empty";
+    DEBUG_LOG(m_logger) << "ControlUnitHandler::onDataReceived ba is empty";
     return;
   }
   if (ba.size() >= 2)
   {
-    TRACE_LOG() << "ControlUnitHandler::onDataReceived ba.at(1)        " << (ba.at(1));
-    TRACE_LOG() << "ControlUnitHandler::onDataReceived ba.at(1) & 0xFF " << (ba.at(1) & 0xFF);
+    TRACE_LOG(m_logger) << "ControlUnitHandler::onDataReceived ba.at(1)        " << (ba.at(1));
+    TRACE_LOG(m_logger) << "ControlUnitHandler::onDataReceived ba.at(1) & 0xFF " << (ba.at(1) & 0xFF);
   }
   const unsigned int data = ba.at(0);
   if (data >= SE_FT_CB_WERFER_MUNITION && data < 93)
   {
-    DEBUG_LOG() << "ControlUnitHandler::SE_FT_CB_WERFER_MUNITION: " << data;
-    DEBUG_LOG() << "ControlUnitHandler::SE_FT_CB_WERFER_MUNITION real: " << data - SE_FT_CB_WERFER_MUNITION;
+    DEBUG_LOG(m_logger) << "ControlUnitHandler::SE_FT_CB_WERFER_MUNITION: " << data;
+    DEBUG_LOG(m_logger) << "ControlUnitHandler::SE_FT_CB_WERFER_MUNITION real: " << data - SE_FT_CB_WERFER_MUNITION;
     emit vehicleRoundCount(data - SE_FT_CB_WERFER_MUNITION);
     return;
   }
@@ -132,14 +131,14 @@ void ControlUnitHandler::onDataReceived(const QByteArray &ba)
    * our defined ReturningSignals enum.
    */
 
-  TRACE_LOG() << "ControlUnitHandler::onDataReceived ba     " << ba;
+  TRACE_LOG(m_logger) << "ControlUnitHandler::onDataReceived ba     " << ba;
   const unsigned int commandByte = ba.at(0) & 0xFF;
 
-  TRACE_LOG() << "ControlUnitHandler::onDataReceived byte   " << commandByte;
+  TRACE_LOG(m_logger) << "ControlUnitHandler::onDataReceived byte   " << commandByte;
   const unsigned int byte = ba.at(1) & 0xFF;
-  TRACE_LOG() << "ControlUnitHandler::onDataReceived cmdbyte" << byte;
+  TRACE_LOG(m_logger) << "ControlUnitHandler::onDataReceived cmdbyte" << byte;
 
-  TRACE_LOG() << "onDataReceived byte: " << byte << " commandByte: " << commandByte;
+  TRACE_LOG(m_logger) << "onDataReceived byte: " << byte << " commandByte: " << commandByte;
 
   switch (commandByte)
   {
@@ -161,7 +160,7 @@ void ControlUnitHandler::onDataReceived(const QByteArray &ba)
       emit safetyStatus(SafetyConfirmation_e::SafetyExpiring);
     else
       emit safetyStatus(SafetyConfirmation_e::SafetyNotConfirmed);
-    DEBUG_LOG() << "safety warning  ";
+    DEBUG_LOG(m_logger) << "safety warning  ";
     emit safetyWarnings(sst);
     break;
   }
@@ -176,7 +175,7 @@ void ControlUnitHandler::onDataReceived(const QByteArray &ba)
     else
       m_feature = EffectShowManagement::Feature_e::NotSpecified;
 
-    DEBUG_LOG() << "Got Vehicle Type " << m_feature;
+    DEBUG_LOG(m_logger) << "Got Vehicle Type " << m_feature;
     emit vehicleType(m_feature);
     break;
   }
@@ -188,7 +187,7 @@ void ControlUnitHandler::onDataReceived(const QByteArray &ba)
     scr.cardrige3 = byte & BIT_POSITION_5;
     scr.cardrige4 = byte & BIT_POSITION_4;
     scr.cardrige5 = byte & BIT_POSITION_3;
-    DEBUG_LOG() << " CB STATUS FEUER " << byte;
+    DEBUG_LOG(m_logger) << " CB STATUS FEUER " << byte;
     emit vehicleErrorStatus(scr);
     break;
   }
@@ -206,7 +205,7 @@ void ControlUnitHandler::onDataReceived(const QByteArray &ba)
     scr.cardrige4 = byte & BIT_POSITION_4;
     scr.cardrige5 = byte & BIT_POSITION_3;
     //emit vehicleSmokeCardridgesStatus(scr);
-    DEBUG_LOG() << " WERFER STATUS ";
+    DEBUG_LOG(m_logger) << " WERFER STATUS ";
     emit vehicleFireUnits(scr);
     break;
   }
@@ -218,7 +217,7 @@ void ControlUnitHandler::onDataReceived(const QByteArray &ba)
     scr.cardrige3 = byte & BIT_POSITION_5;
     scr.cardrige4 = byte & BIT_POSITION_4;
     scr.cardrige5 = byte & BIT_POSITION_3;
-    DEBUG_LOG() << " NB STATUS ";
+    DEBUG_LOG(m_logger) << " NB STATUS ";
     emit vehicleSmokeCardridgesStatus(scr);
     break;
   }
@@ -240,13 +239,13 @@ void ControlUnitHandler::onDataReceived(const QByteArray &ba)
   }
   case ReturningSignal::SE_FT_CB_SALVE_ERLEDIGT:
   {
-    DEBUG_LOG() << "Volley Done";
+    DEBUG_LOG(m_logger) << "Volley Done";
     emit vehicleFinshedVolley(byte);
     break;
   }
   case ReturningSignal::SE_FT_CB_SALVE_UNTERBROCHEN:
   {
-    DEBUG_LOG() << "Volley Stopped!!";
+    DEBUG_LOG(m_logger) << "Volley Stopped!!";
     emit vehicleStoppedVolley(byte);
     //add error to ui
     CardRidges scr;
@@ -256,22 +255,22 @@ void ControlUnitHandler::onDataReceived(const QByteArray &ba)
   }
   case ReturningSignal::SE_FT_CB_SICHERHEIT_WIDERRUFEN:
   {
-    DEBUG_LOG() << "Sicherheit widerrufen!!";
+    DEBUG_LOG(m_logger) << "Sicherheit widerrufen!!";
     emit vehicleSafetyRevoked();
     break;
   }
   default:
   {
-    DEBUG_LOG() << "onDataReceived switch default";
+    DEBUG_LOG(m_logger) << "onDataReceived switch default";
     break;
   }
   }
-  TRACE_LOG() << "end of onDataReceived";
+  TRACE_LOG(m_logger) << "end of onDataReceived";
 }
 
 void ControlUnitHandler::onConnectedToSerialConveter()
 {
-  DEBUG_LOG() << "Send Type Request";
+  DEBUG_LOG(m_logger) << "Send Type Request";
   send(CommandSignal::FT_SE_CB_FZRSTYP);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/control_unit_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/control_unit_handler.h
index 353c0835b..c6b8e2ac3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/control_unit_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/control_unit_handler.h
@@ -59,6 +59,7 @@ private slots:
   void onDisconnectedFromSerialConveter();
 
 private:
+  NGL::INGLLogger &m_logger;
   ConnectionHandler *m_connectionHandler;
   QTimer            *m_timer;
   EffectShowManagement::Feature_e m_feature;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/dds_handler.cpp
index 6d46b1e22..c5c3723e5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/dds_handler.cpp
@@ -16,7 +16,7 @@ DdsHandler::DdsHandler(int domainId, int exerciseId)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Any, exerciseId))
   , m_exerciseId(exerciseId)
 {
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 
@@ -24,7 +24,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -41,10 +41,10 @@ bool DdsHandler::init(const QStringList &qosFileList)
   m_ddsFts = EffectShowClient::Interface::Fts::create(m_ddsConnector);
 
   bRet &= m_ddsDts->enableAll();
-  INFO_LOG() << "Dts initialised";
+  INFO_LOG(m_logger) << "Dts initialised";
 
   bRet &= m_ddsFts->enableAll();
-  INFO_LOG() << "Fts initialised";
+  INFO_LOG(m_logger) << "Fts initialised";
 
   if (!bRet)
     return false;
@@ -54,13 +54,13 @@ bool DdsHandler::init(const QStringList &qosFileList)
 
   if (!m_dtcTab->enableFireSmokeMarkerData())
   {
-    ERROR_LOG() << "Error initializing TrainingAreaBase DTC";
+    ERROR_LOG(m_logger) << "Error initializing TrainingAreaBase DTC";
     return false;
   }
   m_ftcTab = TrainingAreaBase::Interface::Ftc::create(m_ddsConnector);
   if (!m_ftcTab->enableSendFireSmokeMarkerData())
   {
-    ERROR_LOG() << "Error initializing TrainingAreaBase FTC";
+    ERROR_LOG(m_logger) << "Error initializing TrainingAreaBase FTC";
     return false;
   }
 
@@ -68,7 +68,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
   m_ftcNom = NotificationManagement::Interface::Ftc::create(m_ddsConnector);
   if (!m_ftcNom->enableCreateNotification())
   {
-    ERROR_LOG() << "Error initializing NotificationManagement FTC";
+    ERROR_LOG(m_logger) << "Error initializing NotificationManagement FTC";
     return false;
   }
 
@@ -77,7 +77,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
 
   if (!m_dtcAsm->enableAsset())
   {
-    ERROR_LOG() << "Error initializing AssetManagement DTC";
+    ERROR_LOG(m_logger) << "Error initializing AssetManagement DTC";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/dds_handler.h
index 9704199d6..1723aff90 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/dds_handler.h
@@ -47,6 +47,7 @@ public:
   std::shared_ptr<Core::Interface::Dtc> dtcCore() const { return m_dtcCore;}
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<Core::Pacemaker>            m_pacemaker;
   std::shared_ptr<Core::Interface::Dtc>              m_dtcCore;
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 3d2e27365..2ee28f937 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
@@ -76,8 +76,8 @@ void HandlerFiringExplosion::setFiringClearanceDuration()
 //-----------------------------------------------------------------------------
 void HandlerFiringExplosion::onStartHandlerFiring(const Database::EscOrder &escOrder)
 {
-  DEBUG_LOG() << "onStartHandlerFiring()";
-  DEBUG_LOG() << "numOfVolley: " << escOrder.numOfVolley
+  DEBUG_LOG(m_logger) << "onStartHandlerFiring()";
+  DEBUG_LOG(m_logger) << "numOfVolley: " << escOrder.numOfVolley
                       << "shotsInTotal: " << escOrder.shotsPerVolley
                       << "duration: " << escOrder.duration;
   if (escOrder.numOfVolley < 0)
@@ -94,7 +94,7 @@ void HandlerFiringExplosion::onStartHandlerFiring(const Database::EscOrder &escO
     m_firingExplosionEntity.numberOfShot(escOrder.shotsPerVolley);
     m_firingExplosionEntity.remainingVolleys(escOrder.numOfVolley);
     m_firingExplosionEntity.remainingShots(m_firingExplosionEntity.numberOfShot());
-    DEBUG_LOG() << "Changed number of Shots Remain: " << m_firingExplosionEntity.numberOfShot();
+    DEBUG_LOG(m_logger) << "Changed number of Shots Remain: " << m_firingExplosionEntity.numberOfShot();
     m_isNew = false;
   }
   m_firingExplosionEntity.duration(escOrder.duration * 1000);
@@ -103,7 +103,7 @@ void HandlerFiringExplosion::onStartHandlerFiring(const Database::EscOrder &escO
     m_firingExplosionEntity.firingClearanceTime().set(escOrder.startTime);
   else
   {
-    WARNING_LOG() << "reset clearance time";
+    WARNING_LOG(m_logger) << "reset clearance time";
     m_firingExplosionEntity.firingClearanceTime().reset();
   }
 
@@ -111,7 +111,7 @@ void HandlerFiringExplosion::onStartHandlerFiring(const Database::EscOrder &escO
       m_firingExplosionEntity.numberOfShot() <= 0 ||
       m_firingExplosionEntity.numberOfVolley() <= 0)
   {
-    WARNING_LOG() << "Won't start Explosion ";
+    WARNING_LOG(m_logger) << "Won't start Explosion ";
     return;
   }
 
@@ -123,8 +123,8 @@ void HandlerFiringExplosion::onStartHandlerFiring(const Database::EscOrder &escO
 //-----------------------------------------------------------------------------
 void HandlerFiringExplosion::onEndHandlerFiring(const Database::EscOrder &escOrder)
 {
-  DEBUG_LOG() << "onStopHandlerFiring()";
-  DEBUG_LOG() << "numOfVolley: " << escOrder.numOfVolley
+  DEBUG_LOG(m_logger) << "onStopHandlerFiring()";
+  DEBUG_LOG(m_logger) << "numOfVolley: " << escOrder.numOfVolley
                       << "shotsInTotal: " << escOrder.shotsPerVolley
                       << "duration: " << escOrder.duration;
   if (escOrder.numOfVolley < 0 || escOrder.idOrder != m_firingExplosionEntity.idOrder())
@@ -154,7 +154,7 @@ void HandlerFiringExplosion::onEffectShowStopped(qint16 idEffectShow)
 {
   if (idEffectShow != m_firingExplosionEntity.idEffectShow())
   {
-    ERROR_LOG() << "EffectShow IDs not consistent: " << idEffectShow << " / " << m_firingExplosionEntity.idEffectShow();
+    ERROR_LOG(m_logger) << "EffectShow IDs not consistent: " << idEffectShow << " / " << m_firingExplosionEntity.idEffectShow();
     return;
   }
   m_firingExplosionEntity.isActive(false);
@@ -164,7 +164,7 @@ void HandlerFiringExplosion::onEffectShowContinued(const ConvertFromTab::EffectS
 {
   if (effectShowContinue.idEffectShow != m_firingExplosionEntity.idEffectShow())
   {
-    ERROR_LOG() << "EffectShow IDs not consistent: " << effectShowContinue.idEffectShow << " / " << m_firingExplosionEntity.idEffectShow();
+    ERROR_LOG(m_logger) << "EffectShow IDs not consistent: " << effectShowContinue.idEffectShow << " / " << m_firingExplosionEntity.idEffectShow();
     return;
   }
 }
@@ -206,7 +206,7 @@ void HandlerFiringExplosion::onStatusExplosionFiring(const StatusExplosionFiring
 void HandlerFiringExplosion::onEffectShowStarted()
 {
 
-  DEBUG_LOG() << "onEffectShowStarted";
+  DEBUG_LOG(m_logger) << "onEffectShowStarted";
   m_mainHandler->handlerVehicle()->setExplosionParameter(m_firingExplosionEntity.remainingVolleys(),
                                                          m_firingExplosionEntity.remainingShots(),
                                                          m_firingExplosionEntity.remainingTime());
@@ -227,10 +227,10 @@ bool HandlerFiringExplosion::onEffectShowInterrupted()
 
   if (!m_firingExplosionEntity.isActive() && m_isInterrupted == false)
   {
-    DEBUG_LOG() << "onEffectShowInterrupted is active so return";
+    DEBUG_LOG(m_logger) << "onEffectShowInterrupted is active so return";
     return false;
   }
-  DEBUG_LOG() << "onEffectShowInterrupted";
+  DEBUG_LOG(m_logger) << "onEffectShowInterrupted";
   m_mainHandler->handlerControlUnit()->send(CommandSignal::FT_SE_CB_SICHERHEIT_WIDERRUFEN);
   m_mainHandler->handlerVehicle()->effectShowControl(EffectShowControl_e::StopTimer);
 
@@ -246,7 +246,7 @@ bool HandlerFiringExplosion::onEffectShowInterrupted()
 void HandlerFiringExplosion::onManuallyExplosionRequest(const rti::core::SampleIdentity &cookie,
                                                         const ManuallyExplosionRequest &request)
 {
-  DEBUG_LOG() << "onManuallyExplosionRequest ";
+  DEBUG_LOG(m_logger) << "onManuallyExplosionRequest ";
   //override order!
   if (m_firingExplosionEntity.idEffectShow() == 0)
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_explosion.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_explosion.h
index 07ccf6e6e..91619ca28 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_explosion.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_explosion.h
@@ -54,11 +54,13 @@ private Q_SLOTS:
   void onEffectShowStarted();
 
 private:
+  NGL::INGLLogger &m_logger;
   void onManuallyExplosionRequest(const rti::core::SampleIdentity &cookie,
                                   const ManuallyExplosionRequest &request);
 
 
 private:
+  NGL::INGLLogger &m_logger;
   MainHandler     *m_mainHandler;
   EffectShowClient::FiringExplosionEntity m_firingExplosionEntity;
   bool m_isInterrupted = false;
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 f979f98e7..30f446ffe 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
@@ -27,7 +27,7 @@ HandlerFiringSmoke::HandlerFiringSmoke(MainHandler *mainHandler,
   , ManuallySmokeRequestHandler(mainHandler->dds()->fts())
   , m_mainHandler(mainHandler)
 {
-  DEBUG_LOG() << "HandlerFiringSmoke ctor";
+  DEBUG_LOG(m_logger) << "HandlerFiringSmoke ctor";
 }
 //=============================================================================
 HandlerFiringSmoke::~HandlerFiringSmoke()
@@ -81,8 +81,8 @@ void HandlerFiringSmoke::onStartHandlerFiring(const Database::EscOrder &escOrder
   if (m_firingSmokeEntity.lengthOfFogZone() <= 0 ||
       m_firingSmokeEntity.duration() <= 0)
   {
-    WARNING_LOG() << "Won't start Smoke ";
-    DEBUG_LOG() << "areaWidth: " << escOrder.areaWidth
+    WARNING_LOG(m_logger) << "Won't start Smoke ";
+    DEBUG_LOG(m_logger) << "areaWidth: " << escOrder.areaWidth
                         << "duration: " << escOrder.duration;
     return;
   }
@@ -110,7 +110,7 @@ void HandlerFiringSmoke::onEffectShowStopped(qint16 idEffectShow)
 {
   if (idEffectShow != m_firingSmokeEntity.idEffectShow())
   {
-    ERROR_LOG() << "EffectShow IDs not consistent: " << idEffectShow << " / " << m_firingSmokeEntity.idEffectShow();
+    ERROR_LOG(m_logger) << "EffectShow IDs not consistent: " << idEffectShow << " / " << m_firingSmokeEntity.idEffectShow();
     return;
   }
 }
@@ -119,7 +119,7 @@ void HandlerFiringSmoke::onEffectShowContinued(const ConvertFromTab::EffectShowC
 {
   if (effectShowContinue.idEffectShow != m_firingSmokeEntity.idEffectShow())
   {
-    ERROR_LOG() << "EffectShow IDs not consistent: " << effectShowContinue.idEffectShow << " / " << m_firingSmokeEntity.idEffectShow();
+    ERROR_LOG(m_logger) << "EffectShow IDs not consistent: " << effectShowContinue.idEffectShow << " / " << m_firingSmokeEntity.idEffectShow();
     return;
   }
 }
@@ -153,7 +153,7 @@ void HandlerFiringSmoke::setSmoking()
 void HandlerFiringSmoke::onManuallySmokeRequest(const rti::core::SampleIdentity &cookie,
                                                 const ManuallySmokeRequest &request)
 {
-  DEBUG_LOG() << "onManuallySmokeRequest";
+  DEBUG_LOG(m_logger) << "onManuallySmokeRequest";
 
   //override order!
   if (m_firingSmokeEntity.idOrder() == 0)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_smoke.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_smoke.h
index f1ecc9eee..3c0d3fc11 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_smoke.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_smoke.h
@@ -46,11 +46,13 @@ private Q_SLOTS:
   void onStatusSmokeFiring(const StatusSmokeFiring_t &statusSmokeFiring);
 
 private:
+  NGL::INGLLogger &m_logger;
   void onManuallySmokeRequest(const rti::core::SampleIdentity &cookie,
                               const ManuallySmokeRequest &request);
 
 
 private:
+  NGL::INGLLogger &m_logger;
   MainHandler               *m_mainHandler;
   EffectShowClient::FiringSmokeEntity     m_firingSmokeEntity;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_operating_condition.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_operating_condition.cpp
index b2b1e78f1..beb2edb1f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_operating_condition.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_operating_condition.cpp
@@ -76,7 +76,7 @@ void HandlerOperatingCondition::onVehicleBattery(double battery)
 {
   m_operatingCondition.batteryVoltage(battery);
   if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
-    ERROR_LOG() << "Error publishing OperatingConditionEntity-data Battery to dds";
+    ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data Battery to dds";
 }
 
 void HandlerOperatingCondition::onVehicleSmokeCardridgesFireStatus(const CardRidges &fireStatus)
@@ -116,7 +116,7 @@ void HandlerOperatingCondition::onVehicleSmokeCardridgesFireStatus(const CardRid
     m_operatingCondition.smokeCartridge5(StatusSmokeCartridge_e_def::Smoking);
 
   if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
-    ERROR_LOG() << "Error publishing OperatingConditionEntity-data (Somoking) to dds";
+    ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (Somoking) to dds";
 }
 
 void HandlerOperatingCondition::onVehicleSmokeCardridgesStatus(const CardRidges   &fireStatus)
@@ -134,7 +134,7 @@ void HandlerOperatingCondition::onVehicleSmokeCardridgesStatus(const CardRidges
     m_operatingCondition.smokeCartridge5(m_readyCardridges.cardrige5 ? StatusSmokeCartridge_e_def::Ready : StatusSmokeCartridge_e_def::NotReady);
 
   if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
-    ERROR_LOG() << "Error publishing OperatingConditionEntity-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data to dds";
 }
 
 void HandlerOperatingCondition::onVehicleFireUnits(const CardRidges   &fireStatus)
@@ -144,7 +144,7 @@ void HandlerOperatingCondition::onVehicleFireUnits(const CardRidges   &fireStatu
   m_operatingCondition.firingUnitReadyAftRh(fireStatus.cardrige3);
   m_operatingCondition.firingUnitReadyAftLh(fireStatus.cardrige4);
   if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
-    ERROR_LOG() << "Error publishing OperatingConditionEntity-data (fireStatus) to dds";
+    ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (fireStatus) to dds";
 }
 
 void HandlerOperatingCondition::onVehicleErrorStatus(const CardRidges &errorStatus)
@@ -155,7 +155,7 @@ void HandlerOperatingCondition::onVehicleErrorStatus(const CardRidges &errorStat
   m_operatingCondition.errorEquipment(errorStatus.cardrige4);
   m_operatingCondition.errorGeneral(errorStatus.cardrige5);
   if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
-    ERROR_LOG() << "Error publishing OperatingConditionEntity-data (errorStatus) to dds";
+    ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (errorStatus) to dds";
 
   if (isErrorDmf() != m_oldErrorState)
   {
@@ -168,7 +168,7 @@ void HandlerOperatingCondition::onVehicleErrorStatus(const CardRidges &errorStat
 
 void HandlerOperatingCondition::onOperationalStatusTimeout()
 {
-  DEBUG_LOG() << "Operational status timeout. Setting operational status to: not operational.";
+  DEBUG_LOG(m_logger) << "Operational status timeout. Setting operational status to: not operational.";
   m_isOperational = false;
   m_operatingCondition.readiness(m_isOperational);
 
@@ -188,7 +188,7 @@ bool HandlerOperatingCondition::isErrorDmf()
 
 void HandlerOperatingCondition::onConnectionToSerial()
 {
-  DEBUG_LOG() << "Connected to Serial: send ammunition Magazine to Control Unit Count: " << m_operatingCondition.ammunitionMagazine();
+  DEBUG_LOG(m_logger) << "Connected to Serial: send ammunition Magazine to Control Unit Count: " << m_operatingCondition.ammunitionMagazine();
   m_mainHandler->handlerVehicle()->setAmmunitionParameter(m_operatingCondition.ammunitionMagazine());
 }
 
@@ -196,7 +196,7 @@ void HandlerOperatingCondition::onVehicleType(const EffectShowManagement::Featur
 {
   m_operatingCondition.vehicleFeature(type);
   if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
-    ERROR_LOG() << "Error publishing OperatingConditionEntity-data (vehicle type) to dds";
+    ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (vehicle type) to dds";
 }
 
 void HandlerOperatingCondition::onSafetyStatus(const SafetyStatus &status)
@@ -206,20 +206,20 @@ void HandlerOperatingCondition::onSafetyStatus(const SafetyStatus &status)
   m_operatingCondition.emergencyStop(status.emergencyStop);
 
   if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
-    ERROR_LOG() << "Error publishing OperatingConditionEntity-data (SafetyStatus) to dds";
+    ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (SafetyStatus) to dds";
 }
 
 void HandlerOperatingCondition::onVehicleRoundCount(int loadedRounds)
 {
-  DEBUG_LOG() << "Got RoundCount Reply from Unit " << loadedRounds;
+  DEBUG_LOG(m_logger) << "Got RoundCount Reply from Unit " << loadedRounds;
   m_operatingCondition.ammunitionMagazine(loadedRounds);
   if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
-    ERROR_LOG() << "Error publishing OperatingConditionEntity-data (ammunition magazine) to dds";
+    ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (ammunition magazine) to dds";
 }
 
 void HandlerOperatingCondition::onVolleyRounds(int usedRounds)
 {
-  DEBUG_LOG() << "Got used rounds " << usedRounds;
+  DEBUG_LOG(m_logger) << "Got used rounds " << usedRounds;
   m_operatingCondition.ammunitionMagazine(m_operatingCondition.ammunitionMagazine() - usedRounds);
   if (m_operatingCondition.ammunitionMagazine() < 0)
     m_operatingCondition.ammunitionMagazine(0);
@@ -227,7 +227,7 @@ void HandlerOperatingCondition::onVolleyRounds(int usedRounds)
   if (m_operatingCondition.ammunitionAvailable() < 0)
     m_operatingCondition.ammunitionAvailable(0);
   if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
-    ERROR_LOG() << "Error publishing OperatingConditionEntity-data (ammunition magazine used) to dds";
+    ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (ammunition magazine used) to dds";
 }
 
 void HandlerOperatingCondition::sendStatus()
@@ -252,7 +252,7 @@ void HandlerOperatingCondition::getVehicleStatus(ConvertToTab::VehicleStatus_t &
 void HandlerOperatingCondition::onSendAmmunitionRequest(const rti::core::SampleIdentity &cookie,
                                                         const SendAmmunitionRequest &request)
 {
-  DEBUG_LOG() << "onSendAmmunitionRequest";
+  DEBUG_LOG(m_logger) << "onSendAmmunitionRequest";
   //take available ammo and send excon
   //then wait for reply from unit
   m_operatingCondition.ammunitionAvailable(request.ammunitionAvailable());
@@ -276,7 +276,7 @@ void HandlerOperatingCondition::onSendAmmunitionRequest(const rti::core::SampleI
 void HandlerOperatingCondition::onSendSafetyRevokeRequest(const rti::core::SampleIdentity &cookie,
                                                           const SendSafetyRevokeRequest &request)
 {
-  DEBUG_LOG() << "onSendSafetyRevokeRequest with " <<  request.revoke();
+  DEBUG_LOG(m_logger) << "onSendSafetyRevokeRequest with " <<  request.revoke();
   m_mainHandler->dds()->fts()->sendSafetyRevokeReply(cookie, Core::FunctionReplyObject());
   if (request.revoke())
   {
@@ -289,7 +289,7 @@ void HandlerOperatingCondition::onSendSafetyRevokeRequest(const rti::core::Sampl
 void HandlerOperatingCondition::onSendReadinessRequest(const rti::core::SampleIdentity &cookie,
                                                        const SendReadinessRequest &request)
 {
-  DEBUG_LOG() << "onSendReadinessRequest";
+  DEBUG_LOG(m_logger) << "onSendReadinessRequest";
   //Confirm or Revoke Readiness
   //send to EXCON
   m_isOperational = request.readiness();
@@ -304,16 +304,16 @@ void HandlerOperatingCondition::onSendReadinessRequest(const rti::core::SampleId
   //now change operating condition in hope that tetra worked
   m_operatingCondition.readiness(m_isOperational);
   if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
-    ERROR_LOG() << "Error publishing OperatingConditionEntity-data readiness) to dds";
+    ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data readiness) to dds";
 
   if (m_isOperational)
   {
-    DEBUG_LOG() << "Operating condition: operational. Starting timer.";
+    DEBUG_LOG(m_logger) << "Operating condition: operational. Starting timer.";
     m_operationalStatusTimer->start(15 * 60 * 1000);
   }
   else
   {
-    DEBUG_LOG() << "Operating condition: not operational. Stopping timer.";
+    DEBUG_LOG(m_logger) << "Operating condition: not operational. Stopping timer.";
     m_operationalStatusTimer->stop();
   }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_operating_condition.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_operating_condition.h
index 9673ace27..288ceb1d6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_operating_condition.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_operating_condition.h
@@ -53,6 +53,7 @@ private slots:
 
 
 private:
+  NGL::INGLLogger &m_logger;
   void onSendAmmunitionRequest(const rti::core::SampleIdentity &cookie,
                                const SendAmmunitionRequest &request);
   void onSendSafetyRevokeRequest(const rti::core::SampleIdentity &cookie,
@@ -63,6 +64,7 @@ private:
   bool isErrorDmf();
 
 private:
+  NGL::INGLLogger &m_logger;
   MainHandler *m_mainHandler{nullptr};
   CardRidges  m_readyCardridges;
   CardRidges  m_smokingCardridges;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_order.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_order.cpp
index bff509198..9c7f8b3d2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_order.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_order.cpp
@@ -44,7 +44,7 @@ bool HandlerOrder::init()
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       bRet = false;
       return;
     }
@@ -52,11 +52,11 @@ bool HandlerOrder::init()
   };
   if (!m_mainHandler->db()->select(cbOrder) || !bRet)
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
 
-  DEBUG_LOG() << "m_orderObjMap.size() = " << m_orderObjMap.size();
+  DEBUG_LOG(m_logger) << "m_orderObjMap.size() = " << m_orderObjMap.size();
 
   return true;
 }
@@ -95,7 +95,7 @@ void HandlerOrder::createOrder(const ConvertFromTab::EffectShowOrder_t &effectSh
   if (ret.error())
   {
     delete ifs;
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
     return;
   }
   m_orderObjMap.insert(ifs->getId(), ifs);
@@ -125,7 +125,7 @@ void HandlerOrder::createOrder(const ConvertFromTab::RelocationOrder_t &relocati
   if (ret.error())
   {
     delete ifs;
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
     return;
   }
   m_orderObjMap.insert(ifs->getId(), ifs);
@@ -136,7 +136,7 @@ void HandlerOrder::removeOrder(const ConvertFromTab::OrderRetract_t &orderRetrac
   for (auto it = m_orderObjMap.begin(); it != m_orderObjMap.end(); ++it)
   {
     if (it.value()->getData().typeOfOrder == orderRetract.orderType)
-      //ERROR_LOG() << "current idorder =" ;
+      //ERROR_LOG(m_logger) << "current idorder =" ;
       if (it.value()->getData().idOrder == orderRetract.id)
       {
         int id = it.key();
@@ -144,14 +144,14 @@ void HandlerOrder::removeOrder(const ConvertFromTab::OrderRetract_t &orderRetrac
         int def = it.value()->getData().orderConfirmation;
         ret = it.value()->removeObject();
         if (ret.error())
-          ERROR_LOG() << Q_FUNC_INFO << ret();
+          ERROR_LOG(m_logger) << Q_FUNC_INFO << ret();
         else
         {
           if (def == EffectShowManagement::OrderConfirmation_e_def::Execution ||
               def == EffectShowManagement::OrderConfirmation_e_def::InterruptExecution ||
               def == EffectShowManagement::OrderConfirmation_e_def::FiringReadiness)
           {
-            DEBUG_LOG() << "EndFireHandler from Remove";
+            DEBUG_LOG(m_logger) << "EndFireHandler from Remove";
 
             emit endHandlerFiring(it.value()->getData());
             //Stop the current execution
@@ -171,7 +171,7 @@ void HandlerOrder::removeOrder(const ConvertFromTab::OrderRetract_t &orderRetrac
 void HandlerOrder::sendOrderConfirmation(const ConvertToTab::OrderConfirmation_t &oc)
 {
 
-  ERROR_LOG() << "Send Order Confirmation to Excon  " << oc.orderId << " / ";
+  ERROR_LOG(m_logger) << "Send Order Confirmation to Excon  " << oc.orderId << " / ";
   m_mainHandler->handlerTabData()->orderConfirmation(oc);
 }
 
@@ -179,7 +179,7 @@ void HandlerOrder::sendOrderConfirmation(const ConvertToTab::OrderConfirmation_t
 void HandlerOrder::onOrderModifyRequest(const rti::core::SampleIdentity &cookie,
                                         const OrderModifyRequest &request)
 {
-  DEBUG_LOG() << "Order: " << request.id() << " Order: " << request.orderConfirmation();
+  DEBUG_LOG(m_logger) << "Order: " << request.id() << " Order: " << request.orderConfirmation();
 
   if (request.id() > 0)
   {
@@ -194,7 +194,7 @@ void HandlerOrder::onOrderModifyRequest(const rti::core::SampleIdentity &cookie,
       if (ret.error())
       {
         m_mainHandler->dds()->fts()->orderModifyReply(cookie, ret);
-        ERROR_LOG() << "Update Order object failed.";
+        ERROR_LOG(m_logger) << "Update Order object failed.";
         return;
       }
 
@@ -207,7 +207,7 @@ void HandlerOrder::onOrderModifyRequest(const rti::core::SampleIdentity &cookie,
   else
   {
     m_mainHandler->dds()->fts()->orderModifyReply(cookie, Core::FunctionReplyObject(request.id()));
-    ERROR_LOG() << "Illegal Order ID";
+    ERROR_LOG(m_logger) << "Illegal Order ID";
   }
 }
 bool HandlerOrder::updateOrder(ObjectOrder *order,
@@ -222,14 +222,14 @@ bool HandlerOrder::updateOrder(ObjectOrder *order,
   oc.confirmation = orderConf.underlying();
   oc.answerText = answerText;
   sendOrderConfirmation(oc);
-  ERROR_LOG() << "Update Order " << oc.orderId << " / ";
+  ERROR_LOG(m_logger) << "Update Order " << oc.orderId << " / ";
   switch (orderConf.underlying())
   {
   case EffectShowManagement::OrderConfirmation_e_def::FiringReadiness:
     emit startHandlerFiring(order->getData());
     break;
   case EffectShowManagement::OrderConfirmation_e_def::Execution:
-    DEBUG_LOG() << "start execution";
+    DEBUG_LOG(m_logger) << "start execution";
     m_mainHandler->handlerVehicle()->effectShowControl(EffectShowClient::EffectShowControl_e::Start);
     emit effectShowStarted();
     break;
@@ -242,7 +242,7 @@ bool HandlerOrder::updateOrder(ObjectOrder *order,
   case EffectShowManagement::OrderConfirmation_e_def::Abort:
     if (checkForActiveOrder(escOrder.idOrder))
     {
-      DEBUG_LOG() << "idOrder is " << escOrder.idOrder << " send abbort as is active";
+      DEBUG_LOG(m_logger) << "idOrder is " << escOrder.idOrder << " send abbort as is active";
       m_mainHandler->handlerControlUnit()->send(CommandSignal::FT_SE_CB_SALVE_UNTERBRECHEN);
       m_mainHandler->handlerVehicle()->effectShowControl(EffectShowControl_e::Abort);
     }
@@ -262,7 +262,7 @@ bool HandlerOrder::updateOrder(ObjectOrder *order,
     break;
   }
   default:
-    ERROR_LOG() << "Unhandled EffectShowManagement::OrderConfirmation_e_def in HandlerOrder::onOrderModifyRequest"; // todo
+    ERROR_LOG(m_logger) << "Unhandled EffectShowManagement::OrderConfirmation_e_def in HandlerOrder::onOrderModifyRequest"; // todo
     break;
   }
 
@@ -279,14 +279,14 @@ void HandlerOrder::updateOrderWithId(int orderId, const QString &answerText, Eff
   ifs->setOrderConfirmation(orderConf.underlying());
   auto ret = ifs->updateObject();
   if (ret.error())
-    ERROR_LOG() << "Error Updating Order " << orderId << " / ";
+    ERROR_LOG(m_logger) << "Error Updating Order " << orderId << " / ";
   updateOrder(ifs, answerText, orderConf);
 
 }
 
 bool HandlerOrder::checkForActiveOrder(int orderId)
 {
-  DEBUG_LOG() << "check for active Order " <<  orderId << " ";
+  DEBUG_LOG(m_logger) << "check for active Order " <<  orderId << " ";
   if (orderId <= 0)
     return false;
   return ((m_mainHandler->handlerFiringExplosion()->getCurrentorderId() == orderId )||( m_mainHandler->handlerFiringSmoke()->getCurrentorderId() == orderId));
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_order.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_order.h
index 3a8ac7883..a44a79625 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_order.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_order.h
@@ -47,10 +47,12 @@ Q_SIGNALS:
   void effectShowInterrupted();
 
 private:
+  NGL::INGLLogger &m_logger;
   void onOrderModifyRequest(const rti::core::SampleIdentity &cookie,
                             const OrderModifyRequest &request) override final;
   
 private:
+  NGL::INGLLogger &m_logger;
   QMap<int, ObjectOrder *>    m_orderObjMap;
   MainHandler               *m_mainHandler;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_tab_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_tab_data.cpp
index 0eefe9a95..e683e0b04 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_tab_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_tab_data.cpp
@@ -31,7 +31,7 @@ HandlerTabData::~HandlerTabData()
 //=============================================================================
 bool HandlerTabData::init()
 {
-  DEBUG_LOG() << "Begin HandlerTabData";
+  DEBUG_LOG(m_logger) << "Begin HandlerTabData";
   auto dtcTab = m_mainHandler->dds()->dtcTab();
   connect(dtcTab.get(), &TrainingAreaBase::Interface::Dtc::fireSmokeMarkerDataChanged,
           this, &HandlerTabData::onFireSmokeMarkerDataChanged);
@@ -47,13 +47,13 @@ bool HandlerTabData::init()
       return false;
   }
 
-  DEBUG_LOG() << "End HandlerTabData";
+  DEBUG_LOG(m_logger) << "End HandlerTabData";
   return true;
 } // end of init()
 //=============================================================================
 void HandlerTabData::orderConfirmation(const ConvertToTab::OrderConfirmation_t &orderConfirmation)
 {
-  DEBUG_LOG() << "Trigger Sending of Order Confirmation ";
+  DEBUG_LOG(m_logger) << "Trigger Sending of Order Confirmation ";
   TrainingAreaBase::SendFireSmokeMarkerDataRequest out;
 
   out.payload(ConvertToTab::convertOrderConfirmation(orderConfirmation));
@@ -63,7 +63,7 @@ void HandlerTabData::orderConfirmation(const ConvertToTab::OrderConfirmation_t &
 //=============================================================================
 void HandlerTabData::vehicleStatus(const ConvertToTab::VehicleStatus_t &vehicleStatus)
 {
-  DEBUG_LOG() << "Trigger Sending of Vehicle Status ";
+  DEBUG_LOG(m_logger) << "Trigger Sending of Vehicle Status ";
   TrainingAreaBase::SendFireSmokeMarkerDataRequest out;
 
   out.payload(ConvertToTab::convertVehicleStatus(vehicleStatus));
@@ -73,9 +73,9 @@ void HandlerTabData::vehicleStatus(const ConvertToTab::VehicleStatus_t &vehicleS
 void HandlerTabData::onSendFireSmokeMarkerDataReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "Fire Smoke Marker Data could not be send: " << reply.str();
+    ERROR_LOG(m_logger) << "Fire Smoke Marker Data could not be send: " << reply.str();
   else
-    DEBUG_LOG() << "Fire Smoke Marker Data send successfully to TAB!";
+    DEBUG_LOG(m_logger) << "Fire Smoke Marker Data send successfully to TAB!";
 }
 //-----------------------------------------------------------------------------
 void HandlerTabData::onFireSmokeMarkerDataChanged(const TrainingAreaBase::FireSmokeMarkerData &data, DataModification modType)
@@ -83,43 +83,43 @@ void HandlerTabData::onFireSmokeMarkerDataChanged(const TrainingAreaBase::FireSm
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG() << "Got Fire Smoke Marker " << data.sampleTime();
+  DEBUG_LOG(m_logger) << "Got Fire Smoke Marker " << data.sampleTime();
 
   switch (ConvertFromTab::isTelegram(data))
   {
   case ConvertFromTab::RxTelegram_e::EffectShowOrder:
   {
-    DEBUG_LOG() << "Got Effect Show Order";
+    DEBUG_LOG(m_logger) << "Got Effect Show Order";
     m_mainHandler->handlerOrder()->createOrder(ConvertFromTab::convertEffectShowOrder(data));
     break;
   }
   case ConvertFromTab::RxTelegram_e::RelocationOrder:
   {
-    DEBUG_LOG() << "Got Relocation order ";
+    DEBUG_LOG(m_logger) << "Got Relocation order ";
     m_mainHandler->handlerOrder()->createOrder(ConvertFromTab::convertRelocationOrder(data));
     break;
   }
   case ConvertFromTab::RxTelegram_e::EffectShowStop:
   {
-    DEBUG_LOG() << "Got Effect Show Stop ";
+    DEBUG_LOG(m_logger) << "Got Effect Show Stop ";
     emit effectShowStopped(ConvertFromTab::convertEffectShowStop(data));
     break;
   }
   case ConvertFromTab::RxTelegram_e::EffectShowContinue:
   {
-    DEBUG_LOG() << "Got Effect Show Continue ";
+    DEBUG_LOG(m_logger) << "Got Effect Show Continue ";
     emit effectShowContinued(ConvertFromTab::convertEffectShowContinue(data));
     break;
   }
   case ConvertFromTab::RxTelegram_e::OrderRetract:
   {
-    DEBUG_LOG() << "Got Order Retract ";
+    DEBUG_LOG(m_logger) << "Got Order Retract ";
     m_mainHandler->handlerOrder()->removeOrder(ConvertFromTab::convertOrderRetract(data));
     break;
   }
   case ConvertFromTab::RxTelegram_e::StatusRequest:
   {
-    DEBUG_LOG() << "Got Status Request " ;
+    DEBUG_LOG(m_logger) << "Got Status Request " ;
     if (ConvertFromTab::convertStatusRequest(data))
     {
       m_mainHandler->handlerOperatingCondition()->sendStatus();
@@ -128,9 +128,9 @@ void HandlerTabData::onFireSmokeMarkerDataChanged(const TrainingAreaBase::FireSm
   }
   case ConvertFromTab::RxTelegram_e::MeteoData:
   {
-    DEBUG_LOG() << "Got Meteo Data ";
+    DEBUG_LOG(m_logger) << "Got Meteo Data ";
     if (!m_mainHandler->dds()->dts()->publish(ConvertFromTab::convertMeteoData(data)))
-      ERROR_LOG() << "Error publishing MeteoNearVehicle to dds";
+      ERROR_LOG(m_logger) << "Error publishing MeteoNearVehicle to dds";
     break;
   }
   case ConvertFromTab::RxTelegram_e::unknown:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_tab_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_tab_data.h
index 6a63061bd..525fae43d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_tab_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_tab_data.h
@@ -52,6 +52,7 @@ public:
   void vehicleStatus(const ConvertToTab::VehicleStatus_t &vehicleStatus);
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onSendFireSmokeMarkerDataReply(const Core::FunctionReplyObject &reply) override final;
 
 Q_SIGNALS:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_vehicle.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_vehicle.cpp
index 7aca054ea..bd8b0fa48 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_vehicle.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_vehicle.cpp
@@ -19,14 +19,12 @@ namespace EffectShowClient
 {
 //=============================================================================
 HandlerVehicle::HandlerVehicle(MainHandler *mainHandler,
-                               QObject     *parent)
-
-  : QObject(parent)
+                               QObject     *parent) : QObject(parent)
   , m_mainHandler(mainHandler)
   , m_volleyTimer(new QTimer(this))
-  , m_remainingTimer(new QTimer(this))
-{
-  DEBUG_LOG() << "HandlerVehicle ctor";
+  , m_remainingTimer(new QTimer(this)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  DEBUG_LOG(m_logger) << "HandlerVehicle ctor";
   m_volleyTimer->setSingleShot(true);
   m_remainingTimer->setInterval(1000);
   m_statusExplosionFiring.remainingTime_s = -1;
@@ -41,7 +39,7 @@ HandlerVehicle::~HandlerVehicle()
 //=============================================================================
 bool HandlerVehicle::init()
 {
-  DEBUG_LOG() << "HandlerVehicle::init()";
+  DEBUG_LOG(m_logger) << "HandlerVehicle::init()";
   connect(m_mainHandler->handlerControlUnit().get(), &ControlUnitHandler::vehicleBattery, this, &HandlerVehicle::vehicleBattery);
   connect(m_mainHandler->handlerControlUnit().get(), &ControlUnitHandler::vehicleFinshedVolley, this, &HandlerVehicle::onVolleyFinished);
   //connect(m_mainHandler->handlerControlUnit().get(), &ControlUnitHandler::vehicleShutDown, this, &HandlerVehicle::vehicleShutDown);
@@ -75,7 +73,7 @@ int HandlerVehicle::burningTimeSmokeCartridge_s() const
 //=============================================================================
 void HandlerVehicle::setExplosionParameter(int numberOfVolley, int numberOfShot, qint64 duration)
 {
-  DEBUG_LOG() << "Duration: " << duration << " number of shots: " << numberOfShot << " number of volles" << numberOfVolley;
+  DEBUG_LOG(m_logger) << "Duration: " << duration << " number of shots: " << numberOfShot << " number of volles" << numberOfVolley;
   m_statusExplosionFiring.remainingShots  = numberOfShot;
   m_statusExplosionFiring.remainingTime_s = duration;
   m_statusExplosionFiring.remainingVolley = numberOfVolley;
@@ -196,7 +194,7 @@ void HandlerVehicle::spreadShotsInVolleys(int shots, int volleys)
 
 void HandlerVehicle::onVolleyStopped(int shots)
 {
-  DEBUG_LOG() << "Volles Stopped after " << shots << " rounds";
+  DEBUG_LOG(m_logger) << "Volles Stopped after " << shots << " rounds";
   //m_statusExplosionFiring.remainingTime_s = 0;
   //stopp timer and take current seconds
   m_remainingTimer->stop();
@@ -220,7 +218,7 @@ void HandlerVehicle::onVolleyStopped(int shots)
 
 void HandlerVehicle::onVolleyFinished(int shots)
 {
-  DEBUG_LOG() << "Volley finished after shots: " <<  shots;
+  DEBUG_LOG(m_logger) << "Volley finished after shots: " <<  shots;
   m_remainingTimer->stop();
   if (m_volleyTimer->isActive())
     m_volleyTimer->stop();
@@ -234,7 +232,7 @@ void HandlerVehicle::onVolleyFinished(int shots)
 
   //m_statusExplosionFiring.remainingTime_s = m_statusExplosionFiring.remainingTime_s - (m_timeBetweenShots * (shots - 1)) - pauseTime;
   m_statusExplosionFiring.remainingTime_s = m_oldTime - (m_timeBetweenShots * shots) - pauseTime;
-  DEBUG_LOG() << "Remaining time: " << m_statusExplosionFiring.remainingTime_s;
+  DEBUG_LOG(m_logger) << "Remaining time: " << m_statusExplosionFiring.remainingTime_s;
   m_oldTime = m_statusExplosionFiring.remainingTime_s;
   if (m_statusExplosionFiring.remainingTime_s < 0 || m_statusExplosionFiring.remainingShots == 0)
     m_statusExplosionFiring.remainingTime_s = 0;
@@ -261,7 +259,7 @@ void HandlerVehicle::onVolleyFinished(int shots)
 
 void HandlerVehicle::onStartVolley()
 {
-  DEBUG_LOG() << "Send Start Volley";
+  DEBUG_LOG(m_logger) << "Send Start Volley";
   if (!m_remainingTimer->isActive())
     m_remainingTimer->start();
   if (m_volleyTimer->isActive())
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_vehicle.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_vehicle.h
index e1224763b..5b7a3b0b9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_vehicle.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_vehicle.h
@@ -85,6 +85,7 @@ public:
   void effectShowControl(EffectShowClient::EffectShowControl_e effectShowControl);
 
 private:
+  NGL::INGLLogger &m_logger;
   void spreadShotsInVolleys(int shots, int volleys);
 
 signals:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/main_handler.cpp
index 5891abc7a..61708ca8e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/main_handler.cpp
@@ -19,8 +19,7 @@
 namespace EffectShowClient
 {
 
-MainHandler::MainHandler(QObject *parent)
-  : QObject(parent)
+MainHandler::MainHandler(QObject *parent) : QObject(parent)
   , m_ddsHandler(nullptr)
   , m_dbHandler(nullptr)
   , m_handlerOrder(nullptr)
@@ -29,8 +28,8 @@ MainHandler::MainHandler(QObject *parent)
   , m_handlerFiringSmoke(nullptr)
   , m_handlerTabData(nullptr)
   , m_handlerVehicle(nullptr)
-  , m_handlerControlUnit(nullptr)
-{}
+  , m_handlerControlUnit(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 MainHandler::~MainHandler()
 {
@@ -54,28 +53,28 @@ bool MainHandler::init(int domainId, int exerciseId)
 
   if (!m_dbHandler->init(exerciseId, Settings::settings()))
   {
-    ERROR_LOG() << "Initialisation dbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation dbHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation dbHandler succesful.";
 
   // initialize DDS
   m_ddsHandler = std::make_shared<DdsHandler>(domainId, exerciseId);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation ddsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation ddsHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation ddsHandler succesful.";
 
   // init control unit handler
   m_handlerControlUnit = std::make_shared<EffectShowClient::ControlUnitHandler>(this);
   if (!m_handlerControlUnit->init())
   {
-    ERROR_LOG() << "Initialisation control unit handler failed.";
+    ERROR_LOG(m_logger) << "Initialisation control unit handler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation control unit handler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation control unit handler succesful.";
 
   // create handler
   m_handlerOrder = std::make_shared<HandlerOrder>(this, this);
@@ -88,38 +87,38 @@ bool MainHandler::init(int domainId, int exerciseId)
   // ini handler
   if (!m_handlerOrder->init())
   {
-    ERROR_LOG() << "Initialisation HandlerOrder failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerOrder failed.";
     return false;
   }
 
   if (!m_handlerOperatingCondition->init())
   {
-    ERROR_LOG() << "Initialisation handlerOperatingCondition failed.";
+    ERROR_LOG(m_logger) << "Initialisation handlerOperatingCondition failed.";
     return false;
   }
 
   if (!m_handlerFiringExplosion->init())
   {
-    ERROR_LOG() << "Initialisation handlerFiringExplosion failed.";
+    ERROR_LOG(m_logger) << "Initialisation handlerFiringExplosion failed.";
     return false;
   }
 
   if (!m_handlerFiringSmoke->init())
   {
-    ERROR_LOG() << "Initialisation handlerFiringSmoke failed.";
+    ERROR_LOG(m_logger) << "Initialisation handlerFiringSmoke failed.";
     return false;
   }
 
 
   if (!m_handlerTabData->init())
   {
-    ERROR_LOG() << "Initialisation HandlerTabData failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerTabData failed.";
     return false;
   }
 
   if (!m_handlerVehicle->init())
   {
-    ERROR_LOG() << "Initialisation handlerVehicle failed.";
+    ERROR_LOG(m_logger) << "Initialisation handlerVehicle failed.";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/main_handler.h
index 06a025117..5884dba2c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/main_handler.h
@@ -48,6 +48,7 @@ public:
   std::shared_ptr<ControlUnitHandler>        handlerControlUnit()        const { return m_handlerControlUnit; }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>   m_ddsHandler;
   std::shared_ptr<DbHandler>    m_dbHandler;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/object_order.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/object_order.cpp
index b8f590e18..3ed9fa510 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/object_order.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/object_order.cpp
@@ -36,7 +36,7 @@ Core::FunctionReplyObject ObjectOrder::createObject(const Database::EscOrder &da
     if (!m_mainHandler->db()->insert(m_data))
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting Order into database."));
 
-    DEBUG_LOG() << "New Order created Id: " << m_data.id;
+    DEBUG_LOG(m_logger) << "New Order created Id: " << m_data.id;
   }
 
   // Publish Data via DTS
@@ -55,7 +55,7 @@ Core::FunctionReplyObject ObjectOrder::updateObject(const Database::EscOrder &da
   if (!m_mainHandler->db()->update(m_data))
     return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error updating Order into database"));
 
-  DEBUG_LOG() << "Data changed for Changed Id: " << m_data.id;
+  DEBUG_LOG(m_logger) << "Data changed for Changed Id: " << m_data.id;
 
   // Publish Data via DTS
   onPublishData();
@@ -91,13 +91,13 @@ void ObjectOrder::onPublishData()
   ddsData.startTime(m_data.startTime);
   ddsData.typeOfOrder(m_data.typeOfOrder);
   ddsData.info(m_data.info.toStdString());
-  INFO_LOG() << "Publish EscOrder-data to dds (" << m_data.id << ") ...";
+  INFO_LOG(m_logger) << "Publish EscOrder-data to dds (" << m_data.id << ") ...";
 
   if (oc ==  EffectShowManagement::OrderConfirmation_e::WaitingForAcceptance)
     createNotificationRequest();
 
   if (!m_mainHandler->dds()->dts()->publish(ddsData))
-    ERROR_LOG() << "Error publishing EscOrder-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing EscOrder-data to dds";
 }
 
 //-----------------------------------------------------------------------------
@@ -163,25 +163,25 @@ void ObjectOrder::createNotificationRequest()
   NotificationManagement::CreateNotification data;
   getCreateNotificationRequestData(data);
 
-  INFO_LOG() << "trying to send CreateNotificationRequest";
+  INFO_LOG(m_logger) << "trying to send CreateNotificationRequest";
   if (!m_mainHandler->dds()->ftcNom()->createNotificationRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
   }
 }
 
 //-----------------------------------------------------------------------------
 void ObjectOrder::onCreateNotificationReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got createReply with id " << replyObject.id() << " and errorString " << replyObject.translated();
+  INFO_LOG(m_logger) << "Got createReply with id " << replyObject.id() << " and errorString " << replyObject.translated();
 
   if (replyObject.error())
   {
-    ERROR_LOG() << "Error requesting CreateNotification";
+    ERROR_LOG(m_logger) << "Error requesting CreateNotification";
     return;
   }
   else
-    DEBUG_LOG() << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
+    DEBUG_LOG(m_logger) << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
 
 } // end of onNotificationCreateReply()
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/object_order.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/object_order.h
index 1b777a1e5..345c6f914 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/object_order.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/object_order.h
@@ -40,6 +40,7 @@ class ObjectOrder
   Core::FunctionReplyObject updateObject() { return updateObject(m_data); }
 
   protected:
+  NGL::INGLLogger &m_logger;
   // Callbackfunctions for FTC
   void onCreateNotificationReply(const Core::FunctionReplyObject &replyObject) override final;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/dds_handler.cpp
index 72d2b3f59..5ed402456 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/dds_handler.cpp
@@ -17,16 +17,16 @@ namespace EffectShowManagement
 DdsHandler::DdsHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
   : m_ddsConnector(ddsConnector)
 {
-  DEBUG_LOG() << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
-  INFO_LOG() << "--- StartEffectShowManagement DDSHandler.";
+  INFO_LOG(m_logger) << "--- StartEffectShowManagement DDSHandler.";
 
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -44,13 +44,13 @@ bool DdsHandler::init(const QStringList &qosFileList)
 
   if (!m_ddsDts->enableAll())
   {
-    ERROR_LOG() << "Could not Dts enableAll";
+    ERROR_LOG(m_logger) << "Could not Dts enableAll";
     return false;
   }
 
   if (!m_ddsFts->enableAll())
   {
-    ERROR_LOG() << "Could not Fts enableAll";
+    ERROR_LOG(m_logger) << "Could not Fts enableAll";
     return false;
   }
 
@@ -58,18 +58,18 @@ bool DdsHandler::init(const QStringList &qosFileList)
   m_dtcAes = AreaEffectSimulation::Interface::Dtc::create(m_ddsConnector);
   if (!m_dtcAes->enableExplosionArea())
   {
-    ERROR_LOG() << "Could not initialize enableExplosionArea data topic client";
+    ERROR_LOG(m_logger) << "Could not initialize enableExplosionArea data topic client";
     return false;
   }
   if (!m_dtcAes->enableExplosionSingle())
   {
-    ERROR_LOG() << "Could not initialize enableExplosionArea data topic client";
+    ERROR_LOG(m_logger) << "Could not initialize enableExplosionArea data topic client";
     return false;
   }
 
   if (!m_dtcAes->enableMineArea())
   {
-    ERROR_LOG() << "Could not initialize enableMineArea data topic client";
+    ERROR_LOG(m_logger) << "Could not initialize enableMineArea data topic client";
     return false;
   }
 
@@ -78,7 +78,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
   m_ftcAes = AreaEffectSimulation::Interface::Ftc::create(m_ddsConnector);
   if (!m_ftcAes->enableSetAesItemEffectorState(true))
   {
-    ERROR_LOG() << "Could not initialize enableSetAesItemEffectorState data topic client";
+    ERROR_LOG(m_logger) << "Could not initialize enableSetAesItemEffectorState data topic client";
     return false;
   }
 
@@ -87,13 +87,13 @@ bool DdsHandler::init(const QStringList &qosFileList)
 
   if (!m_dtcPpm->enableParticipant())
   {
-    ERROR_LOG() << "Could not initialize Participant data topic client";
+    ERROR_LOG(m_logger) << "Could not initialize Participant data topic client";
     return false;
   }
 
   if (!m_dtcPpm->enableType())
   {
-    ERROR_LOG() << "Could not initialize Participant type data topic client";
+    ERROR_LOG(m_logger) << "Could not initialize Participant type data topic client";
     return false;
   }
   m_dtcPpm->waitForHistoricalDataType();
@@ -103,7 +103,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
 
   if (!m_dtcPdm->enableChargeType())
   {
-    ERROR_LOG() << "Error initializing ProjectDataManagement DTC";
+    ERROR_LOG(m_logger) << "Error initializing ProjectDataManagement DTC";
     return false;
   }
 
@@ -112,7 +112,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
 
   if (!m_dtcMdm->enableMeteoData())
   {
-    ERROR_LOG() << "Error initializing MeteoDataManagement DTC";
+    ERROR_LOG(m_logger) << "Error initializing MeteoDataManagement DTC";
     return false;
   }
 
@@ -121,19 +121,19 @@ bool DdsHandler::init(const QStringList &qosFileList)
 
   if (!m_dtcTab->enableFireSmokeMarkerData())
   {
-    ERROR_LOG() << "Error initializing TrainingAreaBase DTC";
+    ERROR_LOG(m_logger) << "Error initializing TrainingAreaBase DTC";
     return false;
   }
 
   m_ftcTab = TrainingAreaBase::Interface::Ftc::create(m_ddsConnector);
   if (!m_ftcTab->enableSendFireSmokeMarkerData())
   {
-    ERROR_LOG() << "Error initializing TrainingAreaBase FTC";
+    ERROR_LOG(m_logger) << "Error initializing TrainingAreaBase FTC";
     return false;
   }
   if (!m_ftcTab->enableAdlerFqFb())
   {
-    ERROR_LOG() << "Error initializing TrainingAreaBase FTC";
+    ERROR_LOG(m_logger) << "Error initializing TrainingAreaBase FTC";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/dds_handler.h
index d99b298a8..86fbbcf8d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/dds_handler.h
@@ -65,6 +65,7 @@ public:
   qint64 currentPartitionTime() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<Core::TopicLockMaster>      m_topicLockMaster;
   std::shared_ptr<Core::Interface::Dtc>       m_dtcCore;
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 7865c06e1..5c6e35e50 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
@@ -15,11 +15,10 @@ const static int DEFAULT_EFFECT_DURATION = 777777;
 namespace EffectShowManagement
 {
 EffectShowEffectCluster::EffectShowEffectCluster(const AreaEffectSimulation::EffectCluster &effectCluster,
-                                                       const std::shared_ptr<HandlerPdmData>     &handlerPdmData)
-  : m_effectCluster(effectCluster)
+                                                       const std::shared_ptr<HandlerPdmData>     &handlerPdmData) : m_effectCluster(effectCluster)
   , m_handlerPdmData(handlerPdmData)
-  , m_numOfEffectShows(0)
-{
+  , m_numOfEffectShows(0),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 //=============================================================================
@@ -82,7 +81,7 @@ Database::EsmEffectShow EffectShowEffectCluster::getEffectShow(int idx)
     if (esmEffectShow.shotsPerVolley <= 0)
       esmEffectShow.shotsPerVolley = 1;
 
-    DEBUG_LOG() << "recalc effectDuration ";
+    DEBUG_LOG(m_logger) << "recalc effectDuration ";
 
     if (m_effectCluster.effectDuration() == DEFAULT_EFFECT_DURATION)
     {
@@ -94,7 +93,7 @@ Database::EsmEffectShow EffectShowEffectCluster::getEffectShow(int idx)
       {
         //use default
         esmEffectShow.duration = Settings::getDefaultCadence() * esmEffectShow.shotsPerVolley;
-        DEBUG_LOG() << " recalc effectDuration use default value as fireoncommand " << esmEffectShow.duration ;
+        DEBUG_LOG(m_logger) << " recalc effectDuration use default value as fireoncommand " << esmEffectShow.duration ;
       }
       else
       {
@@ -102,13 +101,13 @@ Database::EsmEffectShow EffectShowEffectCluster::getEffectShow(int idx)
         if (m_effectCluster.effectors().size()) //should always be there!
         {
            esmEffectShow.duration = m_effectCluster.effectors().at(0).chargeAmount() * m_handlerPdmData.get()->getCadence(m_effectCluster.effectors().at(0).chargeStruct().chargeTypeId());
-           DEBUG_LOG() << " recalc effectDuration use cadence value " << esmEffectShow.duration  << " effector shots: " << m_effectCluster.effectors().at(0).chargeAmount() << " cadence " << m_handlerPdmData.get()->getCadence(m_effectCluster.effectors().at(0).chargeStruct().chargeTypeId());
+           DEBUG_LOG(m_logger) << " recalc effectDuration use cadence value " << esmEffectShow.duration  << " effector shots: " << m_effectCluster.effectors().at(0).chargeAmount() << " cadence " << m_handlerPdmData.get()->getCadence(m_effectCluster.effectors().at(0).chargeStruct().chargeTypeId());
         }
       }
     }
     else
     {
-      DEBUG_LOG() << "Use effectDuration directly ";
+      DEBUG_LOG(m_logger) << "Use effectDuration directly ";
       esmEffectShow.duration        = m_effectCluster.effectDuration();
     }
     esmEffectShow.lowerLeftPosition = lowerLeftPosRotated.geographic();
@@ -117,7 +116,7 @@ Database::EsmEffectShow EffectShowEffectCluster::getEffectShow(int idx)
     esmEffectShow.areaRotation      = m_effectCluster.area().rotation() + 90;
 
 
-    DEBUG_LOG() << "\nWidth: " << m_effectCluster.area().width() << " Height: " << m_effectCluster.area().height()
+    DEBUG_LOG(m_logger) << "\nWidth: " << m_effectCluster.area().width() << " Height: " << m_effectCluster.area().height()
                         << "\nRotated LL Pos: " << lowerLeftPosRotated.mgrs()
                         << "\nduration: " << esmEffectShow.duration
                         << "\nRotated Center Pos:  " << centerPosRotated.mgrs()
@@ -155,7 +154,7 @@ Database::EsmEffectShow EffectShowEffectCluster::getEffectShow(int idx)
     esmEffectShow.areaDepth         = m_effectCluster.area().height();
     esmEffectShow.areaRotation      = m_effectCluster.area().rotation() + 90;
 
-    DEBUG_LOG() << "\nWidth: " << m_effectCluster.area().width() << " Height: " << m_effectCluster.area().height()
+    DEBUG_LOG(m_logger) << "\nWidth: " << m_effectCluster.area().width() << " Height: " << m_effectCluster.area().height()
                         << "\nRotated LL Pos: " << lowerLeftPosRotated.mgrs()
                         << "\nRotated Center Pos:  " << centerPosRotated.mgrs()
                         << "\nSide x,y:  " << m_effectCluster.area().width() << " , " << m_effectCluster.area().height();
@@ -167,12 +166,12 @@ Database::EsmEffectShow EffectShowEffectCluster::getEffectShow(int idx)
 void EffectShowEffectCluster::updateEffectShow(Database::EsmEffectShow &data)
 {
 
-  DEBUG_LOG() << "update EffectSHow for  (" << data.id << ")";
+  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;
 
 
-  DEBUG_LOG() << "Recalc effectDuration ";
+  DEBUG_LOG(m_logger) << "Recalc effectDuration ";
 
   if (m_effectCluster.effectDuration() == DEFAULT_EFFECT_DURATION)
   {
@@ -184,7 +183,7 @@ void EffectShowEffectCluster::updateEffectShow(Database::EsmEffectShow &data)
     {
       //use default
       data.duration = Settings::getDefaultCadence() * data.shotsPerVolley;
-      DEBUG_LOG() << " recalc effectDuration use default value as fireoncommand " << data.duration ;
+      DEBUG_LOG(m_logger) << " recalc effectDuration use default value as fireoncommand " << data.duration ;
     }
     else
     {
@@ -192,13 +191,13 @@ void EffectShowEffectCluster::updateEffectShow(Database::EsmEffectShow &data)
       if (m_effectCluster.effectors().size()) //should always be there!
       {
          data.duration = m_effectCluster.effectors().at(0).chargeAmount() * m_handlerPdmData.get()->getCadence(m_effectCluster.effectors().at(0).chargeStruct().chargeTypeId());
-         DEBUG_LOG() << " recalc effectDuration use cadence value " << data.duration  << " effector shots: " << m_effectCluster.effectors().at(0).chargeAmount() << " cadence " << m_handlerPdmData.get()->getCadence(m_effectCluster.effectors().at(0).chargeStruct().chargeTypeId());
+         DEBUG_LOG(m_logger) << " recalc effectDuration use cadence value " << data.duration  << " effector shots: " << m_effectCluster.effectors().at(0).chargeAmount() << " cadence " << m_handlerPdmData.get()->getCadence(m_effectCluster.effectors().at(0).chargeStruct().chargeTypeId());
       }
     }
   }
   else
   {
-    DEBUG_LOG() << "Use effectDuration directly ";
+    DEBUG_LOG(m_logger) << "Use effectDuration directly ";
     data.duration        = m_effectCluster.effectDuration();
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_effect_cluster.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_effect_cluster.h
index c7f8dd781..e99eade9c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_effect_cluster.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_effect_cluster.h
@@ -71,6 +71,7 @@ public:
   int getShotsPerArea() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   /**
     * @brief Calculates the square of the each effect area.
     */
@@ -114,6 +115,7 @@ private:
   double rotationRad() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   AreaEffectSimulation::EffectCluster const  m_effectCluster;
   std::shared_ptr<HandlerPdmData>            m_handlerPdmData;
   int m_numOfEffectShows;
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 a2c08fa1d..21a1fc884 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
@@ -10,11 +10,10 @@
 namespace EffectShowManagement
 {
 EffectShowExplosionArea::EffectShowExplosionArea(const AreaEffectSimulation::ExplosionArea &explosionArea,
-                                                 const std::shared_ptr<HandlerPdmData>     &handlerPdmData)
-  : m_explosionArea(explosionArea)
+                                                 const std::shared_ptr<HandlerPdmData>     &handlerPdmData) : m_explosionArea(explosionArea)
   , m_handlerPdmData(handlerPdmData)
-  , m_numOfEffectShows(0)
-{
+  , m_numOfEffectShows(0),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 //=============================================================================
@@ -82,7 +81,7 @@ Database::EsmEffectShow EffectShowExplosionArea::getEffectShow(int idx)
     esmEffectShow.areaRotation      = m_explosionArea.area().rotation() + 90;
 
 
-    DEBUG_LOG() << "\nWidth: " << m_explosionArea.area().width() << " Height: " << m_explosionArea.area().height()
+    DEBUG_LOG(m_logger) << "\nWidth: " << m_explosionArea.area().width() << " Height: " << m_explosionArea.area().height()
                         << "\nRotated LL Pos: " << lowerLeftPosRotated.mgrs()
                         << "\nRotated Center Pos:  " << centerPosRotated.mgrs()
                         << "\nOffset x,y:  " << x_off << " , " << y_off
@@ -119,7 +118,7 @@ Database::EsmEffectShow EffectShowExplosionArea::getEffectShow(int idx)
     esmEffectShow.areaDepth         = m_explosionArea.area().height();
     esmEffectShow.areaRotation      = m_explosionArea.area().rotation() + 90;
 
-    DEBUG_LOG() << "\nWidth: " << m_explosionArea.area().width() << " Height: " << m_explosionArea.area().height()
+    DEBUG_LOG(m_logger) << "\nWidth: " << m_explosionArea.area().width() << " Height: " << m_explosionArea.area().height()
                         << "\nRotated LL Pos: " << lowerLeftPosRotated.mgrs()
                         << "\nRotated Center Pos:  " << centerPosRotated.mgrs()
                         << "\nSide x,y:  " << m_explosionArea.area().width() << " , " << m_explosionArea.area().height();
@@ -157,7 +156,7 @@ void EffectShowExplosionArea::calculateSquare()
   else
     m_numOfEffectShows = m_areasWidth.numOfAreas * m_areasDepth.numOfAreas;
 
-  DEBUG_LOG() << "Calc Square poslef " << m_lowerLeftPos.x << " " << m_lowerLeftPos.y  << " witdh" << m_areasWidth.sideLength1 << " depth " << m_areasDepth.sideLength1 << " num of Effect Shows " << m_numOfEffectShows;
+  DEBUG_LOG(m_logger) << "Calc Square poslef " << m_lowerLeftPos.x << " " << m_lowerLeftPos.y  << " witdh" << m_areasWidth.sideLength1 << " depth " << m_areasDepth.sideLength1 << " num of Effect Shows " << m_numOfEffectShows;
 }
 //static ----------------------------------------------------------------------
 LtsCoordTrans::UtmCoordinate EffectShowExplosionArea::rotate(const LtsCoordTrans::UtmCoordinate &p, const LtsCoordTrans::UtmCoordinate &c, double angle)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_explosion_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_explosion_area.h
index 6988c95df..f8362df82 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_explosion_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_explosion_area.h
@@ -73,6 +73,7 @@ public:
   int getShotsPerArea() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   /**
     * @brief Calculates the square of the each effect area.
     */
@@ -116,6 +117,7 @@ private:
   double rotationRad() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   AreaEffectSimulation::ExplosionArea const  m_explosionArea;
   std::shared_ptr<HandlerPdmData>            m_handlerPdmData;
   int m_numOfEffectShows;
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 4d1cf8b67..31fc1c9b3 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
@@ -10,11 +10,10 @@
 namespace EffectShowManagement
 {
 EffectShowExplosionCluster::EffectShowExplosionCluster(const AreaEffectSimulation::ExplosionCluster &explosionCluster,
-                                                       const std::shared_ptr<HandlerPdmData>     &handlerPdmData)
-  : m_explosionCluster(explosionCluster)
+                                                       const std::shared_ptr<HandlerPdmData>     &handlerPdmData) : m_explosionCluster(explosionCluster)
   , m_handlerPdmData(handlerPdmData)
-  , m_numOfEffectShows(0)
-{
+  , m_numOfEffectShows(0),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 //=============================================================================
@@ -82,7 +81,7 @@ Database::EsmEffectShow EffectShowExplosionCluster::getEffectShow(int idx)
     esmEffectShow.areaRotation      = m_explosionCluster.area().rotation() + 90;
 
 
-    DEBUG_LOG() << "\nWidth: " << m_explosionCluster.area().width() << " Height: " << m_explosionCluster.area().height()
+    DEBUG_LOG(m_logger) << "\nWidth: " << m_explosionCluster.area().width() << " Height: " << m_explosionCluster.area().height()
                         << "\nRotated LL Pos: " << lowerLeftPosRotated.mgrs()
                         << "\nRotated Center Pos:  " << centerPosRotated.mgrs()
                         << "\nOffset x,y:  " << x_off << " , " << y_off
@@ -119,7 +118,7 @@ Database::EsmEffectShow EffectShowExplosionCluster::getEffectShow(int idx)
     esmEffectShow.areaDepth         = m_explosionCluster.area().height();
     esmEffectShow.areaRotation      = m_explosionCluster.area().rotation() + 90;
 
-    DEBUG_LOG() << "\nWidth: " << m_explosionCluster.area().width() << " Height: " << m_explosionCluster.area().height()
+    DEBUG_LOG(m_logger) << "\nWidth: " << m_explosionCluster.area().width() << " Height: " << m_explosionCluster.area().height()
                         << "\nRotated LL Pos: " << lowerLeftPosRotated.mgrs()
                         << "\nRotated Center Pos:  " << centerPosRotated.mgrs()
                         << "\nSide x,y:  " << m_explosionCluster.area().width() << " , " << m_explosionCluster.area().height();
@@ -131,7 +130,7 @@ Database::EsmEffectShow EffectShowExplosionCluster::getEffectShow(int idx)
 void EffectShowExplosionCluster::updateEffectShow(Database::EsmEffectShow &data)
 {
 
-  DEBUG_LOG() << "update EffectSHow for  (" << data.id << ")";
+  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.duration         = m_explosionCluster.effectDuration();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_explosion_cluster.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_explosion_cluster.h
index 4ca98f2b4..491400d44 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_explosion_cluster.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_explosion_cluster.h
@@ -71,6 +71,7 @@ public:
   int getShotsPerArea() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   /**
     * @brief Calculates the square of the each effect area.
     */
@@ -114,6 +115,7 @@ private:
   double rotationRad() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   AreaEffectSimulation::ExplosionCluster const  m_explosionCluster;
   std::shared_ptr<HandlerPdmData>            m_handlerPdmData;
   int m_numOfEffectShows;
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 fccfe7546..76242e7f4 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
@@ -11,12 +11,11 @@
 
 namespace EffectShowManagement
 {
-EffectShowMineArea::EffectShowMineArea(const AreaEffectSimulation::MineArea &mineArea)
-  : m_mineArea(mineArea)
+EffectShowMineArea::EffectShowMineArea(const AreaEffectSimulation::MineArea &mineArea) : m_mineArea(mineArea)
   , m_segment(getEffectShowSegment(mineArea))
   , m_utmZone(-1)
-  , m_rotation(0.0)
-{
+  , m_rotation(0.0),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 //=============================================================================
@@ -46,9 +45,9 @@ Database::EsmEffectShow EffectShowMineArea::getEffectShow()
   {
     const Core::GeoPosition2D &posGeo = seg.positionStart();
     LtsCoordTrans::UtmCoordinate pos = LtsCoordTrans::UtmCoordinate::fromGeographic(posGeo.lon(), posGeo.lat(), m_utmZone);
-    DEBUG_LOG() << "Start Pos Segm.: " << pos.mgrs();
+    DEBUG_LOG(m_logger) << "Start Pos Segm.: " << pos.mgrs();
   }
-  DEBUG_LOG() << "Center Pos Effect Show: " << LtsCoordTrans::mgrsFromGeographic(esmEffectShow.centerPosition.x(), esmEffectShow.centerPosition.y());
+  DEBUG_LOG(m_logger) << "Center Pos Effect Show: " << LtsCoordTrans::mgrsFromGeographic(esmEffectShow.centerPosition.x(), esmEffectShow.centerPosition.y());
   return esmEffectShow;
 }
 //-----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_mine_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_mine_area.h
index 8938f14d2..94307777d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_mine_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_mine_area.h
@@ -60,6 +60,7 @@ public:
   }
 
 private:
+  NGL::INGLLogger &m_logger;
   /**
     * @brief Calculates the center position and the lower left position of the effect area.
     */
@@ -89,6 +90,7 @@ private:
   static LtsCoordTrans::UtmCoordinate rotate(const LtsCoordTrans::UtmCoordinate &p, const LtsCoordTrans::UtmCoordinate &c, double angle);
 
 private:
+  NGL::INGLLogger &m_logger;
   AreaEffectSimulation::MineArea const     m_mineArea;
   const AreaEffectSimulation::MineSegment &m_segment;
   int m_utmZone;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_aes_data.cpp
index af5a47178..08e4352c1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_aes_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_aes_data.cpp
@@ -15,10 +15,9 @@
 
 using namespace EffectShowManagement;
 
-HandlerAesData::HandlerAesData(Initialization *mainHandler)
-  : QObject()
-  , m_mainHandler(mainHandler)
-{
+HandlerAesData::HandlerAesData(Initialization *mainHandler) : QObject()
+  , m_mainHandler(mainHandler),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 } // end of ctor()
 //=============================================================================
 HandlerAesData::~HandlerAesData()
@@ -30,7 +29,7 @@ HandlerAesData::~HandlerAesData()
 
 bool HandlerAesData::init()
 {
-  DEBUG_LOG() << "Begin HandlerAesData";
+  DEBUG_LOG(m_logger) << "Begin HandlerAesData";
 
   // create ObjectAesData
   auto cbAes = [this](const Database::EsmAesData & data)
@@ -41,7 +40,7 @@ bool HandlerAesData::init()
   };
   if (!m_mainHandler->db()->select(cbAes))
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
 
@@ -109,7 +108,7 @@ bool HandlerAesData::init()
       return false;
   }
 
-  DEBUG_LOG() << "m_AesDataObjMap.size() = " << m_AesDataObjMap.size();
+  DEBUG_LOG(m_logger) << "m_AesDataObjMap.size() = " << m_AesDataObjMap.size();
   return true;
 } // end of init()
 
@@ -147,7 +146,7 @@ void HandlerAesData::onExplosionSingleChanged(const AreaEffectSimulation::Explos
   if (kindOfModification == HandlerEffectShow::KindOfModification_e::Added && ifs)
     kindOfModification = HandlerEffectShow::KindOfModification_e::ModifiedData;
 
-  DEBUG_LOG() << "Got ExplosionArea: "
+  DEBUG_LOG(m_logger) << "Got ExplosionArea: "
                       << "\n ID:                " << data.id()
                       << "\n Name:              " << data.name()
                       << "\n Effect status:     " << data.effectStateId()
@@ -167,7 +166,7 @@ void HandlerAesData::onExplosionSingleChanged(const AreaEffectSimulation::Explos
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
     }
     else
     {
@@ -187,10 +186,10 @@ void HandlerAesData::onExplosionSingleChanged(const AreaEffectSimulation::Explos
       if (!ret.error())
         m_mainHandler->handlerEffectShow()->onExplosionAreaChanged(areaData, kindOfModification);
       else
-        ERROR_LOG() << ret();
+        ERROR_LOG(m_logger) << ret();
     }
     else
-      WARNING_LOG() << "Explosion Area not available for modification: " << data.id();
+      WARNING_LOG(m_logger) << "Explosion Area not available for modification: " << data.id();
     break;
   }
   case HandlerEffectShow::KindOfModification_e::Removed:
@@ -198,11 +197,11 @@ void HandlerAesData::onExplosionSingleChanged(const AreaEffectSimulation::Explos
     if (ifs != nullptr)
     {
       if (!m_AesDataObjMap.remove(data.id()))
-        ERROR_LOG() << "Remove of AES data (" << data.id() << ") from map failed.";
+        ERROR_LOG(m_logger) << "Remove of AES data (" << data.id() << ") from map failed.";
 
       Core::FunctionReplyObject ret = ifs->removeObject();
       if (ret.error())
-        ERROR_LOG() << ret();
+        ERROR_LOG(m_logger) << ret();
     }
 
     m_mainHandler->handlerEffectShow()->onExplosionAreaChanged(areaData, kindOfModification);
@@ -228,7 +227,7 @@ void HandlerAesData::onExplosionAreaChanged(const AreaEffectSimulation::Explosio
     kindOfModification = HandlerEffectShow::KindOfModification_e::ModifiedData;
 
   const Core::GeoPosition2D &posLl = data.area().cornerBottomLeft();
-  DEBUG_LOG() << "Got ExplosionArea: "
+  DEBUG_LOG(m_logger) << "Got ExplosionArea: "
                       << "\n ID:                " << data.id()
                       << "\n Name:              " << data.name()
                       << "\n Effect status:     " << data.effectStateId()
@@ -251,7 +250,7 @@ void HandlerAesData::onExplosionAreaChanged(const AreaEffectSimulation::Explosio
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
     }
     else
     {
@@ -271,10 +270,10 @@ void HandlerAesData::onExplosionAreaChanged(const AreaEffectSimulation::Explosio
       if (!ret.error())
         m_mainHandler->handlerEffectShow()->onExplosionAreaChanged(data, kindOfModification);
       else
-        ERROR_LOG() << ret();
+        ERROR_LOG(m_logger) << ret();
     }
     else
-      WARNING_LOG() << "Explosion Area not available for modification: " << data.id();
+      WARNING_LOG(m_logger) << "Explosion Area not available for modification: " << data.id();
     break;
   }
   case HandlerEffectShow::KindOfModification_e::Removed:
@@ -282,11 +281,11 @@ void HandlerAesData::onExplosionAreaChanged(const AreaEffectSimulation::Explosio
     if (ifs != nullptr)
     {
       if (!m_AesDataObjMap.remove(data.id()))
-        ERROR_LOG() << "Remove of AES data (" << data.id() << ") from map failed.";
+        ERROR_LOG(m_logger) << "Remove of AES data (" << data.id() << ") from map failed.";
 
       Core::FunctionReplyObject ret = ifs->removeObject();
       if (ret.error())
-        ERROR_LOG() << ret();
+        ERROR_LOG(m_logger) << ret();
     }
 
     m_mainHandler->handlerEffectShow()->onExplosionAreaChanged(data, kindOfModification);
@@ -310,7 +309,7 @@ void HandlerAesData::onExplosionClusterChanged(const AreaEffectSimulation::Explo
     kindOfModification = HandlerEffectShow::KindOfModification_e::ModifiedData;
 
   const Core::GeoPosition2D &posLl = data.area().cornerBottomLeft();
-  DEBUG_LOG() << ">>>> Got Cluster: "
+  DEBUG_LOG(m_logger) << ">>>> Got Cluster: "
                       << "\n ID:                " << data.id()
                       << "\n Name:              " << data.name()
                       << "\n Effect status:     " << data.effectStateId()
@@ -333,7 +332,7 @@ void HandlerAesData::onExplosionClusterChanged(const AreaEffectSimulation::Explo
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
     }
     else
     {
@@ -353,10 +352,10 @@ void HandlerAesData::onExplosionClusterChanged(const AreaEffectSimulation::Explo
       if (!ret.error())
         m_mainHandler->handlerEffectShow()->onExplosionClusterChanged(data, kindOfModification);
       else
-        ERROR_LOG() << ret();
+        ERROR_LOG(m_logger) << ret();
     }
     else
-      WARNING_LOG() << "Explosion Area not available for modification: " << data.id();
+      WARNING_LOG(m_logger) << "Explosion Area not available for modification: " << data.id();
     break;
   }
   case HandlerEffectShow::KindOfModification_e::Removed:
@@ -364,11 +363,11 @@ void HandlerAesData::onExplosionClusterChanged(const AreaEffectSimulation::Explo
     if (ifs != nullptr)
     {
       if (!m_AesDataObjMap.remove(data.id()))
-        ERROR_LOG() << "Remove of AES data (" << data.id() << ") from map failed.";
+        ERROR_LOG(m_logger) << "Remove of AES data (" << data.id() << ") from map failed.";
 
       Core::FunctionReplyObject ret = ifs->removeObject();
       if (ret.error())
-        ERROR_LOG() << ret();
+        ERROR_LOG(m_logger) << ret();
     }
 
     m_mainHandler->handlerEffectShow()->onExplosionClusterChanged(data, kindOfModification);
@@ -391,7 +390,7 @@ void HandlerAesData::onEffectClusterChanged(const AreaEffectSimulation::EffectCl
     kindOfModification = HandlerEffectShow::KindOfModification_e::ModifiedData;
 
   const Core::GeoPosition2D &posLl = data.area().cornerBottomLeft();
-  DEBUG_LOG() << ">>>> Got EffectCluster: "
+  DEBUG_LOG(m_logger) << ">>>> Got EffectCluster: "
                       << "\n ID:                " << data.id()
                       << "\n Name:              " << data.name()
                       << "\n Effect status:     " << data.effectStateId()
@@ -414,7 +413,7 @@ void HandlerAesData::onEffectClusterChanged(const AreaEffectSimulation::EffectCl
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
     }
     else
     {
@@ -434,10 +433,10 @@ void HandlerAesData::onEffectClusterChanged(const AreaEffectSimulation::EffectCl
       if (!ret.error())
         m_mainHandler->handlerEffectShow()->onEffectClusterChanged(data, kindOfModification);
       else
-        ERROR_LOG() << ret();
+        ERROR_LOG(m_logger) << ret();
     }
     else
-      WARNING_LOG() << "Explosion Area not available for modification: " << data.id();
+      WARNING_LOG(m_logger) << "Explosion Area not available for modification: " << data.id();
     break;
   }
   case HandlerEffectShow::KindOfModification_e::Removed:
@@ -445,11 +444,11 @@ void HandlerAesData::onEffectClusterChanged(const AreaEffectSimulation::EffectCl
     if (ifs != nullptr)
     {
       if (!m_AesDataObjMap.remove(data.id()))
-        ERROR_LOG() << "Remove of AES data (" << data.id() << ") from map failed.";
+        ERROR_LOG(m_logger) << "Remove of AES data (" << data.id() << ") from map failed.";
 
       Core::FunctionReplyObject ret = ifs->removeObject();
       if (ret.error())
-        ERROR_LOG() << ret();
+        ERROR_LOG(m_logger) << ret();
     }
 
     m_mainHandler->handlerEffectShow()->onEffectClusterChanged(data, kindOfModification);
@@ -476,7 +475,7 @@ void HandlerAesData::onMineAreaChanged(const AreaEffectSimulation::MineArea &dat
     return;
 
   const Core::GeoPosition2D &posLl = data.segments().at(data.segments().size() / 2).positionStart();
-  DEBUG_LOG() << "Got MineArea: "
+  DEBUG_LOG(m_logger) << "Got MineArea: "
                       << "\n ID:                " << data.id()
                       << "\n Name:              " << data.name()
                       << "\n Effect status:     " << data.effectStateId()
@@ -497,7 +496,7 @@ void HandlerAesData::onMineAreaChanged(const AreaEffectSimulation::MineArea &dat
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
     }
     else
     {
@@ -517,10 +516,10 @@ void HandlerAesData::onMineAreaChanged(const AreaEffectSimulation::MineArea &dat
       if (!ret.error())
         m_mainHandler->handlerEffectShow()->onMineAreaChanged(data, kindOfModification);
       else
-        ERROR_LOG() << ret();
+        ERROR_LOG(m_logger) << ret();
     }
     else
-      WARNING_LOG() << "Mine Area not available for modification: " << data.id();
+      WARNING_LOG(m_logger) << "Mine Area not available for modification: " << data.id();
     break;
   }
   case HandlerEffectShow::KindOfModification_e::Removed:
@@ -528,11 +527,11 @@ void HandlerAesData::onMineAreaChanged(const AreaEffectSimulation::MineArea &dat
     if (ifs != nullptr)
     {
       if (!m_AesDataObjMap.remove(data.id()))
-        ERROR_LOG() << "Remove of AES data (" << data.id() << ") from map failed.";
+        ERROR_LOG(m_logger) << "Remove of AES data (" << data.id() << ") from map failed.";
 
       Core::FunctionReplyObject ret = ifs->removeObject();
       if (ret.error())
-        ERROR_LOG() << ret();
+        ERROR_LOG(m_logger) << ret();
     }
     m_mainHandler->handlerEffectShow()->onMineAreaChanged(data, kindOfModification);
     break;
@@ -558,18 +557,18 @@ bool HandlerAesData::takeIntoAccountEffectShow(const AreaEffectSimulation::AesEf
 HandlerEffectShow::KindOfModification_e HandlerAesData::getKindOfModification(const Database::EsmAesData &data, DataModification modType) const
 {
   auto it = m_AesDataObjMap.find(data.idAes);
-  DEBUG_LOG() << "Check esm " << data.idAes << " modType " << modType;
+  DEBUG_LOG(m_logger) << "Check esm " << data.idAes << " modType " << modType;
   switch (modType)
   {
   case DataModification::eAdded:
   case DataModification::eModified:
   {
-    DEBUG_LOG() << "Case Added Or Modified";
+    DEBUG_LOG(m_logger) << "Case Added Or Modified";
 
     if (it != m_AesDataObjMap.end())
     {
 
-      DEBUG_LOG() << "Found data";
+      DEBUG_LOG(m_logger) << "Found data";
       if (it.value()->areaChanged(data))
         return HandlerEffectShow::KindOfModification_e::ModifiedArea;
       if (it.value()->dataChanged(data))
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_aes_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_aes_data.h
index 8cfa6d07a..c6fcb4cea 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_aes_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_aes_data.h
@@ -76,6 +76,7 @@ private Q_SLOTS:
   void onMineAreaChanged(const AreaEffectSimulation::MineArea &data, DataModification modType);
 
 private:
+  NGL::INGLLogger &m_logger;
   /**
    * @brief Checks, if the status of the area effect simulation allows a treatment of its data.
    * @param effectStateId Status of the area effect simulatin data.
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show.cpp
index 92e1ea1e3..dd1426e14 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show.cpp
@@ -54,7 +54,7 @@ bool HandlerEffectShow::init()
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       bRet = false;
       return;
     }
@@ -62,7 +62,7 @@ bool HandlerEffectShow::init()
   };
   if (!m_mainHandler->db()->select(cbEffectShow) || !bRet)
   {
-    ERROR_LOG() << "Error reading data from database 'esm_effect_show!";
+    ERROR_LOG(m_logger) << "Error reading data from database 'esm_effect_show!";
     return false;
   }
 
@@ -73,13 +73,13 @@ bool HandlerEffectShow::init()
   connect(m_cleanupTimer, &QTimer::timeout, this, &HandlerEffectShow::onCleanUp);
   m_cleanupTimer->start(CLEANUPTIME); //10 minutes
 
-  DEBUG_LOG() << "m_effectShowObjMap.size() = " << m_effectShowObjMap.size();
+  DEBUG_LOG(m_logger) << "m_effectShowObjMap.size() = " << m_effectShowObjMap.size();
   return true;
 }  // end of init()
 //=============================================================================
 void HandlerEffectShow::onExplosionAreaChanged(const AreaEffectSimulation::ExplosionArea &data, KindOfModification_e kindOfModification)
 {
-  INFO_LOG() << "onExplosionAreaChanged: " << data << ", kindOfModification: " << enumToString(kindOfModification);
+  INFO_LOG(m_logger) << "onExplosionAreaChanged: " << data << ", kindOfModification: " << enumToString(kindOfModification);
   switch (kindOfModification)
   {
   case KindOfModification_e::Added:
@@ -113,7 +113,7 @@ void HandlerEffectShow::onExplosionAreaChanged(const AreaEffectSimulation::Explo
 
 void HandlerEffectShow::onExplosionClusterChanged(const AreaEffectSimulation::ExplosionCluster &data, HandlerEffectShow::KindOfModification_e kindOfModification)
 {
-  INFO_LOG() << "onExplosionClusterChanged: " << data << ", kindOfModification: " << enumToString(kindOfModification);
+  INFO_LOG(m_logger) << "onExplosionClusterChanged: " << data << ", kindOfModification: " << enumToString(kindOfModification);
   switch (kindOfModification)
   {
   case KindOfModification_e::Added:
@@ -148,7 +148,7 @@ void HandlerEffectShow::onExplosionClusterChanged(const AreaEffectSimulation::Ex
 
 void HandlerEffectShow::onEffectClusterChanged(const AreaEffectSimulation::EffectCluster &data, KindOfModification_e kindOfModification)
 {
-  INFO_LOG() << "onEffectClusterChanged: " << data << ", kindOfModification: " << enumToString(kindOfModification);
+  INFO_LOG(m_logger) << "onEffectClusterChanged: " << data << ", kindOfModification: " << enumToString(kindOfModification);
   switch (kindOfModification)
   {
   case KindOfModification_e::Added:
@@ -184,7 +184,7 @@ void HandlerEffectShow::onEffectClusterChanged(const AreaEffectSimulation::Effec
 //=============================================================================
 void HandlerEffectShow::onMineAreaChanged(const AreaEffectSimulation::MineArea &data, KindOfModification_e kindOfModification)
 {
-  INFO_LOG() << "onMineAreaChanged: " << data << ", kindOfModification: " << enumToString(kindOfModification);
+  INFO_LOG(m_logger) << "onMineAreaChanged: " << data << ", kindOfModification: " << enumToString(kindOfModification);
   switch (kindOfModification)
   {
   case KindOfModification_e::Added:
@@ -218,12 +218,12 @@ void HandlerEffectShow::onMineAreaChanged(const AreaEffectSimulation::MineArea &
 //=============================================================================
 void HandlerEffectShow::effectShowOrderConfirmationReceived(const ConvertFromTab::OrderConfirmation_t &orderConfirmation)
 {
-  DEBUG_LOG() << "onEffectShowConfirmationReceived()";
+  DEBUG_LOG(m_logger) << "onEffectShowConfirmationReceived()";
 
   ObjectEffectShow *ifs = m_effectShowObjMap.value(orderConfirmation.orderId);
   if (ifs == nullptr)
   {
-    WARNING_LOG() << "Error receiving effect show ID not known: " << orderConfirmation.orderId;
+    WARNING_LOG(m_logger) << "Error receiving effect show ID not known: " << orderConfirmation.orderId;
     return;
   }
   const auto oldId = ifs->getData().orderConfirmation;
@@ -233,7 +233,7 @@ void HandlerEffectShow::effectShowOrderConfirmationReceived(const ConvertFromTab
 
   if (oldId != ifs->getData().orderConfirmation && ifs->getData().orderConfirmation ==  EffectShowManagement::OrderConfirmation_e::FiringReadiness)
   {
-    DEBUG_LOG() << "effectShowOrderConfirmationReceived Got Fire Readyness, send to aes for " << ifs->getId();
+    DEBUG_LOG(m_logger) << "effectShowOrderConfirmationReceived Got Fire Readyness, send to aes for " << ifs->getId();
     AreaEffectSimulation::SetAesItemEffectorStateRequest req;
     req.aesId(ifs->getIdAES());
     req.newEffectorState(AreaEffectSimulation::AesEffectorState::EsReadyToFire);
@@ -263,7 +263,7 @@ void HandlerEffectShow::createEffectShow(const Database::EsmEffectShow &data, bo
   if (ret.error())
   {
     delete ifs;
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
   }
   else
   {
@@ -277,10 +277,10 @@ void HandlerEffectShow::onEffectShowModifyRequest(
   const rti::core::SampleIdentity &cookie,
   const EffectShow &request)
 {
-  DEBUG_LOG() << "onEffectShowModifyRequest: " << request.id();
+  DEBUG_LOG(m_logger) << "onEffectShowModifyRequest: " << request.id();
   if (request.id() <= 0)
   {
-    ERROR_LOG() << "Illegal Effect Show Id: " << request.id();
+    ERROR_LOG(m_logger) << "Illegal Effect Show Id: " << request.id();
     return;
   }
 
@@ -289,7 +289,7 @@ void HandlerEffectShow::onEffectShowModifyRequest(
 
   auto ret = effectShowModifyRequest(request);
   if (ret.error())
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
 
   m_mainHandler->dds()->fts()->effectShowModifyReply(cookie, ret);
 
@@ -319,7 +319,7 @@ Core::FunctionReplyObject HandlerEffectShow::effectShowModifyRequest(const Effec
     triggerEffectShowOrder(ifs); // trigger effect show order to effect show actor
 
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
 
   return ret;
 }
@@ -327,7 +327,7 @@ Core::FunctionReplyObject HandlerEffectShow::effectShowModifyRequest(const Effec
 void HandlerEffectShow::onEffectShowRemoveRequest(const rti::core::SampleIdentity &cookie,
                                                   const Core::RemoveElementRequest &request)
 {
-  DEBUG_LOG() << "onEffectShowRemoveRequest: " << request.id();
+  DEBUG_LOG(m_logger) << "onEffectShowRemoveRequest: " << request.id();
 
   ObjectEffectShow *ifs = m_effectShowObjMap.value(request.id());
   Core::FunctionReplyObject ret;
@@ -377,7 +377,7 @@ void HandlerEffectShow::createEffectShowsRelatedToMineArea(const AreaEffectSimul
   for (const auto &esmEffectShow : esmEffectShows)
   {
     createEffectShow(esmEffectShow);
-    DEBUG_LOG() << toString(esmEffectShow);
+    DEBUG_LOG(m_logger) << toString(esmEffectShow);
   }
 }
 //-------------------------------------------------------------------------------
@@ -387,7 +387,7 @@ void HandlerEffectShow::createEffectShowsRelatedToExplosionArea(const AreaEffect
   for (const auto &esmEffectShow : esmEffectShows)
   {
     createEffectShow(esmEffectShow);
-    DEBUG_LOG() << toString(esmEffectShow);
+    DEBUG_LOG(m_logger) << toString(esmEffectShow);
   }
 }
 
@@ -397,7 +397,7 @@ void HandlerEffectShow::createEffectShowsRelatedToExplosionCluster(const AreaEff
   for (const auto &esmEffectShow : esmEffectShows)
   {
     createEffectShow(esmEffectShow);
-    DEBUG_LOG() << toString(esmEffectShow);
+    DEBUG_LOG(m_logger) << toString(esmEffectShow);
   }
 }
 
@@ -407,7 +407,7 @@ void HandlerEffectShow::createEffectShowsRelatedToEffectCluster(const AreaEffect
   for (const auto &esmEffectShow : esmEffectShows)
   {
     createEffectShow(esmEffectShow);
-    DEBUG_LOG() << toString(esmEffectShow);
+    DEBUG_LOG(m_logger) << toString(esmEffectShow);
   }
 }
 //-------------------------------------------------------------------------------
@@ -415,7 +415,7 @@ QVector<Database::EsmEffectShow> HandlerEffectShow::createEffectShowDbDataRelate
 {
   QVector<Database::EsmEffectShow> ret;
 
-  DEBUG_LOG() << "createEffectShowDbDataRelatedToExplosionArea: ";
+  DEBUG_LOG(m_logger) << "createEffectShowDbDataRelatedToExplosionArea: ";
 
   EffectShowMineArea effectShowMineArea(data);
   Database::EsmEffectShow esmEffectShow = effectShowMineArea.getEffectShow();
@@ -427,7 +427,7 @@ QVector<Database::EsmEffectShow> HandlerEffectShow::createEffectShowDbDataRelate
 {
   QVector<Database::EsmEffectShow> ret;
 
-  DEBUG_LOG() << "createEffectShowDbDataRelatedToExplosionArea: ";
+  DEBUG_LOG(m_logger) << "createEffectShowDbDataRelatedToExplosionArea: ";
 
   EffectShowExplosionArea effectShowExplosionArea(data, m_mainHandler->handlerPdmData());
 
@@ -436,7 +436,7 @@ QVector<Database::EsmEffectShow> HandlerEffectShow::createEffectShowDbDataRelate
     //create exact 1
     ret.reserve(1);
     Database::EsmEffectShow esmEffectShow = effectShowExplosionArea.getEffectShow(0);
-    DEBUG_LOG() << toString(esmEffectShow);
+    DEBUG_LOG(m_logger) << toString(esmEffectShow);
     ret.push_back(std::move(esmEffectShow));
   }
   else
@@ -466,7 +466,7 @@ QVector<Database::EsmEffectShow> HandlerEffectShow::createEffectShowDbDataRelate
       esmEffectShow.shotsPerVolley = effectShowExplosionArea.getShotsPerArea();
       if (esmEffectShow.shotsPerVolley < esmEffectShow.numOfVolley)
         esmEffectShow.shotsPerVolley = esmEffectShow.numOfVolley; // set minimum shots per volley
-      DEBUG_LOG() << toString(esmEffectShow);
+      DEBUG_LOG(m_logger) << toString(esmEffectShow);
 
       ret.push_back(std::move(esmEffectShow));
     }
@@ -486,7 +486,7 @@ QVector<Database::EsmEffectShow> HandlerEffectShow::createEffectShowDbDataRelate
     Database::EsmEffectShow esmEffectShow = effectShowExplosionCluster.getEffectShow(0);
     if(data.esmParticipantIds().size() > 0)
       esmEffectShow.esmParticipantId = data.esmParticipantIds().at(0); // TODO handle vector
-    DEBUG_LOG() << toString(esmEffectShow);
+    DEBUG_LOG(m_logger) << toString(esmEffectShow);
     ret.push_back(std::move(esmEffectShow));
   }
   else
@@ -516,7 +516,7 @@ QVector<Database::EsmEffectShow> HandlerEffectShow::createEffectShowDbDataRelate
       esmEffectShow.shotsPerVolley = effectShowExplosionCluster.getShotsPerArea();
       if (esmEffectShow.shotsPerVolley < esmEffectShow.numOfVolley)
         esmEffectShow.shotsPerVolley = esmEffectShow.numOfVolley; // set minimum shots per volley
-      DEBUG_LOG() << toString(esmEffectShow);
+      DEBUG_LOG(m_logger) << toString(esmEffectShow);
 
       // Evlt. nicht bei DM42 (dann ist max > 1)
       if(data.esmParticipantIds().size() > 0)
@@ -539,7 +539,7 @@ QVector<Database::EsmEffectShow> HandlerEffectShow::createEffectShowDbDataRelate
     Database::EsmEffectShow esmEffectShow = effectShowEffectCluster.getEffectShow(0);
     if(data.esmParticipantIds().size() > 0)
       esmEffectShow.esmParticipantId = data.esmParticipantIds().at(0); // TODO handle vector
-    DEBUG_LOG() << toString(esmEffectShow);
+    DEBUG_LOG(m_logger) << toString(esmEffectShow);
     ret.push_back(std::move(esmEffectShow));
   }
   else
@@ -569,12 +569,12 @@ QVector<Database::EsmEffectShow> HandlerEffectShow::createEffectShowDbDataRelate
       esmEffectShow.shotsPerVolley = effectShowEffectCluster.getShotsPerArea();
       if (esmEffectShow.shotsPerVolley < esmEffectShow.numOfVolley)
         esmEffectShow.shotsPerVolley = esmEffectShow.numOfVolley; // set minimum shots per volley
-      //DEBUG_LOG() << toString(esmEffectShow);
+      //DEBUG_LOG(m_logger) << toString(esmEffectShow);
 
       // Evlt. nicht bei DM42 (dann ist max > 1)
       if(data.esmParticipantIds().size() > (size_t)i)
         esmEffectShow.esmParticipantId = data.esmParticipantIds().at(i); // TODO handle vector
-      DEBUG_LOG() << toString(esmEffectShow);
+      DEBUG_LOG(m_logger) << toString(esmEffectShow);
 
       ret.push_back(std::move(esmEffectShow));
     }
@@ -584,7 +584,7 @@ QVector<Database::EsmEffectShow> HandlerEffectShow::createEffectShowDbDataRelate
 //-------------------------------------------------------------------------------
 void HandlerEffectShow::removeEffectShowsRelatedToAes(int idAes, bool retract)
 {
-  DEBUG_LOG() << "removeEffectShowsRelatedToAes(" << idAes << ")";
+  DEBUG_LOG(m_logger) << "removeEffectShowsRelatedToAes(" << idAes << ")";
   auto it = m_effectShowObjMap.begin();
   while (it != m_effectShowObjMap.end())
   {
@@ -595,7 +595,7 @@ void HandlerEffectShow::removeEffectShowsRelatedToAes(int idAes, bool retract)
           (it.value()->getData().orderConfirmation != EffectShowManagement::OrderConfirmation_e_def::OrderCarriedOut))
         remove = true;
       else
-        INFO_LOG() << "Effect Show: " << it.value()->getId() << " not removed due to EXECUTION / ORDER CARRIED OUT";
+        INFO_LOG(m_logger) << "Effect Show: " << it.value()->getId() << " not removed due to EXECUTION / ORDER CARRIED OUT";
     }
     if (remove)
     {
@@ -782,7 +782,7 @@ Core::FunctionReplyObject HandlerEffectShow::removeEffectShow(ObjectEffectShow *
   Core::FunctionReplyObject ret = ifs->removeObject();
   if (ret.error())
   {
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
     return ret;
   }
 
@@ -791,9 +791,9 @@ Core::FunctionReplyObject HandlerEffectShow::removeEffectShow(ObjectEffectShow *
 
   // remove from map
   if (!m_effectShowObjMap.remove(effectShowId) && bWarnWhenNotInMap)
-    WARNING_LOG() << "Remove of EffectShow(" << effectShowId << ") failed.";
+    WARNING_LOG(m_logger) << "Remove of EffectShow(" << effectShowId << ") failed.";
   else
-    DEBUG_LOG() << "EffectShow(" << effectShowId << ") removed.";
+    DEBUG_LOG(m_logger) << "EffectShow(" << effectShowId << ") removed.";
 
   return ret;
 }
@@ -801,7 +801,7 @@ Core::FunctionReplyObject HandlerEffectShow::removeEffectShow(ObjectEffectShow *
 void HandlerEffectShow::triggerEffectShowOrder(const ObjectEffectShow *ifs)
 {
   const Database::EsmEffectShow &effectShow = ifs->getData();
-  INFO_LOG() << "triggerEffectShowOrder for id " << ifs->getId()
+  INFO_LOG(m_logger) << "triggerEffectShowOrder for id " << ifs->getId()
                      << ", aesId: " << ifs->getIdAES()
                      << ", actor: " << effectShow.esmParticipantId;
   if (effectShow.esmParticipantId == -1)
@@ -816,7 +816,7 @@ void HandlerEffectShow::triggerEffectShowOrder(const ObjectEffectShow *ifs)
 void HandlerEffectShow::triggerRetractOrder(const ObjectEffectShow *ifs)
 {
   const Database::EsmEffectShow &effectShow = ifs->getData();
-  INFO_LOG() << "triggerRetractOrder for id " << ifs->getId()
+  INFO_LOG(m_logger) << "triggerRetractOrder for id " << ifs->getId()
                      << ", aesId: " << ifs->getIdAES()
                      << ", actor: " << effectShow.esmParticipantId;
   if (effectShow.esmParticipantId == -1)
@@ -832,7 +832,7 @@ void HandlerEffectShow::triggerRetractOrder(const ObjectEffectShow *ifs)
 void HandlerEffectShow::triggerEffectShowStop(const ObjectEffectShow *ifs)
 {
   const Database::EsmEffectShow &effectShow = ifs->getData();
-  INFO_LOG() << "triggerEffectShowStop for id " << ifs->getId()
+  INFO_LOG(m_logger) << "triggerEffectShowStop for id " << ifs->getId()
                      << ", aesId: " << ifs->getIdAES()
                      << ", actor: " << effectShow.esmParticipantId;
   if (effectShow.esmParticipantId == -1)
@@ -846,7 +846,7 @@ void HandlerEffectShow::triggerEffectShowStop(const ObjectEffectShow *ifs)
 void HandlerEffectShow::triggerEffectShowContinue(const ObjectEffectShow *ifs)
 {
   const Database::EsmEffectShow &effectShow = ifs->getData();
-  INFO_LOG() << "triggerEffectShowContinue for id " << ifs->getId()
+  INFO_LOG(m_logger) << "triggerEffectShowContinue for id " << ifs->getId()
                      << ", aesId: " << ifs->getIdAES()
                      << ", actor: " << effectShow.esmParticipantId;
   if (effectShow.esmParticipantId == -1)
@@ -868,7 +868,7 @@ void HandlerEffectShow::triggerMeteoData(const ObjectEffectShow *ifs)
   {
     if (!meteoData.windOk() && !meteoData.climateOk())
     {
-      WARNING_LOG() << "Found MeteoStation but no weather Data available, try again in 1 minute";
+      WARNING_LOG(m_logger) << "Found MeteoStation but no weather Data available, try again in 1 minute";
       QTimer::singleShot(6000, this, &HandlerEffectShow::onSendMeteoData);
       return;
     }
@@ -879,12 +879,12 @@ void HandlerEffectShow::triggerMeteoData(const ObjectEffectShow *ifs)
     // meteo data available
     qint64 deltaTime = m_mainHandler->dds()->currentPartitionTime() - meteoData.timeStamp();
     if (deltaTime > (60 * 15 * 1000))
-      WARNING_LOG() << "Age of meteo data=" << (deltaTime / 60000) << "min for vehicle: " << equipmentNumber;
+      WARNING_LOG(m_logger) << "Age of meteo data=" << (deltaTime / 60000) << "min for vehicle: " << equipmentNumber;
   }
   else
   {
     int equipmentNumber = m_mainHandler->handlerPpmData()->getEquipmentNumber(effectShow.esmParticipantId);
-    WARNING_LOG() << "Meteo data not available for effect show vehicle: " << equipmentNumber;
+    WARNING_LOG(m_logger) << "Meteo data not available for effect show vehicle: " << equipmentNumber;
   }
 }
 
@@ -907,7 +907,7 @@ void HandlerEffectShow::onSendMeteoData()
 
 void HandlerEffectShow::onCleanUp()
 {
-  DEBUG_LOG() << "Start Cleanup ";
+  DEBUG_LOG(m_logger) << "Start Cleanup ";
   QVector<ObjectEffectShow * > objects;
   for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap))
   {
@@ -915,11 +915,11 @@ void HandlerEffectShow::onCleanUp()
     if (effectShow.orderConfirmation == OrderConfirmation_e::OrderCarriedOut || effectShow.startTime <= 0  || effectShow.id  <= 0)
       continue;
 
-    DEBUG_LOG() << "Effect show with ID " << effectShow.id << " will expire at: " << QDateTime::fromMSecsSinceEpoch(effectShow.startTime + effectShow.duration + CLEANUPTIME).toString() << " current time:  " << QDateTime::fromMSecsSinceEpoch(m_mainHandler->dds()->currentPartitionTime()).toString();
+    DEBUG_LOG(m_logger) << "Effect show with ID " << effectShow.id << " will expire at: " << QDateTime::fromMSecsSinceEpoch(effectShow.startTime + effectShow.duration + CLEANUPTIME).toString() << " current time:  " << QDateTime::fromMSecsSinceEpoch(m_mainHandler->dds()->currentPartitionTime()).toString();
     if ((effectShow.startTime + effectShow.duration + CLEANUPTIME) < m_mainHandler->dds()->currentPartitionTime())
     {
       //remove object
-      DEBUG_LOG() << "Remove Effect Show  " << effectShow.id ;
+      DEBUG_LOG(m_logger) << "Remove Effect Show  " << effectShow.id ;
       objects.append(obj);
     }
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show.h
index 43765be7e..61b777a55 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show.h
@@ -82,7 +82,7 @@ public:
   enum class KindOfModification_e : int { Added = 0, ModifiedArea, ModifiedData, Removed, Paused, Continued, None };
   static QString enumToString(HandlerEffectShow::KindOfModification_e mod);
 
-  void onSetAesItemEffectorStateReply(const Core::FunctionReplyObject &replyObject) override {DEBUG_LOG() << replyObject.translated();}
+  void onSetAesItemEffectorStateReply(const Core::FunctionReplyObject &replyObject) override {DEBUG_LOG(m_logger) << replyObject.translated();}
   /**
    * @brief Create, update, remove & create or remove Effect Shows in relation to the changes of the Explosion Area.
    * @param[in] data
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_actor_relocation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_actor_relocation.cpp
index f447fa1a2..b6276f9d9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_actor_relocation.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_actor_relocation.cpp
@@ -44,7 +44,7 @@ bool HandlerEffectShowActorRelocation::init()
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       bRet = false;
       return;
     }
@@ -52,23 +52,23 @@ bool HandlerEffectShowActorRelocation::init()
   };
   if (!m_mainHandler->db()->select(cbActor) || !bRet)
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
 
-  DEBUG_LOG() << "m_effectShowActorRelocationObjMap.size() = " << m_effectShowActorRelocationObjMap.size();
+  DEBUG_LOG(m_logger) << "m_effectShowActorRelocationObjMap.size() = " << m_effectShowActorRelocationObjMap.size();
 
   return true;
 }
 //=============================================================================
 void HandlerEffectShowActorRelocation::relocationOrderConfirmationReceived(const ConvertFromTab::OrderConfirmation_t &orderConfirmation)
 {
-  DEBUG_LOG() << "relocationOrderConfirmationReceived()";
+  DEBUG_LOG(m_logger) << "relocationOrderConfirmationReceived()";
 
   ObjectEffectShowActorRelocation *ifs = m_effectShowActorRelocationObjMap.value(orderConfirmation.orderId);
   if (ifs == nullptr)
   {
-    WARNING_LOG() << "Error receiving effect show relocation ID not known.";
+    WARNING_LOG(m_logger) << "Error receiving effect show relocation ID not known.";
     return;
   }
 
@@ -83,10 +83,10 @@ void HandlerEffectShowActorRelocation::onEffectShowActorRelocationModifyRequest(
   const rti::core::SampleIdentity &cookie,
   const EffectShowActorRelocation &request)
 {
-  DEBUG_LOG() << "onEffectShowActorRelocationModifyRequest: " << request.id();
+  DEBUG_LOG(m_logger) << "onEffectShowActorRelocationModifyRequest: " << request.id();
   auto ret = request.id() > 0 ? effectShowActorRelocationModifyRequest(request) : effectShowActorRelocationCreateRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_mainHandler->dds()->fts()->effectShowActorRelocationModifyReply(cookie, ret);
 
 }
@@ -106,7 +106,7 @@ Core::FunctionReplyObject HandlerEffectShowActorRelocation::effectShowActorReloc
     int equipmentNumber = m_mainHandler->handlerPpmData()->getEquipmentNumber(participantId);
     m_mainHandler->handlerTabData()->relocationOrder(equipmentNumber, participantId, ifs->getRelocationOrder());
 
-    DEBUG_LOG() << "effectShowActorRelocationCreateRequest() - insert";
+    DEBUG_LOG(m_logger) << "effectShowActorRelocationCreateRequest() - insert";
   }
   return ret;
 }
@@ -122,7 +122,7 @@ Core::FunctionReplyObject HandlerEffectShowActorRelocation::effectShowActorReloc
 void HandlerEffectShowActorRelocation::onEffectShowActorRelocationRemoveRequest(const rti::core::SampleIdentity &cookie,
                                                                                 const Core::RemoveElementRequest &request)
 {
-  DEBUG_LOG() << "onEffectShowActorRelocationRemoveRequest: " << request.id();
+  DEBUG_LOG(m_logger) << "onEffectShowActorRelocationRemoveRequest: " << request.id();
 
   Core::FunctionReplyObject ret;
   ObjectEffectShowActorRelocation *ifs = m_effectShowActorRelocationObjMap.value(request.id());
@@ -145,7 +145,7 @@ void HandlerEffectShowActorRelocation::onEffectShowActorRelocationRemoveRequest(
 
   ret = ifs->removeObject();
   if (ret.error())
-    ERROR_LOG() << Q_FUNC_INFO << ret();
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << ret();
   else
   {
     // trigger relocation telegram to effect show actor
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_actor_relocation.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_actor_relocation.h
index 70a800321..7e8dbbb82 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_actor_relocation.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_actor_relocation.h
@@ -57,6 +57,7 @@ public:
   void relocationOrderConfirmationReceived(const ConvertFromTab::OrderConfirmation_t &orderConfirmation);
 
 private:
+  NGL::INGLLogger &m_logger;
   void onEffectShowActorRelocationModifyRequest(const rti::core::SampleIdentity &cookie,
                                                 const EffectShowActorRelocation &request) override final;
   Core::FunctionReplyObject effectShowActorRelocationModifyRequest(const EffectShowActorRelocation &request);
@@ -66,6 +67,7 @@ private:
 
 
 private:
+  NGL::INGLLogger &m_logger;
   QMap<int, ObjectEffectShowActorRelocation *>       m_effectShowActorRelocationObjMap;
   struct Completed_t
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_vehicle_status.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_vehicle_status.cpp
index 55c1847c5..a6d0a18b7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_vehicle_status.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_vehicle_status.cpp
@@ -20,10 +20,9 @@ namespace EffectShowManagement
 {
 //=============================================================================
 HandlerEffectShowVehicleStatus::HandlerEffectShowVehicleStatus(Initialization *mainHandler,
-                                                               QObject *parent)
-  : QObject(parent)
-  , m_mainHandler(mainHandler)
-{
+                                                               QObject *parent) : QObject(parent)
+  , m_mainHandler(mainHandler),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_timerVehicleStatus.setSingleShot(true);
 }
 //=============================================================================
@@ -35,19 +34,19 @@ HandlerEffectShowVehicleStatus::~HandlerEffectShowVehicleStatus()
 //=============================================================================
 bool HandlerEffectShowVehicleStatus::init()
 {
-  DEBUG_LOG() << "Begin HandlerEffectShowVehicleStatus";
+  DEBUG_LOG(m_logger) << "Begin HandlerEffectShowVehicleStatus";
 
   // create EffectShowVehicleStatuss objects
   auto cbEsvs = [this] (const Database::EsmEffectShowVehicleStatus &data)
   {
     ObjectEffectShowVehicleStatus *ifs(new ObjectEffectShowVehicleStatus(m_mainHandler));
     ifs->set(data);
-    DEBUG_LOG() << "HandlerEffectShowVehicleStatus::init getParticipantId :" <<  ifs->getParticipantId();
+    DEBUG_LOG(m_logger) << "HandlerEffectShowVehicleStatus::init getParticipantId :" <<  ifs->getParticipantId();
     m_effectShowVehicleStatusObjMap.insert(ifs->getParticipantId(), ifs);
   };
   if (!m_mainHandler->db()->select(cbEsvs))
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
 
@@ -60,7 +59,7 @@ bool HandlerEffectShowVehicleStatus::init()
   if (m_effectShowVehicleStatusObjMap.size() != 0)
     onTimeoutVehicleStatus();
 
-  DEBUG_LOG() << "m_effectShowVehicleStatusObjMap.size() = " << m_effectShowVehicleStatusObjMap.size();
+  DEBUG_LOG(m_logger) << "m_effectShowVehicleStatusObjMap.size() = " << m_effectShowVehicleStatusObjMap.size();
 
   return true;
 }
@@ -108,7 +107,7 @@ bool HandlerEffectShowVehicleStatus::isOperational(int id) const
 void HandlerEffectShowVehicleStatus::vehicleStatusReceived(const ConvertFromTab::VehicleStatus_t &vehicleStatus)
 
 {
-  DEBUG_LOG() << "vehicleStatusReceived: " << vehicleStatus.equipmentNumber
+  DEBUG_LOG(m_logger) << "vehicleStatusReceived: " << vehicleStatus.equipmentNumber
                       << ' ' << vehicleStatus.timestamp << ' ' << m_mainHandler->dds()->currentPartitionTime();
 
   HandlerPpmData::Participant_t actor = m_mainHandler->handlerPpmData()->getIdAndNameOfEffectShowActor(vehicleStatus.equipmentNumber);
@@ -138,7 +137,7 @@ void HandlerEffectShowVehicleStatus::vehicleStatusReceived(const ConvertFromTab:
 //=============================================================================
 void HandlerEffectShowVehicleStatus::effectShowActorChanged(const HandlerPpmData::Participant_t &data, DataModification modType)
 {
-  DEBUG_LOG() << "onEffectShowActorChanged: " << data.equipmentNumber;
+  DEBUG_LOG(m_logger) << "onEffectShowActorChanged: " << data.equipmentNumber;
   auto it = m_effectShowVehicleStatusObjMap.find(data.id);
   if (it == m_effectShowVehicleStatusObjMap.end()) return;   // participant not allocated to any order
 
@@ -186,7 +185,7 @@ void HandlerEffectShowVehicleStatus::onStatusRequest()
     auto it = m_effectShowVehicleStatusObjMap.find(actor.id);
     if (it != m_effectShowVehicleStatusObjMap.end())
     {
-      DEBUG_LOG() << "Status Request equipment number: " << equipmentNumber << ' ' << it.value()->getIdOfEffectShowActor();
+      DEBUG_LOG(m_logger) << "Status Request equipment number: " << equipmentNumber << ' ' << it.value()->getIdOfEffectShowActor();
       m_mainHandler->handlerTabData()->effectShowVehicleStatusRequest(equipmentNumber, it.value()->getIdOfEffectShowActor());
     }
 
@@ -220,7 +219,7 @@ void HandlerEffectShowVehicleStatus::onTimeoutVehicleStatus()
     if (it.value()->getOperational())
     {
       qint64 age = currentTime - it.value()->getTimestamp();
-      DEBUG_LOG() << currentTime << ' ' << it.value()->getTimestamp();
+      DEBUG_LOG(m_logger) << currentTime << ' ' << it.value()->getTimestamp();
       if ((age + 1000) >= HandlerEffectShowVehicleStatus::statusTimeout)
       {
         it.value()->setOperational(false);  // reset operational status
@@ -238,7 +237,7 @@ void HandlerEffectShowVehicleStatus::onTimeoutVehicleStatus()
   if (activateTimer)
     m_timerVehicleStatus.start(HandlerEffectShowVehicleStatus::statusTimeout - maxAge);
 
-  DEBUG_LOG() << "onTimeoutVehicleStatus(): " << activateTimer << ' ' << maxAge;
+  DEBUG_LOG(m_logger) << "onTimeoutVehicleStatus(): " << activateTimer << ' ' << maxAge;
 
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_vehicle_status.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_vehicle_status.h
index c414a7cde..c9d2c69ed 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_vehicle_status.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_vehicle_status.h
@@ -87,11 +87,13 @@ public Q_SLOTS:
   void onTimeoutVehicleStatus();
 
 private:
+  NGL::INGLLogger &m_logger;
   static const qint64 statusTimeout = 1800000; // 30 min timeout effect show vehicle status
   static const qint64 delayAfterStart = 20000; // 20 seconds delay for status requests after service start
   static const qint64 statusRequestInterval = 5000; // Status request time interval of 5 seconds
 
 private:
+  NGL::INGLLogger &m_logger;
   QMap<int, ObjectEffectShowVehicleStatus *>       m_effectShowVehicleStatusObjMap; // key = equipment number
   QVector<int> m_statusRequest; // List of equipment numbers; Order List for request of vehicle status.
   QTimer       m_timerVehicleStatus;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_mdm_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_mdm_data.cpp
index 8711b9f71..b68dae652 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_mdm_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_mdm_data.cpp
@@ -14,16 +14,15 @@
 using namespace EffectShowManagement;
 //=============================================================================
 HandlerMdmData::HandlerMdmData(const std::shared_ptr<DdsHandler> &ddsHandler,
-                               QObject *parent)
-  : QObject(parent)
-  , m_ddsHandler(ddsHandler)
-{
+                               QObject *parent) : QObject(parent)
+  , m_ddsHandler(ddsHandler),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 //=============================================================================
 bool HandlerMdmData::init()
 {
-  DEBUG_LOG() << "init() HandlerMdmData";
+  DEBUG_LOG(m_logger) << "init() HandlerMdmData";
   auto dtcMdm = m_ddsHandler->dtcMdm();
 
   connect(dtcMdm.get(), &MeteoDataManagement::Interface::Dtc::meteoDataChanged,
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_mdm_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_mdm_data.h
index 78c2395d3..697433d20 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_mdm_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_mdm_data.h
@@ -40,6 +40,7 @@ private Q_SLOTS:
   void onMeteoDataChanged(const MeteoDataManagement::MeteoData &data, DataModification modType);
 
 private:
+  NGL::INGLLogger &m_logger;
   QHash<int, MeteoDataManagement::MeteoData> m_meteoData;
   std::shared_ptr<DdsHandler> m_ddsHandler;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_pdm_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_pdm_data.cpp
index d426e7bff..62e77e96a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_pdm_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_pdm_data.cpp
@@ -15,11 +15,9 @@ namespace EffectShowManagement
 //=============================================================================
 
 HandlerPdmData::HandlerPdmData(const std::shared_ptr<DdsHandler> &ddsHandler,
-                               QObject *parent)
-
-  : QObject(parent)
-  , m_ddsHandler(ddsHandler)
-{
+                               QObject *parent) : QObject(parent)
+  , m_ddsHandler(ddsHandler),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 } // end of ctor()
 //=============================================================================
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_pdm_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_pdm_data.h
index 476d760f6..057286855 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_pdm_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_pdm_data.h
@@ -35,6 +35,8 @@ public:
   int getCadence(const int chargeId) const;
 
 private: // attributes
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler> m_ddsHandler;
 };
 } // namespace EffectShowManagement
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 c3a06b2b6..fb5070de9 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
@@ -15,16 +15,15 @@ using namespace EffectShowManagement;
 //=============================================================================
 
 HandlerPpmData::HandlerPpmData(Initialization *mainHandler,
-                               QObject     *parent)
-  : QObject(parent)
-  , m_mainHandler(mainHandler)
-{
+                               QObject     *parent) : QObject(parent)
+  , m_mainHandler(mainHandler),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 } // end of ctor()
 //=============================================================================
 
 bool HandlerPpmData::init()
 {
-  DEBUG_LOG() << "Begin HandlerPpmData";
+  DEBUG_LOG(m_logger) << "Begin HandlerPpmData";
   auto dtcPpm = m_mainHandler->dds()->dtcPpm();
   connect(dtcPpm.get(), &ParticipantManagement::Interface::Dtc::participantChanged,
           this, &HandlerPpmData::onParticipantChanged);
@@ -40,7 +39,7 @@ bool HandlerPpmData::init()
       return false;
   }
 
-  DEBUG_LOG() << "End HandlerPpmData";
+  DEBUG_LOG(m_logger) << "End HandlerPpmData";
   return true;
 } // end of init()
 
@@ -53,7 +52,7 @@ HandlerPpmData::Participant_t HandlerPpmData::getIdAndNameOfEffectShowActor(int
       return p;
   }
 
-  WARNING_LOG() << Q_FUNC_INFO << " Equipment Number not found: " << equipmentNum;
+  WARNING_LOG(m_logger) << Q_FUNC_INFO << " Equipment Number not found: " << equipmentNum;
   return Participant_t(); // participant not available
 
 } // end of getIdAndNameOfEffectShowActor()
@@ -64,7 +63,7 @@ int HandlerPpmData::getEquipmentNumber(int id) const
   auto it = m_participant.find(id);
   if (it == m_participant.end())
   {
-    WARNING_LOG() << Q_FUNC_INFO << " Participant(" << id << ") not found. ";
+    WARNING_LOG(m_logger) << Q_FUNC_INFO << " Participant(" << id << ") not found. ";
     return -1; // participant not available
   }
   return it.value().equipmentNumber;
@@ -78,7 +77,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() << "support entity / equipment number set " << (typeClass == ParticipantManagement::TypeClass::SupportEntity)
+    DEBUG_LOG(m_logger) << "support entity / equipment number set " << (typeClass == ParticipantManagement::TypeClass::SupportEntity)
                         << " / " << data.equipmentNumber().is_set() << ", typeId: " << data.typeId()
                         << ", cnt: " << m_ppmDtc->types().size();
 
@@ -119,7 +118,7 @@ void HandlerPpmData::onParticipantChanged(const ParticipantManagement::Participa
   }
   }
 
-  DEBUG_LOG() << "onParticipantChanged: " << data.id() << ' ' << data.name() << ' ' << modType;
+  DEBUG_LOG(m_logger) << "onParticipantChanged: " << data.id() << ' ' << data.name() << ' ' << modType;
 
 
 } // end of onParticipantChanged()
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 fa1d5f783..80550fde1 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
@@ -71,6 +71,7 @@ private Q_SLOTS:
   void onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType);
 
 private:
+  NGL::INGLLogger &m_logger;
   QMap<int, Participant_t> m_participant; // key = ID
 
   Initialization   *m_mainHandler;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_tab_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_tab_data.cpp
index 9dbd7b1cd..19b7d26af 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_tab_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_tab_data.cpp
@@ -37,7 +37,7 @@ HandlerTabData::HandlerTabData(Initialization *mainHandler,
 //=============================================================================
 bool HandlerTabData::init()
 {
-  DEBUG_LOG() << "Begin HandlerTabData";
+  DEBUG_LOG(m_logger) << "Begin HandlerTabData";
   auto dtcTab = m_mainHandler->dds()->dtcTab();
   connect(dtcTab.get(), &TrainingAreaBase::Interface::Dtc::fireSmokeMarkerDataChanged,
           this, &HandlerTabData::onFireSmokeMarkerDataChanged);
@@ -53,13 +53,13 @@ bool HandlerTabData::init()
       return false;
   }
 
-  DEBUG_LOG() << "End HandlerTabData";
+  DEBUG_LOG(m_logger) << "End HandlerTabData";
   return true;
 } // end of init()
 //=============================================================================
 void HandlerTabData::effectShowVehicleStatusRequest(int equipmentNumber, int participantId)
 {
-  DEBUG_LOG() << "Trigger Status Request " << equipmentNumber << ' ' << participantId;
+  DEBUG_LOG(m_logger) << "Trigger Status Request " << equipmentNumber << ' ' << participantId;
   TrainingAreaBase::SendFireSmokeMarkerDataRequest out;
 
   out.equipmentNumber(equipmentNumber);
@@ -71,7 +71,7 @@ void HandlerTabData::effectShowVehicleStatusRequest(int equipmentNumber, int par
 //=============================================================================
 void HandlerTabData::relocationOrder(int equipmentNumber, int participantId, const ConvertToTab::RelocationOrder_t &relocationOrder)
 {
-  DEBUG_LOG() << "Trigger Relocation Order " << equipmentNumber << ' ' << participantId;
+  DEBUG_LOG(m_logger) << "Trigger Relocation Order " << equipmentNumber << ' ' << participantId;
   TrainingAreaBase::SendFireSmokeMarkerDataRequest out;
 
   out.equipmentNumber(equipmentNumber);
@@ -90,7 +90,7 @@ void HandlerTabData::effectShowOrder(int equipmentNumber, int participantId, con
 
   Core::GeoPosition2D posCenter = effectShowOrder.centerPosition;
   Core::GeoPosition2D posLl     = effectShowOrder.lowerLeftPosition;
-  DEBUG_LOG() << "Trigger Effect Show Order " << equipmentNumber << ' ' << participantId
+  DEBUG_LOG(m_logger) << "Trigger Effect Show Order " << equipmentNumber << ' ' << participantId
                       << "\n idEffectShow      " << effectShowOrder.idEffectShow
                       << "\n startTime         " << effectShowOrder.startTime
                       << "\n centerPosition    " << LtsCoordTrans::mgrsFromGeographic(posCenter.lon(), posCenter.lat())
@@ -110,7 +110,7 @@ void HandlerTabData::effectShowOrder(int equipmentNumber, int participantId, con
 //=============================================================================
 void HandlerTabData::effectShowStop(int equipmentNumber, int participantId, const qint16 &idEffectShow)
 {
-  DEBUG_LOG() << "Trigger Effect Show Stop " << equipmentNumber << ' ' << participantId;
+  DEBUG_LOG(m_logger) << "Trigger Effect Show Stop " << equipmentNumber << ' ' << participantId;
   TrainingAreaBase::SendFireSmokeMarkerDataRequest out;
 
   out.equipmentNumber(equipmentNumber);
@@ -127,7 +127,7 @@ void HandlerTabData::effectShowContinue(int equipmentNumber, int participantId,
   out.participantId(participantId);
   out.payload(ConvertToTab::convertEffectShowContinue(effectShowContinue));
 
-  DEBUG_LOG() << "Trigger Effect Show Continue " << equipmentNumber << ' ' << participantId
+  DEBUG_LOG(m_logger) << "Trigger Effect Show Continue " << equipmentNumber << ' ' << participantId
                       << "\n idEffectShow "  << effectShowContinue.idEffectShow
                       << "\n executionTime " << effectShowContinue.executionTime
                       << "\n payload" << plText(out.payload());
@@ -143,7 +143,7 @@ void HandlerTabData::retractOrder(int equipmentNumber, int participantId, const
   out.participantId(participantId);
   out.payload(ConvertToTab::convertOrderRetract(retractOrder));
 
-  DEBUG_LOG() << "Trigger Retract Order " << equipmentNumber << ' ' << participantId
+  DEBUG_LOG(m_logger) << "Trigger Retract Order " << equipmentNumber << ' ' << participantId
                       << "\n orderType " << retractOrder.orderType
                       << "\n id        " << retractOrder.id
                       << "\n payload" << plText(out.payload());
@@ -158,7 +158,7 @@ void HandlerTabData::meteoData(int equipmentNumber, int participantId, const Met
   out.participantId(participantId);
   out.payload(ConvertToTab::convertMeteoData(meteoData));
 
-  DEBUG_LOG() << "Trigger Meteo data " << equipmentNumber << ' ' << participantId
+  DEBUG_LOG(m_logger) << "Trigger Meteo data " << equipmentNumber << ' ' << participantId
                       << "\n temperature   " << meteoData.temperature()
                       << "\n humidity      " << meteoData.humidity()
                       << "\n pressure      " << meteoData.pressure()
@@ -171,9 +171,9 @@ void HandlerTabData::meteoData(int equipmentNumber, int participantId, const Met
 void HandlerTabData::onSendFireSmokeMarkerDataReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "Fire Smoke Marker Data could not be send: " << reply.str();
+    ERROR_LOG(m_logger) << "Fire Smoke Marker Data could not be send: " << reply.str();
   else
-    DEBUG_LOG() << "Fire Smoke Marker Data send successfully to TAB!";
+    DEBUG_LOG(m_logger) << "Fire Smoke Marker Data send successfully to TAB!";
 } // end of onSendFireSmokeMarkerDataReply()
 //-----------------------------------------------------------------------------
 void HandlerTabData::onFireSmokeMarkerDataChanged(const TrainingAreaBase::FireSmokeMarkerData &data, DataModification modType)
@@ -181,18 +181,18 @@ void HandlerTabData::onFireSmokeMarkerDataChanged(const TrainingAreaBase::FireSm
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG() << "Got Fire Smoke Marker " << data.sampleTime();
+  DEBUG_LOG(m_logger) << "Got Fire Smoke Marker " << data.sampleTime();
   switch (ConvertFromTab::isTelegram(data))
   {
   case ConvertFromTab::RxTelegram_e::VehicleStatus:
   {
-    DEBUG_LOG() << "Got Vehicle Status";
+    DEBUG_LOG(m_logger) << "Got Vehicle Status";
     m_mainHandler->handlerEffectShowVehicleStatus()->vehicleStatusReceived(ConvertFromTab::getVehicleStatus(data));
     break;
   }
   case ConvertFromTab::RxTelegram_e::OrderConfirmation:
   {
-    DEBUG_LOG() << "Got Order Confirmation ";
+    DEBUG_LOG(m_logger) << "Got Order Confirmation ";
     switch (modType)
     {
     case DataModification::eAdded:
@@ -201,12 +201,12 @@ void HandlerTabData::onFireSmokeMarkerDataChanged(const TrainingAreaBase::FireSm
       const ConvertFromTab::OrderConfirmation_t orderConfirmation = ConvertFromTab::getOrderConfirmation(data);
       if (orderConfirmation.orderType == ConvertFromTab::OrderType_e::Relocation)
       {
-        DEBUG_LOG() << "relocationOrderConfirmationReceived(orderConfirmation)";
+        DEBUG_LOG(m_logger) << "relocationOrderConfirmationReceived(orderConfirmation)";
         m_mainHandler->handlerEffectShowActorRelocation()->relocationOrderConfirmationReceived(orderConfirmation);
       }
       else
       {
-        DEBUG_LOG() << "effectShowOrderConfirmationReceived(orderConfirmation)";
+        DEBUG_LOG(m_logger) << "effectShowOrderConfirmationReceived(orderConfirmation)";
         m_mainHandler->handlerEffectShow()->effectShowOrderConfirmationReceived(orderConfirmation);
       }
       break;
@@ -224,14 +224,14 @@ void HandlerTabData::onFireSmokeMarkerDataChanged(const TrainingAreaBase::FireSm
 //-----------------------------------------------------------------------------
 void HandlerTabData::publishVehicleStatus(const EffectShowManagement::EffectShowVehicleStatus &vehicleStatus)
 {
-  DEBUG_LOG() << "Vehicle Status published esmParticipantId: " << vehicleStatus.esmParticipantId() << ' ' << vehicleStatus.operational();
+  DEBUG_LOG(m_logger) << "Vehicle Status published esmParticipantId: " << vehicleStatus.esmParticipantId() << ' ' << vehicleStatus.operational();
   m_mainHandler->dds()->dts()->publish(vehicleStatus);
 } // end of publishVehicleStatus()
 //-----------------------------------------------------------------------------
 
 void HandlerTabData::sendAdlerFqFb(const int aesId)
 {
-  DEBUG_LOG() << "Send Adler Feuerbereitschaft";
+  DEBUG_LOG(m_logger) << "Send Adler Feuerbereitschaft";
   TrainingAreaBase::AdlerFqFbRequest out;
 
   out.aesItemId(aesId);
@@ -241,10 +241,10 @@ void HandlerTabData::sendAdlerFqFb(const int aesId)
 void HandlerTabData::onAdlerFqFbReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "Adler Feuerbereitschaft could not be send: " << reply.str()
+    ERROR_LOG(m_logger) << "Adler Feuerbereitschaft could not be send: " << reply.str()
                         << ", id:" << reply.id();
   else
-    DEBUG_LOG() << "Adler Feuerbereitschaft successfully to TAB!";
+    DEBUG_LOG(m_logger) << "Adler Feuerbereitschaft successfully to TAB!";
 }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_tab_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_tab_data.h
index ae4631977..47e0f7dc7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_tab_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_tab_data.h
@@ -102,6 +102,7 @@ public:
   void sendAdlerFqFb(const int aesId);
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onSendFireSmokeMarkerDataReply(const Core::FunctionReplyObject &reply) override final;
   void onAdlerFqFbReply(const Core::FunctionReplyObject &reply) override final;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/initialization.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/initialization.cpp
index 1c9866b3e..738070f81 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/initialization.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/initialization.cpp
@@ -41,13 +41,13 @@ Initialization::~Initialization()
 
 bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector, const QSqlDatabase &sqlDb)
 {
-  INFO_LOG() << "Start EffectShowManagement Initialization.";
+  INFO_LOG(m_logger) << "Start EffectShowManagement Initialization.";
 
   // initialize DDS
   m_ddsHandler = std::make_shared<DdsHandler>(ddsConnector);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation DdsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
     return false;
   }
 
@@ -55,7 +55,7 @@ bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector
   m_dbHandler = std::make_shared<DbHandler>();
   if (!m_dbHandler->init(ddsConnector->getPartitionId(), sqlDb))
   {
-    ERROR_LOG() << "Initialisation DbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation DbHandler failed.";
     return false;
   }
 
@@ -76,7 +76,7 @@ bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector
   // initialize handlerAesData
   m_handlerAesData = std::make_shared<HandlerAesData>(this);
 
-  INFO_LOG() << "EffectShowManagement initialized.";
+  INFO_LOG(m_logger) << "EffectShowManagement initialized.";
 
   return true;
 
@@ -98,43 +98,43 @@ bool Initialization::loadFromDatabase()
 
   if (!m_handlerEffectShow->init())
   {
-    ERROR_LOG() << "Initialisation handlerEffectShow failed.";
+    ERROR_LOG(m_logger) << "Initialisation handlerEffectShow failed.";
     return false;
   }
 
   if (!m_handlerEffectShowActorRelocation->init())
   {
-    ERROR_LOG() << "Initialisation handlerEffectShowActorRelocation failed.";
+    ERROR_LOG(m_logger) << "Initialisation handlerEffectShowActorRelocation failed.";
     return false;
   }
 
   if (!m_handlerEffectShowVehicleStatus->init())
   {
-    ERROR_LOG() << "Initialisation HandlerEffectShowVehicleStatus failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerEffectShowVehicleStatus failed.";
     return false;
   }
 
   if (!m_handlerPpmData->init())
   {
-    ERROR_LOG() << "Initialisation HandlerPpmData failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerPpmData failed.";
     return false;
   }
 
   if (!m_handlerMdmData->init())
   {
-    ERROR_LOG() << "Initialisation HandlerMdmData failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerMdmData failed.";
     return false;
   }
 
   if (!m_handlerTabData->init())
   {
-    ERROR_LOG() << "Initialisation HandlerTabData failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerTabData failed.";
     return false;
   }
 
   if (!m_handlerAesData->init())
   {
-    ERROR_LOG() << "Initialisation HandlerAesData failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerAesData failed.";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/initialization.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/initialization.h
index 8072f4424..c1e7bb76f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/initialization.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/initialization.h
@@ -52,6 +52,7 @@ public:
   int exerciseId() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>            m_ddsHandler;
   std::shared_ptr<DbHandler>             m_dbHandler;
 
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 ee4b210d4..05b48b18b 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
@@ -15,10 +15,9 @@ namespace EffectShowManagement
 {
 //=============================================================================
 ObjectAesData::ObjectAesData(Initialization *mainHandler,
-                             QObject     *parent)
-  : QObject(parent)
-  , m_mainHandler(mainHandler)
-{
+                             QObject     *parent) : QObject(parent)
+  , m_mainHandler(mainHandler),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 //=============================================================================
 
@@ -29,7 +28,7 @@ Core::FunctionReplyObject ObjectAesData::createObject(const Database::EsmAesData
   if (!m_mainHandler->db()->insert(m_data))
     return Core::FunctionReplyObject(m_data.idAes, tr_lts("dds", "Error inserting EsmAesData into database."));
 
-  DEBUG_LOG() << "New EsmAesData Id: " << m_data.idAes;
+  DEBUG_LOG(m_logger) << "New EsmAesData Id: " << m_data.idAes;
   return Core::FunctionReplyObject(m_data.idAes);
 }
 //=============================================================================
@@ -40,7 +39,7 @@ Core::FunctionReplyObject ObjectAesData::updateObject(const Database::EsmAesData
   if (!m_mainHandler->db()->update(m_data))
     return Core::FunctionReplyObject(m_data.idAes, tr_lts("dds", "Error updating EsmAesData into database"));
 
-  DEBUG_LOG() << "Data changed for EsmAesData Id: " << m_data.idAes;
+  DEBUG_LOG(m_logger) << "Data changed for EsmAesData Id: " << m_data.idAes;
 
   return Core::FunctionReplyObject(m_data.idAes);
 }
@@ -72,7 +71,7 @@ bool ObjectAesData::dataChanged(const Database::EsmAesData &data) const
   if (m_data.nameAes != data.nameAes)
     return true;
 
-  DEBUG_LOG() << "Data Volley: " << data.volley << " old: "   << m_data.volley;
+  DEBUG_LOG(m_logger) << "Data Volley: " << data.volley << " old: "   << m_data.volley;
   return (m_data.chargeTypeId != data.chargeTypeId)
          || (m_data.effectStart != data.effectStart)
          || (m_data.effectStateId == AreaEffectSimulation::AesEffectState::EsFired)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.h
index 8c905373a..2499950eb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.h
@@ -92,6 +92,7 @@ public:
   static Database::EsmAesData asEsmAesData(const AreaEffectSimulation::EffectCluster &data);
 
 private:
+  NGL::INGLLogger &m_logger;
   Initialization          *m_mainHandler;
   Database::EsmAesData m_data;
 };
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 5c8cebeed..20904c618 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
@@ -39,7 +39,7 @@ Core::FunctionReplyObject ObjectEffectShow::createObject(const Database::EsmEffe
       return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error updating EffectShow into database"));
   }
 
-  DEBUG_LOG() << "createObject(db) complete ->"
+  DEBUG_LOG(m_logger) << "createObject(db) complete ->"
                       << "\n id                    " << m_data.id
                       << "\n centerPosition        " << LtsCoordTrans::mgrsFromGeographic(m_data.centerPosition.x(), m_data.centerPosition.y())
                       << "\n idAreaEffectSimulation " << m_data.idAreaEffectSimulation
@@ -79,7 +79,7 @@ Core::FunctionReplyObject ObjectEffectShow::updateObject(const EffectShowManagem
   if (m_data.orderConfirmation == EffectShowManagement::OrderConfirmation_e_def::Execution)
     return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Changes rejected due to Effect Show in execution."));
 
-  DEBUG_LOG() << "updateObject(data topic) complete ->"
+  DEBUG_LOG(m_logger) << "updateObject(data topic) complete ->"
                       << "\n id                    " << m_data.id                    << " new: " << data.id()
                       << "\n centerPosition x      " << m_data.centerPosition.x()    << " new: " << data.position().lon()
                       << "\n centerPosition y      " << m_data.centerPosition.y()    << " new: " << data.position().lat()
@@ -120,7 +120,7 @@ Core::FunctionReplyObject ObjectEffectShow::updateObject(const EffectShowManagem
   if (!m_mainHandler->db()->update(m_data))
     return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error updating EffectShow into database"));
 
-  DEBUG_LOG() << "Data changed for EffectShow Id: " << m_data.id;
+  DEBUG_LOG(m_logger) << "Data changed for EffectShow Id: " << m_data.id;
 
   // Publish Data via DTS
   onPublishData();
@@ -130,7 +130,7 @@ Core::FunctionReplyObject ObjectEffectShow::updateObject(const EffectShowManagem
 //=============================================================================
 bool ObjectEffectShow::updateObject(const ConvertFromTab::OrderConfirmation_t &data)
 {
-  DEBUG_LOG() << "updateObject() partly ->"
+  DEBUG_LOG(m_logger) << "updateObject() partly ->"
                       << "\n orderConfirmation " << m_data.orderConfirmation  << " new: " << data.confirmation.underlying()
                       << "\n answerText        " << m_data.answerText         << " new: " << data.answerText;
 
@@ -139,7 +139,7 @@ bool ObjectEffectShow::updateObject(const ConvertFromTab::OrderConfirmation_t &d
 
   if (!m_mainHandler->db()->update(m_data))
   {
-    ERROR_LOG() << "Effect Show Order Confirmation can_t be updated Id: " << m_data.id;
+    ERROR_LOG(m_logger) << "Effect Show Order Confirmation can_t be updated Id: " << m_data.id;
     return false;
   }
 
@@ -151,7 +151,7 @@ bool ObjectEffectShow::updateObject(const ConvertFromTab::OrderConfirmation_t &d
 //=============================================================================
 bool ObjectEffectShow::updateObject(const Database::EsmEffectShow &data)
 {
-  DEBUG_LOG() << "updateObject(db) complete ->"
+  DEBUG_LOG(m_logger) << "updateObject(db) complete ->"
                       << "\n id                    " << m_data.id                    << " new: " << data.id
                       << "\n centerPosition x      " << m_data.centerPosition.x()    << " new: " << data.centerPosition.x()
                       << "\n centerPosition y      " << m_data.centerPosition.y()    << " new: " << data.centerPosition.y()
@@ -176,7 +176,7 @@ bool ObjectEffectShow::updateObject(const Database::EsmEffectShow &data)
 
   if (!m_mainHandler->db()->update(m_data))
   {
-    ERROR_LOG() << "Failed effect Show updated Id: " << m_data.id;
+    ERROR_LOG(m_logger) << "Failed effect Show updated Id: " << m_data.id;
     return false;
   }
 
@@ -194,7 +194,7 @@ bool ObjectEffectShow::resetOrderConfirmation()
 
   if (!m_mainHandler->db()->update(m_data))
   {
-    ERROR_LOG() << "Effect Show Order Confirmation can_t be updated Id: " << m_data.id;
+    ERROR_LOG(m_logger) << "Effect Show Order Confirmation can_t be updated Id: " << m_data.id;
     return false;
   }
 
@@ -220,7 +220,7 @@ ConvertToTab::EffectShowOrder_t ObjectEffectShow::getEffectShowOrder() const
   order.typeOfAmmunition  = m_data.typeOfAmmunition;
   order.name              = m_data.nameAreaEfffectSimulation;
 
-  DEBUG_LOG() << "getEffectShowOrder():"
+  DEBUG_LOG(m_logger) << "getEffectShowOrder():"
                       << "\n idEffectShow      " << order.idEffectShow
                       << "\n areaDepth         " << order.areaDepth
                       << "\n areaWidth         " << order.areaWidth
@@ -242,7 +242,7 @@ ConvertToTab::RetractOrder_t ObjectEffectShow::getRetractOrder() const
   order.id        = m_data.id;
   order.orderType = 1;
 
-  DEBUG_LOG() << "getRetractOrder():"
+  DEBUG_LOG(m_logger) << "getRetractOrder():"
                       << "\n id        " << order.id
                       << "\n orderType " << (int)order.orderType;
   return order;
@@ -254,7 +254,7 @@ ConvertToTab::EffectShowContinue_t ObjectEffectShow::getContinueOrder() const
   order.idEffectShow  = m_data.id;
   order.executionTime = m_data.startTime / 1000; // [ms] -> [s]
 
-  DEBUG_LOG() << "getContinueOrder():"
+  DEBUG_LOG(m_logger) << "getContinueOrder():"
                       << "\n id        " << order.idEffectShow
                       << "\n orderType " << order.executionTime;
 
@@ -288,10 +288,10 @@ void ObjectEffectShow::onPublishData()
 
 
 
-  INFO_LOG() << "Publish EsmEffectShow-data to dds (" << m_data.id << ") ...";
+  INFO_LOG(m_logger) << "Publish EsmEffectShow-data to dds (" << m_data.id << ") ...";
 
   if (!m_mainHandler->dds()->dts()->publish(ddsData))
-    ERROR_LOG() << "Error publishing EsmEffectShow-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing EsmEffectShow-data to dds";
 } // end of onPublishData()
 //-----------------------------------------------------------------------------
 } // Namespace EffectShowManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show.h
index 3b5a16d93..84ca4057d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show.h
@@ -60,6 +60,7 @@ public Q_SLOTS:
   void onPublishData();
 
 private:
+  NGL::INGLLogger &m_logger;
   Initialization         *m_mainHandler;
   Database::EsmEffectShow m_data;
   bool                    m_bRemoveFromDdsOnDestruction = true;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_actor_relocation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_actor_relocation.cpp
index b6ddf077a..e8a263fa9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_actor_relocation.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_actor_relocation.cpp
@@ -31,7 +31,7 @@ Core::FunctionReplyObject ObjectEffectShowActorRelocation::createObject(const Da
     if (!m_mainHandler->db()->insert(m_data))
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting Effect Show Actor Relocation into database."));
 
-    DEBUG_LOG() << "New Effect Show Actor Relocation Id: " << m_data.id;
+    DEBUG_LOG(m_logger) << "New Effect Show Actor Relocation Id: " << m_data.id;
   }
 
   // Publish Data via DTS
@@ -50,7 +50,7 @@ Core::FunctionReplyObject ObjectEffectShowActorRelocation::updateObject(const Da
   if (!m_mainHandler->db()->update(m_data))
     return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error updating EffectShowActorRelocation into database"));
 
-  DEBUG_LOG() << "Data changed for EffectShowActorRelocation Id: " << m_data.id;
+  DEBUG_LOG(m_logger) << "Data changed for EffectShowActorRelocation Id: " << m_data.id;
 
   // Publish Data via DTS
   onPublishData();
@@ -80,10 +80,10 @@ void ObjectEffectShowActorRelocation::onPublishData()
   ddsData.isDeleted(false);
   ddsData.isUsed(false);
 
-  INFO_LOG() << "Publish EsmEffectShowActorRelocation-data to dds (" << m_data.id << ") ...";
+  INFO_LOG(m_logger) << "Publish EsmEffectShowActorRelocation-data to dds (" << m_data.id << ") ...";
 
   if (!m_mainHandler->dds()->dts()->publish(ddsData))
-    ERROR_LOG() << "Error publishing EsmEffectShowActorRelocation-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing EsmEffectShowActorRelocation-data to dds";
 }
 //=============================================================================
 ConvertToTab::RelocationOrder_t ObjectEffectShowActorRelocation::getRelocationOrder() const
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_actor_relocation.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_actor_relocation.h
index 08d6eb31a..8c1ed8474 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_actor_relocation.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_actor_relocation.h
@@ -51,6 +51,7 @@ public:
   static Database::EsmEffectShowActorRelocation ddsToDb(const EffectShowManagement::EffectShowActorRelocation &ddsData);
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onPublishData();
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_vehicle_status.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_vehicle_status.cpp
index 854a22f14..8a1f180f0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_vehicle_status.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_vehicle_status.cpp
@@ -54,11 +54,11 @@ void ObjectEffectShowVehicleStatus::createObject()
 {
   if (!m_mainHandler->db()->insert(m_data))
   {
-    ERROR_LOG() << "Error inserting EsmEffectShowVehicleStatus into database. esmParticipantId" << m_data.esmParticipantId;
+    ERROR_LOG(m_logger) << "Error inserting EsmEffectShowVehicleStatus into database. esmParticipantId" << m_data.esmParticipantId;
     return;
   }
 
-  DEBUG_LOG() << "New Effect Show Vehicle Status esmParticipantId: " << m_data.esmParticipantId;
+  DEBUG_LOG(m_logger) << "New Effect Show Vehicle Status esmParticipantId: " << m_data.esmParticipantId;
 
   // Publish Data via DTS
   onPublishData();
@@ -68,17 +68,17 @@ void ObjectEffectShowVehicleStatus::updateObject()
 {
   if (m_data.esmParticipantId <= 0)
   {
-    ERROR_LOG() << "Update object illegal esmParticipantId: " << m_data.esmParticipantId;
+    ERROR_LOG(m_logger) << "Update object illegal esmParticipantId: " << m_data.esmParticipantId;
     return;
   }
 
   if (!m_mainHandler->db()->update(m_data))
   {
-    ERROR_LOG() << "Error updating EsmEffectShowVehicleStatus into database esmParticipantId:  " << m_data.esmParticipantId;
+    ERROR_LOG(m_logger) << "Error updating EsmEffectShowVehicleStatus into database esmParticipantId:  " << m_data.esmParticipantId;
     return;
   }
 
-  DEBUG_LOG() << "Data changed for EsmEffectShowVehicleStatus esmParticipantId: " << m_data.esmParticipantId;
+  DEBUG_LOG(m_logger) << "Data changed for EsmEffectShowVehicleStatus esmParticipantId: " << m_data.esmParticipantId;
 
   // Publish Data via DTS
   onPublishData();
@@ -88,7 +88,7 @@ void ObjectEffectShowVehicleStatus::removeObject()
 {
   if (!m_mainHandler->db()->removeEsmEffectShowVehicleStatus(m_data.esmParticipantId))
   {
-    ERROR_LOG() << "EsmEffectShowVehicleStatus can not be removed eqpNum: " << m_data.esmParticipantId;
+    ERROR_LOG(m_logger) << "EsmEffectShowVehicleStatus can not be removed eqpNum: " << m_data.esmParticipantId;
     return;
   }
 }
@@ -110,10 +110,10 @@ void ObjectEffectShowVehicleStatus::onPublishData()
   ddsData.nameEffectShowActor(m_data.nameEffectShowActor.toStdString());
   ddsData.operational(m_data.operational);
   ddsData.sampleTime(m_data.timestamp);
-  INFO_LOG() << "Publish EsmEffectShowVehicleStatus-data to dds (" << m_data.esmParticipantId << ") ...";
+  INFO_LOG(m_logger) << "Publish EsmEffectShowVehicleStatus-data to dds (" << m_data.esmParticipantId << ") ...";
 
   if (!m_mainHandler->dds()->dts()->publish(ddsData))
-    ERROR_LOG() << "Error publishing EsmEffectShowVehicleStatus-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing EsmEffectShowVehicleStatus-data to dds";
 }
 
 } // Namespace EffectShowManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_vehicle_status.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_vehicle_status.h
index 332eead6f..4f7b08202 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_vehicle_status.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_vehicle_status.h
@@ -61,6 +61,7 @@ public:
 
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onPublishData();
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/ModuleTests/evl_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/ModuleTests/evl_tests.cpp
index e28fee4e6..2c1b5f114 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/ModuleTests/evl_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/ModuleTests/evl_tests.cpp
@@ -40,7 +40,7 @@ EvlTests::EvlTests(QObject *parent)
 //-----------------------------------------------------------------------------
 bool EvlTests::init(int domainId, int exerciseId, int testId, int operatorId, int criteriumId, int elementId, int sanNineLinerId)
 {
-  INFO_LOG() << "EvlTests::init() "
+  INFO_LOG(m_logger) << "EvlTests::init() "
                      << " domainId:" << domainId
                      << " exerciseId:" << exerciseId
                      << " testId: " << testId
@@ -54,7 +54,7 @@ bool EvlTests::init(int domainId, int exerciseId, int testId, int operatorId, in
   m_operatorId = operatorId;
   m_sanNineLinerId = sanNineLinerId;
 
-  DEBUG_LOG() << "Operator Id = " << m_operatorId;
+  DEBUG_LOG(m_logger) << "Operator Id = " << m_operatorId;
 
   // initialize DDS
   m_ddsConnector.reset(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId));
@@ -63,18 +63,18 @@ bool EvlTests::init(int domainId, int exerciseId, int testId, int operatorId, in
   m_ddsConnector->initPublisherSubscriber();
 
   // Access to FTC
-  DEBUG_LOG() << "create ftc";
+  DEBUG_LOG(m_logger) << "create ftc";
   m_ftc = Evaluations::Interface::Ftc::create(m_ddsConnector);
-  DEBUG_LOG() << "init ftc";
+  DEBUG_LOG(m_logger) << "init ftc";
   bool bRet = m_ftc->enableAll();
-  DEBUG_LOG() << "init end - bRet = " << bRet;
+  DEBUG_LOG(m_logger) << "init end - bRet = " << bRet;
 
   // Access to DTC
-  DEBUG_LOG() << "create dtc";
+  DEBUG_LOG(m_logger) << "create dtc";
   m_dtc = Evaluations::Interface::Dtc::create(m_ddsConnector);
-  DEBUG_LOG() << "init dtc";
+  DEBUG_LOG(m_logger) << "init dtc";
   bRet = m_dtc->enableAll();
-  DEBUG_LOG() << "init end - bRet = " << bRet;
+  DEBUG_LOG(m_logger) << "init end - bRet = " << bRet;
 
   return bRet;
 } // end of init()
@@ -82,7 +82,7 @@ bool EvlTests::init(int domainId, int exerciseId, int testId, int operatorId, in
 //-----------------------------------------------------------------------------
 void EvlTests::startTest()
 {
-  INFO_LOG() << "startTest() ******* "
+  INFO_LOG(m_logger) << "startTest() ******* "
                      << " exerciseId: " << m_exerciseId
                      << " testId: " << m_testId
                      << " criteriumId: " << m_criteriumId
@@ -117,10 +117,10 @@ void EvlTests::startTest()
     QTimer::singleShot(0, this, &EvlTests::tryGetSanNineLiner);
   else
   {
-    ERROR_LOG() << "Unknown test case !";
+    ERROR_LOG(m_logger) << "Unknown test case !";
     failExit();
   }
-  INFO_LOG() << "endTest   ******* ";
+  INFO_LOG(m_logger) << "endTest   ******* ";
   QTimer::singleShot(0, qApp, QCoreApplication::quit);
 
 } // end of startTest()
@@ -136,10 +136,10 @@ void EvlTests::tryCreateCriterium()
   data.description("Test description");
   data.operatorId(m_operatorId);
 
-  INFO_LOG() << "trying to send EvlCriteriumModifyRequest";
+  INFO_LOG(m_logger) << "trying to send EvlCriteriumModifyRequest";
   if (!m_ftc->evlCriteriumModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
   QTest::qWait(1000);
@@ -156,10 +156,10 @@ void EvlTests::tryModifyCriterium()
   data.description("Description modified");
   data.operatorId(m_operatorId);
 
-  INFO_LOG() << "trying to send EvlCriteriumModifyRequest for criteriumId:" << data.id();
+  INFO_LOG(m_logger) << "trying to send EvlCriteriumModifyRequest for criteriumId:" << data.id();
   if (!m_ftc->evlCriteriumModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting modify data for criteriumId:" << data.id();
+    ERROR_LOG(m_logger) << "Error requesting modify data for criteriumId:" << data.id();
     failExit();
   }
   QTest::qWait(1000);
@@ -173,10 +173,10 @@ void EvlTests::tryRemoveCriterium()
 
   data.id(m_criteriumId);
 
-  INFO_LOG() << "trying to send remove request for criteriumId:" << data.id();
+  INFO_LOG(m_logger) << "trying to send remove request for criteriumId:" << data.id();
   if (!m_ftc->evlCriteriumRemoveRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting remove data for criteriumId:" << data.id();
+    ERROR_LOG(m_logger) << "Error requesting remove data for criteriumId:" << data.id();
     failExit();
   }
   QTest::qWait(1000);
@@ -186,14 +186,14 @@ void EvlTests::tryRemoveCriterium()
 void EvlTests::tryGetAllCriteria()
 {
   m_eTestStep = eGetAllCriteria;
-  DEBUG_LOG() << "trying to get all criteria";
+  DEBUG_LOG(m_logger) << "trying to get all criteria";
 
   m_dtc->waitForHistoricalDataEvaluationCriterium(5000);
   m_criteriumId = -1;
   auto cb = [this] (const Evaluations::EvaluationCriterium &c)
   {
     m_criteriumId = c.id();
-    INFO_LOG() << "Evl("         << c.id() << ") :"
+    INFO_LOG(m_logger) << "Evl("         << c.id() << ") :"
                        << " name:"       << c.name()
                        << " desc:"       << c.description()
                        << " operatorId:" << c.operatorId();
@@ -201,7 +201,7 @@ void EvlTests::tryGetAllCriteria()
   m_dtc->evaluationCriteriums(cb);
   if (m_criteriumId == -1)
   {
-    ERROR_LOG() << "Error requesting all criterium data";
+    ERROR_LOG(m_logger) << "Error requesting all criterium data";
     failExit();
   }
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -210,7 +210,7 @@ void EvlTests::tryGetAllCriteria()
 //-----------------------------------------------------------------------------
 void EvlTests::tryGetCriterium()
 {
-  DEBUG_LOG() << "trying to get criterium with id:" << m_criteriumId;
+  DEBUG_LOG(m_logger) << "trying to get criterium with id:" << m_criteriumId;
 
   if(m_testId > 1)
   {
@@ -219,7 +219,7 @@ void EvlTests::tryGetCriterium()
 
   if (m_criteriumId <= 0)
   {
-    ERROR_LOG() << "invalid criteriumId - test aborted.";
+    ERROR_LOG(m_logger) << "invalid criteriumId - test aborted.";
     failExit();
   }
 
@@ -228,12 +228,12 @@ void EvlTests::tryGetCriterium()
 
   if (data.id() <= 0)
   {
-    ERROR_LOG() << "Error receiving data for criteriumId " << m_criteriumId << " returnVal: " << data.id();
+    ERROR_LOG(m_logger) << "Error receiving data for criteriumId " << m_criteriumId << " returnVal: " << data.id();
     failExit();
   }
   else
   {
-    INFO_LOG() << "Evl(" << data.id() << ") :"
+    INFO_LOG(m_logger) << "Evl(" << data.id() << ") :"
                        << " name:"            << data.name()
                        << " desc:"            << data.description()
                        << " operatorId:"      << data.operatorId();
@@ -243,7 +243,7 @@ void EvlTests::tryGetCriterium()
   {
     if (!onCompareCreatedData(data))
     {
-      ERROR_LOG() << "Compare created data failed!";
+      ERROR_LOG(m_logger) << "Compare created data failed!";
       failExit();
     }
     else
@@ -279,10 +279,10 @@ void EvlTests::tryCreateElement()
   obj[QStringLiteral("allStreams")] = QJsonValue(QStringLiteral("vhf01, hf01, hf02, vhf03"));
   data.audioContent().set(QJsonDocument(obj).toJson().constData());
 
-  INFO_LOG() << "trying to send evlElementModifyRequest";
+  INFO_LOG(m_logger) << "trying to send evlElementModifyRequest";
   if (!m_ftc->evlElementModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
   QTest::qWait(1000);
@@ -310,10 +310,10 @@ void EvlTests::tryModifyElement()
   obj[QStringLiteral("allStreams")] = QJsonValue(QStringLiteral("vhf01, hf01, hf02, vhf03"));
   data.audioContent().set(QJsonDocument(obj).toJson().constData());
 
-  INFO_LOG() << "trying to send evlElementModifyRequest for elementId:" << data.id();
+  INFO_LOG(m_logger) << "trying to send evlElementModifyRequest for elementId:" << data.id();
   if (!m_ftc->evlElementModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting modify data for snapshotId:" << data.id();
+    ERROR_LOG(m_logger) << "Error requesting modify data for snapshotId:" << data.id();
     failExit();
   }
   QTest::qWait(1000);
@@ -328,10 +328,10 @@ void EvlTests::tryRemoveElement()
   data.id(m_elementId);
   data.criteriumId(m_criteriumId);
 
-  INFO_LOG() << "trying to send remove request for elementId:" << data.id();
+  INFO_LOG(m_logger) << "trying to send remove request for elementId:" << data.id();
   if (!m_ftc->evlElementRemoveRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting remove data for elementId:" << data.id();
+    ERROR_LOG(m_logger) << "Error requesting remove data for elementId:" << data.id();
     failExit();
   }
   QTest::qWait(1000);
@@ -402,12 +402,12 @@ void EvlTests::tryCreateSanNineLiner()
   QJsonDocument doc = SanCategoryLine::toJson(vecCl);
   data.lines(doc.toJson().toStdString());
 
-  INFO_LOG() << "lines: " << data.lines();
+  INFO_LOG(m_logger) << "lines: " << data.lines();
 
-  INFO_LOG() << "trying to send sanNineLinerRequest";
+  INFO_LOG(m_logger) << "trying to send sanNineLinerRequest";
   if (!m_ftc->sanNineLinerModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
   QTest::qWait(1000);
@@ -477,12 +477,12 @@ void EvlTests::tryModifySanNineLiner()
   QJsonDocument doc = SanCategoryLine::toJson(vecCl);
   data.lines(doc.toJson().toStdString());
 
-  INFO_LOG() << "lines: " << data.lines();
+  INFO_LOG(m_logger) << "lines: " << data.lines();
 
-  INFO_LOG() << "trying to send sanNineLinerRequest";
+  INFO_LOG(m_logger) << "trying to send sanNineLinerRequest";
   if (!m_ftc->sanNineLinerModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting modify data";
+    ERROR_LOG(m_logger) << "Error requesting modify data";
     failExit();
   }
   QTest::qWait(1000);
@@ -496,10 +496,10 @@ void EvlTests::tryRemoveSanNineLiner()
 
   data.id(m_sanNineLinerId);
 
-  INFO_LOG() << "trying to send remove request for sanNineLinerId:" << data.id();
+  INFO_LOG(m_logger) << "trying to send remove request for sanNineLinerId:" << data.id();
   if (!m_ftc->sanNineLinerRemoveRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting remove data for sanNineLinerId:" << data.id();
+    ERROR_LOG(m_logger) << "Error requesting remove data for sanNineLinerId:" << data.id();
     failExit();
   }
   QTest::qWait(1000);
@@ -508,7 +508,7 @@ void EvlTests::tryRemoveSanNineLiner()
 //-----------------------------------------------------------------------------
 void EvlTests::tryGetSanNineLiner()
 {
-  DEBUG_LOG() << "trying to get sanNineLinerId with id:" << m_sanNineLinerId;
+  DEBUG_LOG(m_logger) << "trying to get sanNineLinerId with id:" << m_sanNineLinerId;
 
   if(m_testId > 1)
   {
@@ -517,7 +517,7 @@ void EvlTests::tryGetSanNineLiner()
 
   if (m_sanNineLinerId <= 0)
   {
-    ERROR_LOG() << "invalid sanNineLinerId - test aborted.";
+    ERROR_LOG(m_logger) << "invalid sanNineLinerId - test aborted.";
     failExit();
   }
 
@@ -526,12 +526,12 @@ void EvlTests::tryGetSanNineLiner()
 
   if (data.id() <= 0)
   {
-    ERROR_LOG() << "Error receiving data for sanNineLiner " << m_sanNineLinerId << " returnVal: " << data.id();
+    ERROR_LOG(m_logger) << "Error receiving data for sanNineLiner " << m_sanNineLinerId << " returnVal: " << data.id();
     failExit();
   }
   else
   {
-    INFO_LOG() << "SanNineLiner(" << data.id() << ") :"
+    INFO_LOG(m_logger) << "SanNineLiner(" << data.id() << ") :"
                        << " lastModified: " << data.lastModified()
                        << " position lat: " << data.line1_position().lat()
                        << " position lon: " << data.line1_position().lon()
@@ -544,7 +544,7 @@ void EvlTests::tryGetSanNineLiner()
   {
     if (!onCompareCreatedData(data))
     {
-      ERROR_LOG() << "Compare created data failed!";
+      ERROR_LOG(m_logger) << "Compare created data failed!";
       failExit();
     }
     else
@@ -562,20 +562,20 @@ void EvlTests::tryGetSanNineLiner()
 //-----------------------------------------------------------------------------
 void EvlTests::onEvlCriteriumModifyReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got onEvlCriteriumModifyReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got onEvlCriteriumModifyReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   m_criteriumId = replyObject.id();
 
   if (replyObject.error())
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
     return;
   }
   else
   {
-    DEBUG_LOG() << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
+    DEBUG_LOG(m_logger) << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
   }
 
   QTimer::singleShot(0, this, &EvlTests::tryGetCriterium);
@@ -585,18 +585,18 @@ void EvlTests::onEvlCriteriumModifyReply(const Core::FunctionReplyObject &replyO
 //-----------------------------------------------------------------------------
 void EvlTests::onEvlCriteriumRemoveReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got removeReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   if (replyObject.error())
   {
-    ERROR_LOG() << "Error requesting remove data for criteriumId:" << replyObject.id();
+    ERROR_LOG(m_logger) << "Error requesting remove data for criteriumId:" << replyObject.id();
     failExit();
     return;
   }
   else
   {
-    DEBUG_LOG() << "Requesting remove data for criteriumd:" << replyObject.id() << " ... ok.";
+    DEBUG_LOG(m_logger) << "Requesting remove data for criteriumd:" << replyObject.id() << " ... ok.";
   }
 
   QTimer::singleShot(0, qApp, QCoreApplication::quit);
@@ -606,20 +606,20 @@ void EvlTests::onEvlCriteriumRemoveReply(const Core::FunctionReplyObject &replyO
 //-----------------------------------------------------------------------------
 void EvlTests::onEvlElementModifyReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got modifyReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got modifyReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   m_elementId = replyObject.id();
 
   if (replyObject.error())
   {
-    ERROR_LOG() << "Error requesting modify data";
+    ERROR_LOG(m_logger) << "Error requesting modify data";
     failExit();
     return;
   }
   else
   {
-    DEBUG_LOG() << "Requesting modify data ok. Got id:" << replyObject.id() << " ... ok.";
+    DEBUG_LOG(m_logger) << "Requesting modify data ok. Got id:" << replyObject.id() << " ... ok.";
   }
 
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -630,18 +630,18 @@ void EvlTests::onEvlElementModifyReply(const Core::FunctionReplyObject &replyObj
 //-----------------------------------------------------------------------------
 void EvlTests::onEvlElementRemoveReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got removeReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   if (replyObject.error())
   {
-    ERROR_LOG() << "Error requesting remove data for elementId:" << replyObject.id();
+    ERROR_LOG(m_logger) << "Error requesting remove data for elementId:" << replyObject.id();
     failExit();
     return;
   }
   else
   {
-    DEBUG_LOG() << "Requesting remove data for elementId:" << replyObject.id() << " ... ok.";
+    DEBUG_LOG(m_logger) << "Requesting remove data for elementId:" << replyObject.id() << " ... ok.";
   }
 
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -651,20 +651,20 @@ void EvlTests::onEvlElementRemoveReply(const Core::FunctionReplyObject &replyObj
 //-----------------------------------------------------------------------------
 void EvlTests::onSanNineLinerModifyReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got onSanNineLinerModifyReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got onSanNineLinerModifyReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   m_sanNineLinerId = replyObject.id();
 
   if (replyObject.error())
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
     return;
   }
   else
   {
-    DEBUG_LOG() << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
+    DEBUG_LOG(m_logger) << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
   }
 
   QTimer::singleShot(0, this, &EvlTests::tryGetSanNineLiner);
@@ -673,18 +673,18 @@ void EvlTests::onSanNineLinerModifyReply(const Core::FunctionReplyObject &replyO
 //-----------------------------------------------------------------------------
 void EvlTests::onSanNineLinerRemoveReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got removeReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   if (replyObject.error())
   {
-    ERROR_LOG() << "Error requesting remove data for sanNineLinerId:" << replyObject.id();
+    ERROR_LOG(m_logger) << "Error requesting remove data for sanNineLinerId:" << replyObject.id();
     failExit();
     return;
   }
   else
   {
-    DEBUG_LOG() << "Requesting remove data for sanNineLinerId:" << replyObject.id() << " ... ok.";
+    DEBUG_LOG(m_logger) << "Requesting remove data for sanNineLinerId:" << replyObject.id() << " ... ok.";
   }
 
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -695,21 +695,21 @@ void EvlTests::onSanNineLinerRemoveReply(const Core::FunctionReplyObject &replyO
 //-----------------------------------------------------------------------------
 void EvlTests::onReceiveCriteriumChanged(const EvaluationCriterium &data, DataModification modType)
 {
-  INFO_LOG() << "onReceiveCriteriumChanged()  criteriumId:" << data.id()
+  INFO_LOG(m_logger) << "onReceiveCriteriumChanged()  criteriumId:" << data.id()
                      << " modificationType: = " << (int)modType<< " received";
 
   switch (modType)
   {
   case DataModification::eAdded:
-    INFO_LOG() << "*** Criterium added received. criteriumId:" << data.id();
+    INFO_LOG(m_logger) << "*** Criterium added received. criteriumId:" << data.id();
     break;
 
   case DataModification::eModified:
-    INFO_LOG() << "*** Criterium modified received. criteriumId:" << data.id();
+    INFO_LOG(m_logger) << "*** Criterium modified received. criteriumId:" << data.id();
     break;
 
   case DataModification::eRemoved:
-    INFO_LOG() << "*** Criterium removed received. criteriumId:" << data.id();
+    INFO_LOG(m_logger) << "*** Criterium removed received. criteriumId:" << data.id();
     break;
   }
 
@@ -736,7 +736,7 @@ void EvlTests::getSanNineLinerModifyRequestData(SanNineLinerModifyRequest &data)
 //-----------------------------------------------------------------------------
 bool EvlTests::onCompareCreatedData(EvaluationCriterium &data)
 {
-  DEBUG_LOG() << "start onCompareCreatedData() for id :" << data.id();
+  DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id();
 
   // Vergleicht die zurueckgelesen Datan mit den statischen create Daten
 
@@ -754,7 +754,7 @@ bool EvlTests::onCompareCreatedData(EvaluationCriterium &data)
     return false;
 
 
-  DEBUG_LOG() << "successfully finished onCompareCreatedData() for id :" << data.id();
+  DEBUG_LOG(m_logger) << "successfully finished onCompareCreatedData() for id :" << data.id();
 
   return true;
 } // end of onCompareCreatedData()
@@ -762,7 +762,7 @@ bool EvlTests::onCompareCreatedData(EvaluationCriterium &data)
 //-----------------------------------------------------------------------------
 bool EvlTests::onCompareCreatedData(SanNineLiner &data)
 {
-  DEBUG_LOG() << "start onCompareCreatedData() for id :" << data.id();
+  DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id();
 
   SanNineLinerModifyRequest createData;
 
@@ -774,7 +774,7 @@ bool EvlTests::onCompareCreatedData(SanNineLiner &data)
   if (createData.line2_radioFrequencyCallSignSuffix() != data.line2_RadioFrequencyCallSignSuffix())
     return false;
 
-  DEBUG_LOG() << "successfully finished onCompareCreatedData() for id :" << data.id();
+  DEBUG_LOG(m_logger) << "successfully finished onCompareCreatedData() for id :" << data.id();
 
   return true;
 } // end of onCompareCreatedData()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/ModuleTests/evl_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/ModuleTests/evl_tests.h
index f5d296aa5..2fb8aefb3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/ModuleTests/evl_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/ModuleTests/evl_tests.h
@@ -72,6 +72,7 @@ protected Q_SLOTS:
   void onReceiveCriteriumChanged(const EvaluationCriterium &data, DataModification modType);
 
 protected:
+  NGL::INGLLogger &m_logger;
   // Callbackfunctions for FTC
   void onEvlCriteriumModifyReply(const Core::FunctionReplyObject &replyObject) override final;
   void onEvlCriteriumRemoveReply(const Core::FunctionReplyObject &replyObject) override final;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/dds_handler.cpp
index 3c4e0a1b3..f855ce41d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/dds_handler.cpp
@@ -16,14 +16,14 @@ namespace Evaluations
 DdsHandler::DdsHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
   : m_ddsConnector(ddsConnector)
 {
-  DEBUG_LOG() << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
   if(!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -32,11 +32,11 @@ bool DdsHandler::init(const QStringList &qosFileList)
 
   m_ddsDts = Evaluations::Interface::Dts::create(m_ddsConnector);
   bool bRet = m_ddsDts->enableAll();
-  INFO_LOG() << "Dts initialised";
+  INFO_LOG(m_logger) << "Dts initialised";
 
   m_ddsFts = Evaluations::Interface::Fts::create(m_ddsConnector);
   bRet &= m_ddsFts->enableAll();
-  INFO_LOG() << "Fts initialised: ";
+  INFO_LOG(m_logger) << "Fts initialised: ";
 
   return bRet;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/dds_handler.h
index 75380d922..effcf805b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/dds_handler.h
@@ -28,6 +28,7 @@ public:
   std::shared_ptr<Evaluations::Interface::Fts> fts() const { return m_ddsFts; }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector>   m_ddsConnector;
   std::shared_ptr<Evaluations::Interface::Dts>  m_ddsDts;
   std::shared_ptr<Evaluations::Interface::Fts>  m_ddsFts;
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 e718e80c3..a8a7ba464 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
@@ -37,7 +37,7 @@ bool HandlerComment::init()
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       bRet = false;
       return;
     }
@@ -45,7 +45,7 @@ bool HandlerComment::init()
   };
   if (!m_db->select(cbComment) || !bRet)
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
 
@@ -58,7 +58,7 @@ bool HandlerComment::init()
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       bRet = false;
       return;
     }
@@ -66,7 +66,7 @@ bool HandlerComment::init()
   };
   if (!m_db->select(cbSchema) || !bRet)
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
 
@@ -116,7 +116,7 @@ void HandlerComment::onEvlCommentModifyRequest(const rti::core::SampleIdentity &
     {
       delete ifs;
       ifs = nullptr;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
     }
     else
       m_mapObjectComment.insert(ifs->getId(), ifs);
@@ -150,7 +150,7 @@ void HandlerComment::onEvlSchemaModifyRequest(const rti::core::SampleIdentity &c
     {
       delete ifs;
       ifs = nullptr;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
     }
     else
       m_mapObjectSchema.insert(ifs->getId(), ifs);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_comment.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_comment.h
index f5c94c2a9..0fabc98ff 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_comment.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_comment.h
@@ -30,6 +30,7 @@ public:
   bool init();
 
 private:
+  NGL::INGLLogger &m_logger;
   void onEvlCommentModifyRequest(const rti::core::SampleIdentity &cookie,
                                  const EvlCommentModifyRequest &request) override final;
 
@@ -37,6 +38,7 @@ private:
                                 const EvlSchemaModifyRequest &request) override final;
 
 private:
+  NGL::INGLLogger &m_logger;
   void createDefaultSchema();
   QHash<int, ObjectComment *> m_mapObjectComment;
   QHash<int, ObjectSchema *> m_mapObjectSchema;
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 0ecc88915..2647978b0 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
@@ -40,7 +40,7 @@ bool HandlerCriterium::init()
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       bRet = false;
       return;
     }
@@ -48,10 +48,10 @@ bool HandlerCriterium::init()
   };
   if (!m_db->select(cbCriterim) || !bRet)
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
-  DEBUG_LOG() << "m_criteriumObjMap.size() = " << m_criteriumObjMap.size();
+  DEBUG_LOG(m_logger) << "m_criteriumObjMap.size() = " << m_criteriumObjMap.size();
 
   auto cbElement = [this, &bRet](const Database::EvlElement & data)
   {
@@ -64,7 +64,7 @@ bool HandlerCriterium::init()
     if (ret.error())
     {
       delete oee;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       bRet = false;
       return;
     }
@@ -72,7 +72,7 @@ bool HandlerCriterium::init()
   };
   if (!m_db->select(cbElement) || !bRet)
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
 
@@ -97,7 +97,7 @@ void HandlerCriterium::onEvlCriteriumModifyRequest(const rti::core::SampleIdenti
     {
       delete ifs;
       ifs = nullptr;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
     }
     else
       m_criteriumObjMap.insert(ifs->getId(), ifs);
@@ -115,7 +115,7 @@ void HandlerCriterium::onEvlCriteriumModifyRequest(const rti::core::SampleIdenti
 void HandlerCriterium::onEvlCriteriumRemoveRequest(const rti::core::SampleIdentity &cookie,
                                                    const Core::RemoveElementRequest &request)
 {
-  DEBUG_LOG() << "onEvlCriteriumRemoveRequest: " << request;
+  DEBUG_LOG(m_logger) << "onEvlCriteriumRemoveRequest: " << request;
 
   ObjectCriterium *ifs = m_criteriumObjMap.value(request.id());
   Core::FunctionReplyObject ret;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_criterium.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_criterium.h
index f50dc3dfc..ffbe8e33e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_criterium.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_criterium.h
@@ -31,6 +31,7 @@ public:
   bool init();
 
 private:
+  NGL::INGLLogger &m_logger;
   void onEvlCriteriumModifyRequest(const rti::core::SampleIdentity &cookie,
                                    const EvlCriteriumModifyRequest &request) override final;
   void onEvlCriteriumRemoveRequest(const rti::core::SampleIdentity &cookie,
@@ -41,6 +42,7 @@ private:
                                  const EvlElementRemoveRequest &request) override final;
 
 private:
+  NGL::INGLLogger &m_logger;
   QHash<int, ObjectCriterium *>      m_criteriumObjMap;
   std::shared_ptr<DdsHandler>        m_ddsHandler;
   std::shared_ptr<DatabaseInterface> m_db;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_san_nine_liner.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_san_nine_liner.cpp
index c626b0a55..4ed5b6615 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_san_nine_liner.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_san_nine_liner.cpp
@@ -43,7 +43,7 @@ bool HandlerSanNineLiner::init()
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       bRet = false;
       return;
     }
@@ -51,7 +51,7 @@ bool HandlerSanNineLiner::init()
   };
   if (!m_db->select(cbSanNineLiner) || !bRet)
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
 
@@ -61,7 +61,7 @@ bool HandlerSanNineLiner::init()
     ObjectSanNineLiner *objSan = m_mapObjectSanNineLiner.value(data.nineLinerId);
     if (!objSan)
     {
-      WARNING_LOG() << "Cannot find nineLiner Id = " << data.nineLinerId
+      WARNING_LOG(m_logger) << "Cannot find nineLiner Id = " << data.nineLinerId
                             << " for categoryLineId " << data.id;
       return;
     }
@@ -70,7 +70,7 @@ bool HandlerSanNineLiner::init()
 
   if (!m_db->select(cb))
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
 
@@ -96,7 +96,7 @@ void HandlerSanNineLiner::onSanNineLinerModifyRequest(const rti::core::SampleIde
 
   data.radioFrequencySuffixCallsign = QString::fromStdString(request.line2_radioFrequencyCallSignSuffix());
 
-  INFO_LOG() << "lines: " << request.lines();
+  INFO_LOG(m_logger) << "lines: " << request.lines();
 
   Core::FunctionReplyObject ret;  
   ObjectSanNineLiner *ifs = nullptr;
@@ -109,7 +109,7 @@ void HandlerSanNineLiner::onSanNineLinerModifyRequest(const rti::core::SampleIde
     {
       delete ifs;
       ifs = nullptr;
-      ERROR_LOG() << ret();      
+      ERROR_LOG(m_logger) << ret();      
     }
     else
     {
@@ -132,22 +132,22 @@ void HandlerSanNineLiner::onSanNineLinerModifyRequest(const rti::core::SampleIde
 
   // delete old entries
   if (!m_db->removeCategoryLinesPerNineLiner(data.id))
-    ERROR_LOG() << "Error while deleting old entries for nineLinerId " << data.id;
+    ERROR_LOG(m_logger) << "Error while deleting old entries for nineLinerId " << data.id;
 
   ifs->removeCategoryLines();
 
   // line3 - line9 in object_san_category_line  
-  INFO_LOG() << "data.id: " << data.id;
+  INFO_LOG(m_logger) << "data.id: " << data.id;
 
   QVector<Database::SanCategoryLine> linesCategory = SanCategoryLine::fromJson(request.lines(), data.id);
-  INFO_LOG() << "LinesCategory count: " << linesCategory.count();
+  INFO_LOG(m_logger) << "LinesCategory count: " << linesCategory.count();
 
   for (Database::SanCategoryLine cl : std::as_const(linesCategory))
   {
     ObjectSanCategoryLine *ifsCl(new ObjectSanCategoryLine(m_ddsHandler, m_db));
     ret = ifsCl->createObject(cl);
     if (ret.error())
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
     else
     {
       cl.id = ifsCl->getId();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_san_nine_liner.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_san_nine_liner.h
index 95c6f0e02..3bb1847f9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_san_nine_liner.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_san_nine_liner.h
@@ -30,6 +30,7 @@ public:
   bool init();
 
 private:
+  NGL::INGLLogger &m_logger;
   void onSanNineLinerModifyRequest(const rti::core::SampleIdentity &cookie,
                                  const SanNineLinerModifyRequest &request) override final;
 
@@ -37,6 +38,7 @@ private:
                                 const Core::RemoveElementRequest &request) override final;
 
 private:  
+  NGL::INGLLogger &m_logger;
   QHash<int, ObjectSanNineLiner *> m_mapObjectSanNineLiner;
 
   std::shared_ptr<DdsHandler> m_ddsHandler;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/initialization.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/initialization.cpp
index a6a8d58c4..c2251cc90 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/initialization.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/initialization.cpp
@@ -36,26 +36,26 @@ Initialization::~Initialization()
 bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector,
                                 const QSqlDatabase &sqlDb)
 {
-  INFO_LOG() << "Start Evaluations Initialization.";
+  INFO_LOG(m_logger) << "Start Evaluations Initialization.";
 
   // initialize DDS
   m_ddsHandler = std::make_shared<DdsHandler>(ddsConnector);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation ddsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation ddsHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation ddsHandler succesful.";
 
 
   // initialize database
   m_dbHandler = std::make_shared<DbHandler>();
   if (!m_dbHandler->init(ddsConnector->getPartitionId(), sqlDb))
   {
-    ERROR_LOG() << "Initialisation dbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation dbHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation dbHandler succesful.";
 
 
   // HandlerCriterium
@@ -76,18 +76,18 @@ bool Initialization::loadFromDatabase()
     return false;
   if (!m_handlerCriterium->init())
   {
-    ERROR_LOG() << "Initialisation HandlerCriterium failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerCriterium failed.";
     return false;
   }
   if (!m_handlerComment->init())
   {
-    ERROR_LOG() << "Initialisation HandlerComment failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerComment failed.";
     return false;
   }
 
   if (!m_handlerSanNineLiner->init())
   {
-    ERROR_LOG() << "Initialisation HandlerSanNineLiner failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerSanNineLiner failed.";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/initialization.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/initialization.h
index edae9772d..680083413 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/initialization.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/initialization.h
@@ -31,6 +31,7 @@ public:
   bool loadFromDatabase();
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>            m_ddsHandler;
   std::shared_ptr<DbHandler>             m_dbHandler;
   std::unique_ptr<HandlerCriterium>      m_handlerCriterium;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_comment.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_comment.cpp
index 5ce527417..a96bc4340 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_comment.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_comment.cpp
@@ -64,10 +64,10 @@ void ObjectComment::onPublishData()
   ddsData.schemaId(m_data.schemaId);
   ddsData.elementId(m_data.elementId);
 
-  INFO_LOG() << "Publish EvlComment-data to dds (" << m_data.id << ") ...";
+  INFO_LOG(m_logger) << "Publish EvlComment-data to dds (" << m_data.id << ") ...";
 
   if (!m_ddsHandler->dts()->publish(ddsData))
-    ERROR_LOG() << "Error publishing EvlComment-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing EvlComment-data to dds";
 }
 
 
@@ -133,9 +133,9 @@ void ObjectSchema::onPublishData()
   ddsData.schemadata(m_data.schemadata.toStdString());
   ddsData.sendToTa(m_data.sendToTa);
 
-  INFO_LOG() << "Publish EvlSchema-data to dds (id = " << m_data.id << ", send to training area = " << m_data.sendToTa << ") ...";
+  INFO_LOG(m_logger) << "Publish EvlSchema-data to dds (id = " << m_data.id << ", send to training area = " << m_data.sendToTa << ") ...";
 
   if (!m_ddsHandler->dts()->publish(ddsData))
-    ERROR_LOG() << "Error publishing EvlSchema-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing EvlSchema-data to dds";
 }
 } // Namespace Evaluations
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_comment.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_comment.h
index 2f2cdb7ad..a7acaede7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_comment.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_comment.h
@@ -31,6 +31,7 @@ public:
   int getId() const { return m_data.id; }
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onPublishData();
 
 private:
@@ -53,6 +54,7 @@ public:
   int getId() const { return m_data.id; }
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onPublishData();
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_criterium.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_criterium.cpp
index 90c0cc154..1f441b94c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_criterium.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_criterium.cpp
@@ -73,10 +73,10 @@ void ObjectCriterium::onPublishData()
   ddsData.description(m_data.description.toStdString());
   ddsData.operatorId(m_data.operatorId);
 
-  INFO_LOG() << "Publish EvlCriterium-data to dds (" << m_data.id << ") ...";
+  INFO_LOG(m_logger) << "Publish EvlCriterium-data to dds (" << m_data.id << ") ...";
 
   if (!m_ddsHandler->dts()->publish(ddsData))
-    ERROR_LOG() << "Error publishing EvlCriterium-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing EvlCriterium-data to dds";
 }
 
 void ObjectCriterium::addElement(ObjectEvaluationElement *oee)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_criterium.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_criterium.h
index e05cdedf1..d68361266 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_criterium.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_criterium.h
@@ -39,6 +39,7 @@ protected Q_SLOTS:
   void onPublishData();
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>             m_ddsHandler;
   std::shared_ptr<DatabaseInterface>      m_db;
   Database::EvlCriterium                  m_data;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_evaluation_element.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_evaluation_element.cpp
index 8e44a9a48..2ce697400 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_evaluation_element.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_evaluation_element.cpp
@@ -75,10 +75,10 @@ void ObjectEvaluationElement::onPublishData()
   if (!m_data.situationContent.isNull())
     ddsData.situationContent(m_data.situationContent.toString().toStdString());
 
-  INFO_LOG() << "Publish EvlElement-data to dds (" << m_data.id << ") ...";
+  INFO_LOG(m_logger) << "Publish EvlElement-data to dds (" << m_data.id << ") ...";
 
   if (!m_ddsHandler->dts()->publish(ddsData))
-    ERROR_LOG() << "Error publishing EvlEvaluationElement-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing EvlEvaluationElement-data to dds";
 }
 
 } // Namespace Evaluations
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_evaluation_element.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_evaluation_element.h
index 6474439a7..af1fb6463 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_evaluation_element.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_evaluation_element.h
@@ -35,6 +35,7 @@ protected Q_SLOTS:
   void onPublishData();
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>         m_ddsHandler;
   std::shared_ptr<DatabaseInterface>  m_db;
   Database::EvlElement                m_data;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_category_line.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_category_line.cpp
index 42e4dff42..fc9b1f868 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_category_line.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_category_line.cpp
@@ -19,7 +19,7 @@ ObjectSanCategoryLine::ObjectSanCategoryLine(const std::shared_ptr<DdsHandler> &
 
 Core::FunctionReplyObject ObjectSanCategoryLine::createObject(const Database::SanCategoryLine &data)
 {
-  INFO_LOG() << "SanCategoryLine: nineLiner: " << data.nineLinerId << " line: " << data.line << ", amount: " << data.amount << ", category: " << data.category;
+  INFO_LOG(m_logger) << "SanCategoryLine: nineLiner: " << data.nineLinerId << " line: " << data.line << ", amount: " << data.amount << ", category: " << data.category;
   m_data = data;
   if (m_data.id <= 0)
   {
@@ -27,7 +27,7 @@ Core::FunctionReplyObject ObjectSanCategoryLine::createObject(const Database::Sa
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting SanCategoryLine-data into database"));
   }  
 
-  INFO_LOG() << "New data id: " << m_data.id;
+  INFO_LOG(m_logger) << "New data id: " << m_data.id;
 
   return Core::FunctionReplyObject(m_data.id);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_category_line.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_category_line.h
index 67cc78185..aac8d2ee8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_category_line.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_category_line.h
@@ -31,6 +31,7 @@ public:
   int getId() const { return m_data.id; }
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onPublishData();
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_nine_liner.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_nine_liner.cpp
index ea46ef541..03861f455 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_nine_liner.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_nine_liner.cpp
@@ -76,10 +76,10 @@ void ObjectSanNineLiner::onPublishData()
   QJsonDocument doc = SanCategoryLine::toJson(m_lines);
   ddsData.lines(QString::fromUtf8(doc.toJson(QJsonDocument::Compact)).toStdString());
 
-  INFO_LOG() << "Publish SanNineLiner-data to dds (" << m_data.id << ") other lines: " << ddsData.lines();
+  INFO_LOG(m_logger) << "Publish SanNineLiner-data to dds (" << m_data.id << ") other lines: " << ddsData.lines();
 
   if (!m_ddsHandler->dts()->publish(ddsData))
-    ERROR_LOG() << "Error publishing SanNineLiner-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing SanNineLiner-data to dds";
 }
 
 } // Namespace Evaluations
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_nine_liner.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_nine_liner.h
index 857a824a6..f86aba031 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_nine_liner.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_nine_liner.h
@@ -35,6 +35,7 @@ public:
   void onPublishData();
 protected:
 
+  NGL::INGLLogger &m_logger;
 private:
   std::shared_ptr<DdsHandler>            m_ddsHandler;
   std::shared_ptr<DatabaseInterface>     m_db;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/san_category_line_json.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/san_category_line_json.cpp
index 78cbaaec7..b4610a0ea 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/san_category_line_json.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/san_category_line_json.cpp
@@ -26,13 +26,13 @@ QVector<Database::SanCategoryLine> SanCategoryLine::fromJson(const std::string &
   QJsonDocument doc(QJsonDocument::fromJson(QByteArray::fromStdString(line), &jError));
   if (jError.error)
   {
-    //ERROR_LOG() << "Can not parse json document: " << jError.errorString();
+    //ERROR_LOG(m_logger) << "Can not parse json document: " << jError.errorString();
     return QVector<Database::SanCategoryLine>();
   }
 
   const QJsonObject rootObj = doc.object();
   const QJsonArray arrCategoryLines(rootObj[QStringLiteral("categoryLines")].toArray());
-  //INFO_LOG() << "Lines: " << arrCategoryLines.count();
+  //INFO_LOG(m_logger) << "Lines: " << arrCategoryLines.count();
 
   QVector<Database::SanCategoryLine> categoryLines;  
   categoryLines.reserve(arrCategoryLines.size());
@@ -63,7 +63,7 @@ QJsonDocument SanCategoryLine::toJson(std::vector<Database::SanCategoryLine> vec
     obj[QStringLiteral("amount")] = cl.amount;
     obj[QStringLiteral("category")] = cl.category;
 
-    //INFO_LOG() << "toJsonDocument: id: " << cl.id << ", line: " << cl.line << ", amount: " << cl.amount << ", category: " << cl.category;
+    //INFO_LOG(m_logger) << "toJsonDocument: id: " << cl.id << ", line: " << cl.line << ", amount: " << cl.amount << ", category: " << cl.category;
     arr.append(obj);
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/san_category_line_json.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/san_category_line_json.h
index 16ba156af..1c94a9ff9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/san_category_line_json.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/san_category_line_json.h
@@ -19,6 +19,8 @@ namespace Evaluations
     static QJsonDocument toJson(std::vector<Database::SanCategoryLine> vecCategoryLines);
 
   private:
+
+  NGL::INGLLogger &m_logger;
   };
 
 }
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 40bb3e34f..7a78392e6 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
@@ -29,15 +29,14 @@
 //-----------------------------------------------------------------------------------------------------------------------
 namespace ExerciseEventManagement
 {
-EemTests::EemTests(QObject *parent)
-  : QObject(parent)
-{}
+EemTests::EemTests(QObject *parent) : QObject(parent),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 //-----------------------------------------------------------------------------------------------------------------------
 bool EemTests::init(int domainId, int exerciseId, int testId)
 {
   bool bRet = true;
-  DEBUG_LOG() << "init begin";
+  DEBUG_LOG(m_logger) << "init begin";
 
   m_testId = testId;
 
@@ -63,7 +62,7 @@ bool EemTests::init(int domainId, int exerciseId, int testId)
   m_bldDts = Buildings::Interface::Dts::create(m_ddsConnector42);
   bRet &= m_bldDts->enableBuildingState();
 
-  DEBUG_LOG() << "bRet: " << bRet;
+  DEBUG_LOG(m_logger) << "bRet: " << bRet;
 
   return bRet;
 }
@@ -71,7 +70,7 @@ bool EemTests::init(int domainId, int exerciseId, int testId)
 //-----------------------------------------------------------------------------------------------------------------------
 void EemTests::startTest()
 {
-  INFO_LOG() << "startTest m_testId = " << m_testId;
+  INFO_LOG(m_logger) << "startTest m_testId = " << m_testId;
 
   if (m_testId == 1) // publish dynamicParticipantData
   {
@@ -134,7 +133,7 @@ void EemTests::startTest()
 
   if (m_testId <= 0 || m_testId > 6)
   {
-    ERROR_LOG() << "Unknown test case: " << m_testId;
+    ERROR_LOG(m_logger) << "Unknown test case: " << m_testId;
     failExit();
   }
 
@@ -166,10 +165,10 @@ void EemTests::tryCreateDynamicParticipantData(int participantId, ProjectDataMan
   dp.stateHistory().push_back(si);
   dp.sampleTime(esTime);
 
-  DEBUG_LOG() << "Publishing DynamicParticipantData for participant " << participantId ;
+  DEBUG_LOG(m_logger) << "Publishing DynamicParticipantData for participant " << participantId ;
   if (!m_ppmDts->publish(dp))
   {
-    ERROR_LOG() << "Error requesting create DynamicParticipantData";
+    ERROR_LOG(m_logger) << "Error requesting create DynamicParticipantData";
     failExit();
   }
 }
@@ -191,10 +190,10 @@ void EemTests::trySendFireEvent()
 
   gearAssigment.gears(gears);
 
-  DEBUG_LOG() << "Publish EquipmentGearAssigment";
+  DEBUG_LOG(m_logger) << "Publish EquipmentGearAssigment";
   if (!m_tabDts->publish(gearAssigment))
   {
-    ERROR_LOG() << "Error while publishing EquipmentGearAssigment";
+    ERROR_LOG(m_logger) << "Error while publishing EquipmentGearAssigment";
     failExit();
   }
 
@@ -212,10 +211,10 @@ void EemTests::trySendFireEvent()
 
   gearChargeState.charge(vGearCharge);
 
-  DEBUG_LOG() << "Publish EquipmentGearChargeState";
+  DEBUG_LOG(m_logger) << "Publish EquipmentGearChargeState";
   if (!m_tabDts->publish(gearChargeState))
   {
-    ERROR_LOG() << "Error while publishing EquipmentGearChargeState";
+    ERROR_LOG(m_logger) << "Error while publishing EquipmentGearChargeState";
     failExit();
   }
 
@@ -231,10 +230,10 @@ void EemTests::trySendFireEvent()
   gearEvent.chargeAmount(200);
   gearEvent.charge(gc);
 
-  DEBUG_LOG() << "Publish EquipmentGearEvent";
+  DEBUG_LOG(m_logger) << "Publish EquipmentGearEvent";
   if (!m_tabDts->publish(gearEvent))
   {
-    ERROR_LOG() << "Error while publishing EquipmentGearEvent";
+    ERROR_LOG(m_logger) << "Error while publishing EquipmentGearEvent";
     failExit();
   }
 
@@ -246,10 +245,10 @@ void EemTests::trySendFireEvent()
   gearEvent.chargeAmount(100);
   gearEvent.charge(gc);
 
-  DEBUG_LOG() << "Publish EquipmentGearEvent";
+  DEBUG_LOG(m_logger) << "Publish EquipmentGearEvent";
   if (!m_tabDts->publish(gearEvent))
   {
-    ERROR_LOG() << "Error while publishing EquipmentGearEvent";
+    ERROR_LOG(m_logger) << "Error while publishing EquipmentGearEvent";
     failExit();
   }
 
@@ -257,12 +256,12 @@ void EemTests::trySendFireEvent()
 
   const QMap<qint64, ExerciseEventManagement::Event> events = m_dtc->events();
 
-  DEBUG_LOG() << "events: " << events.size();
+  DEBUG_LOG(m_logger) << "events: " << events.size();
 
   int noEvents = 0;
   for(const ExerciseEventManagement::Event &e : events)
   {
-    INFO_LOG() << "eventId: " << e.id() << ", eventType: " << e.eventTypeId().underlying();
+    INFO_LOG(m_logger) << "eventId: " << e.id() << ", eventType: " << e.eventTypeId().underlying();
     if (e.eventTypeId() == ProjectDataManagement::EventType_def::WeaponAssignment ||
         e.eventTypeId() == ProjectDataManagement::EventType_def::FireEvent)
       noEvents ++;
@@ -270,7 +269,7 @@ void EemTests::trySendFireEvent()
 
   if (noEvents != 5)
   {
-    ERROR_LOG() << "Error number of events (" << QString::number(noEvents) << ") not as expected (5)";
+    ERROR_LOG(m_logger) << "Error number of events (" << QString::number(noEvents) << ") not as expected (5)";
     failExit();
   }
 
@@ -306,7 +305,7 @@ void EemTests::trySendBiteMessage()
 
   if (!m_tabDts->publish(bite))
   {
-    ERROR_LOG() << "Error while publishing EquipmentBite";
+    ERROR_LOG(m_logger) << "Error while publishing EquipmentBite";
     failExit();
   }
 
@@ -331,7 +330,7 @@ void EemTests::trySendBuildingState()
 
   if (!m_bldDts->publish(bState))
   {
-    ERROR_LOG() << "Error while publishing building state";
+    ERROR_LOG(m_logger) << "Error while publishing building state";
     failExit();
   }
 
@@ -358,10 +357,10 @@ void EemTests::tryCreateIed(qint64 time)
   const rti::core::int64 esTime = static_cast<rti::core::int64>(time);
   ied.sampleTime(esTime);
 
-  DEBUG_LOG() << "Publishing Ied " ;
+  DEBUG_LOG(m_logger) << "Publishing Ied " ;
   if (!m_gimDts->publish(ied))
   {
-    ERROR_LOG() << "Error requesting publish Ied";
+    ERROR_LOG(m_logger) << "Error requesting publish Ied";
     failExit();
   }
 }
@@ -371,12 +370,12 @@ void EemTests::checkEvents(const ProjectDataManagement::EventType &et, int expec
 {
   const QMap<qint64, ExerciseEventManagement::Event> events = m_dtc->events();
 
-  DEBUG_LOG() << "All published events: " << events.size();
+  DEBUG_LOG(m_logger) << "All published events: " << events.size();
   int noEvents = 0;
 
   for (const ExerciseEventManagement::Event &e : events)
   {
-    INFO_LOG() << "eventId: " << e.id() << ", eventType: " << e.eventTypeId().underlying();
+    INFO_LOG(m_logger) << "eventId: " << e.id() << ", eventType: " << e.eventTypeId().underlying();
     if (e.eventTypeId() == et)
     {
       QJsonObject prop = LtsUtils::JsonObject::fromJson(e.properties());
@@ -389,11 +388,11 @@ void EemTests::checkEvents(const ProjectDataManagement::EventType &et, int expec
     }
   }
 
-  DEBUG_LOG() << "No events: " << noEvents;
+  DEBUG_LOG(m_logger) << "No events: " << noEvents;
 
   if (noEvents != expected)
   {
-    ERROR_LOG() << "Error number of events (" << QString::number(noEvents) << ") not as expected (" << QString::number(expected) << ")";
+    ERROR_LOG(m_logger) << "Error number of events (" << QString::number(noEvents) << ") not as expected (" << QString::number(expected) << ")";
     failExit();
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/ModuleTests/eem_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/ModuleTests/eem_tests.h
index 5894c0e61..9ec62169d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/ModuleTests/eem_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/ModuleTests/eem_tests.h
@@ -47,6 +47,7 @@ protected Q_SLOTS:
   void failExit();
   void ExitSuccess();
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector>              m_ddsConnector42;
   std::shared_ptr<ParticipantManagement::Interface::Dts>   m_ppmDts;
   std::shared_ptr<TrainingAreaBase::Interface::Dts>        m_tabDts;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/WebSocketServer/web_socket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/WebSocketServer/web_socket_handler.cpp
index bc46c3c80..d07256c82 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/WebSocketServer/web_socket_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/WebSocketServer/web_socket_handler.cpp
@@ -18,11 +18,10 @@
 namespace ExerciseEventManagement
 {
 
-WebSocketHandler::WebSocketHandler(QObject *parent)
-  : QObject(parent)
+WebSocketHandler::WebSocketHandler(QObject *parent) : QObject(parent)
   , m_webSocketServer(new QWebSocketServer(QStringLiteral("AVS-Server"), QWebSocketServer::NonSecureMode, this))
-  , m_timer(new QTimer())
-{
+  , m_timer(new QTimer()),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   connect(m_timer, &QTimer::timeout,
           this, &WebSocketHandler::onSendMessage);
 
@@ -44,7 +43,7 @@ bool WebSocketHandler::init(quint16 listenPort)
 {
   if (!m_webSocketServer->listen(QHostAddress::Any, listenPort))
   {
-    WARNING_LOG() << "Can not listen on port " << listenPort << " - aborting";
+    WARNING_LOG(m_logger) << "Can not listen on port " << listenPort << " - aborting";
     return false;
   }
   // inform calling process via stdout about the port/url
@@ -61,7 +60,7 @@ bool WebSocketHandler::sendTelegram(const QString &jsonStr)
   if (!isConnected())
     return false;
 
-  ERROR_LOG() << "jsonStr" << jsonStr;
+  ERROR_LOG(m_logger) << "jsonStr" << jsonStr;
 
   bool bOk = false;
   for (QWebSocket *ws : std::as_const(m_webSockets))
@@ -79,7 +78,7 @@ void WebSocketHandler::onNewConnection()
   QWebSocket *ws = m_webSocketServer->nextPendingConnection();
   if (!ws)
     return;
-  INFO_LOG() << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
+  INFO_LOG(m_logger) << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
 
   connect(ws, &QWebSocket::disconnected,
           this, &WebSocketHandler::onWebSocketDisconnected);
@@ -91,7 +90,7 @@ void WebSocketHandler::onNewConnection()
 
 void WebSocketHandler::onSendMessage()
 {
-  ERROR_LOG() << "Send message: ";
+  ERROR_LOG(m_logger) << "Send message: ";
 
   QJsonObject obj;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/WebSocketServer/web_socket_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/WebSocketServer/web_socket_handler.h
index 9d1ad6a6f..b5dfd99da 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/WebSocketServer/web_socket_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/WebSocketServer/web_socket_handler.h
@@ -40,6 +40,7 @@ private Q_SLOTS:
   void onWebSocketDisconnected();
   void onSendMessage();
 private:
+  NGL::INGLLogger &m_logger;
   QWebSocketServer *m_webSocketServer;
   QSet<QWebSocket *> m_webSockets;
   QTimer           *m_timer;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/dds_handler.cpp
index de47f1ad1..398ec1e75 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/dds_handler.cpp
@@ -16,7 +16,7 @@ namespace ExerciseEventManagement
 DdsHandler::DdsHandler(int domainId, int partitionId, IDL::PartitionType partitionType)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, partitionType, partitionId))
 {
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 DdsHandler::~DdsHandler()
@@ -25,11 +25,11 @@ DdsHandler::~DdsHandler()
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
-  TRACE_LOG() << " START, this=" << this;
+  TRACE_LOG(m_logger) << " START, this=" << this;
 
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -45,12 +45,12 @@ bool DdsHandler::init(const QStringList &qosFileList)
   m_ddsDts = ExerciseEventManagement::Interface::Dts::create(m_ddsConnector);
 
   bool bRet = m_ddsDts->enableAll();
-  INFO_LOG() << "Dts initialised";
+  INFO_LOG(m_logger) << "Dts initialised";
 
   // Subsribe for InfrastructureManagement::MainStructureElement
   m_dtcIsm = InfrastructureManagement::Interface::Dtc::create(m_ddsConnector);
 
-  TRACE_LOG() << " END, this=" << this;
+  TRACE_LOG(m_logger) << " END, this=" << this;
   return bRet;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/dds_handler.h
index 672c7273a..a928a7777 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/dds_handler.h
@@ -37,6 +37,7 @@ public:
   std::shared_ptr<InfrastructureManagement::Interface::Dtc> dtcIsm() const { return m_dtcIsm;} ///< Pointer to DTC InfrastructureManagement interface object
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<ExerciseEventManagement::Interface::Dts> m_ddsDts;
   std::shared_ptr<InfrastructureManagement::Interface::Dtc> m_dtcIsm; ///< Pointer to DTC InfrastructureManagement interface object
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 d98c5ab33..9cd5cd35b 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
@@ -30,12 +30,11 @@ using namespace ExerciseEventManagement;
 HandlerDynamicParticipantData::HandlerDynamicParticipantData(MainHandler *mainHandler,
                                                              const std::shared_ptr<DdsHandler> &ddsHandler,
                                                              const std::shared_ptr<DbHandler> &db,
-                                                             const std::shared_ptr<WebSocketEventServer> &eventServer)
-  : m_ddsHandler(ddsHandler)
+                                                             const std::shared_ptr<WebSocketEventServer> &eventServer) : m_ddsHandler(ddsHandler)
   , m_dbHandler(db)
   , m_eventServer(eventServer)
-  , m_mainHandler(mainHandler)
-{
+  , m_mainHandler(mainHandler),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 } // end of ctor()
 
 //-----------------------------------------------------------------------------
@@ -46,13 +45,13 @@ HandlerDynamicParticipantData::~HandlerDynamicParticipantData()
 //-----------------------------------------------------------------------------
 bool HandlerDynamicParticipantData::init()
 {
-  INFO_LOG() << "start init() DTC ParticipantManagement ";
+  INFO_LOG(m_logger) << "start init() DTC ParticipantManagement ";
 
   // DTC ParticipantManagement
   m_ppmDtc = ParticipantManagement::Interface::Dtc::create(m_ddsHandler->ddsConnector());
   if (m_ppmDtc == nullptr)
   {
-    ERROR_LOG() << "Could not create DTC ParticipantManagement";
+    ERROR_LOG(m_logger) << "Could not create DTC ParticipantManagement";
     return false;
   }
 
@@ -79,7 +78,7 @@ bool HandlerDynamicParticipantData::init()
       !m_ppmDtc->enableBite() ||
       !m_ppmDtc->enableParticipantPosition())
   {
-    ERROR_LOG() << "init() DTC ParticipantManagement failed";
+    ERROR_LOG(m_logger) << "init() DTC ParticipantManagement failed";
     return false;
   }
 
@@ -87,7 +86,7 @@ bool HandlerDynamicParticipantData::init()
 
   if (m_bldDtc == nullptr)
   {
-    ERROR_LOG() << "Could not create DTC Buildings";
+    ERROR_LOG(m_logger) << "Could not create DTC Buildings";
     return false;
   }
 
@@ -96,7 +95,7 @@ bool HandlerDynamicParticipantData::init()
 
   if (!m_bldDtc->enableBuildingState())
   {
-    ERROR_LOG() << "Enable buildingState failed";
+    ERROR_LOG(m_logger) << "Enable buildingState failed";
     return false;
   }
 
@@ -143,7 +142,7 @@ void HandlerDynamicParticipantData::onAesItemViewChanged(const AreaEffectSimulat
 void HandlerDynamicParticipantData::tryCreateHitEvent(Database::EemEvent eData,
                                                       const ParticipantManagement::StateInformation &stateInfo)
 {
-  DEBUG_LOG() << "tryCreateHitEvent";
+  DEBUG_LOG(m_logger) << "tryCreateHitEvent";
   // special values - ignore
   const ProjectDataManagement::VulnerabilityState vulnState = stateInfo.vulnerabilityState();
   if (vulnState == ProjectDataManagement::VulnerabilityState_def::VulnerabilityBitsChanged ||
@@ -198,7 +197,7 @@ void HandlerDynamicParticipantData::tryCreateHitEvent(Database::EemEvent eData,
   }
   if (eData.eventTypeId == ProjectDataManagement::EventType::HitEffectSimulation)
   {
-    DEBUG_LOG() << "Event HitEffectSimulation from originatorId = " << stateInfo.originatorId();
+    DEBUG_LOG(m_logger) << "Event HitEffectSimulation from originatorId = " << stateInfo.originatorId();
     obj[QStringLiteral("AesId")] = stateInfo.originatorId();
     obj[QStringLiteral("AesType")] = m_itemViews.value(stateInfo.originatorId()).underlying();
     AreaEffectSimulation::AesItem aesItem;
@@ -211,7 +210,7 @@ void HandlerDynamicParticipantData::tryCreateHitEvent(Database::EemEvent eData,
     if (stateInfo.sanitationProceduresTaken() == 0 && stateInfo.originatorChargeTypeId() == 0) //qualification
       return;
 
-    DEBUG_LOG() << "Event sanitation ";
+    DEBUG_LOG(m_logger) << "Event sanitation ";
 
     obj[QStringLiteral("Vitality")] = stateInfo.vitality();
     obj[QStringLiteral("SanitationResult")] = stateInfo.sanitationResult().underlying();
@@ -224,7 +223,7 @@ void HandlerDynamicParticipantData::tryCreateHitEvent(Database::EemEvent eData,
     eData.sampleTime = stateInfo.stateTime();
 
   if (!m_dbHandler->db()->insert(eData))
-    ERROR_LOG() << "Error while inserting event data for participant: " << eData.participantId;
+    ERROR_LOG(m_logger) << "Error while inserting event data for participant: " << eData.participantId;
   else
     publishData(eData);
 }
@@ -236,7 +235,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG() << "onDynamicParticipantDataChanged()"
+  DEBUG_LOG(m_logger) << "onDynamicParticipantDataChanged()"
                       << ", participantId: " << data.participantId()
                       << ", size stateHistory: " << data.stateHistory().size();
 
@@ -257,7 +256,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
     itParticipant = m_partMap.find(data.participantId());
     if (itParticipant == m_partMap.end())
     {
-      ERROR_LOG() << "Participant does not exist: participantId: " << data.participantId();
+      ERROR_LOG(m_logger) << "Participant does not exist: participantId: " << data.participantId();
       return;
     }
   }
@@ -300,7 +299,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
   {
     if (gearIsKnown(gi))
       continue;
-    DEBUG_LOG() << "Found new gear " << gi << " for participant " << data.participantId();
+    DEBUG_LOG(m_logger) << "Found new gear " << gi << " for participant " << data.participantId();
     QJsonObject obj;
     obj[QStringLiteral("GearId")]     = QJsonValue(gi.gearId());
     obj[QStringLiteral("GearTypeId")] = QJsonValue(gi.gearTypeId());
@@ -310,7 +309,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
     eData.eventTypeId = ProjectDataManagement::EventType_def::WeaponAssignment;
     eData.id = 0;
     if (!m_dbHandler->db()->insert(eData))
-      ERROR_LOG() << "Error while inserting event data for participant: " << data.participantId();
+      ERROR_LOG(m_logger) << "Error while inserting event data for participant: " << data.participantId();
     else
       publishData(eData);
   }
@@ -335,7 +334,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
       eData.sampleTime = mani.manipulationTime();
       eData.id = 0;
       if (!m_dbHandler->db()->insert(eData))
-        ERROR_LOG() << "Error while inserting event data for participant: " << data.participantId();
+        ERROR_LOG(m_logger) << "Error while inserting event data for participant: " << data.participantId();
       else
         publishData(eData);
     }
@@ -360,7 +359,7 @@ void HandlerDynamicParticipantData::onParticipantGearEventChanged(const Particip
     itParticipant = m_partMap.find(data.participantId());
     if (itParticipant == m_partMap.end())
     {
-      ERROR_LOG() << "Participant does not exist: participantId: " << data.participantId();
+      ERROR_LOG(m_logger) << "Participant does not exist: participantId: " << data.participantId();
       return;
     }
   }
@@ -389,9 +388,9 @@ void HandlerDynamicParticipantData::onParticipantGearEventChanged(const Particip
   eData.properties = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact));
   eData.id = 0;
 
-  DEBUG_LOG() << "create fire event for participant " << data.participantId();
+  DEBUG_LOG(m_logger) << "create fire event for participant " << data.participantId();
   if (!m_dbHandler->db()->insert(eData))
-    ERROR_LOG() << "Error while inserting event data for participant: " << data.participantId();
+    ERROR_LOG(m_logger) << "Error while inserting event data for participant: " << data.participantId();
   else
     publishData(eData);
 }
@@ -403,9 +402,9 @@ void HandlerDynamicParticipantData::onParticipantChanged(const ParticipantManage
   {
   case DataModification::eAdded:
   case DataModification::eModified:
-    DEBUG_LOG() << "added/modified";
+    DEBUG_LOG(m_logger) << "added/modified";
     m_partMap.insert(data.id(), data);
-    DEBUG_LOG() << "data.participantId: " << data.id()
+    DEBUG_LOG(m_logger) << "data.participantId: " << data.id()
                         << ", data.partyId: " << data.partyId()
                         << ". data.equipmentNumber: " << data.equipmentNumber();
     break;
@@ -423,7 +422,7 @@ void HandlerDynamicParticipantData::onParticipantPositionChanged(const Participa
   case DataModification::eAdded:
   case DataModification::eModified:
     m_partPosMap.insert(data.participantId(), data);
-    DEBUG_LOG() << "data.participantId: " << data.participantId()
+    DEBUG_LOG(m_logger) << "data.participantId: " << data.participantId()
                         << ", position lat: " << data.pos().lat()
                         << ", position lon: " << data.pos().lon();
     break;
@@ -481,7 +480,7 @@ void HandlerDynamicParticipantData::onBiteChanged(const ParticipantManagement::B
   }
 
   if (!m_dbHandler->db()->insert(eData))
-    ERROR_LOG() << "Error while inserting event data for participantId: " << data.participantId();
+    ERROR_LOG(m_logger) << "Error while inserting event data for participantId: " << data.participantId();
   else
     publishData(eData);
 }
@@ -544,7 +543,7 @@ void HandlerDynamicParticipantData::onBuildingStateChanged(const Buildings::Buil
   eData.properties = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact));
 
   if (!m_dbHandler->db()->insert(eData))
-    ERROR_LOG() << "Error while inserting event data for building ";
+    ERROR_LOG(m_logger) << "Error while inserting event data for building ";
   else
     publishData(eData);
 }
@@ -557,7 +556,7 @@ void HandlerDynamicParticipantData::publishData(const Database::EemEvent &data)
   ExerciseEventManagement::Event ddsData = toDdsData(data);
 
   if (!m_ddsHandler->dts()->publish(ddsData))
-    ERROR_LOG() << "Error publishing event-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing event-data to dds";
 
   // take data from dds-bus after 10s, we need just to make sure the recording service got it
   m_mainHandler->addEventIdToRemove(ddsData.id());
@@ -580,7 +579,7 @@ ExerciseEventManagement::Event HandlerDynamicParticipantData::toDdsData(const Da
   if (data.eventTypeId == ProjectDataManagement::EventType_def::HitBuilding)
   {
     int mainStructureElementId = LtsUtils::JsonObject::fromJson(ddsData.properties()).valueOr<int>(QStringLiteral("MainStructureElementId"), 0);
-    DEBUG_LOG() << "MainStructureElementId=" << mainStructureElementId;
+    DEBUG_LOG(m_logger) << "MainStructureElementId=" << mainStructureElementId;
     ddsData.position(m_mainStructureElements.value(mainStructureElementId).geoPosition());
   }
 
@@ -592,7 +591,7 @@ ExerciseEventManagement::Event HandlerDynamicParticipantData::toDdsData(const Da
 // ///////////////////////////////////
 void HandlerDynamicParticipantData::onMainStructureElementChanged(const InfrastructureManagement::MainStructureElement &data, DataModification modType)
 {
-  DEBUG_LOG() << "onMainStructureElementChanged";
+  DEBUG_LOG(m_logger) << "onMainStructureElementChanged";
   if (modType != DataModification::eAdded &&
       modType != DataModification::eModified)
   {
@@ -601,7 +600,7 @@ void HandlerDynamicParticipantData::onMainStructureElementChanged(const Infrastr
   }
 
   m_mainStructureElements.insert(data.id(), data);
-  DEBUG_LOG() << "Got MainStructureElement: " << data;
+  DEBUG_LOG(m_logger) << "Got MainStructureElement: " << data;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_dynamic_participant_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_dynamic_participant_data.h
index 12faaacb3..ff886993f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_dynamic_participant_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_dynamic_participant_data.h
@@ -68,6 +68,8 @@ private Q_SLOTS:
   void onMainStructureElementChanged(const InfrastructureManagement::MainStructureElement  &data, DataModification modType);
 
 private: // methoden
+
+NGL::INGLLogger &m_logger;
   void publishData(const Database::EemEvent &data);
   ExerciseEventManagement::Event toDdsData(const Database::EemEvent &data);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_equipment_error_registration.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_equipment_error_registration.cpp
index 8d4920556..c4b78fb7f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_equipment_error_registration.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_equipment_error_registration.cpp
@@ -28,13 +28,12 @@ using namespace ExerciseEventManagement;
 HandlerEquipmentErrorRegistration::HandlerEquipmentErrorRegistration(MainHandler *mainHandler,
                                                                      const std::shared_ptr<DdsHandler> &ddsHandler,
                                                                      const std::shared_ptr<DbHandler>  &db,
-                                                                     const std::shared_ptr<WebSocketEventServer> &eventServer)
-  : m_mainHandler(mainHandler)
+                                                                     const std::shared_ptr<WebSocketEventServer> &eventServer) : m_mainHandler(mainHandler)
   , m_ddsHandler(ddsHandler)
   , m_dbHandler(db)
   , m_eventServer(eventServer)
-  , m_ossDtc(nullptr)
-{
+  , m_ossDtc(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 } // end of ctor()
 //-----------------------------------------------------------------------------
 
@@ -45,14 +44,14 @@ HandlerEquipmentErrorRegistration::~HandlerEquipmentErrorRegistration()
 
 bool HandlerEquipmentErrorRegistration::init()
 {
-  INFO_LOG() << "start init() DTC OcSituationServer ";
+  INFO_LOG(m_logger) << "start init() DTC OcSituationServer ";
 
 
   // DTC OcSituationServer
   m_ossDtc = OcSituationServer::Interface::Dtc::create(m_ddsHandler->ddsConnector());
   if (m_ossDtc == nullptr)
   {
-    ERROR_LOG() << "Could not create DTC OcSituationServer";
+    ERROR_LOG(m_logger) << "Could not create DTC OcSituationServer";
     return false;
   }
 
@@ -62,7 +61,7 @@ bool HandlerEquipmentErrorRegistration::init()
 
   if (!m_ossDtc->enableEquipmentErrorRegistration())
   {
-    ERROR_LOG() << "init() DTC OcSituationServer failed";
+    ERROR_LOG(m_logger) << "init() DTC OcSituationServer failed";
     return false;
   }
 
@@ -74,7 +73,7 @@ bool HandlerEquipmentErrorRegistration::init()
 //-----------------------------------------------------------------------------
 void HandlerEquipmentErrorRegistration::onEquipmentErrorRegistrationChanged(const OcSituationServer::EquipmentErrorRegistration &data, DataModification modType)
 {
-  INFO_LOG() << "onEquipmentErrorRegistrationChanged()"
+  INFO_LOG(m_logger) << "onEquipmentErrorRegistrationChanged()"
                      << ", equipmentNr: " << data.equipmentNumber()
                      << ", text: " << QString::fromStdString(data.text());
 
@@ -94,7 +93,7 @@ void HandlerEquipmentErrorRegistration::onEquipmentErrorRegistrationChanged(cons
   eData.properties = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact));
 
   if (!m_dbHandler->db()->insert(eData))
-    ERROR_LOG() << "Error while inserting event into database";
+    ERROR_LOG(m_logger) << "Error while inserting event into database";
   else
     publishData(eData);
 
@@ -108,7 +107,7 @@ void HandlerEquipmentErrorRegistration::publishData(const Database::EemEvent &da
   ExerciseEventManagement::Event ddsData = toDdsData(data);
 
   if (!m_ddsHandler->dts()->publish(ddsData))
-    ERROR_LOG() << "Error publishing event-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing event-data to dds";
 
   // take data from dds-bus after 10s, we need just to make sure the recording service got it
   m_mainHandler->addEventIdToRemove(ddsData.id());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_equipment_error_registration.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_equipment_error_registration.h
index 67bbec4d8..538ae95ac 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_equipment_error_registration.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_equipment_error_registration.h
@@ -56,6 +56,8 @@ private Q_SLOTS:
   void onEquipmentErrorRegistrationChanged(const OcSituationServer::EquipmentErrorRegistration &data, DataModification modType);
 
 private: // methoden
+
+NGL::INGLLogger &m_logger;
   void publishData(const Database::EemEvent &data);
   ExerciseEventManagement::Event toDdsData(const Database::EemEvent &data);
 
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 1d3f73f10..749152a9d 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
@@ -22,12 +22,11 @@ using namespace ExerciseEventManagement;
 HandlerParticipantEvent::HandlerParticipantEvent(MainHandler *mainHandler,
                                                  const std::shared_ptr<DdsHandler> &ddsHandler,
                                                  const std::shared_ptr<DbHandler> &db,
-                                                 const std::shared_ptr<WebSocketEventServer> &eventServer)
-  : m_ddsHandler(ddsHandler)
+                                                 const std::shared_ptr<WebSocketEventServer> &eventServer) : m_ddsHandler(ddsHandler)
   , m_dbHandler(db)
   , m_eventServer(eventServer)
-  , m_mainHandler(mainHandler)
-{
+  , m_mainHandler(mainHandler),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 } // end of ctor()
 //-----------------------------------------------------------------------------
 
@@ -38,13 +37,13 @@ HandlerParticipantEvent::~HandlerParticipantEvent()
 
 bool HandlerParticipantEvent::init()
 {
-  INFO_LOG() << "start init() DTC CentralEffectSimulation ";
+  INFO_LOG(m_logger) << "start init() DTC CentralEffectSimulation ";
 
   // DTC CentralEffectSimulation
   m_cesDtc = CentralEffectSimulation::Interface::Dtc::create(m_ddsHandler->ddsConnector());
   if (!m_cesDtc)
   {
-    ERROR_LOG() << "Could not create DTC CentralEffectSimulation";
+    ERROR_LOG(m_logger) << "Could not create DTC CentralEffectSimulation";
     return false;
   }
 
@@ -54,7 +53,7 @@ bool HandlerParticipantEvent::init()
 
   if (!m_cesDtc->enableParticipantEvent() )
   {
-    ERROR_LOG() << "init() DTC CentralEffectSimulation failed";
+    ERROR_LOG(m_logger) << "init() DTC CentralEffectSimulation failed";
     return false;
   }
 
@@ -62,7 +61,7 @@ bool HandlerParticipantEvent::init()
   m_pdmDtc = ProjectDataManagement::Interface::Dtc::create(m_ddsHandler->ddsConnector());
   if (!m_pdmDtc)
   {
-    ERROR_LOG() << "Could not create DTC ProjectDataManagement";
+    ERROR_LOG(m_logger) << "Could not create DTC ProjectDataManagement";
     return false;
   }
   m_pdmDtc->enableChargeType();
@@ -84,7 +83,7 @@ bool HandlerParticipantEvent::init()
 
 void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &data, DataModification modType)
 {
-  DEBUG_LOG() << "AesItemId: " << data.aesItemId() << ", effectState: " << data.effectStateId();
+  DEBUG_LOG(m_logger) << "AesItemId: " << data.aesItemId() << ", effectState: " << data.effectStateId();
 
   Database::EemEvent eData = m_aesMap[data.id()];
   eData.sampleTime = data.effectStart();
@@ -96,7 +95,7 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
   {
   case DataModification::eAdded:
     m_itemViews.insert(data.aesItemId(), data.aesTypeId());
-    DEBUG_LOG() << "eAdded: AesItemId: " << data.aesItemId() << ", effectState: " << data.effectStateId();
+    DEBUG_LOG(m_logger) << "eAdded: AesItemId: " << data.aesItemId() << ", effectState: " << data.effectStateId();
     m_aesEffectState.insert(data.aesItemId(), data.effectStateId());
 
     if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtBorderline)
@@ -115,7 +114,7 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
                                           data.boundingBoxBottomLeft().lat(), 0.0);
 
       if (!m_dbHandler->db()->insert(eData))
-        ERROR_LOG() << "Error while inserting event data from AES ";
+        ERROR_LOG(m_logger) << "Error while inserting event data from AES ";
       else
         publishData(eData);
     }
@@ -124,22 +123,22 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
   {
     AreaEffectSimulation::AesEffectState effectState = m_aesEffectState.value(data.aesItemId());
 
-    DEBUG_LOG() << "eModified: AesItemId: " << data.aesItemId() << ", effectState: " << data.effectStateId();
-    DEBUG_LOG() << "effectState: " << effectState;
+    DEBUG_LOG(m_logger) << "eModified: AesItemId: " << data.aesItemId() << ", effectState: " << data.effectStateId();
+    DEBUG_LOG(m_logger) << "effectState: " << effectState;
 
     // insert event only once
     if (effectState != AreaEffectSimulation::AesEffectState::EsPrepared &&
        (effectState == AreaEffectSimulation::AesEffectState_def::EsActivated && data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsExpired))
       return;
 
-    INFO_LOG() << "new/update event: aesId: " << data.aesItemId();
+    INFO_LOG(m_logger) << "new/update event: aesId: " << data.aesItemId();
 
     m_aesEffectState.insert(data.aesItemId(), data.effectStateId());
     m_itemViews.insert(data.aesItemId(), data.aesTypeId());
     eData.position = LtsUtils::QPoint3D(data.boundingBoxBottomLeft().lon(),
                                         data.boundingBoxBottomLeft().lat(), 0.0);
 
-    INFO_LOG() << "aesType: " << data.aesTypeId();
+    INFO_LOG(m_logger) << "aesType: " << data.aesTypeId();
 
     switch (data.aesTypeId().underlying())
     {
@@ -181,7 +180,7 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
       // No ExerciseEvent for AesType
     default:
     {
-      INFO_LOG() << "No ExerciseEvent for AesType:" << data.aesTypeId().underlying();
+      INFO_LOG(m_logger) << "No ExerciseEvent for AesType:" << data.aesTypeId().underlying();
       return;
     }
     }
@@ -212,7 +211,7 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
     {
       if (!m_dbHandler->db()->insert(eData))
       {
-        ERROR_LOG() << "Error while inserting event data from AES ";
+        ERROR_LOG(m_logger) << "Error while inserting event data from AES ";
         break;
       }
       m_aesMap.insert(data.id(), eData);
@@ -221,7 +220,7 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
     {
       if (!m_dbHandler->db()->update(eData))
       {
-        ERROR_LOG() << "Error while updating event data from AES ";
+        ERROR_LOG(m_logger) << "Error while updating event data from AES ";
         break;
       }
     }
@@ -290,7 +289,7 @@ void HandlerParticipantEvent::onExplosionSingleChanged(const AreaEffectSimulatio
     {
       if (!m_dbHandler->db()->insert(eData))
       {
-        ERROR_LOG() << "Error while inserting event data from AES ";
+        ERROR_LOG(m_logger) << "Error while inserting event data from AES ";
         break;
       }
       m_aesMap.insert(data.id(), eData);
@@ -299,7 +298,7 @@ void HandlerParticipantEvent::onExplosionSingleChanged(const AreaEffectSimulatio
     {
       if (!m_dbHandler->db()->update(eData))
       {
-        ERROR_LOG() << "Error while updating event data from AES ";
+        ERROR_LOG(m_logger) << "Error while updating event data from AES ";
         break;
       }
     }
@@ -307,7 +306,7 @@ void HandlerParticipantEvent::onExplosionSingleChanged(const AreaEffectSimulatio
     break;
   }
   default:
-    DEBUG_LOG() << "Nothing to do";
+    DEBUG_LOG(m_logger) << "Nothing to do";
   }
 }
 //-----------------------------------------------------------------------------
@@ -323,7 +322,7 @@ void HandlerParticipantEvent::onParticipantEventChanged(const CentralEffectSimul
   eData.partyId         = data.partyId();
   eData.sampleTime      = data.eventTime();
   eData.position        = LtsUtils::QPoint3D(data.position().lon(), data.position().lat(), data.position().z());
-  DEBUG_LOG() << " onParticipantEventChanged "
+  DEBUG_LOG(m_logger) << " onParticipantEventChanged "
                        << " position=" << data.position()
                        << " eData.position=" << eData.position;
 
@@ -397,7 +396,7 @@ void HandlerParticipantEvent::onParticipantEventChanged(const CentralEffectSimul
 
 
   if (!m_dbHandler->db()->insert(eData))
-    ERROR_LOG() << "Error while inserting event data from CES ";
+    ERROR_LOG(m_logger) << "Error while inserting event data from CES ";
   else
     publishData(eData);
 
@@ -412,7 +411,7 @@ void HandlerParticipantEvent::publishData(const Database::EemEvent &data)
   ExerciseEventManagement::Event ddsData = toDdsData(data);
 
   if (!m_ddsHandler->dts()->publish(ddsData))
-    ERROR_LOG() << "Error publishing event-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing event-data to dds";
 
   // take data from dds-bus after 10s, we need just to make sure the recording service got it
   m_mainHandler->addEventIdToRemove(ddsData.id());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_participant_event.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_participant_event.h
index 228aca3ec..6aa7b84f1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_participant_event.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_participant_event.h
@@ -47,6 +47,8 @@ private Q_SLOTS:
   void onExplosionSingleChanged(const AreaEffectSimulation::ExplosionSingle &data, DataModification modType);
 
 private: // methoden
+
+NGL::INGLLogger &m_logger;
   void publishData(const Database::EemEvent &data);
   ExerciseEventManagement::Event toDdsData(const Database::EemEvent &data);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/main_handler.cpp
index 03b4e87de..2c5a384cb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/main_handler.cpp
@@ -24,13 +24,12 @@
 namespace ExerciseEventManagement
 {
 
-MainHandler::MainHandler()
-  : m_almService(nullptr)
+MainHandler::MainHandler() : m_almService(nullptr)
   , m_fltService(nullptr)
   , m_mrkService(nullptr)
   , m_evlService(nullptr)
-  , m_removeTimer(new QTimer(this))
-{
+  , m_removeTimer(new QTimer(this)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   connect(m_removeTimer, &QTimer::timeout, this, &MainHandler::onRemoveKeys);
   m_removeTimer->setInterval(5000);
   m_removeTimer->setSingleShot(false);
@@ -64,12 +63,12 @@ bool MainHandler::init(int domainId, int exerciseId)
   bool bRet = initInternal(domainId, exerciseId);
   if (bRet)
   {
-    INFO_LOG() << "svcExerciseEventManagement successfully initialized";
+    INFO_LOG(m_logger) << "svcExerciseEventManagement successfully initialized";
     m_ddsHandler->setRunningState(Core::RunningState::Running);
   }
   else
   {
-    ERROR_LOG() << "Error initializing svcExerciseEventManagement...";
+    ERROR_LOG(m_logger) << "Error initializing svcExerciseEventManagement...";
     if (m_ddsHandler)
       m_ddsHandler->setRunningState(Core::RunningState::StartingError);
   }
@@ -143,27 +142,27 @@ bool MainHandler::loadFromDatabase()
 {
   if (!m_webSocketEventServer || !m_webSocketEventServer->listen(Settings::getWebSocketServerPortRange(1)))
   {
-    ERROR_LOG() << "Can not initialize WebSocket Event server";
+    ERROR_LOG(m_logger) << "Can not initialize WebSocket Event server";
     return false;
   }
   m_ddsHandler->addPortToPacemaker(m_webSocketEventServer->listenPort(), Core::PortType::WebSocketServer);
 
   if (!m_handlerEerEvent || !m_handlerEerEvent->init())
   {
-    ERROR_LOG() << "Can not initialize EquipmentErrorRegistration handler";
+    ERROR_LOG(m_logger) << "Can not initialize EquipmentErrorRegistration handler";
     return false;
   }
   if (!m_dynPartData || !m_dynPartData->init())
   {
-    ERROR_LOG() << "Can not initialize Participant Data handler";
+    ERROR_LOG(m_logger) << "Can not initialize Participant Data handler";
     return false;
   }
   if (!m_handlerPartEvent || !m_handlerPartEvent->init())
   {
-    ERROR_LOG() << "Can not initialize Participant Event handler";
+    ERROR_LOG(m_logger) << "Can not initialize Participant Event handler";
     return false;
   }
-  DEBUG_LOG() << "loadFromDatabase successfully finished";
+  DEBUG_LOG(m_logger) << "loadFromDatabase successfully finished";
   return true;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/main_handler.h
index b46a58a40..347dc6ec8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/main_handler.h
@@ -51,6 +51,7 @@ public:
   void addEventIdToRemove(qint64 id); 
 
 private:
+  NGL::INGLLogger &m_logger;
   bool initInternal(int domainId, int exerciseId);
   void onRemoveKeys();
   bool loadFromDatabase();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.cpp
index a33350157..7190e4509 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.cpp
@@ -53,8 +53,7 @@ WebSocketAvs::WebSocketAvs(MainHandler *mainHandler,
                            const std::shared_ptr<AudioVideoManagement::Interface::Dtc> &avmDtc,
                            const std::shared_ptr<InfrastructureManagement::Interface::Dtc> &ismDtc,
                            int exerciseId,
-                           QObject *parent)
-  : QObject(parent)
+                           QObject *parent) : QObject(parent)
   , m_ddsHandler(ddsHandler)
   , m_dbHandler(db)
   , m_eventServer(eventServer)
@@ -66,8 +65,8 @@ WebSocketAvs::WebSocketAvs(MainHandler *mainHandler,
   , m_cleanupTimer(new QTimer(this))
   , m_exerciseId(exerciseId)
   , m_lastUpdate(0)
-  , m_bWebSocketDisconnectedWarnedOnce(false)
-{
+  , m_bWebSocketDisconnectedWarnedOnce(false),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   connect(m_wsReconnectTimer, &QTimer::timeout,
           this, &WebSocketAvs::openWebSocket);
 
@@ -77,12 +76,12 @@ WebSocketAvs::WebSocketAvs(MainHandler *mainHandler,
   //if there is a positive time start it
   //if not: don't do it!
   int cleanupTimeout = Settings::getCleanupTimeout();
-  INFO_LOG() << "cleanup Timer Interval: " << cleanupTimeout;
+  INFO_LOG(m_logger) << "cleanup Timer Interval: " << cleanupTimeout;
   if (cleanupTimeout > 0)
   {
     m_cleanupTimer->setInterval(cleanupTimeout);
     m_cleanupTimer->start();
-    INFO_LOG() << "Started cleanup Timer with Interval: " << cleanupTimeout;
+    INFO_LOG(m_logger) << "Started cleanup Timer with Interval: " << cleanupTimeout;
   }
 
 }
@@ -93,14 +92,14 @@ WebSocketAvs::~WebSocketAvs()
 
 void WebSocketAvs::init()
 {
-  DEBUG_LOG() << "WebSocketAvs::init";
+  DEBUG_LOG(m_logger) << "WebSocketAvs::init";
   m_wsReconnectTimer->start(1000);
   //onCleanUpDbInternal();
 }
 
 void WebSocketAvs::setWsUrl(const QString &url)
 {
-  DEBUG_LOG() << "Url: " << url;
+  DEBUG_LOG(m_logger) << "Url: " << url;
   m_wsUrl = url;
 }
 
@@ -128,7 +127,7 @@ AvsData WebSocketAvs::jsonObjectToAvsData(const QJsonObject &obj)
     break;
   default:
     eventType = ProjectDataManagement::EventType::Unknown;
-    ERROR_LOG() << "Unknown avsEventType: " << avsEventType;
+    ERROR_LOG(m_logger) << "Unknown avsEventType: " << avsEventType;
     break;
   }
   data.eventType  = eventType.underlying();
@@ -188,7 +187,7 @@ ExerciseEventManagement::Event WebSocketAvs::avsDataToEvent(const AvsData &data)
 
 void WebSocketAvs::onTextMessageReceived(const QString &message)
 {
-  INFO_LOG() << "Got message from AVS control process: " << message;
+  INFO_LOG(m_logger) << "Got message from AVS control process: " << message;
 
   const QJsonDocument doc(QJsonDocument::fromJson(message.toUtf8()));
   const QJsonObject obj = doc.object();
@@ -202,41 +201,41 @@ void WebSocketAvs::handleAvsData(const AvsData &data, const bool &lastRangeClose
 {
   QString streamName = data.streamName;
 
-  DEBUG_LOG() << "handleAvsData for stream: " << streamName;
+  DEBUG_LOG(m_logger) << "handleAvsData for stream: " << streamName;
 
   auto it = m_avsDataMap.find(streamName);
 
   // existing stream ..........................................................
   if (it != m_avsDataMap.end())
   {
-    DEBUG_LOG() << "handleAvsData for stream 1: " << streamName;
+    DEBUG_LOG(m_logger) << "handleAvsData for stream 1: " << streamName;
     AvsData &avsData = m_avsDataMap[streamName];
     if ( (avsData.endTime == -1) && (data.endTime == -1))
     {
-      DEBUG_LOG() << "kein Publish (avsData.endTime == -1) && (data.endTime == -1)";
+      DEBUG_LOG(m_logger) << "kein Publish (avsData.endTime == -1) && (data.endTime == -1)";
       return;
     }
     if (  (data.endTime == -1) && (data.eventType == ProjectDataManagement::EventType::RadioCnr))
     {
-      DEBUG_LOG() << "kein Publish (avsData.endTime == -1) && RadioCnr";
+      DEBUG_LOG(m_logger) << "kein Publish (avsData.endTime == -1) && RadioCnr";
       return;
     }
 
     if (avsData.eventTime != data.eventTime) // new range -> close old range
     {
-      DEBUG_LOG() << "handleAvsData for stream 2: " << streamName;
+      DEBUG_LOG(m_logger) << "handleAvsData for stream 2: " << streamName;
       if (avsData.eventTime == -1) // missing end time -> set artificial end time
       {
-        WARNING_LOG() << "Missing end time for stream: " << streamName << " -> setting artificial end time: " << avsData.eventTime + 1000;
+        WARNING_LOG(m_logger) << "Missing end time for stream: " << streamName << " -> setting artificial end time: " << avsData.eventTime + 1000;
         avsData.eventTime = avsData.eventTime + 1000;
         publishData(streamName);
       }
-      DEBUG_LOG() << "handleAvsData for stream remove: " << streamName;
+      DEBUG_LOG(m_logger) << "handleAvsData for stream remove: " << streamName;
       m_avsDataMap.remove(streamName);
     }
     else // update range
     {
-      DEBUG_LOG() << "handleAvsData update range publish" << streamName;
+      DEBUG_LOG(m_logger) << "handleAvsData update range publish" << streamName;
 
       avsData.endTime = data.endTime;
       publishData(streamName);
@@ -247,20 +246,20 @@ void WebSocketAvs::handleAvsData(const AvsData &data, const bool &lastRangeClose
   }
 
   // new range ................................................................
-  DEBUG_LOG() << "m_avsDataMap.insert(streamName";
+  DEBUG_LOG(m_logger) << "m_avsDataMap.insert(streamName";
   m_avsDataMap.insert(streamName, data);
   AvsData &avsData = m_avsDataMap[streamName];
   if (!lastRangeClosed)
   {
-    DEBUG_LOG() << "!lastRangeClosed";
+    DEBUG_LOG(m_logger) << "!lastRangeClosed";
     avsData.endTime = -1;
   }
   else if (avsData.endTime == -1) // range is closed but end time is missing
   {
-    DEBUG_LOG() << "avsData.endTime == -1";
+    DEBUG_LOG(m_logger) << "avsData.endTime == -1";
     avsData.endTime = avsData.eventTime + 1000; // -> set artificial end time
   }
-  DEBUG_LOG() << "publishData";
+  DEBUG_LOG(m_logger) << "publishData";
   avsData.id = publishData(streamName);
   //  if (lastRangeClosed)
   //    m_avsDataMap.remove(streamName);
@@ -268,7 +267,7 @@ void WebSocketAvs::handleAvsData(const AvsData &data, const bool &lastRangeClose
   //  // new stream ...............................................................
   //  if (it == m_avsDataMap.end())
   //  {
-  //    DEBUG_LOG() << "received event on new stream: " << streamName;
+  //    DEBUG_LOG(m_logger) << "received event on new stream: " << streamName;
   //    AvsData avsData = data;
   //    if (!lastRangeClosed) // waiting for end time
   //      avsData.endTime = -1;
@@ -288,12 +287,12 @@ void WebSocketAvs::handleAvsData(const AvsData &data, const bool &lastRangeClose
 
   //  if (avsData.eventTime != data.eventTime)  // same stream, different time -> new event received
   //  {
-  //    DEBUG_LOG() << "new event on stream: " << streamName;
+  //    DEBUG_LOG(m_logger) << "new event on stream: " << streamName;
 
   //    // close old event ........................................................
   //    if (avsData.endTime == -1) // last event on the same stream was not closed
   //    {
-  //      WARNING_LOG() << "Missing end time for stream: " << streamName << ". Setting artificial end time.";
+  //      WARNING_LOG(m_logger) << "Missing end time for stream: " << streamName << ". Setting artificial end time.";
   //      avsData.endTime = avsData.eventTime + 1000;
   //      publishData(streamName);
   //    }
@@ -311,7 +310,7 @@ void WebSocketAvs::handleAvsData(const AvsData &data, const bool &lastRangeClose
   //  else  // same event
   //  {
   //    avsData.endTime = data.endTime;
-  //    DEBUG_LOG() << "received new end time: " << data.endTime << " for stream: " << streamName;
+  //    DEBUG_LOG(m_logger) << "received new end time: " << data.endTime << " for stream: " << streamName;
   //    if (lastRangeClosed)
   //    {
   //      publishData(streamName);
@@ -322,10 +321,10 @@ void WebSocketAvs::handleAvsData(const AvsData &data, const bool &lastRangeClose
 
 int WebSocketAvs::publishData(const QString &streamName)
 {
-  DEBUG_LOG() << "WebSocketAvs::publishData";
+  DEBUG_LOG(m_logger) << "WebSocketAvs::publishData";
   if (streamName.isEmpty())
   {
-    WARNING_LOG() << "Ignoring empty stream name";
+    WARNING_LOG(m_logger) << "Ignoring empty stream name";
     return 0;
   }
 
@@ -355,7 +354,7 @@ int WebSocketAvs::publishData(const QString &streamName)
   {
     if (isAlreadyInDb)
     {
-      WARNING_LOG() << "Ignoring existing event at " << dbData.sampleTime;
+      WARNING_LOG(m_logger) << "Ignoring existing event at " << dbData.sampleTime;
       return 0;
     }
   }
@@ -364,17 +363,17 @@ int WebSocketAvs::publishData(const QString &streamName)
   if (dbData.id > 0)
   {
     if (!m_dbHandler->db()->update(dbData))
-      ERROR_LOG() << "Error while updating dbData with id : " << data.id;
+      ERROR_LOG(m_logger) << "Error while updating dbData with id : " << data.id;
   }
   else
   {
     if (!m_dbHandler->db()->insert(dbData))
-      ERROR_LOG() << "Error while inserting avsData in db: streamName: " << data.streamName;
+      ERROR_LOG(m_logger) << "Error while inserting avsData in db: streamName: " << data.streamName;
     ddsEvent.id(dbData.id);
   }
 
   // publish data
-  INFO_LOG() << "Publish data for stream: " << streamName << " and database id=" << dbData.id;
+  INFO_LOG(m_logger) << "Publish data for stream: " << streamName << " and database id=" << dbData.id;
   m_eventServer->sendEvent(Database::toJson(dbData));
   m_ddsHandler->dts()->publish(ddsEvent);
   m_mainHandler->addEventIdToRemove(dbData.id);  // take data from dds-bus after 10s, we need just to make sure the recording service got it
@@ -385,7 +384,7 @@ int WebSocketAvs::publishData(const QString &streamName)
 
 void WebSocketAvs::openWebSocket()
 {
-  DEBUG_LOG() << "openWebSocket";
+  DEBUG_LOG(m_logger) << "openWebSocket";
   closeWebSocket();
   m_wsSocket = new QWebSocket;
   connect(m_wsSocket, QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error),
@@ -402,7 +401,7 @@ void WebSocketAvs::openWebSocket()
 
 void WebSocketAvs::closeWebSocket()
 {
-  DEBUG_LOG() << "closeWebSocket";
+  DEBUG_LOG(m_logger) << "closeWebSocket";
   if (m_wsSocket)
   {
     m_wsSocket->disconnect(this);
@@ -417,14 +416,14 @@ void WebSocketAvs::onWebSocketError(QAbstractSocket::SocketError error)
 {
   if (!m_wsSocket)
     return;
-  WARNING_LOG() << "Error connecting to " << m_wsSocket->peerAddress().toString() << ": " << error;
+  WARNING_LOG(m_logger) << "Error connecting to " << m_wsSocket->peerAddress().toString() << ": " << error;
   closeWebSocket();
   m_wsReconnectTimer->start(1000);
 }
 
 void WebSocketAvs::onWebSocketConnected()
 {
-  DEBUG_LOG() << "connected to  via websockets";
+  DEBUG_LOG(m_logger) << "connected to  via websockets";
   m_wsReconnectTimer->stop();
   m_bWebSocketDisconnectedWarnedOnce = false;
 
@@ -433,11 +432,11 @@ void WebSocketAvs::onWebSocketConnected()
 
 void WebSocketAvs::onWebSocketDisconnected()
 {
-  DEBUG_LOG() <<  "WebSocketAvs::onWebSocketDisconnected()";
+  DEBUG_LOG(m_logger) <<  "WebSocketAvs::onWebSocketDisconnected()";
   if (!m_bWebSocketDisconnectedWarnedOnce)
   {
     m_bWebSocketDisconnectedWarnedOnce = true;
-    WARNING_LOG() << "Websocket to " << m_wsUrl << " closed - trying to reconnect in 1 sec";
+    WARNING_LOG(m_logger) << "Websocket to " << m_wsUrl << " closed - trying to reconnect in 1 sec";
   }
 
   closeWebSocket();
@@ -446,7 +445,7 @@ void WebSocketAvs::onWebSocketDisconnected()
 
 void WebSocketAvs::onSendExerciseId()
 {
-  ERROR_LOG() << "Send exerciseId: ";
+  ERROR_LOG(m_logger) << "Send exerciseId: ";
 
   QJsonObject obj;
 
@@ -484,7 +483,7 @@ void WebSocketAvs::onCleanUpDbInternal()
     {
       ntpRangeSortLocal.insert(avItem.eventTime, avItem);
     }
-    DEBUG_LOG() <<" Start with key: '" << stream  << "' external = " << externalData.size() << " internal: " << ntpRangeSortLocal.size();
+    DEBUG_LOG(m_logger) <<" Start with key: '" << stream  << "' external = " << externalData.size() << " internal: " << ntpRangeSortLocal.size();
     QVector<qint64> itemsToRemoveFromInternal;
     QMap<qint64, AvsData> collection;
     QVector<AvsData> toAdd;
@@ -512,7 +511,7 @@ void WebSocketAvs::onCleanUpDbInternal()
             if (m_ismDtc->getBuildingId(mountingPointId, mainStructureElementId))
               add.mainStructureElementId = mainStructureElementId;
           }
-          DEBUG_LOG() << "need to add: " << add.eventType << " st: " << add.streamName << " mpi:" << add.mainStructureElementId;
+          DEBUG_LOG(m_logger) << "need to add: " << add.eventType << " st: " << add.streamName << " mpi:" << add.mainStructureElementId;
           toAdd.append(add);
           collection.insert(add.eventTime, add);
         }
@@ -595,11 +594,11 @@ void WebSocketAvs::onCleanUpDbInternal()
       dbDataAdd.id = 0;
       m_dbHandler->db()->insert(dbDataAdd);
     }
-    DEBUG_LOG() << "DONE Sync wite remote DB "<< stream << " to Ignore" << toIgnore.size()<< " to Add" << toAdd.size() << "   to Update:" << toUpdate.size()<< "   to remove:" << itemsToRemoveFromInternal.size();
+    DEBUG_LOG(m_logger) << "DONE Sync wite remote DB "<< stream << " to Ignore" << toIgnore.size()<< " to Add" << toAdd.size() << "   to Update:" << toUpdate.size()<< "   to remove:" << itemsToRemoveFromInternal.size();
   }
   m_cleanupTimer->start();
   m_lastUpdate = QDateTime::currentMSecsSinceEpoch()-2*60*1000;
-  DEBUG_LOG() << "DONE Sync wite remote DB next check starts at: " << QDateTime::fromMSecsSinceEpoch(m_lastUpdate).toString();
+  DEBUG_LOG(m_logger) << "DONE Sync wite remote DB next check starts at: " << QDateTime::fromMSecsSinceEpoch(m_lastUpdate).toString();
 }
 
 QMap<QString, QVector<AvsData> > WebSocketAvs::getAllAvsData()
@@ -616,11 +615,11 @@ QMap<QString, QVector<AvsData> > WebSocketAvs::getAllAvsData()
                QLatin1String(" WHERE context_id = :context"));
   if (m_lastUpdate > 0)
     stmt += QLatin1String(" and time_start_msec > ") + QString::number(m_lastUpdate);
-  DEBUG_LOG() << "START Sync read remote DB at " << QDateTime::fromMSecsSinceEpoch(m_lastUpdate).toString();
+  DEBUG_LOG(m_logger) << "START Sync read remote DB at " << QDateTime::fromMSecsSinceEpoch(m_lastUpdate).toString();
   NSqlQuery q(m_dbHandler->db()->database());
   if (!q.prepare(stmt))
   {
-    WARNING_LOG() << "Could not prepare statement" << stmt << q.lastError().text() << q.lastError().databaseText();
+    WARNING_LOG(m_logger) << "Could not prepare statement" << stmt << q.lastError().text() << q.lastError().databaseText();
     return retu;
   } // if
   q.setForwardOnly(true);
@@ -632,7 +631,7 @@ QMap<QString, QVector<AvsData> > WebSocketAvs::getAllAvsData()
 
   if (!q.exec())
   {
-    DEBUG_LOG() << "Could not execute" << stmt << q.lastError().text() << q.lastError().databaseText();
+    DEBUG_LOG(m_logger) << "Could not execute" << stmt << q.lastError().text() << q.lastError().databaseText();
     return retu;
   } // if
 
@@ -678,7 +677,7 @@ QMap<QString, QVector<AvsData>> WebSocketAvs::getAllInternalDbData()
 
 //  m_dbHandler->db()->select(dataVec);
   //qCritical() << "END select reading internal db ";
-  DEBUG_LOG() << "START Sync read local DB at " << QDateTime::fromMSecsSinceEpoch(m_lastUpdate).toString();
+  DEBUG_LOG(m_logger) << "START Sync read local DB at " << QDateTime::fromMSecsSinceEpoch(m_lastUpdate).toString();
   int j = 0;
   for (const auto &dataI : std::as_const(dataVec))
   {
@@ -687,7 +686,7 @@ QMap<QString, QVector<AvsData>> WebSocketAvs::getAllInternalDbData()
     QJsonDocument job = QJsonDocument::fromJson(dataI.properties.toUtf8());
     if(!job.isObject())
     {
-      WARNING_LOG() << "ERROR Parsing Json";
+      WARNING_LOG(m_logger) << "ERROR Parsing Json";
     }
 
     QJsonObject obj = job.object();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.h
index 4148ec070..0e0bd2353 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.h
@@ -86,11 +86,13 @@ private Q_SLOTS:
   QMap<QString, QVector<AvsData>> getAllInternalDbData();
 
 private:
+  NGL::INGLLogger &m_logger;
   AvsData jsonObjectToAvsData(const QJsonObject &obj);
   Database::EemEvent avsDataToEemEvent(const AvsData &data);
   ExerciseEventManagement::Event avsDataToEvent(const AvsData &data);
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler> m_ddsHandler;                ///< Pointer to DDS handler
   std::shared_ptr<DbHandler>  m_dbHandler;
   std::shared_ptr<WebSocketEventServer> m_eventServer;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.cpp
index cf8c91be0..bda40dc49 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.cpp
@@ -22,12 +22,11 @@
 
 namespace ExerciseEventManagement
 {
-WebSocketEventServer::WebSocketEventServer(const QSqlDatabase &db, QObject *parent)
-  : QObject(parent)
+WebSocketEventServer::WebSocketEventServer(const QSqlDatabase &db, QObject *parent) : QObject(parent)
   , m_wsServer(nullptr)
   , m_cleanupTimer(new QTimer(this))
-  , m_db(db)
-{
+  , m_db(db),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_cleanupTimer->setInterval(10000); // clear every 10s
   connect(m_cleanupTimer, &QTimer::timeout, this, &WebSocketEventServer::onCleanupLiveHistory);
 }
@@ -94,7 +93,7 @@ void WebSocketEventServer::onNewConnection()
   QWebSocket *ws = m_wsServer->nextPendingConnection();
   if (!ws)
     return;
-  DEBUG_LOG() << "New incoming connection from "
+  DEBUG_LOG(m_logger) << "New incoming connection from "
                       << ws->peerAddress().toString() << ":"
                       << ws->peerPort() << ", "
                       << ws->requestUrl().toString();
@@ -115,7 +114,7 @@ void WebSocketEventServer::onNewConnection()
     historyDataRequested(m_db, ws, requestUrl);
   else
   {
-    WARNING_LOG() << "Unknown request path: '" << requestPath << "' - closing";
+    WARNING_LOG(m_logger) << "Unknown request path: '" << requestPath << "' - closing";
     ws->close();
     ws->deleteLater();
   }
@@ -126,7 +125,7 @@ void WebSocketEventServer::onSocketDisconnected()
   QWebSocket *ws = qobject_cast<QWebSocket *>(sender());
   if (!ws)
     return;
-  DEBUG_LOG() << "Disconnected from "
+  DEBUG_LOG(m_logger) << "Disconnected from "
                       << ws->peerAddress().toString() << ":"
                       << ws->peerPort() << ", "
                       << ws->requestUrl().toString();
@@ -150,7 +149,7 @@ void WebSocketEventServer::historyDataRequested(const QSqlDatabase &db, QWebSock
   const qint64 to = query.queryItemValue(QStringLiteral("to")).toLongLong();
   if (requestId == 0 || from <= 0 || to <= 0 || from > to)
   {
-    WARNING_LOG() << "Unknown request: '" << requestUrl.toString() << "' - closing, "
+    WARNING_LOG(m_logger) << "Unknown request: '" << requestUrl.toString() << "' - closing, "
                           << requestId << ", " << from << ", to " << to;
     ws->sendTextMessage(QStringLiteral("{}"));
     ws->close();
@@ -184,7 +183,7 @@ void WebSocketEventServer::historyDataRequested(const QSqlDatabase &db, QWebSock
   if (query.hasQueryItem(QStringLiteral("filter")))
   {
     const QString filterString = query.queryItemValue(QStringLiteral("filter"));
-    DEBUG_LOG() << "filter string: " << filterString;
+    DEBUG_LOG(m_logger) << "filter string: " << filterString;
     const QJsonObject obj(QJsonDocument::fromJson(filterString.toUtf8()).object());
     if (obj.keys().size() == 1)
     {
@@ -210,16 +209,16 @@ void WebSocketEventServer::historyDataRequested(const QSqlDatabase &db, QWebSock
   if (query.hasQueryItem(QStringLiteral("limit")))
   {
     const QString limitString = query.queryItemValue(QStringLiteral("limit"));
-    DEBUG_LOG() << "limiting query to " << limitString << " events";
+    DEBUG_LOG(m_logger) << "limiting query to " << limitString << " events";
     stmt += QStringLiteral(" LIMIT ") + limitString;
   }
 
-  DEBUG_LOG() << "stmt: " << stmt;
+  DEBUG_LOG(m_logger) << "stmt: " << stmt;
 
   NSqlQuery q(db);
   if (!q.exec(stmt))
   {
-    ERROR_LOG() << "Error while selecting event-data: " << stmt << ", " << q.lastError().databaseText();
+    ERROR_LOG(m_logger) << "Error while selecting event-data: " << stmt << ", " << q.lastError().databaseText();
     ws->sendTextMessage(QStringLiteral("{}"));
     ws->close();
     ws->deleteLater();
@@ -246,7 +245,7 @@ void WebSocketEventServer::historyDataRequested(const QSqlDatabase &db, QWebSock
     events.append(Database::toJson(data));
     if (events.size() > 100)
     {
-      INFO_LOG() << "Sending an answer with " << events.size() << " events for query " << stmt;
+      INFO_LOG(m_logger) << "Sending an answer with " << events.size() << " events for query " << stmt;
       const QJsonDocument doc(events);
       ws->sendTextMessage(QString::fromUtf8(doc.toJson(QJsonDocument::Compact)));
       events = QJsonArray();
@@ -254,7 +253,7 @@ void WebSocketEventServer::historyDataRequested(const QSqlDatabase &db, QWebSock
   }
   if (!events.isEmpty())
   {
-    INFO_LOG() << "Sending an answer with " << events.size() << " events for query " << stmt;
+    INFO_LOG(m_logger) << "Sending an answer with " << events.size() << " events for query " << stmt;
     const QJsonDocument doc(events);
     ws->sendTextMessage(QString::fromUtf8(doc.toJson(QJsonDocument::Compact)));
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.h
index 688159b23..b9b309eed 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.h
@@ -35,6 +35,7 @@ public:
 
   void sendEvent(const QJsonObject &obj);
 private:
+NGL::INGLLogger &m_logger;
   void onNewConnection();
   void onSocketDisconnected();
   void onCleanupLiveHistory();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/exm_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/exm_tests.cpp
index 6daa0b617..0a60ba0c8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/exm_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/ModuleTests/exm_tests.cpp
@@ -50,7 +50,7 @@ ExmTests::~ExmTests()
 //--------------------------------------------------------------------------
 bool ExmTests::init(int domainId, int exerciseId, int testId, int trainingAreaId, int phaseId)
 {
-  INFO_LOG() << "init begin";
+  INFO_LOG(m_logger) << "init begin";
 
   m_testId = testId;
   m_exerciseId = exerciseId;  // overwritten when new exercise created
@@ -64,32 +64,32 @@ bool ExmTests::init(int domainId, int exerciseId, int testId, int trainingAreaId
     return false;
   m_ddsConnector->initPublisherSubscriber();
 
-  DEBUG_LOG() << "Create dtc EXM";
+  DEBUG_LOG(m_logger) << "Create dtc EXM";
   m_dtc = ExerciseManagement::Interface::Dtc::create(m_ddsConnector);
-  DEBUG_LOG() << "Init dtc";
+  DEBUG_LOG(m_logger) << "Init dtc";
   bool bRet = m_dtc->enableAll();
-  DEBUG_LOG() << "init DTC EXM end - bRet = " << bRet;
+  DEBUG_LOG(m_logger) << "init DTC EXM end - bRet = " << bRet;
 
   connect(m_dtc.get(), &ExerciseManagement::Interface::Dtc::exerciseChanged,
           this, &ExmTests::onExerciseChanged);
 
-  DEBUG_LOG() << "create ftc EXM";
+  DEBUG_LOG(m_logger) << "create ftc EXM";
   m_ftc = ExerciseManagement::Interface::Ftc::create(m_ddsConnector);
-  DEBUG_LOG() << "init ftc EXM";
+  DEBUG_LOG(m_logger) << "init ftc EXM";
   bRet &= m_ftc->enableAll();
-  DEBUG_LOG() << "init FTC EXM end - bRet = " << bRet;
+  DEBUG_LOG(m_logger) << "init FTC EXM end - bRet = " << bRet;
 
-  DEBUG_LOG() << "create ftc ASM";
+  DEBUG_LOG(m_logger) << "create ftc ASM";
   m_ftc_asm = AssetManagement::Interface::Ftc::create(m_ddsConnector);
-  DEBUG_LOG() << "init ftc ASM";
+  DEBUG_LOG(m_logger) << "init ftc ASM";
   bRet &= m_ftc_asm->enableAll();
-  DEBUG_LOG() << "init end EXM - bRet = " << bRet;
+  DEBUG_LOG(m_logger) << "init end EXM - bRet = " << bRet;
 
-  DEBUG_LOG() << "Domain Id = " << domainId;
-  DEBUG_LOG() << "Exercise Id = " << exerciseId;
-  DEBUG_LOG() << "Test Id = " << testId;
-  DEBUG_LOG() << "Training Area Id = " << trainingAreaId;
-  DEBUG_LOG() << "Phase Id = " << phaseId;
+  DEBUG_LOG(m_logger) << "Domain Id = " << domainId;
+  DEBUG_LOG(m_logger) << "Exercise Id = " << exerciseId;
+  DEBUG_LOG(m_logger) << "Test Id = " << testId;
+  DEBUG_LOG(m_logger) << "Training Area Id = " << trainingAreaId;
+  DEBUG_LOG(m_logger) << "Phase Id = " << phaseId;
 
   //TODO: add connects
 
@@ -99,7 +99,7 @@ bool ExmTests::init(int domainId, int exerciseId, int testId, int trainingAreaId
 //--------------------------------------------------------------------------
 void ExmTests::startTest()
 {
-  INFO_LOG() << "startTest";
+  INFO_LOG(m_logger) << "startTest";
   if (m_testId <= 1)
     QTimer::singleShot(0, this, &ExmTests::tryCreate);
   else if (m_testId == 2)
@@ -125,7 +125,7 @@ void ExmTests::startTest()
     QTimer::singleShot(0, qApp, &QCoreApplication::quit);
   else
   {
-    ERROR_LOG() << "Unknown test id: " << m_testId;
+    ERROR_LOG(m_logger) << "Unknown test id: " << m_testId;
     failExit();
   }
 }
@@ -133,7 +133,7 @@ void ExmTests::startTest()
 //--------------------------------------------------------------------------
 void ExmTests::tryCreateTrainingArea()
 {
-  INFO_LOG() << "trying to send modifyRequest TrainingArea (create)";
+  INFO_LOG(m_logger) << "trying to send modifyRequest TrainingArea (create)";
   AssetManagement::TrainingAreaModifyRequest request;
   request.id(0);
   request.name("TestTrainingAreaCreate");
@@ -144,10 +144,10 @@ void ExmTests::tryCreateTrainingArea()
   if (!m_ftc_asm->trainingAreaModifyRequest(request, this))
 
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
-  INFO_LOG() << "Training Area Id = " << m_trainingAreaId;
+  INFO_LOG(m_logger) << "Training Area Id = " << m_trainingAreaId;
 
   QTest::qWait(1000);
 }
@@ -155,10 +155,10 @@ void ExmTests::tryCreateTrainingArea()
 //--------------------------------------------------------------------------
 void ExmTests::tryCreateExercisePhase()
 {
-  INFO_LOG() << "trying to send createrequest Exercise Phase";
+  INFO_LOG(m_logger) << "trying to send createrequest Exercise Phase";
   if(!m_ftc->exercisePhaseCreateRequest(ExercisePhaseCreateRequest(std::string("Test Phase"), std::string("Test Phase description"), 10, 20, m_exerciseId), this))
   {
-    ERROR_LOG() << "Error requesting create Exercise Phase";
+    ERROR_LOG(m_logger) << "Error requesting create Exercise Phase";
     failExit();
   }
   QTest::qWait(1000);
@@ -171,9 +171,9 @@ void ExmTests::tryCreate()
   int symbolFillType = 1;
   int radioGroupId = 1;
 
-  INFO_LOG() << "Training Area Id = " << m_trainingAreaId;
+  INFO_LOG(m_logger) << "Training Area Id = " << m_trainingAreaId;
 
-  INFO_LOG() << "trying to send createRequest Exercise";
+  INFO_LOG(m_logger) << "trying to send createRequest Exercise";
   ExerciseCreateRequest req;
   req.name(std::string("TestExerciseCreate"));
   req.beginTime(10);
@@ -186,7 +186,7 @@ void ExmTests::tryCreate()
 
   if (!m_ftc->exerciseCreateRequest(req, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
   QTest::qWait(10000);
@@ -195,7 +195,7 @@ void ExmTests::tryCreate()
 //--------------------------------------------------------------------------
 void ExmTests::tryModify()
 {
-  INFO_LOG() << "trying to send modify request for exercise Id = " << m_exerciseId;
+  INFO_LOG(m_logger) << "trying to send modify request for exercise Id = " << m_exerciseId;
   ExerciseModifyRequest req;
   req.id(m_exerciseId);
   req.name(std::string("ExerciseModifyTest"));
@@ -210,7 +210,7 @@ void ExmTests::tryModify()
   req.newState(ExerciseState::Created);
   if (!m_ftc->exerciseModifyRequest(req, this))
   {
-    ERROR_LOG() << "Error requesting modify data";
+    ERROR_LOG(m_logger) << "Error requesting modify data";
     failExit();
   }
   QTest::qWait(1000);
@@ -219,10 +219,10 @@ void ExmTests::tryModify()
 //--------------------------------------------------------------------------
 void ExmTests::tryModifyExercisePhase()
 {
-  INFO_LOG() << "trying to send modify exercise phase request for exercise phase Id = " << m_phaseId;
+  INFO_LOG(m_logger) << "trying to send modify exercise phase request for exercise phase Id = " << m_phaseId;
   if (!m_ftc->exercisePhaseModifyRequest(ExercisePhaseModifyRequest(std::string("Modified Exercise Phase"), std::string("Exercise Phase has been modified"), 20, 30, m_exerciseId, m_phaseId), this))
   {
-    ERROR_LOG() << "Error requesting modify exercise phase";
+    ERROR_LOG(m_logger) << "Error requesting modify exercise phase";
     failExit();
   }
   QTest::qWait(1000);
@@ -231,10 +231,10 @@ void ExmTests::tryModifyExercisePhase()
 //--------------------------------------------------------------------------
 void ExmTests::tryDelete()
 {
-  INFO_LOG() << "trying to send delete request for exercise Id = " << m_exerciseId;
+  INFO_LOG(m_logger) << "trying to send delete request for exercise Id = " << m_exerciseId;
   if (!m_ftc->exerciseRemoveRequest(ExerciseRemoveRequest(m_exerciseId, false), this))
   {
-    ERROR_LOG() << "Error requesting delete data";
+    ERROR_LOG(m_logger) << "Error requesting delete data";
     failExit();
   }
   QTest::qWait(5000);
@@ -245,15 +245,15 @@ void ExmTests::tryDeleteExercisePhase()
 {
   if (m_phaseId == 0)
   {
-    ERROR_LOG() << "No phase available for deleting";
+    ERROR_LOG(m_logger) << "No phase available for deleting";
     failExit();
   }
 
-  INFO_LOG() << "trying to send delete request for exercise phase Id = " << m_phaseId;
+  INFO_LOG(m_logger) << "trying to send delete request for exercise phase Id = " << m_phaseId;
   m_ftc->enableExercisePhaseRemove();
   if (!m_ftc->exercisePhaseRemoveRequest(ExercisePhaseRemoveRequest(m_phaseId), this))
   {
-    ERROR_LOG() << "Error requesting delete exercise phase";
+    ERROR_LOG(m_logger) << "Error requesting delete exercise phase";
     failExit();
   }
   QTest::qWait(1000);
@@ -262,12 +262,12 @@ void ExmTests::tryDeleteExercisePhase()
 //--------------------------------------------------------------------------
 void ExmTests::tryStartExercise()
 {
-  INFO_LOG() << "trying to start exercise Id = " << m_exerciseId;
+  INFO_LOG(m_logger) << "trying to start exercise Id = " << m_exerciseId;
 
   m_dtc->waitForHistoricalDataExercise();
   ExerciseManagement::Exercise ex = m_dtc->exercise(m_exerciseId);
 
-  DEBUG_LOG() << "Training area id = " << ex.trainingAreaId();
+  DEBUG_LOG(m_logger) << "Training area id = " << ex.trainingAreaId();
 
   ExerciseModifyRequest req;
   req.id(m_exerciseId);
@@ -283,7 +283,7 @@ void ExmTests::tryStartExercise()
   req.newState(ExerciseState::Started);
   if (!m_ftc->exerciseModifyRequest(req, this))
   {
-    ERROR_LOG() << "Error requesting modify data";
+    ERROR_LOG(m_logger) << "Error requesting modify data";
     failExit();
   }
 
@@ -294,7 +294,7 @@ void ExmTests::tryStartExercise()
 
 //  if (!m_ftc->exerciseChangeStateRequest(req, this))
 //  {
-//    ERROR_LOG() << "Error requesting change state";
+//    ERROR_LOG(m_logger) << "Error requesting change state";
 //    failExit();
 //  }
 
@@ -304,19 +304,19 @@ void ExmTests::tryStartExercise()
 //-------------------------------------------------------------------------------
 void ExmTests::tryGetAllExercises()
 {
-  INFO_LOG() << "trying to get all exercises";
+  INFO_LOG(m_logger) << "trying to get all exercises";
   m_dtc->waitForHistoricalDataExercise();
 
   bool bAtLeastOneFound = false;
   auto cb = [this, &bAtLeastOneFound](const ExerciseManagement::Exercise &ex)
   {
-    INFO_LOG() << "Exe(" << ex.id() << ") : " << ex.name();
+    INFO_LOG(m_logger) << "Exe(" << ex.id() << ") : " << ex.name();
     bAtLeastOneFound = true;
   };
   m_dtc->exercises(cb);
   if (!bAtLeastOneFound)
   {
-    ERROR_LOG() << "Error receiving data for exercises";
+    ERROR_LOG(m_logger) << "Error receiving data for exercises";
     failExit();
   }
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -325,19 +325,19 @@ void ExmTests::tryGetAllExercises()
 //-------------------------------------------------------------------------------
 void ExmTests::tryGetExercise()
 {
-  INFO_LOG() << "trying get itemData for exercise " << m_exerciseId;
+  INFO_LOG(m_logger) << "trying get itemData for exercise " << m_exerciseId;
   m_dtc->waitForHistoricalDataExercise();
   ExerciseManagement::Exercise data = m_dtc->exercise(m_exerciseId);
 
   if (data.id() <= 0)
   {
-    ERROR_LOG() << "Error receiving data for exercise " << m_exerciseId;
-    DEBUG_LOG() << "data.id() = " << data.id();
+    ERROR_LOG(m_logger) << "Error receiving data for exercise " << m_exerciseId;
+    DEBUG_LOG(m_logger) << "data.id() = " << data.id();
     failExit();
   }
   else
   {
-    INFO_LOG() << "## Exe(" << data.id() << ") : name = " << data.name()
+    INFO_LOG(m_logger) << "## Exe(" << data.id() << ") : name = " << data.name()
                        << ", begin = " << data.beginTime() << ", end = " << data.endTime()
                        << ", state = " << data.state();
   }
@@ -349,10 +349,10 @@ void ExmTests::onExerciseChanged(const ExerciseManagement::Exercise &data,
                                                       DataModification modType)
 {
   const int id = data.id();
-  DEBUG_LOG() << "onExerciseChanged for exercise " << id
+  DEBUG_LOG(m_logger) << "onExerciseChanged for exercise " << id
                       << " - modType: " << (int)modType;
   if (m_exerciseId == id)
-    INFO_LOG() << "##################### Data for id = " << id << " received";
+    INFO_LOG(m_logger) << "##################### Data for id = " << id << " received";
 }
 
 //--------------------------------------------------------------------------
@@ -360,11 +360,11 @@ void ExmTests::onExerciseCreateReply(const Core::FunctionReplyObject &replyObjec
 {
   if (replyObject.error())
   {
-    ERROR_LOG() << "Got onExerciseCreateReply error: " << replyObject();
+    ERROR_LOG(m_logger) << "Got onExerciseCreateReply error: " << replyObject();
     failExit();
     return;
   }
-  INFO_LOG() << "Got createReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got createReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
   m_exerciseId = replyObject.id();
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -375,11 +375,11 @@ void ExmTests::onExerciseModifyReply(const Core::FunctionReplyObject &replyObjec
 {
   if (replyObject.error())
   {
-    ERROR_LOG() << "Got onExerciseModifyReply error: " << replyObject();
+    ERROR_LOG(m_logger) << "Got onExerciseModifyReply error: " << replyObject();
     failExit();
     return;
   }
-  INFO_LOG() << "Got modifyRequest with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got modifyRequest with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
@@ -389,11 +389,11 @@ void ExmTests::onExerciseModifyReply(const Core::FunctionReplyObject &replyObjec
 //{
 //  if (replyObject.error())
 //  {
-//    ERROR_LOG() << "Got onExerciseChangeStateReply error: " << replyObject();
+//    ERROR_LOG(m_logger) << "Got onExerciseChangeStateReply error: " << replyObject();
 //    failExit();
 //    return;
 //  }
-//  INFO_LOG() << "Got changeStateRequest with id " << replyObject.id()
+//  INFO_LOG(m_logger) << "Got changeStateRequest with id " << replyObject.id()
 //                     << " and errorString " << replyObject.translated();
 //  QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 //}
@@ -403,11 +403,11 @@ void ExmTests::onExerciseRemoveReply(const Core::FunctionReplyObject &replyObjec
 {
   if (replyObject.error())
   {
-    ERROR_LOG() << "Got onExerciseRemoveReply error: " << replyObject();
+    ERROR_LOG(m_logger) << "Got onExerciseRemoveReply error: " << replyObject();
     failExit();
     return;
   }
-  INFO_LOG() << "Got removeReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
@@ -417,11 +417,11 @@ void ExmTests::onExercisePhaseCreateReply(const Core::FunctionReplyObject &reply
 {
   if (replyObject.error())
   {
-    ERROR_LOG() << "Got onExercisePhaseCreateReply error: " << replyObject();
+    ERROR_LOG(m_logger) << "Got onExercisePhaseCreateReply error: " << replyObject();
     failExit();
     return;
   }
-  INFO_LOG() << "Got createExercisePhaseReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got createExercisePhaseReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   m_phaseId = replyObject.id();
@@ -433,11 +433,11 @@ void ExmTests::onExercisePhaseModifyReply(const Core::FunctionReplyObject &reply
 {
   if (replyObject.error())
   {
-    ERROR_LOG() << "Got onExercisePhaseModifyReply error: " << replyObject();
+    ERROR_LOG(m_logger) << "Got onExercisePhaseModifyReply error: " << replyObject();
     failExit();
     return;
   }
-  INFO_LOG() << "Got modifyExercisePhaseReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got modifyExercisePhaseReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -448,11 +448,11 @@ void ExmTests::onExercisePhaseRemoveReply(const Core::FunctionReplyObject &reply
 {
   if (replyObject.error())
   {
-    ERROR_LOG() << "Got onExercisePhaseRemoveReply error: " << replyObject();
+    ERROR_LOG(m_logger) << "Got onExercisePhaseRemoveReply error: " << replyObject();
     failExit();
     return;
   }
-  INFO_LOG() << "Got removeExercisePhaseReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got removeExercisePhaseReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -463,11 +463,11 @@ void ExmTests::onTrainingAreaModifyReply(const Core::FunctionReplyObject &replyO
 {
   if (replyObject.error())
   {
-    ERROR_LOG() << "Got onTrainingAreaModifyReply error: " << replyObject();
+    ERROR_LOG(m_logger) << "Got onTrainingAreaModifyReply error: " << replyObject();
     failExit();
     return;
   }
-  INFO_LOG() << "Got createReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got createReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
   m_trainingAreaId = replyObject.id();
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -476,7 +476,7 @@ void ExmTests::onTrainingAreaModifyReply(const Core::FunctionReplyObject &replyO
 // ------------------------------------------------------------------------------
 void ExmTests::failExit()
 {
-  ERROR_LOG() << "FAIL EXIT !";
+  ERROR_LOG(m_logger) << "FAIL EXIT !";
   m_bTestsSuccessful = false;
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests.cpp
index 1e14cdd5b..61530f241 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests.cpp
@@ -22,8 +22,7 @@
 
 
 
-DataTopicTests::DataTopicTests()
-  : m_domainParticipantPub(nullptr)
+DataTopicTests::DataTopicTests() : m_domainParticipantPub(nullptr)
   , m_domainParticipantSub(nullptr)
   , m_domainId(0)
   , m_ddsPublisher(nullptr)
@@ -33,12 +32,12 @@ DataTopicTests::DataTopicTests()
   , m_subscriberListenerBinder(nullptr)
   , m_dtcExercise(nullptr)
   , m_mainThreadId(QThread::currentThreadId())
-  .getNGLLogger("UnitTests.DataTopicTests"))
-{  
+  .getNGLLogger("UnitTests.DataTopicTests")),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {  
   if (!DDS::QosProfile::setDefault())
-    ERROR_LOG() << "Error setting default QoS from xml-file ";
+    ERROR_LOG(m_logger) << "Error setting default QoS from xml-file ";
 
-  DEBUG_LOG() << "Main thread ID is " << m_mainThreadId;
+  DEBUG_LOG(m_logger) << "Main thread ID is " << m_mainThreadId;
 }
 
 DataTopicTests::~DataTopicTests()
@@ -79,7 +78,7 @@ bool DataTopicTests::initPublisher()
   partitionQos.name( { partition } );
   publisherQos << partitionQos;
 
-  DEBUG_LOG() << "Publish on partition " << partition;
+  DEBUG_LOG(m_logger) << "Publish on partition " << partition;
 
   m_ddsPublisher = dds::pub::Publisher(m_domainParticipantPub, publisherQos);
 
@@ -91,8 +90,8 @@ bool DataTopicTests::initPublisher()
 
 bool DataTopicTests::write(const ExerciseManagement::Exercise &data)
 {
-  INFO_LOG() << "Publish topic Exercise ";
-  DEBUG_LOG() << "ExeId: " << data.id() << ", state: " << data.state()
+  INFO_LOG(m_logger) << "Publish topic Exercise ";
+  DEBUG_LOG(m_logger) << "ExeId: " << data.id() << ", state: " << data.state()
                       << ", partitionName: " << data.partitionName();
 
   return m_dtsExercise->write(data);
@@ -105,7 +104,7 @@ bool DataTopicTests::write(const ExerciseManagement::Exercise &data)
 
 bool DataTopicTests::initSubscriber()
 {
-  DEBUG_LOG() << "Initialisation DDS (Subscriber/Reader)";
+  DEBUG_LOG(m_logger) << "Initialisation DDS (Subscriber/Reader)";
 
   m_domainParticipantSub =
       dds::domain::DomainParticipant(m_domainId,
@@ -126,7 +125,7 @@ bool DataTopicTests::initSubscriber()
   partitionQos.name( partitions );
   subscriberQos << partitionQos;
 
-  DEBUG_LOG() << "Initialise DTC::SubscriberListener";
+  DEBUG_LOG(m_logger) << "Initialise DTC::SubscriberListener";
   m_subscriberListener = new DDSGeneric::SubscriberListener();
 
   m_ddsSubscriber = dds::sub::Subscriber(m_domainParticipantSub,
@@ -145,11 +144,11 @@ bool DataTopicTests::initSubscriber()
 void DataTopicTests::processData(const ExerciseManagement::Exercise &instance, DataModification modType)
 {
   Q_UNUSED(modType);
-  INFO_LOG() << "process Lts_Exercise";
+  INFO_LOG(m_logger) << "process Lts_Exercise";
 
-  DEBUG_LOG() << "exerciseId: " << instance.id();
-  DEBUG_LOG() << "name: " << instance.name();
-  DEBUG_LOG() << "state: " << instance.state();
+  DEBUG_LOG(m_logger) << "exerciseId: " << instance.id();
+  DEBUG_LOG(m_logger) << "name: " << instance.name();
+  DEBUG_LOG(m_logger) << "state: " << instance.state();
 
   m_receivedExerciseData = instance;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests.h
index 4f89e412f..cabac953c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests.h
@@ -42,6 +42,7 @@ public:
   ExerciseManagement::Exercise getReceivedExerciseData() const { return m_receivedExerciseData; }
 
 protected:
+  NGL::INGLLogger &m_logger;
   // Subscriber Methods
   void processData(const ExerciseManagement::Exercise& instance, DataModification modType);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests_main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests_main.cpp
index fd288167e..7b77734f1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests_main.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests_main.cpp
@@ -40,7 +40,7 @@ DataTopicTestsMain::DataTopicTestsMain()
 //-------------------------------------------------------------------------------------------------------
 void DataTopicTestsMain::initTestCase()
 {
-  DEBUG_LOG() <<"DataTopicTestsMain: initTestCase";
+  DEBUG_LOG(m_logger) <<"DataTopicTestsMain: initTestCase";
 
   m_dtTest = new DataTopicTests();
   QVERIFY2(m_dtTest, "Initialisation of DataTopicTest failed");
@@ -53,7 +53,7 @@ void DataTopicTestsMain::initTestCase()
 //-------------------------------------------------------------------------------------------------------
 void DataTopicTestsMain::publishTestCase()
 {
-  DEBUG_LOG() <<"DataTopicTestsMain: publish data";
+  DEBUG_LOG(m_logger) <<"DataTopicTestsMain: publish data";
 
   // Topic Exercise
   m_sentExerciseData.id(222);
@@ -68,7 +68,7 @@ void DataTopicTestsMain::publishTestCase()
 
 void DataTopicTestsMain::subscribeTestCase()
 {
-  DEBUG_LOG() << "IN subscribeTestCase";
+  DEBUG_LOG(m_logger) << "IN subscribeTestCase";
   QTRY_COMPARE(m_exerciseDataArrivedSpy->count(), 1);
 
   ExerciseManagement::Exercise recvExercise = m_dtTest->getReceivedExerciseData();
@@ -82,7 +82,7 @@ void DataTopicTestsMain::subscribeTestCase()
 //-------------------------------------------------------------------------------------------------------
 void DataTopicTestsMain::cleanupTestCase()
 {
-  DEBUG_LOG() <<"DataTopicTestsMain: cleanupTestCase";
+  DEBUG_LOG(m_logger) <<"DataTopicTestsMain: cleanupTestCase";
   delete m_dtTest; m_dtTest = nullptr;
   delete m_exerciseDataArrivedSpy; m_exerciseDataArrivedSpy = nullptr;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests_main.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests_main.h
index 1293bff2f..ac96c61a6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests_main.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests_main.h
@@ -35,6 +35,7 @@ private Q_SLOTS:
 
 protected:
 
+  NGL::INGLLogger &m_logger;
 private:
   ExerciseManagement::Exercise m_sentExerciseData;
   QSignalSpy       *m_exerciseDataArrivedSpy = nullptr;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/initialisation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/initialisation.cpp
index 581740823..4aab328c0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/initialisation.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/initialisation.cpp
@@ -14,22 +14,20 @@
 #include <Lts/Common/ProjectConfig/project_defines.h>
 
 
-Initialisation::Initialisation()
-  : m_domainParticipant(nullptr)
+Initialisation::Initialisation() : m_domainParticipant(nullptr)
   , m_domainParticipantSub(nullptr)
   , m_domainId(0)
   , m_partitionId(-1)
   , m_ddsPublisher(nullptr)
   , m_ddsSubscriber(nullptr)
   , m_subListener(new DTC::SubscriberListener)
-  .getNGLLogger("UnitTests.Initialisation"))
-
-{  
+  .getNGLLogger("UnitTests.Initialisation")),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {  
   DDS::DefaultQos defaultQos;
 
   //if (!defaultQos.setDefaultQos(QStringList("/shd/CTC/SV/.default_dds_profile.xml")))
   if (!defaultQos.setDefaultQos())
-    ERROR_LOG() << "Error setting default QoS from xml-file ";
+    ERROR_LOG(m_logger) << "Error setting default QoS from xml-file ";
 
 }
 
@@ -62,7 +60,7 @@ bool Initialisation::initDDS(int domainId, int partitionId, PubSub pubsub)
   {
     dds::pub::qos::PublisherQos publisherQos = m_domainParticipant.default_publisher_qos();
 
-    DEBUG_LOG() << "Publish on partition " << IDL::getPartitionString(partitionId);
+    DEBUG_LOG(m_logger) << "Publish on partition " << IDL::getPartitionString(partitionId);
 
     // use only selected partition
     dds::core::policy::Partition partitionQos;
@@ -84,7 +82,7 @@ bool Initialisation::initDDS(int domainId, int partitionId, PubSub pubsub)
 
     dds::sub::qos::SubscriberQos subscriberQos = domainPart.default_subscriber_qos();
 
-    DEBUG_LOG() << "Subsribing on partition " << IDL::getPartitionString(partitionId);
+    DEBUG_LOG(m_logger) << "Subsribing on partition " << IDL::getPartitionString(partitionId);
 
     // use only selected partition
     dds::core::policy::Partition partitionQos;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/initialisation.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/initialisation.h
index edea81ed3..9aad1d390 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/initialisation.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/initialisation.h
@@ -38,6 +38,7 @@ public:
   DTC::SubscriberListener       *getSubscriberListener()   { return m_subListener; }
 
 private:
+  NGL::INGLLogger &m_logger;
   dds::domain::DomainParticipant m_domainParticipant;
   dds::domain::DomainParticipant m_domainParticipantSub;
   int                            m_domainId;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/WebSocketInterface/websocket_interface_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/WebSocketInterface/websocket_interface_handler.cpp
index d4d04c802..6a1402df1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/WebSocketInterface/websocket_interface_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/WebSocketInterface/websocket_interface_handler.cpp
@@ -36,7 +36,7 @@ bool WebSocketInterfaceHandler::init()
 {
   cleanup();
 
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "... ok";
 
   m_dataManager = new DataManager(m_mainHandler->db(), m_mainHandler->exerciseHandler());
 
@@ -44,15 +44,15 @@ bool WebSocketInterfaceHandler::init()
 
   m_webSocketServer = new LtsWebSocket::LtsWebSocketServer(m_messageFactory, this);
 
-  DEBUG_LOG() << "Initialising LtsWebSocketServer";
+  DEBUG_LOG(m_logger) << "Initialising LtsWebSocketServer";
   if (!m_webSocketServer->init(QStringLiteral("EXM"), Settings::getWebSocketServerPortRange(1)))
   {
-    ERROR_LOG() << "Failed to initialise LtsWebSocketServer";
+    ERROR_LOG(m_logger) << "Failed to initialise LtsWebSocketServer";
     return false;
   }
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "... ok";
 
-  DEBUG_LOG() << "Connection signals and slots";
+  DEBUG_LOG(m_logger) << "Connection signals and slots";
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/dds_handler.cpp
index b810d89d0..44df852a3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/dds_handler.cpp
@@ -16,14 +16,14 @@ namespace ExerciseManagement
 DdsHandler::DdsHandler(int domainId)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Any))
 {
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
   if(!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -38,23 +38,23 @@ bool DdsHandler::init(const QStringList &qosFileList)
   m_ddsFts = ExerciseManagement::Interface::Fts::create(m_ddsConnector);
 
   bool bRet = m_ddsDts->enableAll();
-  INFO_LOG() << "Dts initialised";
+  INFO_LOG(m_logger) << "Dts initialised";
 
   bRet &= m_ddsFts->enableAll();
-  INFO_LOG() << "Fts initialised";
+  INFO_LOG(m_logger) << "Fts initialised";
 
   m_scmFtc = ServiceManagement::Interface::Ftc::create(m_ddsConnector);
   bRet &= m_scmFtc->enableAll();
-  INFO_LOG() << "ScmFtc Initialised";
+  INFO_LOG(m_logger) << "ScmFtc Initialised";
 
   m_ppmDtc = ParticipantManagement::Interface::Dtc::create(m_ddsConnector);
   bRet &= m_ppmDtc->enableEquipmentExerciseMapping();
-  INFO_LOG() << "m_ppmDtc Initialised";
+  INFO_LOG(m_logger) << "m_ppmDtc Initialised";
 
   m_avmDtc = AudioVideoManagement::Interface::Dtc::create(m_ddsConnector);
   bRet &= m_avmDtc->enableCnrConfig();
   bRet &= m_avmDtc->enableCnrChannel();
-  INFO_LOG() << "m_avmDtc Initialised";
+  INFO_LOG(m_logger) << "m_avmDtc Initialised";
 
   return bRet;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/dds_handler.h
index 34dec0a47..6355a0715 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/dds_handler.h
@@ -42,6 +42,7 @@ public:
   std::shared_ptr<DDSConnector::DdsConnector> ddsConnector() const { return m_ddsConnector; }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector>         m_ddsConnector;
   std::shared_ptr<Core::Pacemaker>                    m_pacemaker;
   std::shared_ptr<Core::TopicLockMaster>              m_topicLockMaster;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_base.cpp
index 0ec83c8a1..22dbd470f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_base.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_base.cpp
@@ -30,7 +30,7 @@ void ExerciseStateBase::onEntry(QEvent *event)
 {
   QState::onEntry(event);
 
-  DEBUG_LOG() << "Ex " << exerciseId() << ": onEntry Base: write exerciseState: " << m_exerciseState;
+  DEBUG_LOG(m_logger) << "Ex " << exerciseId() << ": onEntry Base: write exerciseState: " << m_exerciseState;
   // write exerciseState to db
   m_exercise->setExerciseState(m_exerciseState);
 
@@ -61,7 +61,7 @@ void Creation::onEntry(QEvent *event)
   // fill durchgef_uebungen, before base because
   // we need a filled durchgef_uebungen there
 
-  DEBUG_LOG() << "Ex " << exerciseId() << ": onEntry Creation ";
+  DEBUG_LOG(m_logger) << "Ex " << exerciseId() << ": onEntry Creation ";
   ExerciseStateBase::onEntry(event);
 
   // TODO
@@ -80,7 +80,7 @@ Start::Start(ObjectExercise *objExe)
 
 void Start::onEntry(QEvent *event)
 {
-  DEBUG_LOG() << "Ex " << exerciseId() << ": onEntry Start: write exerciseState: started";
+  DEBUG_LOG(m_logger) << "Ex " << exerciseId() << ": onEntry Start: write exerciseState: started";
   ExerciseStateBase::onEntry(event);
 
   // TODO:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_base.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_base.h
index 580d1ece0..975662040 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_base.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_base.h
@@ -24,12 +24,14 @@ namespace ExerciseManagement
     ExerciseManagement::ExerciseState exerciseState() const { return m_exerciseState; }
 
   protected:
+  NGL::INGLLogger &m_logger;
     ExerciseStateBase(const QString &objectName, const ExerciseState &exerciseState, ObjectExercise* objExe);
     void onEntry(QEvent *event);
 
     int exerciseId() const { return m_exercise ? m_exercise->id() : -1; }
 
   protected:
+  NGL::INGLLogger &m_logger;
     ObjectExercise  *m_exercise;
   private:
     const ExerciseManagement::ExerciseState m_exerciseState;
@@ -48,6 +50,7 @@ namespace ExerciseManagement
     public:
       explicit Creation(ObjectExercise *objExe);
     protected:
+  NGL::INGLLogger &m_logger;
       void onEntry(QEvent *event);
   };
 
@@ -57,6 +60,7 @@ namespace ExerciseManagement
     public:
       explicit Start(ObjectExercise *objExe);
     protected:
+  NGL::INGLLogger &m_logger;
       void onEntry(QEvent *event);
       void onExit(QEvent *event);
   };
@@ -74,6 +78,7 @@ namespace ExerciseManagement
     public:
       explicit Stop(ObjectExercise *objExe);
     protected:
+  NGL::INGLLogger &m_logger;
       void onEntry(QEvent *event);
   };
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_machine.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_machine.cpp
index 5ddb68eea..8e93a13ca 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_machine.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_machine.cpp
@@ -79,12 +79,12 @@ ExerciseStateMachine::ExerciseStateMachine(ObjectExercise* objExe, QObject *pare
   //States zur StateMachine hinzufügen
   for (ExerciseStateBase *state : std::as_const(m_exerciseStates))
   {
-    DEBUG_LOG() << "Ex " << exerciseId() << ": state: " << state->exerciseState();
+    DEBUG_LOG(m_logger) << "Ex " << exerciseId() << ": state: " << state->exerciseState();
     m_stateMachine->addState(state);
     connect(state, &ExerciseStateBase::entered, this, &ExerciseStateMachine::onEnteredState);
   }
 
-  DEBUG_LOG() << "Ex " << exerciseId() << ": Constructor ExerciseStateMachine: size m_exerciseStates = " << m_exerciseStates.size();
+  DEBUG_LOG(m_logger) << "Ex " << exerciseId() << ": Constructor ExerciseStateMachine: size m_exerciseStates = " << m_exerciseStates.size();
 }
 
 ExerciseStateMachine::~ExerciseStateMachine()
@@ -99,11 +99,11 @@ bool ExerciseStateMachine::init()
   if (m_stateMachine->isRunning())
     return false;
 
-  DEBUG_LOG() << "Ex " << exerciseId() << ": Init ExerciseStateMachine ";
+  DEBUG_LOG(m_logger) << "Ex " << exerciseId() << ": Init ExerciseStateMachine ";
   // initialise current exerciseState
   ExerciseStateBase *currentExerciseState = getStateFromId(m_exercise->exerciseState());
 
-  DEBUG_LOG() << "Ex " << exerciseId() << ": State = "
+  DEBUG_LOG(m_logger) << "Ex " << exerciseId() << ": State = "
                       << ExerciseStateManager::toString(m_exercise->exerciseState());
 
   m_stateMachine->setInitialState(currentExerciseState);
@@ -111,7 +111,7 @@ bool ExerciseStateMachine::init()
 
   m_stateManager->setInitial(m_exercise->exerciseState());
 
-  DEBUG_LOG() << "Ex " << exerciseId() << ": ==> Done Init ExerciseStateMachine ";
+  DEBUG_LOG(m_logger) << "Ex " << exerciseId() << ": ==> Done Init ExerciseStateMachine ";
 
   return true;
 }
@@ -128,13 +128,13 @@ bool ExerciseStateMachine::switchToState(ExerciseState newExerciseState)
 
 void ExerciseStateMachine::onEnteredState()
 {
-  DEBUG_LOG() << "Ex " << exerciseId() << ": ExerciseStateMachine - onEnteredState";
+  DEBUG_LOG(m_logger) << "Ex " << exerciseId() << ": ExerciseStateMachine - onEnteredState";
 
   ExerciseStateBase *s = qobject_cast<ExerciseStateBase*>(sender());
   if (!s)
     return;
 
-  DEBUG_LOG() << "Ex " << exerciseId() << ": ExerciseStateBase : " << s->exerciseState();
+  DEBUG_LOG(m_logger) << "Ex " << exerciseId() << ": ExerciseStateBase : " << s->exerciseState();
 
   m_stateManager->setCurrent(s->exerciseState());
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_machine.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_machine.h
index 68d94874d..ffea02c67 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_machine.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_machine.h
@@ -45,6 +45,7 @@ namespace ExerciseManagement
       void onEnteredState();
 
     private:
+  NGL::INGLLogger &m_logger;
       ExerciseStateBase *getStateFromId(ExerciseManagement::ExerciseState exerciseState);
       int exerciseId() const;
 
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 c3a8a35a1..3e5febe0c 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
@@ -30,11 +30,11 @@ namespace ExerciseManagement
 
   bool ExerciseStateManager::triggerSwitchState(ExerciseManagement::ExerciseState state)
   {
-    INFO_LOG() << "Ex " << exerciseId() << ": Trying to switch to state " << toString(state);
+    INFO_LOG(m_logger) << "Ex " << exerciseId() << ": Trying to switch to state " << toString(state);
     std::function<void()> f = m_stateSignals.value(state);
     if (f)
     {
-      //DEBUG_LOG() << "function: emit signal";
+      //DEBUG_LOG(m_logger) << "function: emit signal";
       emit f();
     }
     return (f != nullptr);
@@ -78,7 +78,7 @@ namespace ExerciseManagement
 
   void ExerciseStateManager::setStateInternal(ExerciseManagement::ExerciseState state)
   {
-    INFO_LOG() << "Ex " << exerciseId() << ": In setStateInternal: new state " << toString(state);
+    INFO_LOG(m_logger) << "Ex " << exerciseId() << ": In setStateInternal: new state " << toString(state);
     if(m_exerciseState == state)
       return;
 
@@ -96,7 +96,7 @@ namespace ExerciseManagement
     // or separate object (because we've to check the a/v state periodically etc)
     */
 
-    INFO_LOG() << "Ex " << exerciseId() << ": Changed exercise state to " << toString(state);
+    INFO_LOG(m_logger) << "Ex " << exerciseId() << ": Changed exercise state to " << toString(state);
   }
 
   int ExerciseStateManager::exerciseId() const
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_manager.h
index f44000e76..8db0ba5c4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_manager.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exercise_state_manager.h
@@ -46,6 +46,8 @@ namespace ExerciseManagement
       void stateFalse();
 
     private:
+
+    NGL::INGLLogger &m_logger;
       void setStateInternal(ExerciseManagement::ExerciseState state);
       int exerciseId() const;
 
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 cd5ed75a2..2e8c6b2f8 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
@@ -56,14 +56,14 @@ HandlerExercise::~HandlerExercise()
 
 bool HandlerExercise::init()
 {
-  DEBUG_LOG() << "Finish Initialise DbAdministration (dba) ";
-  INFO_LOG() << "Data available for services: "  << m_exTblGen->getAvailableServices().join(QLatin1Char(','));
+  DEBUG_LOG(m_logger) << "Finish Initialise DbAdministration (dba) ";
+  INFO_LOG(m_logger) << "Data available for services: "  << m_exTblGen->getAvailableServices().join(QLatin1Char(','));
 
   QVector<Database::ExmExercise> dataVec;
   // read all exercises from database
   if (!m_db->select(dataVec))
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return true;
   }
 
@@ -77,13 +77,13 @@ bool HandlerExercise::init()
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       return false;
     }
     m_exeObjMap.insert(ifs->id(), ifs);
     exerciseStates.push_back({ifs->id(), ifs->data().exerciseStateId});
   }
-  DEBUG_LOG() << "m_exeObjMap.size() = " << m_exeObjMap.size();
+  DEBUG_LOG(m_logger) << "m_exeObjMap.size() = " << m_exeObjMap.size();
 
   // make sure to start the important exercises first
   std::sort(exerciseStates.begin(), exerciseStates.end(),
@@ -140,7 +140,7 @@ void HandlerExercise::onStartNextExercise()
     auto *objEx = m_exeObjMap.value(exId);
     if (!objEx)
     {
-      WARNING_LOG() << "Trying to start exercise with id " << exId << " but could not find a handler !?";
+      WARNING_LOG(m_logger) << "Trying to start exercise with id " << exId << " but could not find a handler !?";
       continue;
     }
     NOTICE_LOG(m_logger) << "Init state machine for exercise " << exId << " (" << objEx->data().name << ")";
@@ -155,7 +155,7 @@ bool HandlerExercise::hasError(const Core::FunctionReplyObject &replyObject, Obj
   if (replyObject.error())
   {
     delete ifs;
-    ERROR_LOG() << replyObject();
+    ERROR_LOG(m_logger) << replyObject();
     return true;
   }
   return false;
@@ -194,7 +194,7 @@ void HandlerExercise::onExerciseCreateRequest(const rti::core::SampleIdentity &c
   auto ret = exerciseCreateRequest(request);
   if (ret.error())
   {
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
 
   }
   m_ddsHandler->fts()->exerciseCreateReply(cookie, ret);
@@ -202,7 +202,7 @@ void HandlerExercise::onExerciseCreateRequest(const rti::core::SampleIdentity &c
 
 Core::FunctionReplyObject HandlerExercise::exerciseCreateRequest(const ExerciseCreateRequest &request)
 {
-  DEBUG_LOG() << "onExerciseCreateRequest: " << request;
+  DEBUG_LOG(m_logger) << "onExerciseCreateRequest: " << request;
 
   Database::ExmExercise newData(copyBaseData(request));
   newData.linkedExerciseId = 0;
@@ -234,7 +234,7 @@ Core::FunctionReplyObject HandlerExercise::exerciseCreateRequest(const ExerciseC
   if (hasError(ret, ifs))
   {
     // remove failed create exercise request from DDS bus (id = 0)
-    ERROR_LOG() << "CreateExercise failed, removing request from dds";
+    ERROR_LOG(m_logger) << "CreateExercise failed, removing request from dds";
     m_ddsHandler->dts()->removeExerciseByKey(0);
     return ret;
   }
@@ -250,7 +250,7 @@ Core::FunctionReplyObject HandlerExercise::exerciseCreateRequest(const ExerciseC
 
   if (hasError(ret, ifs))
   {
-    ERROR_LOG() << "CreateExercisePhase failed, removing requests from dds";
+    ERROR_LOG(m_logger) << "CreateExercisePhase failed, removing requests from dds";
     m_ddsHandler->dts()->removeExercisePhaseByKey(0);
     m_ddsHandler->dts()->removeExerciseByKey(0);
     return ret;
@@ -263,7 +263,7 @@ Core::FunctionReplyObject HandlerExercise::exerciseCreateRequest(const ExerciseC
 
   if (hasError(ret, ifs))
   {
-    ERROR_LOG() << "Set active phase failed, removing requests from dds";
+    ERROR_LOG(m_logger) << "Set active phase failed, removing requests from dds";
     m_ddsHandler->dts()->removeExercisePhaseByKey(0);
     m_ddsHandler->dts()->removeExerciseByKey(0);
     return ret;
@@ -283,13 +283,13 @@ void HandlerExercise::onExerciseModifyRequest(const rti::core::SampleIdentity &c
 {
   auto ret = exerciseModifyRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_ddsHandler->fts()->exerciseModifyReply(cookie, ret);
 }
 
 Core::FunctionReplyObject HandlerExercise::exerciseModifyRequest(const ExerciseModifyRequest &request)
 {
-  INFO_LOG() << "onExerciseModifyRequest: " << request;
+  INFO_LOG(m_logger) << "onExerciseModifyRequest: " << request;
 
   ObjectExercise *ifs = m_exeObjMap.value(request.id());
   if (ifs == nullptr)
@@ -430,7 +430,7 @@ Core::FunctionReplyObject HandlerExercise::exerciseModifyRequest(const ExerciseM
     }
   }
 
-  DEBUG_LOG() << "Linked exercise: " << request.linkedExerciseId()
+  DEBUG_LOG(m_logger) << "Linked exercise: " << request.linkedExerciseId()
                       << ", state: " << ifs->exerciseState()
                       << ", new: " << request.newState();
   if (request.linkedExerciseId() != 0 && ifs->exerciseState() != request.newState())
@@ -440,7 +440,7 @@ Core::FunctionReplyObject HandlerExercise::exerciseModifyRequest(const ExerciseM
     {
       ObjectExercise *ifsLinked = m_exeObjMap.value(request.linkedExerciseId());
       if (!ifsLinked)
-        WARNING_LOG() << "Linked exercise with id " << request.linkedExerciseId() << " not found!";
+        WARNING_LOG(m_logger) << "Linked exercise with id " << request.linkedExerciseId() << " not found!";
       else
       {
         if (ifsLinked->exerciseState() != ExerciseManagement::ExerciseState::Paused ||
@@ -478,7 +478,7 @@ Core::FunctionReplyObject HandlerExercise::exerciseModifyRequest(const ExerciseM
 //{
 //  Core::FunctionReplyObject ret;
 
-//  INFO_LOG() << "onExerciseChangeStateRequest id = " << request.id();
+//  INFO_LOG(m_logger) << "onExerciseChangeStateRequest id = " << request.id();
 
 //  ObjectExercise *ifs = m_exeObjMap.value(request.id());
 //  if (ifs == nullptr)
@@ -488,7 +488,7 @@ Core::FunctionReplyObject HandlerExercise::exerciseModifyRequest(const ExerciseM
 //    return;
 //  }
 
-//  DEBUG_LOG() << "request.newState() = " << request.newState();
+//  DEBUG_LOG(m_logger) << "request.newState() = " << request.newState();
 
 //  ret = ifs->switchToState(request.newState());
 //  if (!ret.error() && ifs->linkedExerciseId() != 0)
@@ -498,7 +498,7 @@ Core::FunctionReplyObject HandlerExercise::exerciseModifyRequest(const ExerciseM
 //    {
 //      ObjectExercise *ifsLinked = m_exeObjMap.value(ifs->linkedExerciseId());
 //      if (!ifsLinked)
-//        WARNING_LOG() << "Linked exercise with id " << ifs->linkedExerciseId() << " not found!";
+//        WARNING_LOG(m_logger) << "Linked exercise with id " << ifs->linkedExerciseId() << " not found!";
 //      else
 //      {
 //        if (ifsLinked->exerciseState() != ExerciseManagement::ExerciseState::Paused ||
@@ -509,7 +509,7 @@ Core::FunctionReplyObject HandlerExercise::exerciseModifyRequest(const ExerciseM
 //  }
 
 //  if (ret.error())
-//    ERROR_LOG() << ret();
+//    ERROR_LOG(m_logger) << ret();
 
 //  m_ddsHandler->fts()->exerciseChangeStateReply(cookie, ret);
 //}
@@ -530,7 +530,7 @@ void HandlerExercise::onGetExerciseImageRequest(const rti::core::SampleIdentity
   int32_t exerciseId = request.exerciseId();
   reply.id(exerciseId);
 
-  DEBUG_LOG() << "onGetExerciseImageRequest id = " << exerciseId;
+  DEBUG_LOG(m_logger) << "onGetExerciseImageRequest id = " << exerciseId;
 
   Database::ExmExerciseImage exmImg;
   if (!m_db->selectExmExerciseImage(exerciseId, exmImg))
@@ -566,7 +566,7 @@ void HandlerExercise::onGetExerciseImageRequest(const rti::core::SampleIdentity
 //      reply.imageData(LtsUtils::fromPixmap(excPx));
 //    }
 //    else
-//      ERROR_LOG() << "image isNull for exercise " << exerciseId;
+//      ERROR_LOG(m_logger) << "image isNull for exercise " << exerciseId;
   }
 
 /* test behaviour on bad network speeds
@@ -582,7 +582,7 @@ void HandlerExercise::onExerciseImageModifyRequest(const rti::core::SampleIdenti
 {
   qint32 exerciseId = request.id();
 
-  DEBUG_LOG() << "onExerciseImageModifyRequest id = " << exerciseId << ", image size = " << request.image().size();
+  DEBUG_LOG(m_logger) << "onExerciseImageModifyRequest id = " << exerciseId << ", image size = " << request.image().size();
 
   Database::ExmExerciseImage exImg;
   exImg.exerciseId = exerciseId;
@@ -639,7 +639,7 @@ void HandlerExercise::onExerciseRemoveRequest(const rti::core::SampleIdentity &c
 
   if (ret.error())
   {
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
   }
   else
   {
@@ -657,13 +657,13 @@ void HandlerExercise::onExerciseRemoveRequest(const rti::core::SampleIdentity &c
 void HandlerExercise::onStartGroupReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    WARNING_LOG() << "Error starting group: " << replyObject();
+    WARNING_LOG(m_logger) << "Error starting group: " << replyObject();
 }
 
 
 bool HandlerExercise::checkEquipmentNumbersOnAllExercises(int exerciseIdToBeStarted, QString &mesgOut)
 {
-  INFO_LOG() << Q_FUNC_INFO <<" START, exerciseIdTobeStarted: " << exerciseIdToBeStarted;
+  INFO_LOG(m_logger) << Q_FUNC_INFO <<" START, exerciseIdTobeStarted: " << exerciseIdToBeStarted;
 
   // only one exercise, about to start
   if (m_exeObjMap.size() <= 1)
@@ -684,7 +684,7 @@ bool HandlerExercise::checkEquipmentNumbersOnAllExercises(int exerciseIdToBeStar
 
     if (!ppmDtcForEx)
     {
-      WARNING_LOG() << Q_FUNC_INFO << " no ppmDtcForEx (" << exerciseIdToBeStarted << ")";
+      WARNING_LOG(m_logger) << Q_FUNC_INFO << " no ppmDtcForEx (" << exerciseIdToBeStarted << ")";
       return true;
     }
     ppmDtcForEx->enableParticipant();
@@ -704,7 +704,7 @@ bool HandlerExercise::checkEquipmentNumbersOnAllExercises(int exerciseIdToBeStar
   std::shared_ptr<ParticipantManagement::Interface::Dtc> ppmDtc = m_ddsHandler->ppmDtc();
   if (!ppmDtc)
   {
-    WARNING_LOG() << Q_FUNC_INFO << " no ppmDtc";
+    WARNING_LOG(m_logger) << Q_FUNC_INFO << " no ppmDtc";
     return true;
   }
 
@@ -723,7 +723,7 @@ bool HandlerExercise::checkEquipmentNumbersOnAllExercises(int exerciseIdToBeStar
     ObjectExercise *ifs = m_exeObjMap.value(exerciseId);
     if (!ifs)
     {
-      ERROR_LOG() << Q_FUNC_INFO << " Exercise not found, exId = " << exerciseId;
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " Exercise not found, exId = " << exerciseId;
       return;
     }
     if ((ifs->exerciseState() == ExerciseState::Started) ||
@@ -733,7 +733,7 @@ bool HandlerExercise::checkEquipmentNumbersOnAllExercises(int exerciseIdToBeStar
       for (const auto &eq2p : std::as_const(mapping))
         if (eqNoForEx.contains(eq2p.equipmentNumber()))
         {
-          DEBUG_LOG() << Q_FUNC_INFO << " !!! eq = " << eq2p.equipmentNumber() << " is already used in exercise =" << exerciseId;
+          DEBUG_LOG(m_logger) << Q_FUNC_INFO << " !!! eq = " << eq2p.equipmentNumber() << " is already used in exercise =" << exerciseId;
           usedEqNumbers[exerciseId].insert(eq2p.equipmentNumber());
         }
     }
@@ -767,7 +767,7 @@ bool HandlerExercise::checkEquipmentNumbersOnAllExercises(int exerciseIdToBeStar
       }
     } // while
 
-    WARNING_LOG() << Q_FUNC_INFO << " state change request not allowed: mesgOut:" << mesgOut;
+    WARNING_LOG(m_logger) << Q_FUNC_INFO << " state change request not allowed: mesgOut:" << mesgOut;
 
     // limit length:
     if (mesgOut.size()>200)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.h
index ad330b71c..7618d61a0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.h
@@ -73,8 +73,10 @@ public:
 //    }
 //  };
 private:
+  NGL::INGLLogger &m_logger;
   void onStartNextExercise();
 private:
+  NGL::INGLLogger &m_logger;
   /**
    * @brief HandlerExercise::hasError
    *        checks if there is an error in the replyObject and, if given, deletes
@@ -107,6 +109,7 @@ private:
   QStringList doubleChannels(int exerciseAId, int exerciseBId) const;
 
 private:
+  NGL::INGLLogger &m_logger;
   QHash<int, ObjectExercise*>       m_exeObjMap;
   MainHandler                      *m_mainHandler;
   std::shared_ptr<DdsHandler>       m_ddsHandler;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise_phase.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise_phase.cpp
index cea1ccfba..8c8628b00 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise_phase.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise_phase.cpp
@@ -47,7 +47,7 @@ bool HandlerExercisePhase::init()
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       bRet = false;
       return;
     }
@@ -55,11 +55,11 @@ bool HandlerExercisePhase::init()
   };
   if (!m_db->select(cbPhase) || !bRet)
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return true;
   }
 
-  DEBUG_LOG() << "m_exercisePhaseObjMap.size() = " << m_exercisePhaseObjMap.size();
+  DEBUG_LOG(m_logger) << "m_exercisePhaseObjMap.size() = " << m_exercisePhaseObjMap.size();
 
   return true;
 }
@@ -108,17 +108,17 @@ Core::FunctionReplyObject HandlerExercisePhase::removeAllPhasesByExerciseId(qint
 void HandlerExercisePhase::onExercisePhaseCreateRequest(const rti::core::SampleIdentity &cookie,
                                                         const ExercisePhaseCreateRequest &request)
 {
-  DEBUG_LOG() << "onExercisePhaseCreateRequest " << request;
+  DEBUG_LOG(m_logger) << "onExercisePhaseCreateRequest " << request;
   Core::FunctionReplyObject ret = exercisePhaseCreateRequest(request);
   if (ret.error())
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
 
   m_ddsHandler->fts()->exercisePhaseCreateReply(cookie, ret);
 }
 
 void HandlerExercisePhase::onExercisePhaseModifyRequest(const rti::core::SampleIdentity &cookie, const ExercisePhaseModifyRequest &request)
 {
-  DEBUG_LOG() << "onExercisePhaseModifyRequest " << request;
+  DEBUG_LOG(m_logger) << "onExercisePhaseModifyRequest " << request;
   Core::FunctionReplyObject ret;
 
   ObjectExercisePhase *ifs = m_exercisePhaseObjMap.value(request.id());
@@ -139,13 +139,13 @@ void HandlerExercisePhase::onExercisePhaseModifyRequest(const rti::core::SampleI
 
   ret = ifs->updateObject(data);
   if (ret.error())
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
   m_ddsHandler->fts()->exercisePhaseModifyReply(cookie, ret);
 }
 
 void HandlerExercisePhase::onExercisePhaseRemoveRequest(const rti::core::SampleIdentity &cookie, const Core::RemoveElementRequest &request)
 {
-  DEBUG_LOG() << "onExercisePhaseRemoveRequest " << request;
+  DEBUG_LOG(m_logger) << "onExercisePhaseRemoveRequest " << request;
   Core::FunctionReplyObject ret;
   ObjectExercisePhase *ifs = m_exercisePhaseObjMap.value(request.id());
 
@@ -178,7 +178,7 @@ void HandlerExercisePhase::onExercisePhaseRemoveRequest(const rti::core::SampleI
   ret = ifs->removeObject();
 
   if (ret.error())
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
   else
   {
     // delete ObjectExercise (including ExerciseStateMachine)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise_phase.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise_phase.h
index fd7c26159..d800a0dcf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise_phase.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise_phase.h
@@ -36,6 +36,7 @@ public:
   Core::FunctionReplyObject removeAllPhasesByExerciseId(qint64 exerciseId);
 
 private:
+  NGL::INGLLogger &m_logger;
   void onExercisePhaseCreateRequest(const rti::core::SampleIdentity &cookie,
                                     const ExercisePhaseCreateRequest &request) override final;
   void onExercisePhaseModifyRequest(const rti::core::SampleIdentity &cookie,
@@ -44,6 +45,7 @@ private:
                                     const Core::RemoveElementRequest &request) override final;
 
 private:
+  NGL::INGLLogger &m_logger;
   QMap<int, ObjectExercisePhase *> m_exercisePhaseObjMap;
   MainHandler                     *m_mainHandler;
   std::shared_ptr<DdsHandler>      m_ddsHandler;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/main_handler.cpp
index c54ae892a..5e5de22f0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/main_handler.cpp
@@ -19,9 +19,8 @@
 namespace ExerciseManagement
 {
 
-MainHandler::MainHandler(QObject *parent)
-  : QObject(parent)
-{}
+MainHandler::MainHandler(QObject *parent) : QObject(parent),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 MainHandler::~MainHandler()
 {
@@ -39,7 +38,7 @@ bool MainHandler::init(int domainId)
   m_ddsHandler = std::make_shared<DdsHandler>(domainId);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation ddsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
     return false;
   }
 
@@ -47,14 +46,14 @@ bool MainHandler::init(int domainId)
   m_dbHandler = std::make_shared<DbHandler>();
   if (!m_dbHandler->init(0, Settings::settings()))
   {
-    ERROR_LOG() << "Initialisation dbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
     return false;
   }
 
   // initialize DbAdministration
   if (!initDbAdminstration())
   {
-    ERROR_LOG() << "Initialisation dbAdministration failed.";
+    ERROR_LOG(m_logger) << "Initialisation dbAdministration failed.";
     return false;
   }
 
@@ -86,11 +85,11 @@ bool MainHandler::initDbAdminstration()
   connect(m_exTblGen.get(), &DBAdministration::ExerciseTableGenerator::aliveSignal,
           this, &MainHandler::sendKeepAlive);
 
-  DEBUG_LOG() << "Initialise DbAdmin ";
+  DEBUG_LOG(m_logger) << "Initialise DbAdmin ";
   if (!m_exTblGen->init(m_dbHandler->db()->database(),
                    m_dbHandler->db()->schemaName()))
   {
-    ERROR_LOG() << "Initialisation dbAdminHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation dbAdminHandler failed.";
     return false;
   }
   return true;
@@ -100,10 +99,10 @@ bool MainHandler::initExerciseHandler()
 {
   m_handlerExercise.reset(new HandlerExercise(this, m_ddsHandler, m_dbHandler->db(), m_exTblGen));
 
-  DEBUG_LOG() << "Initialise ExerciseHandler ";
+  DEBUG_LOG(m_logger) << "Initialise ExerciseHandler ";
   if (!m_handlerExercise->init())
   {
-    ERROR_LOG() << "Initialisation ExerciseHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation ExerciseHandler failed.";
     return false;
   }
 
@@ -114,10 +113,10 @@ bool MainHandler::initExercisePhaseHandler()
 {
   m_handlerExercisePhases.reset(new HandlerExercisePhase(this, m_ddsHandler, m_dbHandler->db()));
 
-  DEBUG_LOG() << "Initialise ExercisePhaseHandler ";
+  DEBUG_LOG(m_logger) << "Initialise ExercisePhaseHandler ";
   if (!m_handlerExercisePhases->init())
   {
-    ERROR_LOG() << "Initialisation ExercisePhaseHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation ExercisePhaseHandler failed.";
     return false;
   }
 
@@ -127,10 +126,10 @@ bool MainHandler::initExercisePhaseHandler()
 bool MainHandler::initWebSocketHandler()
 {
   m_websocketHandler =  std::make_shared<WebSocketInterface::WebSocketInterfaceHandler>(this);
-  DEBUG_LOG() << "Initialise WebSocketInterfaceHandler";
+  DEBUG_LOG(m_logger) << "Initialise WebSocketInterfaceHandler";
   if (!m_websocketHandler->init())
   {
-    ERROR_LOG() << "Initialisation WebSocketInterfaceHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler failed.";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/main_handler.h
index 4579bfba6..3eee70bad 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/main_handler.h
@@ -39,6 +39,7 @@ public:
   std::shared_ptr<DdsHandler> dds() const { return m_ddsHandler; }
 
 private:
+  NGL::INGLLogger &m_logger;
   bool initDbAdminstration();
   bool initExerciseHandler();
   bool initExercisePhaseHandler();
@@ -46,6 +47,7 @@ private:
   void sendKeepAlive();
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<HandlerExercise>      m_handlerExercise;
   std::shared_ptr<HandlerExercisePhase> m_handlerExercisePhases;
   std::shared_ptr<DdsHandler>           m_ddsHandler;
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 0a879127f..434d7580e 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
@@ -70,12 +70,12 @@ Core::FunctionReplyObject ObjectExercise::createObject(const Database::ExmExerci
     if (!m_db->insert(m_data))
     {
       QString errText = m_db->getLastError().databaseText();
-      ERROR_LOG() << "Error inserting exercise into database: " << errText;
+      ERROR_LOG(m_logger) << "Error inserting exercise into database: " << errText;
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting ExmExercise-data into database: %1")).arg(errText);
     }
 
     // Id is serial -> will be generated by db => inside m_data after db-insert
-    DEBUG_LOG() << "New exerciseId: " << m_data.id;
+    DEBUG_LOG(m_logger) << "New exerciseId: " << m_data.id;
 
     // Create exercise-schema
     if (!m_exTblGen->createExerciseSchema(m_data.id))
@@ -94,7 +94,7 @@ Core::FunctionReplyObject ObjectExercise::createObject(const Database::ExmExerci
   if (m_logger.isDebugEnabled())
     m_exTblGen->writeExerciseServicesSql(m_data.id);
 
-  INFO_LOG() << "Exercise created sucessfully.";
+  INFO_LOG(m_logger) << "Exercise created sucessfully.";
 
   // Publish Data via DTS
   onPublishData();
@@ -106,7 +106,7 @@ void ObjectExercise::initStateMachine()
 {
   // Start ExerciseStateMachine
   m_stateMachine->init();
-  INFO_LOG() << "StateMachine: currentState" << m_stateMachine->getCurrentState();
+  INFO_LOG(m_logger) << "StateMachine: currentState" << m_stateMachine->getCurrentState();
 }
 
 Core::FunctionReplyObject ObjectExercise::updateObject(const Database::ExmExercise &data)
@@ -136,12 +136,12 @@ Core::FunctionReplyObject ObjectExercise::updateObject(const Database::ExmExerci
 
   fixupTimeZone();
 
-  INFO_LOG() << "Trying to updateObject ExerciseData with id = " << data.id;
+  INFO_LOG(m_logger) << "Trying to updateObject ExerciseData with id = " << data.id;
 
   if (!m_db->update(m_data))
   {
     QString errText = m_db->getLastError().databaseText();
-    ERROR_LOG() << "Failed to update ExerciseData with id = " << data.id << ": " << m_db->getLastError().databaseText();
+    ERROR_LOG(m_logger) << "Failed to update ExerciseData with id = " << data.id << ": " << m_db->getLastError().databaseText();
     return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error updating ExmExercise-data in database: %1")).arg(errText);
   }
 
@@ -153,7 +153,7 @@ Core::FunctionReplyObject ObjectExercise::updateObject(const Database::ExmExerci
       return retOb;
   }
 
-  INFO_LOG() << "ExerciseData changed sucessfully.";
+  INFO_LOG(m_logger) << "ExerciseData changed sucessfully.";
 
   onPublishData();
 
@@ -175,14 +175,14 @@ Core::FunctionReplyObject ObjectExercise::removeObject(bool force)
   if (!m_db->removeExmExercise(m_data.id))
   {
     QString errText = m_db->getLastError().databaseText();
-    ERROR_LOG() << "Cannot remove exercise id = " << m_data.id << "from database: " << errText;
+    ERROR_LOG(m_logger) << "Cannot remove exercise id = " << m_data.id << "from database: " << errText;
     return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Exercise %1 (%2) can not be removed: %3")).arg(m_data.name).arg(m_data.id).arg(errText);
   }
 
   m_ddsHandler->dts()->removeExerciseByKey(m_data.id);
   sendStateToServiceManagement(m_data.exerciseStateId); // terminated
 
-  INFO_LOG() << "Exercise dropped sucessfully.";
+  INFO_LOG(m_logger) << "Exercise dropped sucessfully.";
 
   return Core::FunctionReplyObject(m_data.id);
 }
@@ -192,7 +192,7 @@ bool ObjectExercise::setLinkedExerciseId(int newLinkedExerciseId)
   m_data.linkedExerciseId = newLinkedExerciseId;
   if (!m_db->update(m_data))
   {
-    ERROR_LOG() << "Failed to update ExerciseData with id = " << m_data.id << " : " << m_db->getLastError().text();
+    ERROR_LOG(m_logger) << "Failed to update ExerciseData with id = " << m_data.id << " : " << m_db->getLastError().text();
     return false;
   }
   onPublishData();
@@ -204,7 +204,7 @@ bool ObjectExercise::setSendToWms(bool bSend)
   m_data.sendToWms = bSend;
   if (!m_db->update(m_data))
   {
-    ERROR_LOG() << "Failed to update ExerciseData with id = " << m_data.id << " : " << m_db->getLastError().text();
+    ERROR_LOG(m_logger) << "Failed to update ExerciseData with id = " << m_data.id << " : " << m_db->getLastError().text();
     return false;
   }
   onPublishData();
@@ -219,12 +219,12 @@ bool ObjectExercise::setExerciseState(const ExerciseState &exerciseState)
 
   if (!isValid() || !isEditable())
   {
-    WARNING_LOG() << "Trying to update an already removed ExmExercise object";
+    WARNING_LOG(m_logger) << "Trying to update an already removed ExmExercise object";
     return false;
   }
 
-  DEBUG_LOG() << "## m_data.exerciseStateId = " << m_data.exerciseStateId;
-  DEBUG_LOG() << "## exerciseState = " << exerciseState;
+  DEBUG_LOG(m_logger) << "## m_data.exerciseStateId = " << m_data.exerciseStateId;
+  DEBUG_LOG(m_logger) << "## exerciseState = " << exerciseState;
 
   m_data.exerciseStateId = exerciseState;
   if (m_data.exerciseStateId == ExerciseManagement::ExerciseState::Stopped ||
@@ -242,7 +242,7 @@ bool ObjectExercise::setExerciseState(const ExerciseState &exerciseState)
 
   if (!m_db->update(m_data))
   {
-    ERROR_LOG() << "Error updating ExmExercise-data in database (exerciseState) for exercise id = " << m_data.id  << " : " << m_db->getLastError().text();;
+    ERROR_LOG(m_logger) << "Error updating ExmExercise-data in database (exerciseState) for exercise id = " << m_data.id  << " : " << m_db->getLastError().text();;
     return false;
   }
 
@@ -255,7 +255,7 @@ bool ObjectExercise::setExerciseState(const ExerciseState &exerciseState)
 
   // record exerciseStateChange
   if (!m_db->insert(stateChange))
-    WARNING_LOG() << "Recording change of exerciseState failed: " << m_db->getLastError().text();;
+    WARNING_LOG(m_logger) << "Recording change of exerciseState failed: " << m_db->getLastError().text();;
 
   // Publish Data via DTS
   onPublishData();
@@ -265,10 +265,10 @@ bool ObjectExercise::setExerciseState(const ExerciseState &exerciseState)
 
 void ObjectExercise::onPublishData()
 {
-  INFO_LOG() << "Publish ExmExercise-data to dds (" << m_data.id << ", " << m_data.name << ") ...";
+  INFO_LOG(m_logger) << "Publish ExmExercise-data to dds (" << m_data.id << ", " << m_data.name << ") ...";
 
   if (!m_ddsHandler->dts()->publish(convert(m_data)))
-    ERROR_LOG() << "Error publishing ExmExercise-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing ExmExercise-data to dds";
 
 }
 
@@ -284,7 +284,7 @@ void ObjectExercise::fixupTimeZone()
 Core::FunctionReplyObject ObjectExercise::switchToState(const ExerciseState &newExerciseState, int operatorId, int workstationId)
 {
   Core::FunctionReplyObject ret;
-  INFO_LOG() << "-------------- switchToState: " << newExerciseState
+  INFO_LOG(m_logger) << "-------------- switchToState: " << newExerciseState
                      << ",  currentState = " << m_stateMachine->getCurrentState();
   m_data.operatorId = operatorId;
   m_data.workstationId = workstationId;
@@ -327,9 +327,9 @@ bool ObjectExercise::sendStateToServiceManagement(ExerciseState state)
     return false;
 
   if (sgt != Core::ServiceGroupType::Master)
-    DEBUG_LOG() << "Ex " << m_data.id <<  " - Trying to enable service group " << sgt;
+    DEBUG_LOG(m_logger) << "Ex " << m_data.id <<  " - Trying to enable service group " << sgt;
   else
-    DEBUG_LOG() << "Ex " << m_data.id <<  " - Trying to stop all services";
+    DEBUG_LOG(m_logger) << "Ex " << m_data.id <<  " - Trying to stop all services";
 
   // if there is an old group, stop them
   ServiceManagement::GroupRequest request(sgt,
@@ -341,14 +341,14 @@ bool ObjectExercise::sendStateToServiceManagement(ExerciseState state)
 #ifndef EXM_OBJECT_EXERCISE_NO_HANDLER
   if (!m_exerciseHandler || !m_exerciseHandler->startGroupRequest(request))
   {
-    ERROR_LOG() << "Ex " << m_data.id << " - Failed to start group " << sgt;
+    ERROR_LOG(m_logger) << "Ex " << m_data.id << " - Failed to start group " << sgt;
     return false;
   }
 #endif
   if (sgt != Core::ServiceGroupType::Master)
-    DEBUG_LOG() << "Ex " << m_data.id << " - Sent start group " << sgt;
+    DEBUG_LOG(m_logger) << "Ex " << m_data.id << " - Sent start group " << sgt;
   else
-    DEBUG_LOG() << "Ex " << m_data.id << " - Sent stop all services";
+    DEBUG_LOG(m_logger) << "Ex " << m_data.id << " - Sent stop all services";
 
   return true;
 }
@@ -374,7 +374,7 @@ bool ObjectExercise::transferExerciseToEvaluationDb()
                             Settings::evaluationDatabaseName()) ||
       !m_copyExercise->doCopy())
   {
-    WARNING_LOG() << "Could not backup exercise database to evaluation server";
+    WARNING_LOG(m_logger) << "Could not backup exercise database to evaluation server";
     return false;
   }
   NOTICE_LOG(m_logger) << "Ex " << m_data.id << " - Started copying exercise from "
@@ -391,7 +391,7 @@ void ObjectExercise::onTransferDbFinished()
 
   m_data.transferred = true;
   if (!m_db->update(m_data))
-    ERROR_LOG() << "Error updating ExmExercise-data (transferred) in database (exerciseState) for exercise id = " << m_data.id  << " : " << m_db->getLastError().text();;
+    ERROR_LOG(m_logger) << "Error updating ExmExercise-data (transferred) in database (exerciseState) for exercise id = " << m_data.id  << " : " << m_db->getLastError().text();;
 
   delete m_copyExercise;
   m_copyExercise = nullptr;
@@ -402,7 +402,7 @@ void ObjectExercise::onTransferDbFinished()
 
 void ObjectExercise::onErrorOccured()
 {
-  WARNING_LOG() << "Ex " << m_data.id << " - Copying exercise from "
+  WARNING_LOG(m_logger) << "Ex " << m_data.id << " - Copying exercise from "
                         << Settings::serverDatabaseHost() << ":" << Settings::serverDatabaseName()
                         << " to " << Settings::evaluationDatabaseHost() << ":" << Settings::evaluationDatabaseName();
   delete m_copyExercise;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise.h
index 59853756c..d16d5c30d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise.h
@@ -68,12 +68,14 @@ namespace ExerciseManagement
       bool transferExerciseToEvaluationDb();
 
   private:
+  NGL::INGLLogger &m_logger;
       void onPublishData();
       void fixupTimeZone();
       void onErrorOccured();
       void onTransferDbFinished();
 
     private:
+  NGL::INGLLogger &m_logger;
       std::shared_ptr<DdsHandler>    m_ddsHandler;
       std::shared_ptr<DatabaseInterface>      m_db;
       const std::shared_ptr<DBAdministration::ExerciseTableGenerator> m_exTblGen;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise_phase.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise_phase.cpp
index 59e9b221f..1142d4695 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise_phase.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise_phase.cpp
@@ -16,10 +16,9 @@ namespace ExerciseManagement
 {
 
 ObjectExercisePhase::ObjectExercisePhase(const std::shared_ptr<DdsHandler> &ddsHandler,
-                                         const std::shared_ptr<DatabaseInterface> &db)
-  : m_ddsHandler(ddsHandler)
-  , m_db(db)
-{}
+                                         const std::shared_ptr<DatabaseInterface> &db) : m_ddsHandler(ddsHandler)
+  , m_db(db),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 ObjectExercisePhase::~ObjectExercisePhase ()
 {}
@@ -36,10 +35,10 @@ Core::FunctionReplyObject ObjectExercisePhase::createObject(const Database::ExmE
     }
 
     // Id is serial -> will be generated by db => inside m_data after db-insert
-    DEBUG_LOG() << "New exercisePhaseId: " << m_data.id;
+    DEBUG_LOG(m_logger) << "New exercisePhaseId: " << m_data.id;
   }
 
-  INFO_LOG() << "ExercisePhase created sucessfully.";
+  INFO_LOG(m_logger) << "ExercisePhase created sucessfully.";
 
   // Publish Data via DTS
   onPublishData();
@@ -54,15 +53,15 @@ Core::FunctionReplyObject ObjectExercisePhase::updateObject(const Database::ExmE
 
   m_data = data;
 
-  INFO_LOG() << "Trying to updateObject ExercisePhaseData with id = " << data.id;
+  INFO_LOG(m_logger) << "Trying to updateObject ExercisePhaseData with id = " << data.id;
 
   if (!m_db->update(m_data))
   {
-    ERROR_LOG() << "Failed to update ExercisePhaseData with id = " << data.id;
+    ERROR_LOG(m_logger) << "Failed to update ExercisePhaseData with id = " << data.id;
     return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error updating ExmExercisePhase-data with id %1 in database")).arg(data.id);
   }
 
-  INFO_LOG() << "ExercisePhaseData changed sucessfully.";
+  INFO_LOG(m_logger) << "ExercisePhaseData changed sucessfully.";
 
   // Publish Data via DTS
   onPublishData();
@@ -88,10 +87,10 @@ bool ObjectExercisePhase::isValid() const
 
 void ObjectExercisePhase::onPublishData()
 {
-  INFO_LOG() << "Publish ExmExercisePhase-data to dds (" << m_data.id << ", " << m_data.name << ") ...";
+  INFO_LOG(m_logger) << "Publish ExmExercisePhase-data to dds (" << m_data.id << ", " << m_data.name << ") ...";
 
   if (!m_ddsHandler->dts()->publish(convert(m_data)))
-    ERROR_LOG() << "Error publishing ExmExercisePhase-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing ExmExercisePhase-data to dds";
 
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise_phase.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise_phase.h
index 0170f62d6..0a19f7f1b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise_phase.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise_phase.h
@@ -33,6 +33,7 @@ public:
   bool isValid() const;
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onPublishData();
 
 private:
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 1b1da3e76..7fb7c1fb6 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
@@ -65,7 +65,7 @@ FlmTests::~FlmTests()
 // ------------------------------------------------------------------------------
 bool FlmTests::init(int domainId, int testId, int folderId, int fileContentId, int operatorId)
 {
-  INFO_LOG() << "init begin";
+  INFO_LOG(m_logger) << "init begin";
 
   m_testId = testId;
   m_folderId = folderId;
@@ -79,33 +79,33 @@ bool FlmTests::init(int domainId, int testId, int folderId, int fileContentId, i
     return false;
   m_ddsConnector->initPublisherSubscriber();
 
-  TRACE_LOG() << "create dtc";
+  TRACE_LOG(m_logger) << "create dtc";
   m_dtc = FileManagement::Interface::Dtc::create(m_ddsConnector);
-  TRACE_LOG() << "init dtc";
+  TRACE_LOG(m_logger) << "init dtc";
   bool bRet = m_dtc->enableAll();
-  TRACE_LOG() << "init dtc end - bRet = " << bRet;
+  TRACE_LOG(m_logger) << "init dtc end - bRet = " << bRet;
 
-  TRACE_LOG() << "create ftc";
+  TRACE_LOG(m_logger) << "create ftc";
   m_ftc = FileManagement::Interface::Ftc::create(m_ddsConnector);
-  TRACE_LOG() << "init ftc";
+  TRACE_LOG(m_logger) << "init ftc";
   bRet &= m_ftc->enableAll();
-  TRACE_LOG() << "init ftc end - bRet = " << bRet;
+  TRACE_LOG(m_logger) << "init ftc end - bRet = " << bRet;
 
   // initialize database
   m_dbHandler = std::make_shared<DbHandler>();
   if(!m_dbHandler->init(0, Settings::settings()))
   {
-    ERROR_LOG() << "Initialisation dbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation dbHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation dbHandler succesful.";
   m_db = m_dbHandler->db();
 
-  DEBUG_LOG() << "########### Domain Id = " << domainId;
-  DEBUG_LOG() << "########### Test Id = " << testId;
-  DEBUG_LOG() << "########### Folder Id = " << folderId;
-  DEBUG_LOG() << "########### File Content Id = " << fileContentId;
-  DEBUG_LOG() << "########### Operator Id = " << operatorId;
+  DEBUG_LOG(m_logger) << "########### Domain Id = " << domainId;
+  DEBUG_LOG(m_logger) << "########### Test Id = " << testId;
+  DEBUG_LOG(m_logger) << "########### Folder Id = " << folderId;
+  DEBUG_LOG(m_logger) << "########### File Content Id = " << fileContentId;
+  DEBUG_LOG(m_logger) << "########### Operator Id = " << operatorId;
 
   return bRet;
 }
@@ -113,7 +113,7 @@ bool FlmTests::init(int domainId, int testId, int folderId, int fileContentId, i
 // ------------------------------------------------------------------------------
 void FlmTests::startTest()
 {
-  INFO_LOG() << "********* startTest **************";
+  INFO_LOG(m_logger) << "********* startTest **************";
   switch (m_testId)
   {
   // folder
@@ -168,11 +168,11 @@ void FlmTests::startTest()
     tryCreateSymbol();
     break;
   default:
-    ERROR_LOG() << "Unknown test case !";
+    ERROR_LOG(m_logger) << "Unknown test case !";
     failExit();
     break;
   }
-  INFO_LOG() << "*********  endTest  **************";
+  INFO_LOG(m_logger) << "*********  endTest  **************";
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
 
@@ -181,13 +181,13 @@ void FlmTests::startTest()
 // ------------------------------------------------------------------------------
 void FlmTests::tryCreateFolder()
 {
-  INFO_LOG() << "trying to send FolderCreateRequest";
+  INFO_LOG(m_logger) << "trying to send FolderCreateRequest";
 
   int parentFolderId = m_folderId;
   if (parentFolderId == 0)
     parentFolderId = 1;
 
-  DEBUG_LOG() << "Creating Folder under folder id = " << parentFolderId;
+  DEBUG_LOG(m_logger) << "Creating Folder under folder id = " << parentFolderId;
 
   // Creating hidden folder
   m_folderId = createFolder(parentFolderId, QStringLiteral("Test Folder"), true);
@@ -197,7 +197,7 @@ void FlmTests::tryCreateFolder()
   parentFolderId = m_folderId;
   m_folderId = 0;
 
-  DEBUG_LOG() << "Creating Subfolder for folder id = " << parentFolderId;
+  DEBUG_LOG(m_logger) << "Creating Subfolder for folder id = " << parentFolderId;
 
   m_folderId = createFolder(parentFolderId, QStringLiteral("Test Sub Folder"));
 
@@ -209,19 +209,19 @@ void FlmTests::tryCreateFolder()
 // ------------------------------------------------------------------------------
 void FlmTests::tryModifyFolder()
 {
-  INFO_LOG() << "trying to send folder modify request ";
+  INFO_LOG(m_logger) << "trying to send folder modify request ";
 
-  DEBUG_LOG() << "m_folderId = " << m_folderId;
+  DEBUG_LOG(m_logger) << "m_folderId = " << m_folderId;
 
   m_dtc->waitForHistoricalDataFolder();
   const FileManagement::Folder &fld = m_dtc->folder(m_folderId);
   FileManagement::FolderModifyRequest data;
 
-  DEBUG_LOG() << "fld.id() = " << fld.id();
+  DEBUG_LOG(m_logger) << "fld.id() = " << fld.id();
 
   if (fld.id() == 0)
   {
-    ERROR_LOG() << "Cannot find Folder Id = " << m_folderId;
+    ERROR_LOG(m_logger) << "Cannot find Folder Id = " << m_folderId;
     failExit();
   }
   else
@@ -240,7 +240,7 @@ void FlmTests::tryModifyFolder()
 
     if (!m_ftc->folderModifyRequest(FolderModifyRequest(data), this))
     {
-      ERROR_LOG() << "Error requesting modify data";
+      ERROR_LOG(m_logger) << "Error requesting modify data";
       failExit();
     }
     QTRY_VERIFY(m_folderId > 0);
@@ -252,11 +252,11 @@ void FlmTests::tryModifyFolder()
 // ------------------------------------------------------------------------------
 void FlmTests::tryRemoveFolder()
 {
-  INFO_LOG() << "trying to send FolderRemoveRequest ";
+  INFO_LOG(m_logger) << "trying to send FolderRemoveRequest ";
   m_dtc->waitForHistoricalDataFolder();
   if (!m_ftc->folderRemoveRequest(FolderRemoveRequest(m_folderId), this))
   {
-    ERROR_LOG() << "Error requesting delete data";
+    ERROR_LOG(m_logger) << "Error requesting delete data";
     failExit();
   }
   QTest::qWait(1000);
@@ -278,7 +278,7 @@ int FlmTests::createFolder(int parentFolderId, const QString &folderName, bool i
 
   if (!m_ftc->folderModifyRequest(req, this))
   {
-    ERROR_LOG() << "Error creating folder with parent = " << parentFolderId << " and name = " << folderName ;
+    ERROR_LOG(m_logger) << "Error creating folder with parent = " << parentFolderId << " and name = " << folderName ;
     failExit();
   }
 
@@ -290,7 +290,7 @@ int FlmTests::createFolder(int parentFolderId, const QString &folderName, bool i
 // ------------------------------------------------------------------------------
 void FlmTests::tryCreateFileContent()
 {
-  INFO_LOG() << "trying to send file content create request ";
+  INFO_LOG(m_logger) << "trying to send file content create request ";
   m_dtc->waitForHistoricalDataFileContent();
 
   FileContentModifyRequest data;
@@ -313,7 +313,7 @@ void FlmTests::tryCreateFileContent()
   m_fileContentId = 0;
   if (!m_ftc->fileContentModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
   QTRY_VERIFY(m_fileContentId > 0);
@@ -333,7 +333,7 @@ void FlmTests::tryCreateFileContent()
   m_fileContentId = 0;
   if (!m_ftc->fileContentModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
   QTRY_VERIFY(m_fileContentId > 0);
@@ -352,11 +352,11 @@ void FlmTests::tryCreateFileContent()
   file.setFileName(QCoreApplication::applicationDirPath()+fileName);
   if (!file.open(QFile::ReadOnly))
   {
-    ERROR_LOG() << "Error opening file " << fileName;
+    ERROR_LOG(m_logger) << "Error opening file " << fileName;
     failExit();
   }
   QByteArray rawImage = file.readAll();
-  DEBUG_LOG() << "Read file " << fileName;
+  DEBUG_LOG(m_logger) << "Read file " << fileName;
   file.close();
 
   data.content(LtsUtils::convert<std::vector<uint8_t>>(rawImage));
@@ -364,7 +364,7 @@ void FlmTests::tryCreateFileContent()
   m_fileContentId = 0;
   if (!m_ftc->fileContentModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
   QTRY_VERIFY(m_fileContentId > 0);
@@ -382,11 +382,11 @@ void FlmTests::tryCreateFileContent()
   file.setFileName(QCoreApplication::applicationDirPath()+fileName);
   if (!file.open(QFile::ReadOnly))
   {
-    ERROR_LOG() << "Error opening file " << fileName;
+    ERROR_LOG(m_logger) << "Error opening file " << fileName;
     failExit();
   }
   rawImage = file.readAll();
-  DEBUG_LOG() << "Read file " << fileName;
+  DEBUG_LOG(m_logger) << "Read file " << fileName;
   file.close();
 
   data.content(LtsUtils::convert<std::vector<uint8_t>>(rawImage));
@@ -394,7 +394,7 @@ void FlmTests::tryCreateFileContent()
   m_fileContentId = 0;
   if (!m_ftc->fileContentModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
   QTRY_VERIFY(m_fileContentId > 0);
@@ -403,30 +403,30 @@ void FlmTests::tryCreateFileContent()
 // ------------------------------------------------------------------------------
 void FlmTests::tryModifyFileContent()
 {
-  INFO_LOG() << "trying to send file content modify request ";
+  INFO_LOG(m_logger) << "trying to send file content modify request ";
 
-  DEBUG_LOG() << "m_fileContentId = " << m_fileContentId;
+  DEBUG_LOG(m_logger) << "m_fileContentId = " << m_fileContentId;
 
   m_dtc->waitForHistoricalDataFileContent();
   const FileManagement::FileContent &flc = m_dtc->fileContent(m_fileContentId);
   FileManagement::FileContentModifyRequest data;
 
-  DEBUG_LOG() << "flc.id() = " << flc.id();
+  DEBUG_LOG(m_logger) << "flc.id() = " << flc.id();
 
   if (flc.id() == 0)
   {
-    ERROR_LOG() << "Cannot find File Content Id = " << m_fileContentId;
+    ERROR_LOG(m_logger) << "Cannot find File Content Id = " << m_fileContentId;
     failExit();
   }
   else
   {
     if (!checkContentSize(m_fileContentId))
     {
-      ERROR_LOG() << "Content size 0";
+      ERROR_LOG(m_logger) << "Content size 0";
       failExit();
     }
 
-    DEBUG_LOG() << "Content size = " << m_content.size();
+    DEBUG_LOG(m_logger) << "Content size = " << m_content.size();
 
     data.id(flc.id());
     data.name(flc.name());
@@ -454,7 +454,7 @@ void FlmTests::tryModifyFileContent()
 
     if (!m_ftc->fileContentModifyRequest(FileContentModifyRequest(data), this))
     {
-      ERROR_LOG() << "Error requesting modify data";
+      ERROR_LOG(m_logger) << "Error requesting modify data";
       failExit();
     }
 
@@ -471,7 +471,7 @@ bool FlmTests::checkContentSize(int fileId)
   m_content.clear();
   if (!m_ftc->getFileContentDataRequest(request, this))
   {
-    ERROR_LOG() << "Cannot retrieve file content for id = " << fileId;
+    ERROR_LOG(m_logger) << "Cannot retrieve file content for id = " << fileId;
     return false;
   }
 
@@ -483,25 +483,25 @@ bool FlmTests::checkContentSize(int fileId)
 // ------------------------------------------------------------------------------
 void FlmTests::tryUpdateStatus()
 {
-  INFO_LOG() << "trying update status file content";
+  INFO_LOG(m_logger) << "trying update status file content";
 
-  DEBUG_LOG() << "m_fileContentId = " << m_fileContentId;
+  DEBUG_LOG(m_logger) << "m_fileContentId = " << m_fileContentId;
 
   m_dtc->waitForHistoricalDataFileContent();
   const FileManagement::FileContent &flc = m_dtc->fileContent(m_fileContentId);
 
-  DEBUG_LOG() << "flc.id() = " << flc.id();
+  DEBUG_LOG(m_logger) << "flc.id() = " << flc.id();
 
   if (flc.id() == 0)
   {
-    ERROR_LOG() << "Cannot find File Content Id = " << m_fileContentId;
+    ERROR_LOG(m_logger) << "Cannot find File Content Id = " << m_fileContentId;
     failExit();
   }
   else
   {
     if (!m_db->updateStatus(m_fileContentId, FileManagement::FileStatus::Deleted, m_operatorId))
     {
-      ERROR_LOG() << "Cannot update status for File Content Id = " << m_fileContentId;
+      ERROR_LOG(m_logger) << "Cannot update status for File Content Id = " << m_fileContentId;
       failExit();
     }
 
@@ -509,7 +509,7 @@ void FlmTests::tryUpdateStatus()
 
     if (!checkContentSize(m_fileContentId))
     {
-      ERROR_LOG() << "Content size 0";
+      ERROR_LOG(m_logger) << "Content size 0";
       failExit();
     }
 
@@ -520,11 +520,11 @@ void FlmTests::tryUpdateStatus()
 // ------------------------------------------------------------------------------
 void FlmTests::tryRemoveFileContent()
 {
-  INFO_LOG() << "trying to send FileContentRemoveRequest ";
+  INFO_LOG(m_logger) << "trying to send FileContentRemoveRequest ";
   m_dtc->waitForHistoricalDataFileContent();
   if (!m_ftc->fileContentRemoveRequest(FileContentRemoveRequest(m_fileContentId), this))
   {
-    ERROR_LOG() << "Error requesting delete data";
+    ERROR_LOG(m_logger) << "Error requesting delete data";
     failExit();
   }
   QTest::qWait(1000);
@@ -533,11 +533,11 @@ void FlmTests::tryRemoveFileContent()
 // ------------------------------------------------------------------------------
 void FlmTests::tryExportFileContent()
 {
-  INFO_LOG() << "trying to send FileContentExportRequest ";
+  INFO_LOG(m_logger) << "trying to send FileContentExportRequest ";
   m_dtc->waitForHistoricalDataFileContent();
   if (!m_ftc->fileContentExportRequest(FileContentExportRequest(m_fileContentId), this))
   {
-    ERROR_LOG() << "Error requesting export data";
+    ERROR_LOG(m_logger) << "Error requesting export data";
     failExit();
   }
 
@@ -545,7 +545,7 @@ void FlmTests::tryExportFileContent()
 
   if (!checkContentSize(m_fileContentId))
   {
-    ERROR_LOG() << "Content size 0";
+    ERROR_LOG(m_logger) << "Content size 0";
     failExit();
   }
 
@@ -555,7 +555,7 @@ void FlmTests::tryExportFileContent()
 // ------------------------------------------------------------------------------
 void FlmTests::tryCreatePlan()
 {
-  INFO_LOG() << "trying to send file content create request ";
+  INFO_LOG(m_logger) << "trying to send file content create request ";
 
   FileContentModifyRequest data;
 
@@ -575,7 +575,7 @@ void FlmTests::tryCreatePlan()
   m_fileContentId = 0;
   if (!m_ftc->fileContentModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
   QTRY_VERIFY(m_fileContentId > 0);
@@ -584,7 +584,7 @@ void FlmTests::tryCreatePlan()
 // ------------------------------------------------------------------------------
 void FlmTests::tryCreateFav()
 {
-  INFO_LOG() << "trying to send file content create request ";
+  INFO_LOG(m_logger) << "trying to send file content create request ";
 
   FileContentModifyRequest data;
 
@@ -604,7 +604,7 @@ void FlmTests::tryCreateFav()
   m_fileContentId = 0;
   if (!m_ftc->fileContentModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
   QTRY_VERIFY(m_fileContentId > 0);
@@ -613,7 +613,7 @@ void FlmTests::tryCreateFav()
 // ------------------------------------------------------------------------------
 void FlmTests::tryCreateSymbol()
 {
-  INFO_LOG() << "trying to send file content create request ";
+  INFO_LOG(m_logger) << "trying to send file content create request ";
 
   FileContentModifyRequest data;
 
@@ -633,7 +633,7 @@ void FlmTests::tryCreateSymbol()
   m_fileContentId = 0;
   if (!m_ftc->fileContentModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
   QTRY_VERIFY(m_fileContentId > 0);
@@ -645,15 +645,15 @@ void FlmTests::tryGetContent()
   GetFileContentDataRequest request;
 
   request.fileContentId(m_fileContentId);
-  INFO_LOG() << "trying to send content request for file Id = " << m_fileContentId;
+  INFO_LOG(m_logger) << "trying to send content request for file Id = " << m_fileContentId;
 
   if (!m_ftc->getFileContentDataRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting content for id : " << m_fileContentId;
+    ERROR_LOG(m_logger) << "Error requesting content for id : " << m_fileContentId;
     failExit();
   }
   QTRY_VERIFY(m_content.size() > 0);
-  DEBUG_LOG() << "Got content size: " << m_content.size();
+  DEBUG_LOG(m_logger) << "Got content size: " << m_content.size();
 }
 
 // ------------------------------------------------------------------------------
@@ -661,16 +661,16 @@ void FlmTests::onGetFileContentDataReply(const GetFileContentDataReply &replyObj
 {
   if (replyObject.errorString().size() > 0)
   {
-    ERROR_LOG() << "Got onGetFileContentDataReply error: " << replyObject.errorString();
+    ERROR_LOG(m_logger) << "Got onGetFileContentDataReply error: " << replyObject.errorString();
     failExit();
   }
 
-  INFO_LOG() << "Got reply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got reply with id " << replyObject.id()
                      << " and errorString " << replyObject.errorString();
 
   m_content = replyObject.content();
 
-  DEBUG_LOG() << "Content size: " << m_content.size();
+  DEBUG_LOG(m_logger) << "Content size: " << m_content.size();
 
 //  QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
@@ -679,19 +679,19 @@ void FlmTests::onGetFileContentDataReply(const GetFileContentDataReply &replyObj
 // ------------------------------------------------------------------------------
 void FlmTests::tryGetAllTemplates()
 {
-  INFO_LOG() << "tryGetAllTemplates";
+  INFO_LOG(m_logger) << "tryGetAllTemplates";
 
   QList<FileContent> allTemplates;
   m_dtc->waitForHistoricalDataFileContent();
   if (!m_dtc->getAllTemplates(allTemplates))
   {
-    ERROR_LOG() << "Error requesting dtc data";
+    ERROR_LOG(m_logger) << "Error requesting dtc data";
     failExit();
   }
 
-  DEBUG_LOG() << "Found " << allTemplates.size() << " templates";
+  DEBUG_LOG(m_logger) << "Found " << allTemplates.size() << " templates";
   for (const FileContent &fc : std::as_const(allTemplates))
-    DEBUG_LOG() << "Found template (id, name) = (" << fc.id() << ", " << fc.name() << ")";
+    DEBUG_LOG(m_logger) << "Found template (id, name) = (" << fc.id() << ", " << fc.name() << ")";
 
   QTest::qWait(1000);
 }
@@ -699,19 +699,19 @@ void FlmTests::tryGetAllTemplates()
 // ------------------------------------------------------------------------------
 void FlmTests::tryGetAllPlans()
 {
-  INFO_LOG() << "tryGetAllPlans";
+  INFO_LOG(m_logger) << "tryGetAllPlans";
 
   QStringList allPlans;
   m_dtc->waitForHistoricalDataFileContent();
   if (!m_dtc->getAllFiles(FileManagement::FileType::TacticalPlan, m_folderId, allPlans))
   {
-    ERROR_LOG() << "Error requesting dtc data";
+    ERROR_LOG(m_logger) << "Error requesting dtc data";
     failExit();
   }
 
-  DEBUG_LOG() << "Found " << allPlans.size() << " plans";
+  DEBUG_LOG(m_logger) << "Found " << allPlans.size() << " plans";
   for (const QString &plan : std::as_const(allPlans))
-    DEBUG_LOG() << "Found plan  = " << plan;
+    DEBUG_LOG(m_logger) << "Found plan  = " << plan;
 
   QTest::qWait(1000);
 }
@@ -719,19 +719,19 @@ void FlmTests::tryGetAllPlans()
 // ------------------------------------------------------------------------------
 void FlmTests::tryGetAllFavs()
 {
-  INFO_LOG() << "tryGetAllFavs";
+  INFO_LOG(m_logger) << "tryGetAllFavs";
 
   QStringList allFavs;
   m_dtc->waitForHistoricalDataFileContent();
   if (!m_dtc->getAllFiles(FileManagement::FileType::OperatorFavourite, m_folderId, allFavs))
   {
-    ERROR_LOG() << "Error requesting dtc data";
+    ERROR_LOG(m_logger) << "Error requesting dtc data";
     failExit();
   }
 
-  DEBUG_LOG() << "Found " << allFavs.size() << " favs";
+  DEBUG_LOG(m_logger) << "Found " << allFavs.size() << " favs";
   for (const QString &fav : std::as_const(allFavs))
-    DEBUG_LOG() << "Found fav = " << fav;
+    DEBUG_LOG(m_logger) << "Found fav = " << fav;
 
   QTest::qWait(1000);
 }
@@ -739,19 +739,19 @@ void FlmTests::tryGetAllFavs()
 // ------------------------------------------------------------------------------
 void FlmTests::tryGetAllSymbols()
 {
-  INFO_LOG() << "tryGetAllSymbols";
+  INFO_LOG(m_logger) << "tryGetAllSymbols";
 
   QStringList allSymbols;
   m_dtc->waitForHistoricalDataFileContent();
   if (!m_dtc->getAllFiles(FileManagement::FileType::OperatorDefinedSymbol, m_folderId, allSymbols))
   {
-    ERROR_LOG() << "Error requesting dtc data";
+    ERROR_LOG(m_logger) << "Error requesting dtc data";
     failExit();
   }
 
-  DEBUG_LOG() << "Found " << allSymbols.size() << " symbols";
+  DEBUG_LOG(m_logger) << "Found " << allSymbols.size() << " symbols";
   for (const QString &symbol : std::as_const(allSymbols))
-    DEBUG_LOG() << "Found symbol  = " << symbol;
+    DEBUG_LOG(m_logger) << "Found symbol  = " << symbol;
 
   QTest::qWait(1000);
 }
@@ -760,7 +760,7 @@ void FlmTests::tryGetAllSymbols()
 // ------------------------------------------------------------------------------
 void FlmTests::onError(const QString &reason)
 {
-  ERROR_LOG() << "Got Reply error: " << reason;
+  ERROR_LOG(m_logger) << "Got Reply error: " << reason;
   failExit();
 }
 
@@ -772,7 +772,7 @@ void FlmTests::onReply(const Core::FunctionReplyObject &replyObject)
     onError(replyObject.translated());
     return;
   }
-  INFO_LOG() << "Got Reply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got Reply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 //  QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
@@ -780,7 +780,7 @@ void FlmTests::onReply(const Core::FunctionReplyObject &replyObject)
 // ------------------------------------------------------------------------------
 void FlmTests::failExit()
 {
-  ERROR_LOG() << "FAIL EXIT !";
+  ERROR_LOG(m_logger) << "FAIL EXIT !";
   m_bTestsSuccessful = false;
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
@@ -790,11 +790,11 @@ void FlmTests::onFolderModifyReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
   {
-    ERROR_LOG() << "Got onFolderModifyReply error: " << replyObject();
+    ERROR_LOG(m_logger) << "Got onFolderModifyReply error: " << replyObject();
     failExit();
     return;
   }
-  INFO_LOG() << "Got modifyFolderReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got modifyFolderReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
   m_folderId = replyObject.id();
 }
@@ -804,11 +804,11 @@ void FlmTests::onFileContentModifyReply(const Core::FunctionReplyObject &replyOb
 {
   if (replyObject.error())
   {
-    ERROR_LOG() << "Got onFileContentModifyReply error: " << replyObject();
+    ERROR_LOG(m_logger) << "Got onFileContentModifyReply error: " << replyObject();
     failExit();
     return;
   }
-  INFO_LOG() << "Got modifyFileReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got modifyFileReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
   m_fileContentId = replyObject.id();
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/WebSocketInterface/Messages/client_message.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/WebSocketInterface/Messages/client_message.cpp
index 475775fb7..8bf1f44fa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/WebSocketInterface/Messages/client_message.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/WebSocketInterface/Messages/client_message.cpp
@@ -53,9 +53,8 @@ ClientMessage::ClientMessage(DataManager *dataManager, LtsWebSocket::ReplyHandle
 // ####### ClientMessage end #######
 
 // ####### BaseDlRequest begin #######
-BaseDlRequest::BaseDlRequest(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const int typeId, const QString &uuid, const QJsonValue &data)
-  : ClientMessage(dataManager, client, type, typeId, uuid, data)
-{}
+BaseDlRequest::BaseDlRequest(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const int typeId, const QString &uuid, const QJsonValue &data) : ClientMessage(dataManager, client, type, typeId, uuid, data),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 void BaseDlRequest::process()
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/WebSocketInterface/websocket_interface_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/WebSocketInterface/websocket_interface_handler.cpp
index 60d99286e..a9d428f7e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/WebSocketInterface/websocket_interface_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/WebSocketInterface/websocket_interface_handler.cpp
@@ -36,7 +36,7 @@ bool WebSocketInterfaceHandler::init()
 {
   cleanup();
 
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "... ok";
 
   m_dataManager = new DataManager(m_mainHandler);
 
@@ -44,16 +44,16 @@ bool WebSocketInterfaceHandler::init()
 
   m_webSocketServer = new LtsWebSocket::LtsWebSocketServer(m_messageFactory, this);
 
-  DEBUG_LOG() << "Initialising LtsWebSocketServer";
+  DEBUG_LOG(m_logger) << "Initialising LtsWebSocketServer";
   if (!m_webSocketServer->init(QStringLiteral("FLM"), Settings::getWebSocketServerPortRange(1)))
   {
-    ERROR_LOG() << "Failed to initialise LtsWebSocketServer";
+    ERROR_LOG(m_logger) << "Failed to initialise LtsWebSocketServer";
     return false;
   }
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "... ok";
 
-  DEBUG_LOG() << "Connection signals and slots";
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "Connection signals and slots";
+  DEBUG_LOG(m_logger) << "... ok";
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/base.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/base.h
index 146ecccb1..861151822 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/base.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/base.h
@@ -22,6 +22,7 @@ class Base : public QObject
 {
   Q_OBJECT
 protected:
+NGL::INGLLogger &m_logger;
   explicit Base(MainHandler *mainHandler, NGL::INGLLogger &logger, QObject *parent = nullptr);
   virtual ~Base();
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/dds_handler.cpp
index 17eede7fa..efccb6c32 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/dds_handler.cpp
@@ -17,14 +17,14 @@ namespace FileManagement
 DdsHandler::DdsHandler(int domainId)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Any))
 {
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -40,13 +40,13 @@ bool DdsHandler::init(const QStringList &qosFileList)
   m_ddsFts = FileManagement::Interface::Fts::create(m_ddsConnector);  
 
   bool bRet = m_ddsDts->enableAll();
-  INFO_LOG() << "Dts initialised";
+  INFO_LOG(m_logger) << "Dts initialised";
 
   bRet &= m_ddsDtc->enableAll();
-  INFO_LOG() << "Dtc initialised";
+  INFO_LOG(m_logger) << "Dtc initialised";
 
   bRet &= m_ddsFts->enableAll();
-  INFO_LOG() << "Fts initialised";
+  INFO_LOG(m_logger) << "Fts initialised";
 
   return bRet;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/dds_handler.h
index b7e1c6069..aba128833 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/dds_handler.h
@@ -40,6 +40,7 @@ public:
   std::shared_ptr<FileManagement::Interface::Fts> fts() const { return m_ddsFts; }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector>      m_ddsConnector;
   std::shared_ptr<Core::Pacemaker>                 m_pacemaker;
   std::shared_ptr<Core::TopicLockMaster>           m_topicLockMaster;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_file_type_info.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_file_type_info.cpp
index e8d4917cd..a11bf3a94 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_file_type_info.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_file_type_info.cpp
@@ -16,9 +16,8 @@
 //------------------------------------------------------------------------------------------------------
 namespace FileManagement
 {
-HandlerFileTypeInfo::HandlerFileTypeInfo(MainHandler *mainHandler)
-  : Base(mainHandler, getLogger("HandlerFileTypeInfo"))
-{}
+HandlerFileTypeInfo::HandlerFileTypeInfo(MainHandler *mainHandler) : Base(mainHandler, getLogger("HandlerFileTypeInfo")),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 //------------------------------------------------------------------------------------------------------
 HandlerFileTypeInfo::~HandlerFileTypeInfo()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_file_type_info.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_file_type_info.h
index 03c9b2b0b..975fb6e83 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_file_type_info.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_file_type_info.h
@@ -29,6 +29,8 @@ public:
   QString getFileExtension(const FileManagement::FileType &fileType) const;
 
 private:
+
+NGL::INGLLogger &m_logger;
   QMap<int, ObjectFileTypeInfo *>  m_objectFileTypeInfoMap;
 };
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/main_handler.cpp
index 1ea22e0b6..f122c2daf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/main_handler.cpp
@@ -21,15 +21,14 @@
 
 namespace FileManagement
 {
-MainHandler::MainHandler(QObject *parent)
-  : QObject(parent)
+MainHandler::MainHandler(QObject *parent) : QObject(parent)
   , m_ddsHandler(nullptr)
   , m_dbHandler(nullptr)
   , m_handlerFileTypeInfo(nullptr)
   , m_handlerFolder(nullptr)
   , m_handlerFileContent(nullptr)
-  , m_handlerWebSocket(nullptr)
-{}
+  , m_handlerWebSocket(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 MainHandler::~MainHandler()
 {
@@ -48,29 +47,29 @@ bool MainHandler::init(int domainId)
   m_dbHandler = std::make_shared<DbHandler>();
   if (!m_dbHandler->init(0, Settings::settings()))
   {
-    ERROR_LOG() << "Initialisation dbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation dbHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation dbHandler succesful.";
 
   // initialize DDS
   m_ddsHandler.reset(new DdsHandler(domainId));
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation ddsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation ddsHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation ddsHandler succesful.";
 
   // read project specific data from database
   // publish project specific data
   // initialize all handlers
   if (!initFlmHandler())
   {
-    ERROR_LOG() << "Initialisation FlmHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation FlmHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation FlmHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation FlmHandler succesful.";
 
   m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
 
@@ -86,52 +85,52 @@ int MainHandler::exerciseId() const
 
 bool MainHandler::initFlmHandler()
 {
-  DEBUG_LOG() << "Start Initialisation FlmHandler";
+  DEBUG_LOG(m_logger) << "Start Initialisation FlmHandler";
 
   // FileTypeInfo
   m_handlerFileTypeInfo.reset(new HandlerFileTypeInfo(this));
-  DEBUG_LOG() << "Reset HandlerFileTypeInfo successful.";
+  DEBUG_LOG(m_logger) << "Reset HandlerFileTypeInfo successful.";
 
   if (!m_handlerFileTypeInfo->init())
   {
-    ERROR_LOG() << "Initialisation of HandlerFileTypeInfo failed.";
+    ERROR_LOG(m_logger) << "Initialisation of HandlerFileTypeInfo failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation HandlerFileTypeInfo succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation HandlerFileTypeInfo succesful.";
 
   // Folder
   m_handlerFolder.reset(new HandlerFolder(this));
-  DEBUG_LOG() << "Reset HandlerFolder successful.";
+  DEBUG_LOG(m_logger) << "Reset HandlerFolder successful.";
 
   if (!m_handlerFolder->init())
   {
-    ERROR_LOG() << "Initialisation of HandlerFolder failed.";
+    ERROR_LOG(m_logger) << "Initialisation of HandlerFolder failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation HandlerFolder successful.";
+  DEBUG_LOG(m_logger) << "Initialisation HandlerFolder successful.";
 
   // FileContent
   m_handlerFileContent.reset(new HandlerFileContent(this));
-  DEBUG_LOG() << "Reset HandlerFileContent successful.";
+  DEBUG_LOG(m_logger) << "Reset HandlerFileContent successful.";
 
   if (!m_handlerFileContent->init())
   {
-    ERROR_LOG() << "Initialisation of HandlerFileContent failed.";
+    ERROR_LOG(m_logger) << "Initialisation of HandlerFileContent failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation HandlerFileContent successful.";
+  DEBUG_LOG(m_logger) << "Initialisation HandlerFileContent successful.";
 
   // WebSocketServer
   m_handlerWebSocket =  std::make_shared<WebSocketInterface::WebSocketInterfaceHandler>(this);
-  DEBUG_LOG() << "Reset WebSocketInterfaceHandler successful.";
+  DEBUG_LOG(m_logger) << "Reset WebSocketInterfaceHandler successful.";
 
   if (!m_handlerWebSocket->init())
   {
-    ERROR_LOG() << "Initialisation WebSocketInterfaceHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler failed.";
     return false;
   }
   m_ddsHandler->pacemaker()->addPort(m_handlerWebSocket->serverWebSocketPort(), Core::PortType::WebSocketServer);
-  DEBUG_LOG() << "Initialisation WebSocketInterfaceHandler successful.";
+  DEBUG_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler successful.";
 
 
 
@@ -139,7 +138,7 @@ bool MainHandler::initFlmHandler()
 
 
   m_thpScriptServer.reset(new ThpScriptServer(this));
-  DEBUG_LOG() << "Initialisation ThpTcpScriptServer successful.";
+  DEBUG_LOG(m_logger) << "Initialisation ThpTcpScriptServer successful.";
 
 
 
@@ -149,10 +148,10 @@ bool MainHandler::initFlmHandler()
   m_pdfServer.reset(new PdfServer(this, this));
   if (!m_pdfServer->init())
   {
-    ERROR_LOG() << "Initialisation PdfServer failed.";
+    ERROR_LOG(m_logger) << "Initialisation PdfServer failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation PdfServer successful.";
+  DEBUG_LOG(m_logger) << "Initialisation PdfServer successful.";
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/main_handler.h
index 5363421ec..8ce826c48 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/main_handler.h
@@ -45,9 +45,11 @@ public:
   int exerciseId() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   bool initFlmHandler();
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>            m_ddsHandler;
   std::shared_ptr<DbHandler>             m_dbHandler;
   std::shared_ptr<HandlerFileTypeInfo>   m_handlerFileTypeInfo;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/pdf_download.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/pdf_download.cpp
index 17b1a3aa4..e37d27d01 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/pdf_download.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/pdf_download.cpp
@@ -16,22 +16,21 @@
 namespace FileManagement
 {
 
-CBI_PdfDownload::CBI_PdfDownload(unsigned short port)
-  : CommandInterface(port, "PDF_DOWNLOAD")
-{}
+CBI_PdfDownload::CBI_PdfDownload(unsigned short port) : CommandInterface(port, "PDF_DOWNLOAD"),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 void CBI_PdfDownload::handleCommandInternal(const QVector<QByteArray> &args)
 {
   setAutoWriteEOL(false);
 
-  DEBUG_LOG() << "Got command for PDF download";
+  DEBUG_LOG(m_logger) << "Got command for PDF download";
 
   if (args.count() != 1)
   {
-    ERROR_LOG() << "Invalid arg count";
+    ERROR_LOG(m_logger) << "Invalid arg count";
     return;
   }
-  DEBUG_LOG() << "Argument count ok";
+  DEBUG_LOG(m_logger) << "Argument count ok";
 
   bool bOk;
   int documentId = args.at(0).toInt(&bOk);
@@ -40,10 +39,10 @@ void CBI_PdfDownload::handleCommandInternal(const QVector<QByteArray> &args)
   {
     const QString err(QStringLiteral("Invalid file id: '%1'").arg(QString::fromUtf8(args.at(0))));
     writeError(err);
-    ERROR_LOG() << err;
+    ERROR_LOG(m_logger) << err;
     return;
   }
-  DEBUG_LOG() << "Argument ok";
+  DEBUG_LOG(m_logger) << "Argument ok";
 
   MainHandler *mainHandler = static_cast<MainHandler *>(TcpServer::instance(port())->userData());
 
@@ -54,22 +53,22 @@ void CBI_PdfDownload::handleCommandInternal(const QVector<QByteArray> &args)
   {
     const QString err(QStringLiteral("File with ID '%1' does not exist").arg(QString::fromUtf8(args.at(0))));
     writeError(err);
-    ERROR_LOG() << err;
+    ERROR_LOG(m_logger) << err;
     return;
   }
-  DEBUG_LOG() << "File ID valid";
+  DEBUG_LOG(m_logger) << "File ID valid";
 
   if (fileContent.fileTypeId != FileManagement::FileType::Pdf)
   {
     const QString err(QStringLiteral("File with ID '%1' is not of type Pdf").arg(QString::fromUtf8(args.at(0))));
     writeError(err);
-    ERROR_LOG() << err;
+    ERROR_LOG(m_logger) << err;
     return;
   }
-  DEBUG_LOG() << "FileType valid";
+  DEBUG_LOG(m_logger) << "FileType valid";
 
   // success
-  DEBUG_LOG() << "File ok, sending file \"" << fileContent.name << "\" with ID " << fileContent.id;
+  DEBUG_LOG(m_logger) << "File ok, sending file \"" << fileContent.name << "\" with ID " << fileContent.id;
   writeData(fileContent.content);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/pdf_download.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/pdf_download.h
index 3d7d9f7c6..ce928d0d3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/pdf_download.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/pdf_download.h
@@ -26,6 +26,8 @@ public:
   QString help() const override;
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void handleCommandInternal(const QVector<QByteArray> &args) override;
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/pdf_server.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/pdf_server.cpp
index 09886525d..9144029b6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/pdf_server.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/pdf_server.cpp
@@ -16,10 +16,9 @@
 
 namespace FileManagement
 {
-PdfServer::PdfServer(MainHandler *mainHandler, QObject *parent)
-  : QObject(parent)
-  , m_tcpServer(TcpServer::instance(NGL::Connections::port(NGL::Connections::eConnection::FLM_PDF_SERVER)))
-{
+PdfServer::PdfServer(MainHandler *mainHandler, QObject *parent) : QObject(parent)
+  , m_tcpServer(TcpServer::instance(NGL::Connections::port(NGL::Connections::eConnection::FLM_PDF_SERVER))),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_tcpServer->setUserData(mainHandler);
   m_tcpServer->setUseWorkerThreads(false);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/pdf_server.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/pdf_server.h
index 6e2270dcd..1ef298df5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/pdf_server.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/pdf_server.h
@@ -27,6 +27,7 @@ public:
   bool init();
 
 private:
+  NGL::INGLLogger &m_logger;
   TcpServer *m_tcpServer;
 };
 } // namespace FileManagement
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/thp_script_httq.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/thp_script_httq.cpp
index d59b5a28d..1acfb1147 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/thp_script_httq.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/thp_script_httq.cpp
@@ -63,19 +63,19 @@ Logger::Logger(LoggerFactory *loggerFactory, QObject *parent)
 
 void Logger::debug(const QString &message)
 {
-  /*DEBUG_LOG*/ERROR_LOG() << message;
+  /*DEBUG_LOG*/ERROR_LOG(m_logger) << message;
 }
 
 
 void Logger::warning(const QString &message)
 {
-  WARNING_LOG() << message;
+  WARNING_LOG(m_logger) << message;
 }
 
 
 void Logger::error(const QString &message)
 {
-  ERROR_LOG() << message;
+  ERROR_LOG(m_logger) << message;
 }
 
 
@@ -86,7 +86,7 @@ ThpScriptServer::ThpScriptServer(QObject *parent)
 {
   if (!listen(NGL::Connections::port(NGL::Connections::eConnection::FLM_THP_SERVER)))
   {
-    ERROR_LOG() << "cannot listen on port " << NGL::Connections::port(NGL::Connections::eConnection::FLM_THP_SERVER);
+    ERROR_LOG(m_logger) << "cannot listen on port " << NGL::Connections::port(NGL::Connections::eConnection::FLM_THP_SERVER);
     Q_ASSERT(false);
   }
 
@@ -148,7 +148,7 @@ ThpScriptServer::ThpScriptServer(QObject *parent)
 
         default:
         {
-          ERROR_LOG() << "ws unknown path: " << cli->requestUrl().path();
+          ERROR_LOG(m_logger) << "ws unknown path: " << cli->requestUrl().path();
           failed = true;
           break;
         }
@@ -192,7 +192,7 @@ const QString ThpScriptServer::readContentFile() const
   f->deleteLater();
   if (!f->open(QIODevice::ReadOnly))
   {
-    WARNING_LOG() << "Error opening " << f->fileName() << " for reading: " << f->errorString();
+    WARNING_LOG(m_logger) << "Error opening " << f->fileName() << " for reading: " << f->errorString();
     return QStringLiteral("[]");
   }
 
@@ -224,7 +224,7 @@ bool ThpScriptServer::newHttpConnection(httq::HttpRequest *request)
   }
   catch(const DataStreamError &err)
   {
-    DEBUG_LOG() << "handler threw DataStreamError: " << err.what();
+    DEBUG_LOG(m_logger) << "handler threw DataStreamError: " << err.what();
     // do not delete request as a failed datastream deletes it itself
     return false;
   }
@@ -304,7 +304,7 @@ ThpServerInformation ThpScriptServer::fromJson(const QJsonValue &val)
 
 void ThpScriptServer::errorHandler(httq::HttpRequest *request, const HttpException &e) const
 {
-  DEBUG_LOG() << "handler threw error: " << e.error << " (http status = " << e.status << ")";
+  DEBUG_LOG(m_logger) << "handler threw error: " << e.error << " (http status = " << e.status << ")";
 
   QJsonObject root;
 
@@ -325,7 +325,7 @@ void ThpScriptServer::changeList(const ThpServerInformation &tsi, httq::HttpRequ
     QFile contentFile(thpDirectory() + QStringLiteral("content.json"), this);
     if (!contentFile.open(QIODevice::ReadWrite))
     {
-      ERROR_LOG() << "Error opening file '" << contentFile.fileName() << "' for read/write: " << contentFile.errorString();
+      ERROR_LOG(m_logger) << "Error opening file '" << contentFile.fileName() << "' for read/write: " << contentFile.errorString();
       throw(HttpException(QStringLiteral("cannot open content file '%1': %2").arg(contentFile.fileName(), contentFile.errorString())));
     }
 
@@ -340,7 +340,7 @@ void ThpScriptServer::changeList(const ThpServerInformation &tsi, httq::HttpRequ
 
     if (err.error != QJsonParseError::NoError)
     {
-      ERROR_LOG() << "content file's json invalid at" << err.offset << ":" << err.errorString();
+      ERROR_LOG(m_logger) << "content file's json invalid at" << err.offset << ":" << err.errorString();
       throw(HttpException(QStringLiteral("content file's json invalid at %1: %2").arg(err.offset).arg(err.errorString())));
     }
 
@@ -368,7 +368,7 @@ void ThpScriptServer::changeList(const ThpServerInformation &tsi, httq::HttpRequ
 
     if (!contentFile.resize(0) || !contentFile.write(QJsonDocument(arr).toJson()))
     {
-      ERROR_LOG() << "Error writing content.json: " << contentFile.errorString();
+      ERROR_LOG(m_logger) << "Error writing content.json: " << contentFile.errorString();
       throw(HttpException(QStringLiteral("error writing content file: %1").arg(contentFile.errorString())));
     }
 
@@ -534,7 +534,7 @@ bool ThpScriptServer::handleRequestSync(httq::HttpRequest &request) noexcept(fal
 
       default:
       {
-        WARNING_LOG() << "unsupported method for /thp2";
+        WARNING_LOG(m_logger) << "unsupported method for /thp2";
         throw HttpException(L("unsupported method for /thp2: %1").arg((int)request.method()), 405);
       }
     }
@@ -624,7 +624,7 @@ bool ThpScriptServer::handleRequest(httq::HttpRequest *request) noexcept(false)
         if (!QFile::remove(destFile))
         {
           const QString err(QStringLiteral("Cannot remove old THP upload file %1 - removing THP not possible").arg(destFile));
-          ERROR_LOG() << err;
+          ERROR_LOG(m_logger) << err;
           throw(HttpException(err));
         }
 
@@ -663,7 +663,7 @@ bool ThpScriptServer::handleRequest(httq::HttpRequest *request) noexcept(false)
         if (!QDir().mkpath(destDir))
         {
           const QString err(QStringLiteral("Cannot create directory %1 - THP upload not possible").arg(destDir));
-          ERROR_LOG() << err;
+          ERROR_LOG(m_logger) << err;
           throw(HttpException(err));
         }
 
@@ -672,7 +672,7 @@ bool ThpScriptServer::handleRequest(httq::HttpRequest *request) noexcept(false)
         if (fi.exists() && !QFile::remove(destFile))
         {
           const QString err(QStringLiteral("Cannot remove old THP upload file %1 - THP upload not possible").arg(destDir));
-          ERROR_LOG() << err;
+          ERROR_LOG(m_logger) << err;
           throw(HttpException(err));
         }
 
@@ -701,7 +701,7 @@ bool ThpScriptServer::handleRequest(httq::HttpRequest *request) noexcept(false)
             if (!d.exists() && !d.mkpath(destDir))
             {
               const QString errstr(QStringLiteral("Can create directory '%1' - THP upload not possible").arg(destDir));
-              ERROR_LOG() << errstr;
+              ERROR_LOG(m_logger) << errstr;
               throw(HttpException(errstr));
             }
 
@@ -710,7 +710,7 @@ bool ThpScriptServer::handleRequest(httq::HttpRequest *request) noexcept(false)
             if (fi.exists() && !QFile::remove(destFile))
             {
               const QString errstr(QStringLiteral("Can not remove old file '%1'").arg(destDir));
-              ERROR_LOG() << errstr;
+              ERROR_LOG(m_logger) << errstr;
               throw(HttpException(errstr));
             }
 
@@ -719,7 +719,7 @@ bool ThpScriptServer::handleRequest(httq::HttpRequest *request) noexcept(false)
             if (!f->rename(destFile))
             {
               const QString errstr(QStringLiteral("Can not rename %1 to %2: %3").arg(tmpFilename, destFile, f->errorString()));
-              ERROR_LOG() << errstr;
+              ERROR_LOG(m_logger) << errstr;
               throw(HttpException(errstr));
             }
 
@@ -743,7 +743,7 @@ bool ThpScriptServer::handleRequest(httq::HttpRequest *request) noexcept(false)
 
     default:
     {
-      WARNING_LOG() << "unsupported method";
+      WARNING_LOG(m_logger) << "unsupported method";
       throw(HttpException(QStringLiteral("unsupported method"), 405));
     }
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/thp_script_httq.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/thp_script_httq.h
index 78d5b71e2..07284eca7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/thp_script_httq.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/thp_script_httq.h
@@ -52,6 +52,8 @@ public:
   void error(const QString &message) override;
 
 private:
+
+NGL::INGLLogger &m_logger;
 };
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/dds_handler.cpp
index 763a42435..369d38cfa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/dds_handler.cpp
@@ -32,7 +32,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
 
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/dds_handler.h
index c1fb32621..a1f0d7228 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/dds_handler.h
@@ -40,6 +40,7 @@ public:
   std::shared_ptr<DDSConnector::DdsConnector> ddsConnector() const { return m_ddsConnector; }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<FilterManagement::Interface::Dts>  m_ddsDts;
   std::shared_ptr<FilterManagement::Interface::Fts>  m_ddsFts;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_aes_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_aes_filter.cpp
index ac9f8d202..58f69d3aa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_aes_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_aes_filter.cpp
@@ -45,7 +45,7 @@ bool HandlerAesFilter::init()
   // read all file types from database
   if (!db()->select(cb))
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
 
@@ -68,10 +68,10 @@ void HandlerAesFilter::cleanup()
 void HandlerAesFilter::onAesFilterUpdateRequest(const rti::core::SampleIdentity &cookie,
                                                 const AesFilter &request)
 {
-  DEBUG_LOG() << "onAesFilterUpdateRequest: " << request;
+  DEBUG_LOG(m_logger) << "onAesFilterUpdateRequest: " << request;
   auto ret = aesFilterUpdateRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   dds()->fts()->aesFilterUpdateReply(cookie, ret);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_aes_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_aes_filter.h
index ff071bca4..ec961a064 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_aes_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_aes_filter.h
@@ -28,6 +28,7 @@ public:
   bool init();
 
 private:
+  NGL::INGLLogger &m_logger;
   void cleanup();
   void onAesFilterUpdateRequest(const rti::core::SampleIdentity &cookie,
                                 const AesFilter &request) override;
@@ -37,6 +38,7 @@ private:
   std::shared_ptr<DdsHandler> dds() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   struct key
   {
     int operatorId = 0;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_building_component_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_building_component_filter.cpp
index 6ca8bf774..4edc5b45e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_building_component_filter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_building_component_filter.cpp
@@ -45,7 +45,7 @@ bool HandlerBuildingComponentFilter::init()
   // read all file types from database
   if (!db()->select(cb))
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
 
@@ -68,10 +68,10 @@ void HandlerBuildingComponentFilter::cleanup()
 void HandlerBuildingComponentFilter::onBuildingComponentFilterUpdateRequest(const rti::core::SampleIdentity &cookie,
                                                               const BuildingComponentFilter &request)
 {
-  DEBUG_LOG() << "onBuildingComponentFilterUpdateRequest: " << request;
+  DEBUG_LOG(m_logger) << "onBuildingComponentFilterUpdateRequest: " << request;
   auto ret = BuildingComponentFilterUpdateRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   dds()->fts()->buildingComponentFilterUpdateReply(cookie, ret);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_building_component_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_building_component_filter.h
index b83f1f61f..7d829e4a6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_building_component_filter.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_building_component_filter.h
@@ -28,6 +28,7 @@ public:
   bool init();
 
 private:
+  NGL::INGLLogger &m_logger;
   void cleanup();
   void onBuildingComponentFilterUpdateRequest(const rti::core::SampleIdentity &cookie,
                                 const BuildingComponentFilter &request) override;
@@ -37,6 +38,7 @@ private:
   std::shared_ptr<DdsHandler> dds() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   struct key
   {
     int operatorId = 0;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_filter_data_update.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_filter_data_update.cpp
index a30cb13a5..cbecc2417 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_filter_data_update.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_filter_data_update.cpp
@@ -21,15 +21,15 @@ HandlerFilterDataUpdate::HandlerFilterDataUpdate(Initialization *mainHandler)
   , Interface::Fts::FilterDataUpdateRequestHandler(mainHandler->dds()->fts())
   , m_mainHandler(mainHandler)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 HandlerFilterDataUpdate::~HandlerFilterDataUpdate()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   cleanup();
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool HandlerFilterDataUpdate::init()
@@ -45,31 +45,31 @@ void HandlerFilterDataUpdate::cleanup()
 void HandlerFilterDataUpdate::onTriggerFilterDataUpdateRequest(const rti::core::SampleIdentity &cookie,
                                                                const TriggerFilterData &request)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " TriggerFilterData: " << request;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " TriggerFilterData: " << request;
   auto ret = triggerFilterDataUpdateRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   dds()->fts()->triggerFilterDataUpdateReply(cookie, ret);
 }
 Core::FunctionReplyObject HandlerFilterDataUpdate::triggerFilterDataUpdateRequest(const TriggerFilterData &request)
 {
-  DEBUG_LOG() << " publish TriggerFilterData: " << request;
+  DEBUG_LOG(m_logger) << " publish TriggerFilterData: " << request;
   dds()->dts()->publish(request);
   return Core::FunctionReplyObject();
 }
 
 void HandlerFilterDataUpdate::onFilterDataUpdateRequest(const rti::core::SampleIdentity &cookie, const FilterData &request)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " FilterData: " << request;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " FilterData: " << request;
   auto ret = filterDataUpdateRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   dds()->fts()->filterDataUpdateReply(cookie, ret);
 }
 
 Core::FunctionReplyObject HandlerFilterDataUpdate::filterDataUpdateRequest(const FilterData &request)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " FilterData: " << request;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " FilterData: " << request;
   const std::tuple<int,int,int> k(request.operatorId(), request.screenId(), request.screenContainerId());
   auto it = m_latestFilter.find(k);
   if (it == m_latestFilter.end())
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_filter_data_update.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_filter_data_update.h
index b8489972d..d040418ba 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_filter_data_update.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_filter_data_update.h
@@ -29,6 +29,7 @@ public:
   bool init();
 
 private:
+  NGL::INGLLogger &m_logger;
   void cleanup();
 
   //
@@ -50,6 +51,7 @@ private:
   std::shared_ptr<DdsHandler> dds() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   struct key
   {
     int operatorId = 0;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_symbol_appearance.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_symbol_appearance.cpp
index ac0d4f9bd..d4e5a0ad1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_symbol_appearance.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_symbol_appearance.cpp
@@ -45,7 +45,7 @@ bool HandlerSymbolAppearance::init()
   // read all file types from database
   if (!db()->select(cb))
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
 
@@ -68,10 +68,10 @@ void HandlerSymbolAppearance::cleanup()
 void HandlerSymbolAppearance::onSymbolAppearanceUpdateRequest(const rti::core::SampleIdentity &cookie,
                                                               const SymbolAppearance &request)
 {
-  DEBUG_LOG() << "onSymbolAppearanceUpdateRequest: " << request;
+  DEBUG_LOG(m_logger) << "onSymbolAppearanceUpdateRequest: " << request;
   auto ret = symbolAppearanceUpdateRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   dds()->fts()->symbolAppearanceUpdateReply(cookie, ret);
 }
 
@@ -90,7 +90,7 @@ Core::FunctionReplyObject HandlerSymbolAppearance::symbolAppearanceUpdateRequest
     dbFilter.id = 0;
     if (!db()->insert(dbFilter))
     {
-      ERROR_LOG() << "Can not insert SymbolAppearanceFilter into database: " << db()->getLastError().text();
+      ERROR_LOG(m_logger) << "Can not insert SymbolAppearanceFilter into database: " << db()->getLastError().text();
       return Core::FunctionReplyObject(dbFilter.operatorId, tr_lts("dds", "Can not insert SymbolAppearanceFilter into database"));
     }
     SymbolAppearance *ptr = new SymbolAppearance(request);
@@ -105,7 +105,7 @@ Core::FunctionReplyObject HandlerSymbolAppearance::symbolAppearanceUpdateRequest
     dbFilter.id = it.value()->id();
     dbFilter.operatorId = it.value()->operatorId();
 
-    DEBUG_LOG() << "Update symbol filter with id " << dbFilter.id
+    DEBUG_LOG(m_logger) << "Update symbol filter with id " << dbFilter.id
                         << " for operator " << dbFilter.operatorId;
 
     if (!db()->update(dbFilter))
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_symbol_appearance.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_symbol_appearance.h
index 48b3d128c..0daf3c9b8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_symbol_appearance.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_symbol_appearance.h
@@ -28,6 +28,7 @@ public:
   bool init();
 
 private:
+  NGL::INGLLogger &m_logger;
   void cleanup();
   void onSymbolAppearanceUpdateRequest(const rti::core::SampleIdentity &cookie,
                                        const SymbolAppearance &request) override;
@@ -37,6 +38,7 @@ private:
   std::shared_ptr<DdsHandler> dds() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   struct key
   {
     int operatorId = 0;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/initialization.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/initialization.cpp
index fab2f4ae9..57cfc89dd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/initialization.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/initialization.cpp
@@ -36,7 +36,7 @@ Initialization::~Initialization()
 
 bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector, const QSqlDatabase &sqlDb)
 {
-  INFO_LOG() << "Start FilterManagement Initialization. domainId =" << ddsConnector->getDomainId()
+  INFO_LOG(m_logger) << "Start FilterManagement Initialization. domainId =" << ddsConnector->getDomainId()
                      << " exerciseId=" << ddsConnector->getPartitionId();
 
   // initialize database
@@ -44,33 +44,33 @@ bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector
 
   if (!m_dbHandler->init(ddsConnector->getPartitionId(), sqlDb))
   {
-    ERROR_LOG() << "Initialisation dbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation dbHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation dbHandler succesful.";
 
   // initialize DDS
   m_ddsHandler = std::make_shared<DdsHandler>(ddsConnector);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation ddsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation ddsHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation ddsHandler succesful.";
 
   m_handlerAesFilter                = std::make_shared<HandlerAesFilter>(this);
   m_handlerBuildingComponentFilter  = std::make_shared<HandlerBuildingComponentFilter>(this);
   m_handlerSymbolAppearance         = std::make_shared<HandlerSymbolAppearance>(this);
   m_handlerFilterDataUpdate         = std::make_shared<HandlerFilterDataUpdate>(this);
 
-  DEBUG_LOG() << "initialize succesful.";
+  DEBUG_LOG(m_logger) << "initialize succesful.";
 
   return true;
 }
 
 bool Initialization::initializeUseMainDdsHandler(const std::shared_ptr<DdsHandler> &ddsHandler, const QSqlDatabase &sqlDb)
 {
-  INFO_LOG() << "Start FilterManagement Initialization2. domainId =" << ddsHandler->ddsConnector()->getDomainId()
+  INFO_LOG(m_logger) << "Start FilterManagement Initialization2. domainId =" << ddsHandler->ddsConnector()->getDomainId()
                      << " exerciseId=" << ddsHandler->ddsConnector()->getPartitionId();
 
   // initialize database
@@ -78,21 +78,21 @@ bool Initialization::initializeUseMainDdsHandler(const std::shared_ptr<DdsHandle
 
   if (!m_dbHandler->init(ddsHandler->ddsConnector()->getPartitionId(), sqlDb))
   {
-    ERROR_LOG() << "Initialisation2 dbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation2 dbHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation2 dbHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation2 dbHandler succesful.";
 
   // initialize DDS
 //  m_ddsHandler = std::make_shared<DdsHandler>(ddsConnector);
 //  if (!m_ddsHandler->init())
 //  {
-//    ERROR_LOG() << "Initialisation ddsHandler failed.";
+//    ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
 //    return false;
 //  }
-//  DEBUG_LOG() << "Initialisation ddsHandler succesful.";
+//  DEBUG_LOG(m_logger) << "Initialisation ddsHandler succesful.";
   m_ddsHandler = ddsHandler;
-  DEBUG_LOG() << "ddsHandler referenced";
+  DEBUG_LOG(m_logger) << "ddsHandler referenced";
 
 
   m_handlerAesFilter                = std::make_shared<HandlerAesFilter>(this);
@@ -100,7 +100,7 @@ bool Initialization::initializeUseMainDdsHandler(const std::shared_ptr<DdsHandle
   m_handlerSymbolAppearance         = std::make_shared<HandlerSymbolAppearance>(this);
   m_handlerFilterDataUpdate         = std::make_shared<HandlerFilterDataUpdate>(this);
 
-  DEBUG_LOG() << "initialize2 succesful.";
+  DEBUG_LOG(m_logger) << "initialize2 succesful.";
 
   return true;
 }
@@ -109,21 +109,21 @@ bool Initialization::loadFromDatabase()
 {
   if (!m_handlerAesFilter || !m_handlerAesFilter->init())
   {
-    ERROR_LOG() << "Initialisation of aes filter handler failed.";
+    ERROR_LOG(m_logger) << "Initialisation of aes filter handler failed.";
     return false;
   }
   if (!m_handlerBuildingComponentFilter || !m_handlerBuildingComponentFilter->init())
   {
-    ERROR_LOG() << "Initialisation of building_component handler failed.";
+    ERROR_LOG(m_logger) << "Initialisation of building_component handler failed.";
     return false;
   }
   if (!m_handlerSymbolAppearance || !m_handlerSymbolAppearance->init())
   {
-    ERROR_LOG() << "Initialisation of symbol appearance handler failed.";
+    ERROR_LOG(m_logger) << "Initialisation of symbol appearance handler failed.";
     return false;
   }
 
-  DEBUG_LOG() << "loadFromDatabase succesful.";
+  DEBUG_LOG(m_logger) << "loadFromDatabase succesful.";
   return true;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/initialization.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/initialization.h
index 4341c35b2..ad9228c90 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/initialization.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/initialization.h
@@ -42,6 +42,7 @@ public:
   std::shared_ptr<DatabaseInterface> db()  const;
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>                         m_ddsHandler;
   std::shared_ptr<DbHandler>                          m_dbHandler;
   std::shared_ptr<HandlerAesFilter>                   m_handlerAesFilter;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/main_handler.cpp
index f999100b1..c883d425d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/main_handler.cpp
@@ -15,9 +15,8 @@
 namespace FilterManagement
 {
 
-MainHandler::MainHandler()
-  : m_fltService(nullptr)
-{
+MainHandler::MainHandler() : m_fltService(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 MainHandler::~MainHandler()
@@ -33,14 +32,14 @@ bool MainHandler::init(int domainId, int exerciseId)
   bool bRet = initInternal(domainId, exerciseId);
   if (bRet)
   {
-    INFO_LOG() << "svcFilterManagement successfully initialized"
+    INFO_LOG(m_logger) << "svcFilterManagement successfully initialized"
                        << ", domainId" << domainId
                        << ", exerciseId" << exerciseId;
     m_ddsHandler->setRunningState(Core::RunningState::Running);
   }
   else
   {
-    ERROR_LOG() << "Error initializing svcFilterManagement..."
+    ERROR_LOG(m_logger) << "Error initializing svcFilterManagement..."
                         << ", domainId" << domainId
                         << ", exerciseId" << exerciseId;
     if (m_ddsHandler)
@@ -70,7 +69,7 @@ bool MainHandler::initInternal(int domainId, int exerciseId)
   // Norbert Thoden, 28.09.2022
   // typically the ddsConnector is transfered to XY::Initialization::initialize
   // Unfortunately that leads to a WARNING at flt_fts_impl.cpp later.
-  // WARNING_LOG() << "Incoming BuildingComponentFilterUpdateRequest without registered handler!";
+  // WARNING_LOG(m_logger) << "Incoming BuildingComponentFilterUpdateRequest without registered handler!";
   // It seems like that there a two ddshandler, the first sets the m_buildingComponentFilterUpdateRequestHandler,
   // but the second require that... -> assert
   // Don´t know why this happens. At other processes,/service that seems to work... hmm
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/main_handler.h
index efcbb5556..237739c74 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/main_handler.h
@@ -31,6 +31,7 @@ public:
   bool init(int domainId, int exerciseId);
 
 private:
+  NGL::INGLLogger &m_logger;
   bool initInternal(int domainId, int exerciseId);
 
   std::shared_ptr<DdsHandler>                        m_ddsHandler;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/dds_handler.cpp
index 39218197d..77c1c4aa6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/dds_handler.cpp
@@ -16,14 +16,14 @@ namespace GuezIedManagement
 DdsHandler::DdsHandler(int domainId, int exerciseId)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise, exerciseId))
 {
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
   if(!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -38,10 +38,10 @@ bool DdsHandler::init(const QStringList &qosFileList)
   m_ddsFts = GuezIedManagement::Interface::Fts::create(m_ddsConnector);
 
   bool bRet = m_ddsDts->enableAll();
-  INFO_LOG() << "Dts initialised";
+  INFO_LOG(m_logger) << "Dts initialised";
 
   bRet &= m_ddsFts->enableAll();
-  INFO_LOG() << "Fts initialised";
+  INFO_LOG(m_logger) << "Fts initialised";
 
   return bRet;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/dds_handler.h
index 35631f9f5..c4acef3e4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/dds_handler.h
@@ -36,6 +36,7 @@ public:
   std::shared_ptr<DDSConnector::DdsConnector> dds() const { return m_ddsConnector; }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<Core::Pacemaker>            m_pacemaker;
   std::shared_ptr<Core::TopicLockMaster>      m_topicLockMaster;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/handler_ied.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/handler_ied.cpp
index c57bcfc05..734a231cc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/handler_ied.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/handler_ied.cpp
@@ -52,17 +52,17 @@ bool HandlerIed::init()
   m_ppmDtc = ParticipantManagement::Interface::Dtc::create(m_ddsHandler->dds());
   if (!m_ppmDtc->enableParticipantPosition())
   {
-    ERROR_LOG() << "PPM DTC enableParticipantPosition() failed.";
+    ERROR_LOG(m_logger) << "PPM DTC enableParticipantPosition() failed.";
     return false;
   }
   if (!m_ppmDtc->enableParticipant())
   {
-    ERROR_LOG() << "PPM DTC enableParticipant() failed.";
+    ERROR_LOG(m_logger) << "PPM DTC enableParticipant() failed.";
     return false;
   }
   if (!m_ppmDtc->enableParty())
   {
-    ERROR_LOG() << "PPM DTC enableParty() failed.";
+    ERROR_LOG(m_logger) << "PPM DTC enableParty() failed.";
     return false;
   }
 
@@ -70,7 +70,7 @@ bool HandlerIed::init()
   // read all Ieds from database
   if (!m_db->select(dataVec))
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
 
@@ -82,13 +82,13 @@ bool HandlerIed::init()
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       return false;
     }
     m_iedObjMap.insert(ifs->getId(), ifs);
   }
 
-  DEBUG_LOG() << "m_exeObjMap.size() = " << m_iedObjMap.size();
+  DEBUG_LOG(m_logger) << "m_exeObjMap.size() = " << m_iedObjMap.size();
 
   // Initialize RecordReplay to get initial IedPosition
   RecordReplayPlugin recordReplay;
@@ -101,7 +101,7 @@ bool HandlerIed::init()
   // key is sampleTime -> multiMap
   QMultiMap<qint64, GuezIedManagement::IedPosition> latestPositions = recordReplay.getIedPositionMap();
 
-  DEBUG_LOG() << "Starting to read IED positions from record replay. Size: "
+  DEBUG_LOG(m_logger) << "Starting to read IED positions from record replay. Size: "
                       << latestPositions.size();
 
   for (auto it = latestPositions.begin(); it != latestPositions.end(); ++it)
@@ -111,10 +111,10 @@ bool HandlerIed::init()
 
     if (currentIed == nullptr)
     {
-      INFO_LOG() << "Got position for non existing IED-Id: " << pos.id();
+      INFO_LOG(m_logger) << "Got position for non existing IED-Id: " << pos.id();
       continue;
     }
-    DEBUG_LOG() << "Setting position for IED-Id " << pos.id();
+    DEBUG_LOG(m_logger) << "Setting position for IED-Id " << pos.id();
     currentIed->setPosition(it.value());
   }
 
@@ -123,7 +123,7 @@ bool HandlerIed::init()
   if (!m_tabDtc->enableDefinitionIed() ||
       !m_tabDtc->enableStateIed())
   {
-    ERROR_LOG() << "Could not initialize TraininAreaBase data topic client";
+    ERROR_LOG(m_logger) << "Could not initialize TraininAreaBase data topic client";
     return false;
   }
 
@@ -177,7 +177,7 @@ void HandlerIed::onDefinitionIed(const TrainingAreaBase::DefinitionIed &data, Da
   if (modType != DataModification::eAdded && modType != DataModification::eModified)
     return;
 
-  DEBUG_LOG() << "onDefinitionIed: " << data;
+  DEBUG_LOG(m_logger) << "onDefinitionIed: " << data;
 
   Database::GimIed newData;
 
@@ -237,7 +237,7 @@ void HandlerIed::onDefinitionIed(const TrainingAreaBase::DefinitionIed &data, Da
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       return;
     }
     m_iedObjMap.insert(ifs->getId(), ifs);
@@ -276,7 +276,7 @@ void HandlerIed::onStateIed(const TrainingAreaBase::StateIed &data, DataModifica
   if (modType != DataModification::eAdded && modType != DataModification::eModified)
     return;
 
-  DEBUG_LOG() << "onStateIed: " << data;
+  DEBUG_LOG(m_logger) << "onStateIed: " << data;
 
   // only overwrite state for existing IEDs
   if (m_iedObjMap.contains(getIdByEquipmentnumber(data.iedId())))
@@ -294,7 +294,7 @@ void HandlerIed::onStateIed(const TrainingAreaBase::StateIed &data, DataModifica
   }
   else
   {
-    WARNING_LOG() << "StateIed without an existing IED - got no DefinitionIED? " << data;
+    WARNING_LOG(m_logger) << "StateIed without an existing IED - got no DefinitionIED? " << data;
     m_orphanedStateIed.insert(data.iedId(), data);
   }
 }
@@ -304,7 +304,7 @@ void HandlerIed::onPairIedRequest(const rti::core::SampleIdentity &cookie,
 {
   Core::FunctionReplyObject ret;
 
-  INFO_LOG() << "onPairIedRequest id = " << request.id();
+  INFO_LOG(m_logger) << "onPairIedRequest id = " << request.id();
 
   ObjectIed *ifs = m_iedObjMap.value(request.id());
   if (ifs == nullptr)
@@ -336,7 +336,7 @@ void HandlerIed::onPairIedRequest(const rti::core::SampleIdentity &cookie,
 
   ret = ifs->updatePairingState(data);
   if (ret.error())
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
 
   m_ddsHandler->fts()->pairIedReply(cookie, ret);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/handler_ied.h b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/handler_ied.h
index 2cf964505..f92aa8303 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/handler_ied.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/handler_ied.h
@@ -38,12 +38,14 @@ private slots:
   void onStateIed(const TrainingAreaBase::StateIed &data, DataModification modType);
 
 private:
+  NGL::INGLLogger &m_logger;
   void onPairIedRequest(const rti::core::SampleIdentity &cookie,
                         const PairIedRequest &request) override;
   int getIdByEquipmentnumber(const int number) const;
   int getPartyIdFromParticipantEquipmentNumber(const int equipmentNumber) const;
 
 private:
+  NGL::INGLLogger &m_logger;
   QMap<int, ObjectIed *>       m_iedObjMap;
   QMap<int, TrainingAreaBase::StateIed> m_orphanedStateIed;
   MainHandler                 *m_mainHandler;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/main_handler.cpp
index 0669885e2..7a3e97b7a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/main_handler.cpp
@@ -21,15 +21,14 @@
 
 using namespace GuezIedManagement;
 
-MainHandler::MainHandler()
-  : m_handlerIed(nullptr)
+MainHandler::MainHandler() : m_handlerIed(nullptr)
   , m_ddsHandler(nullptr)
   , m_dbHandler(nullptr)
   , m_codService(nullptr)
   , m_esmService(nullptr)
   , m_gmpService(nullptr)
-  , m_exerciseId(0)
-{}
+  , m_exerciseId(0),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 MainHandler::~MainHandler()
 {
@@ -47,7 +46,7 @@ bool MainHandler::init(int domainId, int exerciseId)
   const QString errStr = initInternal(domainId, exerciseId);
   if (!errStr.isEmpty())
   {
-    ERROR_LOG() << errStr;
+    ERROR_LOG(m_logger) << errStr;
     if (m_ddsHandler && m_ddsHandler->pacemaker())
       m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError, errStr);
     return false;
@@ -97,7 +96,7 @@ bool MainHandler::loadFromDatabase()
     return false;
   if (!m_handlerIed->init())
   {
-    ERROR_LOG() << "Initialisation HandlerIED failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerIED failed.";
     return false;
   }
   return true;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/main_handler.h
index 80c2aed35..8f1ae1524 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/main_handler.h
@@ -47,8 +47,10 @@ public:
   bool loadFromDatabase();
 
 private:
+  NGL::INGLLogger &m_logger;
   QString initInternal(int domainId, int exerciseId);
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<HandlerIed> m_handlerIed;
   std::shared_ptr<DdsHandler> m_ddsHandler;
   std::shared_ptr<DbHandler>  m_dbHandler;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/object_ied.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/object_ied.cpp
index 6da3a418f..8c42dcf6e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/object_ied.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/object_ied.cpp
@@ -43,10 +43,10 @@ Core::FunctionReplyObject ObjectIed::createObject(const Database::GimIed &data)
     }
 
     // Id is serial -> will be generated by db => inside m_data after db-insert
-    DEBUG_LOG() << "New IED-Id: " << m_data.id;
+    DEBUG_LOG(m_logger) << "New IED-Id: " << m_data.id;
   }
 
-  INFO_LOG() << "Ied created sucessfully.";
+  INFO_LOG(m_logger) << "Ied created sucessfully.";
 
   // Publish Data via DTS
   onPublishData();
@@ -163,10 +163,10 @@ void ObjectIed::onPublishData()
   ddsData.symbol(m_data.symbol.toStdString());
   ddsData.sampleTime(m_data.sampleTime);
 
-  INFO_LOG() << "Publish IED-data to dds (" << m_data.id << ") ...";
+  INFO_LOG(m_logger) << "Publish IED-data to dds (" << m_data.id << ") ...";
 
   if (!m_ddsHandler->dts()->publish(ddsData))
-    ERROR_LOG() << "Error publishing IED-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing IED-data to dds";
 }
 
 void ObjectIed::onParticipantPositionChanged(const ParticipantManagement::ParticipantPosition &data, DataModification modType)
@@ -219,15 +219,15 @@ Core::FunctionReplyObject ObjectIed::updateObject()
   if (!isValid())
     return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Trying to update an already removed IED object"));
 
-  INFO_LOG() << "Trying to updateObject IedData with id = " << m_data.id;
+  INFO_LOG(m_logger) << "Trying to updateObject IedData with id = " << m_data.id;
 
   if (!m_db->update(m_data))
   {
-    ERROR_LOG() << "Failed to update IedData with id = " << m_data.id;
+    ERROR_LOG(m_logger) << "Failed to update IedData with id = " << m_data.id;
     return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error updating IED-data with id %1 in database")).arg(m_data.id);
   }
 
-  INFO_LOG() << "IED-Data changed sucessfully.";
+  INFO_LOG(m_logger) << "IED-Data changed sucessfully.";
 
   // Publish Data via DTS
   onPublishData();
@@ -238,7 +238,7 @@ Core::FunctionReplyObject ObjectIed::updateObject()
 void ObjectIed::publishPosition()
 {
   if (!m_ddsHandler->dts()->publish(m_position))
-    ERROR_LOG() << "Error publishing IED-position to dds";
+    ERROR_LOG(m_logger) << "Error publishing IED-position to dds";
 }
 
 bool ObjectIed::isValid() const
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/object_ied.h b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/object_ied.h
index 9bd3c82f8..219d0b63a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/object_ied.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/object_ied.h
@@ -47,6 +47,7 @@ private slots:
   void onParticipantPositionChanged(const ParticipantManagement::ParticipantPosition &data, DataModification modType);
 
 private:
+  NGL::INGLLogger &m_logger;
   void assignBaseData(const Database::GimIed &data);
   void assignPairingState(const Database::GimIed &data);
   Core::FunctionReplyObject updateObject();
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 7b18251e2..59eb6b4a0 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
@@ -38,20 +38,19 @@ int main(int argc, char *argv[])
 }
 
 //-------------------------------------------------------------------------------------------------------
-GmpMinefieldInterpreterTestsMain::GmpMinefieldInterpreterTestsMain()
-  : m_minefieldInterpreter(nullptr)
+GmpMinefieldInterpreterTestsMain::GmpMinefieldInterpreterTestsMain() : m_minefieldInterpreter(nullptr)
   , m_receivedMinefield()
   , m_receivedVeType(0)
   , m_minefieldInterpreterTimer(nullptr)
   , m_minefieldSpy(nullptr)
-  .getNGLLogger("Tests.GmpMinefieldInterpreterTest"))
-{
+  .getNGLLogger("Tests.GmpMinefieldInterpreterTest")),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 //-------------------------------------------------------------------------------------------------------
 void GmpMinefieldInterpreterTestsMain::initTestCase()
 {
-  DEBUG_LOG() << "GmpMinefieldInterpreterTestsMain: initTestCase";
+  DEBUG_LOG(m_logger) << "GmpMinefieldInterpreterTestsMain: initTestCase";
 
   m_minefieldInterpreter = new GuezMinelayerProcessing::ZSSI_WI_Minenfeld_Interpreter();
   QVERIFY2(m_minefieldInterpreter, "Initialisation of GuezMinelayerProcessing::ZSSI_WI_Minenfeld_Interpreter failed");
@@ -241,7 +240,7 @@ void GmpMinefieldInterpreterTestsMain::minefieldTestCase_data()
 //-------------------------------------------------------------------------------------------------------
 void GmpMinefieldInterpreterTestsMain::minefieldTestCase()
 {
-  DEBUG_LOG() << "GmpMinefieldInterpreterTestsMain: multiLaneMinefieldTestCase";
+  DEBUG_LOG(m_logger) << "GmpMinefieldInterpreterTestsMain: multiLaneMinefieldTestCase";
   NOTICE_LOG(m_logger) << "this may take a while.. don't worry";
 
   uint64_t timeStamp = QDateTime::currentSecsSinceEpoch();
@@ -372,7 +371,7 @@ void GmpMinefieldInterpreterTestsMain::minefieldTestCase()
 //-------------------------------------------------------------------------------------------------------
 void GmpMinefieldInterpreterTestsMain::cleanupTestCase()
 {
-  DEBUG_LOG() << "GmpMinefieldInterpreterTestsMain: cleanupTestCase";
+  DEBUG_LOG(m_logger) << "GmpMinefieldInterpreterTestsMain: cleanupTestCase";
   m_minefieldInterpreterTimer->stop();
   m_minefieldInterpreterTimer->deleteLater();
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/UnitTests/gmp_minefieldInterpreter_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/UnitTests/gmp_minefieldInterpreter_test.h
index 642094e86..d447a3746 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/UnitTests/gmp_minefieldInterpreter_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/UnitTests/gmp_minefieldInterpreter_test.h
@@ -37,6 +37,8 @@ private slots:
   void onSendMinefield(const wirkfeld_minensperre_rt &minefield, int veType);
 
 private:
+
+NGL::INGLLogger &m_logger;
   GuezMinelayerProcessing::ZSSI_WI_Minenfeld_Interpreter *m_minefieldInterpreter;
 
   wirkfeld_minensperre_rt m_receivedMinefield;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/dds_handler.cpp
index 8bd755ef7..c687ee578 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/dds_handler.cpp
@@ -16,14 +16,14 @@ namespace GuezMinelayerProcessing
 DdsHandler::DdsHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
   : m_ddsConnector(ddsConnector)
 {
-  DEBUG_LOG() << "DdsHandler(" << ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/dds_handler.h
index f2ba070af..c72e38d80 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/dds_handler.h
@@ -25,6 +25,7 @@ public:
   std::shared_ptr<Core::TopicLockMaster> topicLockMaster() const { return m_topicLockMaster; }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector>       m_ddsConnector;
   std::shared_ptr<Core::TopicLockMaster>            m_topicLockMaster;
 };
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 3ce0b5401..4dc9e9b79 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
@@ -42,7 +42,7 @@ bool HandlerMinelayerData::init()
   bool ret = m_aesFtc->enableMineAreaModifyFromCtaData();
   if (!ret)
   {
-    ERROR_LOG() << "AesFtc Can not enable MineAreaCreateFromCtaData()";
+    ERROR_LOG(m_logger) << "AesFtc Can not enable MineAreaCreateFromCtaData()";
     return false;
   }
 
@@ -54,7 +54,7 @@ bool HandlerMinelayerData::init()
   ret &= m_tabDtc->enableMinelayerThrowerData();
   if (!ret)
   {
-    ERROR_LOG() << "TabDtc Can not ebale Data";
+    ERROR_LOG(m_logger) << "TabDtc Can not ebale Data";
     return false;
   }
 
@@ -67,7 +67,7 @@ bool HandlerMinelayerData::init()
   ret &= m_ppmDtc->enableParticipant();
   if (!ret)
   {
-    ERROR_LOG() << "PpmDtc Can not enable Participant Data";
+    ERROR_LOG(m_logger) << "PpmDtc Can not enable Participant Data";
     return false;
   }
 
@@ -106,12 +106,12 @@ void HandlerMinelayerData::onSpecialSensorDataChanged(const TrainingAreaBase::Sp
     // old code copied from zssi_wi_Empfaenger.cpp
     /*
       if ( checkeTelegrammZeit(telegramm_rt.gps_zeit.gps_zeit) ) {
-        ERROR_LOG() << QStringLiteral("Keine plausible gps_zeit !!  gps_zeit=%1").arg(telegramm_rt.gps_zeit.gps_zeit);
+        ERROR_LOG(m_logger) << QStringLiteral("Keine plausible gps_zeit !!  gps_zeit=%1").arg(telegramm_rt.gps_zeit.gps_zeit);
         return;
       }
 
       if ( checkeKoordinaten(telegramm_rt.gps_pos)!=0 ) {
-        ERROR_LOG() << QStringLiteral("Keine plausible gps_pos !!  pos_x=%1 Keine plausible gps_pos !!  pos_y=%2").arg(telegramm_rt.gps_pos.utm_ostwert).arg(telegramm_rt.gps_pos.utm_nordwert);
+        ERROR_LOG(m_logger) << QStringLiteral("Keine plausible gps_pos !!  pos_x=%1 Keine plausible gps_pos !!  pos_y=%2").arg(telegramm_rt.gps_pos.utm_ostwert).arg(telegramm_rt.gps_pos.utm_nordwert);
         return;
       }
     */
@@ -122,7 +122,7 @@ void HandlerMinelayerData::onSpecialSensorDataChanged(const TrainingAreaBase::Sp
 
     interne_datenbasis_Fahrspur.eintrag_container(key_intern, daten_intern);
 
-    INFO_LOG() << "Inserted new lane data into old interne_datenbasis_Fahrspur succesfully! Lane data:" << data;
+    INFO_LOG(m_logger) << "Inserted new lane data into old interne_datenbasis_Fahrspur succesfully! Lane data:" << data;
 
     // end old code
   }
@@ -153,15 +153,15 @@ void HandlerMinelayerData::onMinelayerTrailerData(const TrainingAreaBase::Minela
 
     // old code copied from zssi_wi_Empfaenger.cpp
     /*
-        INFO_LOG() << log_tr("Telegramm 'SONDERSENSORIK_MIVANH_VERLEGEDATEN' empfangen");
+        INFO_LOG(m_logger) << log_tr("Telegramm 'SONDERSENSORIK_MIVANH_VERLEGEDATEN' empfangen");
 
         if ( checkeTelegrammZeit(telegramm_rt.gps_zeit.gps_zeit) ) {
-          ERROR_LOG() << log_tr("Keine plausible gps_zeit !!  gps_zeit=%1").arg(telegramm_rt.gps_zeit.gps_zeit);
+          ERROR_LOG(m_logger) << log_tr("Keine plausible gps_zeit !!  gps_zeit=%1").arg(telegramm_rt.gps_zeit.gps_zeit);
           return;
         }
 
         if ( checkeKoordinaten(telegramm_rt.gps_pos)!=0 ) {
-          ERROR_LOG() << log_tr("Keine plausible gps_pos !!  pos_x=%1 Keine plausible gps_pos !!  pos_y=%2").arg(telegramm_rt.gps_pos.utm_ostwert).arg(telegramm_rt.gps_pos.utm_nordwert);
+          ERROR_LOG(m_logger) << log_tr("Keine plausible gps_pos !!  pos_x=%1 Keine plausible gps_pos !!  pos_y=%2").arg(telegramm_rt.gps_pos.utm_ostwert).arg(telegramm_rt.gps_pos.utm_nordwert);
           return;
         }
     */
@@ -172,7 +172,7 @@ void HandlerMinelayerData::onMinelayerTrailerData(const TrainingAreaBase::Minela
 
     if (daten_intern.daten.verlegedaten.anzahl_verlegter_minen > 1200)
     {
-      WARNING_LOG() << QStringLiteral("Anzahl_verlegter_minen = %1, wird auf 1200 zurueckgesetzt").arg(daten_intern.daten.verlegedaten.anzahl_verlegter_minen);
+      WARNING_LOG(m_logger) << QStringLiteral("Anzahl_verlegter_minen = %1, wird auf 1200 zurueckgesetzt").arg(daten_intern.daten.verlegedaten.anzahl_verlegter_minen);
       daten_intern.daten.verlegedaten.anzahl_verlegter_minen = 1200;
     }
 
@@ -182,7 +182,7 @@ void HandlerMinelayerData::onMinelayerTrailerData(const TrainingAreaBase::Minela
     interne_datenbasis_Verlegedaten.eintrag_container(
       key_intern, daten_intern);
 
-    INFO_LOG() << "Inserted new minelayertrailer data into old interne_datenbasis_Verlegedaten succesfully! Minelayerthrower data:" << data;
+    INFO_LOG(m_logger) << "Inserted new minelayertrailer data into old interne_datenbasis_Verlegedaten succesfully! Minelayerthrower data:" << data;
   }
 }
 
@@ -197,19 +197,19 @@ void HandlerMinelayerData::onMinelayerThrowerData(const TrainingAreaBase::Minela
 
     /*
         if ( checkeTelegrammZeit(telegramm_rt.gps_zeit.gps_zeit) ) {
-          ERROR_LOG() << log_tr("Keine plausible gps_zeit !!  gps_zeit=%1").arg(telegramm_rt.gps_zeit.gps_zeit);
+          ERROR_LOG(m_logger) << log_tr("Keine plausible gps_zeit !!  gps_zeit=%1").arg(telegramm_rt.gps_zeit.gps_zeit);
           return;
         }
 
         if ( checkeKoordinaten(telegramm_rt.gps_pos) !=0 ) {
-          ERROR_LOG() << log_tr("Keine plausible gps_pos !!  pos_x=%1 Keine plausible gps_pos !!  pos_y=%2").arg(telegramm_rt.gps_pos.utm_ostwert).arg(telegramm_rt.gps_pos.utm_nordwert);
+          ERROR_LOG(m_logger) << log_tr("Keine plausible gps_pos !!  pos_x=%1 Keine plausible gps_pos !!  pos_y=%2").arg(telegramm_rt.gps_pos.utm_ostwert).arg(telegramm_rt.gps_pos.utm_nordwert);
           return;
         }
     */
 
     if (daten_intern.daten.verlegedaten.anzahl_verlegter_minen > 1200)
     {
-      WARNING_LOG() << QStringLiteral("Anzahl_verlegter_minen = %1, wird auf 1200 zurueckgesetzt").arg(daten_intern.daten.verlegedaten.anzahl_verlegter_minen);
+      WARNING_LOG(m_logger) << QStringLiteral("Anzahl_verlegter_minen = %1, wird auf 1200 zurueckgesetzt").arg(daten_intern.daten.verlegedaten.anzahl_verlegter_minen);
       daten_intern.daten.verlegedaten.anzahl_verlegter_minen = 1200;
     }
 
@@ -228,7 +228,7 @@ void HandlerMinelayerData::onMinelayerThrowerData(const TrainingAreaBase::Minela
         key_intern, daten_intern);
     }
 
-    INFO_LOG() << "Inserted new minelayerthrower data into old interne_datenbasis_Verlegedaten succesfully! Minelayerthrower data:" << data;
+    INFO_LOG(m_logger) << "Inserted new minelayerthrower data into old interne_datenbasis_Verlegedaten succesfully! Minelayerthrower data:" << data;
   }
 }
 
@@ -328,7 +328,7 @@ void HandlerMinelayerData::onSendMinefield(const wirkfeld_minensperre_rt &minefi
   }
   outData.segments(segVec);
 
-  INFO_LOG() << "Sending new minefield from generator to AES: " << outData;
+  INFO_LOG(m_logger) << "Sending new minefield from generator to AES: " << outData;
 
   // request create mine area from aes
   m_aesFtc->mineAreaModifyFromCtaDataRequest(outData, this);
@@ -337,16 +337,16 @@ void HandlerMinelayerData::onSendMinefield(const wirkfeld_minensperre_rt &minefi
 
 void HandlerMinelayerData::onStartMinefieldInterpreter()
 {
-  INFO_LOG() << "Starting minefield interpreter ...";
+  INFO_LOG(m_logger) << "Starting minefield interpreter ...";
   m_minefieldInterpreter->processData();
 }
 
 void HandlerMinelayerData::onMineAreaModifyFromCtaDataReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    ERROR_LOG() << "Error inserting minefield via AES->FTC";
+    ERROR_LOG(m_logger) << "Error inserting minefield via AES->FTC";
   else
-    INFO_LOG() << "Got onMineAreaCreateFromCtaDataReply reply with id " << replyObject.id();
+    INFO_LOG(m_logger) << "Got onMineAreaCreateFromCtaDataReply reply with id " << replyObject.id();
 }
 
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/handler_minelayer_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/handler_minelayer_data.h
index c4de3b94a..530113557 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/handler_minelayer_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/handler_minelayer_data.h
@@ -45,6 +45,7 @@ private slots:
   void onStartMinefieldInterpreter ();
 
 private:
+  NGL::INGLLogger &m_logger;
   template<typename T>
   void convertMinelayerDataToXdrData(const TrainingAreaBase::MinelayerTrailerData &inData, T &outData);
   Core::GeoPosition2D geographicFromRelative(const gps_position_rt &position) const;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/initialization.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/initialization.cpp
index b1735931d..542c03fb2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/initialization.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/initialization.cpp
@@ -33,7 +33,7 @@ bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector
   m_ddsHandler.reset(new DdsHandler(ddsConnector));
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation ddsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
     return false;
   }
 
@@ -41,7 +41,7 @@ bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector
   m_handlerMinelayerData.reset(new HandlerMinelayerData(m_ddsHandler));
   if (!m_handlerMinelayerData->init())
   {
-    ERROR_LOG() << "Initialisation m_handlerMinelayerData failed.";
+    ERROR_LOG(m_logger) << "Initialisation m_handlerMinelayerData failed.";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/initialization.h b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/initialization.h
index 495242cd8..64c04f862 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/initialization.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/initialization.h
@@ -26,6 +26,7 @@ public:
   bool loadFromDatabase();
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>           m_ddsHandler;
   std::shared_ptr<HandlerMinelayerData> m_handlerMinelayerData;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/zssi_wi_Minenfeld_Generator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/zssi_wi_Minenfeld_Generator.cpp
index f40ba1aca..6e66a759b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/zssi_wi_Minenfeld_Generator.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/zssi_wi_Minenfeld_Generator.cpp
@@ -591,9 +591,9 @@ static void KontrollausgabeFahrspur(GFS_Map_Container<VERLEGEDATEN_KEY, FAHRSPUR
 {
   NGL::INGLLogger &m_logger(logger());
 
-  INFO_LOG() << QStringLiteral("Fahrspurcontainer am %1 von IS==%2:").arg(art).arg(id);
+  INFO_LOG(m_logger) << QStringLiteral("Fahrspurcontainer am %1 von IS==%2:").arg(art).arg(id);
   for (const auto &d : cont.c())
-    INFO_LOG() << d.second.daten.gps_position.utm_ostwert << "/" << d.second.daten.gps_position.utm_nordwert
+    INFO_LOG(m_logger) << d.second.daten.gps_position.utm_ostwert << "/" << d.second.daten.gps_position.utm_nordwert
                        << " is: " << d.second.intstat;
 }
 
@@ -602,9 +602,9 @@ static void KontrollausgabeVerlegedaten(GFS_Map_Container<VERLEGEDATEN_KEY, VERL
 {
   NGL::INGLLogger &m_logger(logger());
 
-  INFO_LOG() << QStringLiteral("Verlegedatencontainer am %1 von IS==%2:").arg(art).arg(id);
+  INFO_LOG(m_logger) << QStringLiteral("Verlegedatencontainer am %1 von IS==%2:").arg(art).arg(id);
   for (const auto &d : cont.c())
-    INFO_LOG() << d.second.daten.gps_position.utm_ostwert << "/" << d.second.daten.gps_position.utm_nordwert
+    INFO_LOG(m_logger) << d.second.daten.gps_position.utm_ostwert << "/" << d.second.daten.gps_position.utm_nordwert
                        << " Fz: " << d.second.daten.header.identitaet;
 }
 
@@ -613,7 +613,7 @@ static void KontrollausgabeSegmente(const GFS_Map_Container<VERLEGEDATEN_KEY, Se
   NGL::INGLLogger &m_logger(logger());
 
   for (const auto &d : segmente.c())
-    INFO_LOG() << d.second.startpunkt.utm_ostwert << "/" << d.second.startpunkt.utm_nordwert
+    INFO_LOG(m_logger) << d.second.startpunkt.utm_ostwert << "/" << d.second.startpunkt.utm_nordwert
                        << " Winkel: " << d.second.drehwinkel
                        << " Laenge: " << d.second.anzahl;
 }
@@ -626,7 +626,7 @@ static void KontrollausgabeSegmente(const std::vector<Segment_rt> &segmente)
   for (size_t s = 0; s < segmente.size(); s++)
   {
     const auto &seg = segmente.at(s);
-    INFO_LOG() << "Segment[" << s << "] Startpunkt: " << seg.startpunkt.utm_ostwert << "/" << seg.startpunkt.utm_nordwert
+    INFO_LOG(m_logger) << "Segment[" << s << "] Startpunkt: " << seg.startpunkt.utm_ostwert << "/" << seg.startpunkt.utm_nordwert
                        << " Drehwinkel: " << seg.drehwinkel << " Anzahl: " << seg.anzahl;
   }
 }
@@ -636,7 +636,7 @@ static void KontrollausgabeSegmentPunkte(const GFS_Map_Container<VERLEGEDATEN_KE
   NGL::INGLLogger &m_logger(logger());
 
   for (const auto &d : cont.c())
-    INFO_LOG() << d.second.daten.gps_position.utm_ostwert << "/" << d.second.daten.gps_position.utm_nordwert;
+    INFO_LOG(m_logger) << d.second.daten.gps_position.utm_ostwert << "/" << d.second.daten.gps_position.utm_nordwert;
 }
 
 //f+-----------------------------------------------------------------------
@@ -753,7 +753,7 @@ minengenerator_anfang:
 
     if (interne_datenbasis_Fahrspur.getData()->intstat == 9)
     {
-      INFO_LOG() << QStringLiteral("Einspurige Minensperre wird berechnet");
+      INFO_LOG(m_logger) << QStringLiteral("Einspurige Minensperre wird berechnet");
 
 
       gesamte_minenanzahl = 0;
@@ -823,7 +823,7 @@ minengenerator_anfang:
                 //es muss im Falle verschiedener Minentypen ein IS 9 mit folgendem
                 //IS 3 in den Fahrspurcontainer eingetragen werden, und zwar an
                 //der Stelle, an der das vorherige Verlegeendetelegramm kam
-                INFO_LOG() << QStringLiteral("Die Fahrspur wird in zwei Minensperren geteilt, da der Minentyp gewechselt wurde!");
+                INFO_LOG(m_logger) << QStringLiteral("Die Fahrspur wird in zwei Minensperren geteilt, da der Minentyp gewechselt wurde!");
                 interne_datenbasis_Verlegedaten.iter_modify(-1);
                 if (interne_datenbasis_Verlegedaten.getData()->
                     daten.verlegedaten.anzahl_verlegter_minen == 0)//also ein Beginn
@@ -913,7 +913,7 @@ minengenerator_anfang:
               //es muss im Falle verschiedener Minentypen ein IS 9 mit folgendem
               //IS 3 in den Fahrspurcontainer eingetragen werden, und zwar an
               //der Stelle, an der das vorherige Verlegeendetelegramm kam
-              INFO_LOG() << QStringLiteral("Die Fahrspur wird in zwei Minensperren geteilt, da der Minentyp gewechselt wurde!");
+              INFO_LOG(m_logger) << QStringLiteral("Die Fahrspur wird in zwei Minensperren geteilt, da der Minentyp gewechselt wurde!");
               interne_datenbasis_Verlegedaten.iter_modify(-1);
               if (interne_datenbasis_Verlegedaten.getData()->
                   daten.verlegedaten.anzahl_verlegter_minen == 0) //also ein Beginn
@@ -957,7 +957,7 @@ minengenerator_anfang:
 
       if (parameter_key != anfangspunkt_key)
       {
-        INFO_LOG() << QStringLiteral("Parameter fuer einspurige Minensperre gefunden. ");
+        INFO_LOG(m_logger) << QStringLiteral("Parameter fuer einspurige Minensperre gefunden. ");
 
 
         //Die erkannten Segmente haben Vorrang gegenueber den Luecken, will
@@ -1033,13 +1033,13 @@ minengenerator_anfang:
                          segmentpunkte.getData()->daten.gps_position);
           gesamte_verlege_strecke = gesamte_verlege_strecke +
                                     segmente.getData()->anzahl;
-          INFO_LOG() << QStringLiteral("Punktabstand (%1, %2, %3, %4)").arg(segmente.getData()->startpunkt.utm_ostwert).arg(segmente.getData()->startpunkt.utm_nordwert).arg(segmentpunkte.getData()->daten.gps_position.utm_ostwert).arg(segmentpunkte.getData()->daten.gps_position.utm_nordwert);
+          INFO_LOG(m_logger) << QStringLiteral("Punktabstand (%1, %2, %3, %4)").arg(segmente.getData()->startpunkt.utm_ostwert).arg(segmente.getData()->startpunkt.utm_nordwert).arg(segmentpunkte.getData()->daten.gps_position.utm_ostwert).arg(segmentpunkte.getData()->daten.gps_position.utm_nordwert);
         }
         while (segmente.iter_modify(1));
 
         //Kontrollausgabe
-        INFO_LOG() << QStringLiteral("Gesamtlaenge: %1").arg(gesamte_verlege_strecke);
-        INFO_LOG() << QStringLiteral("Gesamtanzahl: %1").arg(gesamte_minenanzahl);
+        INFO_LOG(m_logger) << QStringLiteral("Gesamtlaenge: %1").arg(gesamte_verlege_strecke);
+        INFO_LOG(m_logger) << QStringLiteral("Gesamtanzahl: %1").arg(gesamte_minenanzahl);
         //Ersetzen der Segmentlaengen durch die Anzahl der Minen
         segmente.iter_reset();
         do
@@ -1067,7 +1067,7 @@ minengenerator_anfang:
 
         //Die Startpunkte der Segmente muessen dann verschoben werden, wenn die
         //Verlegeart links oder rechts ist
-        INFO_LOG() << QStringLiteral("Ausstossart: %1").arg(interne_datenbasis_Verlegedaten.getData()->                                   daten.verlegedaten.ausstossart);
+        INFO_LOG(m_logger) << QStringLiteral("Ausstossart: %1").arg(interne_datenbasis_Verlegedaten.getData()->                                   daten.verlegedaten.ausstossart);
 
         switch (interne_datenbasis_Verlegedaten.getData()->
                 daten.verlegedaten.ausstossart)
@@ -1133,7 +1133,7 @@ minengenerator_anfang:
             sperrenmodell.verlegedichte = lrint(max_verlegedichte * FAKTOR_VERLEGEDICHTE);
           else if (sperrenmodell.verlegedichte < 1)
             sperrenmodell.verlegedichte = 1;
-          INFO_LOG() << QStringLiteral("verlegedichte = %1 anz=%2 strecke=%3").arg(sperrenmodell.verlegedichte).arg(gesamte_minenanzahl).arg(gesamte_verlege_strecke);
+          INFO_LOG(m_logger) << QStringLiteral("verlegedichte = %1 anz=%2 strecke=%3").arg(sperrenmodell.verlegedichte).arg(gesamte_minenanzahl).arg(gesamte_verlege_strecke);
         }
         sperrenmodell.minentyp =
           interne_datenbasis_Verlegedaten.getData()->
@@ -1145,7 +1145,7 @@ minengenerator_anfang:
           sperrenmodell.segmente.push_back(val.second);
 
         //Kontrollausgabe
-        INFO_LOG() << QStringLiteral("Einspuriges Minensperrenmodell wurde erstellt. Wirkbeginn: %1 Wirkdauer:%2 Verlegetiefe:%3 Verlegedichte:%4 Minentyp:%5 Minenanzahl:%6 Segmentanzahl:%7").arg(sperrenmodell.wirkbeginn.gps_zeit).arg(sperrenmodell.wirkdauer).arg(sperrenmodell.verlegetiefe).arg(sperrenmodell.verlegedichte).arg(sperrenmodell.minentyp).arg(sperrenmodell.minenanzahl).arg(sperrenmodell.segmente.size());
+        INFO_LOG(m_logger) << QStringLiteral("Einspuriges Minensperrenmodell wurde erstellt. Wirkbeginn: %1 Wirkdauer:%2 Verlegetiefe:%3 Verlegedichte:%4 Minentyp:%5 Minenanzahl:%6 Segmentanzahl:%7").arg(sperrenmodell.wirkbeginn.gps_zeit).arg(sperrenmodell.wirkdauer).arg(sperrenmodell.verlegetiefe).arg(sperrenmodell.verlegedichte).arg(sperrenmodell.minentyp).arg(sperrenmodell.minenanzahl).arg(sperrenmodell.segmente.size());
         KontrollausgabeSegmente(sperrenmodell.segmente);
 
         if (interne_datenbasis_Verlegedaten.getData()->
@@ -1164,7 +1164,7 @@ minengenerator_anfang:
         sperrenmodell.segmente.clear();
       }
       else
-        WARNING_LOG() << QStringLiteral("Minensperre ohne Parameter!");
+        WARNING_LOG(m_logger) << QStringLiteral("Minensperre ohne Parameter!");
 
 
       //Alle Fahrspureintraege dieser Minensperre werden geloescht
@@ -1228,7 +1228,7 @@ minengenerator_anfang:
       map_test = interne_datenbasis_Fahrspur.iter_modify(1);
     if (interne_datenbasis_Fahrspur.getData()->intstat == 7)
     {
-      INFO_LOG() << QStringLiteral("Mehrspurige Minensperre, durch ein Fz verlegt, wird berechnet");
+      INFO_LOG(m_logger) << QStringLiteral("Mehrspurige Minensperre, durch ein Fz verlegt, wird berechnet");
 
       gesamte_minenanzahl = 0;
 
@@ -1280,11 +1280,11 @@ minengenerator_anfang:
       segmentpunkte_eins = segmentpunkte;
 
       //Kontrollausgabe
-      INFO_LOG() << QStringLiteral("Stuetzpunkte fuer die eine Fahrspur wurden gebildet.");
+      INFO_LOG(m_logger) << QStringLiteral("Stuetzpunkte fuer die eine Fahrspur wurden gebildet.");
       KontrollausgabeSegmentPunkte(segmentpunkte_eins);
 
       //Kontrollausgabe
-      INFO_LOG() << QStringLiteral("Stuetzpunkte fuer die andere Fahrspur wurden gebildet.");
+      INFO_LOG(m_logger) << QStringLiteral("Stuetzpunkte fuer die andere Fahrspur wurden gebildet.");
       KontrollausgabeSegmentPunkte(segmentpunkte_zwei);
 
 
@@ -1303,7 +1303,7 @@ minengenerator_anfang:
           anzahl_verlegespur ++;
       }
       //Kontrollausgabe
-      INFO_LOG() << QStringLiteral("Anzahl der Fahrspuren: %1").arg(anzahl_verlegespur);
+      INFO_LOG(m_logger) << QStringLiteral("Anzahl der Fahrspuren: %1").arg(anzahl_verlegespur);
 
 
       //Ermitteln der Parameter der Minensperre durch das Suchen eines
@@ -1360,7 +1360,7 @@ minengenerator_anfang:
               //Die restlichen MVP werden am Ende des Minenfeldgenerators
               //alle auf 0 gesetzt, so dass sie bei Aufruf des
               //Minenfeldinterpreters neu interpretiert werden koennen.
-              INFO_LOG() << QStringLiteral("Die Minensperre enthaelt mindestens eine einspurige Sperre da verschiedene Minentypen vorkommen...Neubeginn");
+              INFO_LOG(m_logger) << QStringLiteral("Die Minensperre enthaelt mindestens eine einspurige Sperre da verschiedene Minentypen vorkommen...Neubeginn");
               goto minengenerator_anfang;
             }
             minentyp = interne_datenbasis_Verlegedaten.getData()->
@@ -1401,7 +1401,7 @@ minengenerator_anfang:
               //Die restlichen MVP werden am Ende des Minenfeldgenerators
               //alle auf 0 gesetzt, so dass sie bei Aufruf des
               //Minenfeldinterpreters neu interpretiert werden koennen.
-              INFO_LOG() << QStringLiteral("Die Minensperre enthaelt mindestens eine einspurige Sperre da verschiedene Minentypen vorkommen...Neubeginn");
+              INFO_LOG(m_logger) << QStringLiteral("Die Minensperre enthaelt mindestens eine einspurige Sperre da verschiedene Minentypen vorkommen...Neubeginn");
               goto minengenerator_anfang;
             }
             minentyp = interne_datenbasis_Verlegedaten.getData()->
@@ -1413,7 +1413,7 @@ minengenerator_anfang:
 
       if (parameter_key != anfangspunkt_key)
       {
-        INFO_LOG() << QStringLiteral("Parameter fuer mehrspurige durch ein Fz angelegte Minensperre gefunden. ");
+        INFO_LOG(m_logger) << QStringLiteral("Parameter fuer mehrspurige durch ein Fz angelegte Minensperre gefunden. ");
 
 
         //VERSCHIEBEN DER SEGMENTE DER ERSTEN FAHRSPUR
@@ -1468,12 +1468,12 @@ minengenerator_anfang:
 
 
         //Kontrollausgabe
-        INFO_LOG() << QStringLiteral("Segmente der einen Fahrspur berechnet...  (das letzte Segment ist nur ein Hilfssegment) ");
+        INFO_LOG(m_logger) << QStringLiteral("Segmente der einen Fahrspur berechnet...  (das letzte Segment ist nur ein Hilfssegment) ");
         map_test = segmente_eins.size() > 0;
         segmente_eins.iter_reset();
         while (map_test)
         {
-          INFO_LOG() << QStringLiteral("%1/%2 Winkel: %3 Laenge: %4").arg(segmente_eins.getData()->startpunkt.utm_ostwert).arg(segmente_eins.getData()->startpunkt.utm_nordwert).arg(segmente_eins.getData()->drehwinkel).arg(segmente_eins.getData()->anzahl);
+          INFO_LOG(m_logger) << QStringLiteral("%1/%2 Winkel: %3 Laenge: %4").arg(segmente_eins.getData()->startpunkt.utm_ostwert).arg(segmente_eins.getData()->startpunkt.utm_nordwert).arg(segmente_eins.getData()->drehwinkel).arg(segmente_eins.getData()->anzahl);
           map_test = segmente_eins.iter_modify(1);
         }
 
@@ -1481,7 +1481,7 @@ minengenerator_anfang:
         //Verlegeart links oder rechts ist
         //Die Verlegeart der ersten Fahrspur steht in erste_verlegeart
 
-        INFO_LOG() << QStringLiteral("Ausstossart der ersten Fahrspur: %1").arg(erste_verlegeart);
+        INFO_LOG(m_logger) << QStringLiteral("Ausstossart der ersten Fahrspur: %1").arg(erste_verlegeart);
 
         segmente = segmente_eins;
 
@@ -1562,12 +1562,12 @@ minengenerator_anfang:
         segmente_zwei.getData()->anzahl = 0;
 
         //Kontrollausgabe
-        INFO_LOG() << QStringLiteral("Segmente der anderen Fahrspur berechnet...  (das letzte Segment ist nur ein Hilfssegment) ");
+        INFO_LOG(m_logger) << QStringLiteral("Segmente der anderen Fahrspur berechnet...  (das letzte Segment ist nur ein Hilfssegment) ");
         map_test = segmente_zwei.size() > 0;
         segmente_zwei.iter_reset();
         while (map_test)
         {
-          INFO_LOG() << QStringLiteral("%1/%2 Winkel: %3 Laenge: %4").arg(segmente_zwei.getData()->startpunkt.utm_ostwert).arg(segmente_zwei.getData()->startpunkt.utm_nordwert).arg(segmente_zwei.getData()->drehwinkel).arg(segmente_zwei.getData()->anzahl);
+          INFO_LOG(m_logger) << QStringLiteral("%1/%2 Winkel: %3 Laenge: %4").arg(segmente_zwei.getData()->startpunkt.utm_ostwert).arg(segmente_zwei.getData()->startpunkt.utm_nordwert).arg(segmente_zwei.getData()->drehwinkel).arg(segmente_zwei.getData()->anzahl);
           map_test = segmente_zwei.iter_modify(1);
         }
 
@@ -1575,7 +1575,7 @@ minengenerator_anfang:
         //Verlegeart links oder rechts ist
         //Die Verlegeart der letzten Fahrspur steht in zweite_verlegeart
 
-        INFO_LOG() << QStringLiteral("Ausstossart der zweiten Fahrspur: %1").arg(zweite_verlegeart);
+        INFO_LOG(m_logger) << QStringLiteral("Ausstossart der zweiten Fahrspur: %1").arg(zweite_verlegeart);
 
         segmente = segmente_zwei;
 
@@ -1608,21 +1608,21 @@ minengenerator_anfang:
 
         //NUN SIND DIE SEGMENTANFANGSPUNKTE DER EINZELNEN FAHRSPUREN VERSCHOBEN
         //Kontrollausgabe
-        INFO_LOG() << QStringLiteral("verschobene Segmente der einen Fahrspur berechnet... ");
+        INFO_LOG(m_logger) << QStringLiteral("verschobene Segmente der einen Fahrspur berechnet... ");
         map_test = segmente_eins.size() > 0;
         segmente_eins.iter_reset();
         while (map_test)
         {
-          INFO_LOG() << QStringLiteral("%1/%2 Winkel: %3 Laenge: %4").arg(segmente_eins.getData()->startpunkt.utm_ostwert).arg(segmente_eins.getData()->startpunkt.utm_nordwert).arg(segmente_eins.getData()->drehwinkel).arg(segmente_eins.getData()->anzahl);
+          INFO_LOG(m_logger) << QStringLiteral("%1/%2 Winkel: %3 Laenge: %4").arg(segmente_eins.getData()->startpunkt.utm_ostwert).arg(segmente_eins.getData()->startpunkt.utm_nordwert).arg(segmente_eins.getData()->drehwinkel).arg(segmente_eins.getData()->anzahl);
           map_test = segmente_eins.iter_modify(1);
         }
         //Kontrollausgabe
-        INFO_LOG() << QStringLiteral("verschobeneSegmente der anderen Fahrspur berechnet... ");
+        INFO_LOG(m_logger) << QStringLiteral("verschobeneSegmente der anderen Fahrspur berechnet... ");
         map_test = segmente_zwei.size() > 0;
         segmente_zwei.iter_reset();
         while (map_test)
         {
-          INFO_LOG() << QStringLiteral("%1/%2 Winkel: %3 Laenge: %4").arg(segmente_zwei.getData()->startpunkt.utm_ostwert).arg(segmente_zwei.getData()->startpunkt.utm_nordwert).arg(segmente_zwei.getData()->drehwinkel).arg(segmente_zwei.getData()->anzahl);
+          INFO_LOG(m_logger) << QStringLiteral("%1/%2 Winkel: %3 Laenge: %4").arg(segmente_zwei.getData()->startpunkt.utm_ostwert).arg(segmente_zwei.getData()->startpunkt.utm_nordwert).arg(segmente_zwei.getData()->drehwinkel).arg(segmente_zwei.getData()->anzahl);
           map_test = segmente_zwei.iter_modify(1);
         }
 
@@ -1790,7 +1790,7 @@ minengenerator_anfang:
         }
 
         //Kontrollausgabe
-        INFO_LOG() << QStringLiteral("Die ausgewaehlten Stuetzpunkte fuer die glattere Fahrspur:");
+        INFO_LOG(m_logger) << QStringLiteral("Die ausgewaehlten Stuetzpunkte fuer die glattere Fahrspur:");
         KontrollausgabeSegmentPunkte(segmentpunkte_eins);
 
         //Sortieren des map-containers segmentpunkte_eins nach den am nahest
@@ -1832,12 +1832,12 @@ minengenerator_anfang:
 
 
         //Kontrollausgabe
-        INFO_LOG() << QStringLiteral("Die sortierten Stuetzpunkte der glatteren Fahrspur: ");
+        INFO_LOG(m_logger) << QStringLiteral("Die sortierten Stuetzpunkte der glatteren Fahrspur: ");
         segmentpunkte_zwei.iter_reset();//in _eins sind mehr Eintraege!
         segmentpunkte_eins.iter_reset();
         do
         {
-          INFO_LOG() << QStringLiteral("%1/%2").arg(segmentpunkte_eins.getData()->daten.gps_position.utm_ostwert).arg(segmentpunkte_eins.getData()->daten.gps_position.utm_nordwert);
+          INFO_LOG(m_logger) << QStringLiteral("%1/%2").arg(segmentpunkte_eins.getData()->daten.gps_position.utm_ostwert).arg(segmentpunkte_eins.getData()->daten.gps_position.utm_nordwert);
         }
         while (segmentpunkte_eins.iter_modify(1)
                &&
@@ -1861,7 +1861,7 @@ minengenerator_anfang:
                && (segmentpunkte_zwei.iter_modify(1)));
 
         //Kontrollausgabe
-        INFO_LOG() << QStringLiteral("Groesster Spurabstand: %1").arg(groesster_spurabstand);
+        INFO_LOG(m_logger) << QStringLiteral("Groesster Spurabstand: %1").arg(groesster_spurabstand);
 
         //Nun sind in den beiden segmentpunkte-map-containern gleichviele Eintraege
         //deren jeweiligen Mittelpunkte die Segmentpunkte bilden sollen
@@ -1887,7 +1887,7 @@ minengenerator_anfang:
 
 
         //Kontrollausgabe
-        INFO_LOG() << QStringLiteral("Die endgueltigen Segmentstuetzpunkte sind folgende:");
+        INFO_LOG(m_logger) << QStringLiteral("Die endgueltigen Segmentstuetzpunkte sind folgende:");
         KontrollausgabeSegmentPunkte(segmentpunkte);
 
         //BERECHNEN DER ENDGUELTIGEN SEGMENTE DES MINENSPERRENMODELLS
@@ -1992,7 +1992,7 @@ minengenerator_anfang:
           sperrenmodell.verlegedichte = lrint(max_verlegedichte * FAKTOR_VERLEGEDICHTE);
         else if (sperrenmodell.verlegedichte < 1)
           sperrenmodell.verlegedichte = 1;
-        INFO_LOG() << QStringLiteral("verlegedichte = %1 anz=%2 strecke=%3").arg(sperrenmodell.verlegedichte).arg(gesamte_minenanzahl).arg(gesamte_verlege_strecke);
+        INFO_LOG(m_logger) << QStringLiteral("verlegedichte = %1 anz=%2 strecke=%3").arg(sperrenmodell.verlegedichte).arg(gesamte_minenanzahl).arg(gesamte_verlege_strecke);
         if ((gesamte_minenanzahl * 100) / gesamte_verlege_strecke >
             max_verlegedichte * 100 + 50 / FAKTOR_VERLEGEDICHTE)
         {
@@ -2002,7 +2002,7 @@ minengenerator_anfang:
           //Die restlichen MVP werden am Ende des Minenfeldgenerators
           //alle auf 0 gesetzt, so dass sie bei Aufruf des
           //Minenfeldinterpreters neu interpretiert werden koennen.
-          INFO_LOG() << QStringLiteral("Die Minensperre enthaelt mindestens eine einspurige Sperre da die Minendichte %1 uebersteigt...Neubeginn").arg(max_verlegedichte);
+          INFO_LOG(m_logger) << QStringLiteral("Die Minensperre enthaelt mindestens eine einspurige Sperre da die Minendichte %1 uebersteigt...Neubeginn").arg(max_verlegedichte);
           goto minengenerator_anfang;
         }
 
@@ -2016,7 +2016,7 @@ minengenerator_anfang:
           sperrenmodell.segmente.push_back(val.second);
 
         //Kontrollausgabe
-        INFO_LOG() << QStringLiteral("Mehrspuriges Minensperrenmodell (ein Fz) wurde erstellt. Wirkbeginn:%1 Wirkdauer:%2 Eckpunkt:%3 %4 Wirkfeldbreite:%5 Wirkfeldtiefe:%6 Verlegetiefe:%7 Verlegedichte:%8 Minentyp:%9 Minenanzahl:%10 Segmentanzahl:%11").arg(sperrenmodell.wirkbeginn.gps_zeit).arg(sperrenmodell.wirkdauer).arg(sperrenmodell.eckpunkt.utm_ostwert).arg(sperrenmodell.eckpunkt.utm_nordwert).arg(sperrenmodell.wirkfeldbreite).arg(sperrenmodell.wirkfeldtiefe).arg(sperrenmodell.verlegetiefe).arg(sperrenmodell.verlegedichte).arg(sperrenmodell.minentyp).arg(sperrenmodell.minenanzahl).arg(sperrenmodell.segmente.size());
+        INFO_LOG(m_logger) << QStringLiteral("Mehrspuriges Minensperrenmodell (ein Fz) wurde erstellt. Wirkbeginn:%1 Wirkdauer:%2 Eckpunkt:%3 %4 Wirkfeldbreite:%5 Wirkfeldtiefe:%6 Verlegetiefe:%7 Verlegedichte:%8 Minentyp:%9 Minenanzahl:%10 Segmentanzahl:%11").arg(sperrenmodell.wirkbeginn.gps_zeit).arg(sperrenmodell.wirkdauer).arg(sperrenmodell.eckpunkt.utm_ostwert).arg(sperrenmodell.eckpunkt.utm_nordwert).arg(sperrenmodell.wirkfeldbreite).arg(sperrenmodell.wirkfeldtiefe).arg(sperrenmodell.verlegetiefe).arg(sperrenmodell.verlegedichte).arg(sperrenmodell.minentyp).arg(sperrenmodell.minenanzahl).arg(sperrenmodell.segmente.size());
         KontrollausgabeSegmente(sperrenmodell.segmente);
 
         if (interne_datenbasis_Verlegedaten.getData()->
@@ -2035,7 +2035,7 @@ minengenerator_anfang:
         sperrenmodell.segmente.clear();
       }
       else
-        WARNING_LOG() << QStringLiteral("Minensperre ohne Parameter!");
+        WARNING_LOG(m_logger) << QStringLiteral("Minensperre ohne Parameter!");
 
       //Alle Fahrspureintraege dieser Minensperre werden geloescht
       interne_datenbasis_Fahrspur.finden_eintrag_container(
@@ -2128,7 +2128,7 @@ minengenerator_anfang:
     map_test = interne_datenbasis_Fahrspur.iter_modify(1);
   if (map_test)
   {
-    INFO_LOG() << QStringLiteral("Minensperre, durch mehrere Fz verlegt, wird berechnet");
+    INFO_LOG(m_logger) << QStringLiteral("Minensperre, durch mehrere Fz verlegt, wird berechnet");
     gesamte_minenanzahl = 0;
     erster_endeeintrag_key = interne_datenbasis_Fahrspur.getKey();
     erster_endeeintrag_key_copy = interne_datenbasis_Fahrspur.getKey();
@@ -2196,7 +2196,7 @@ minengenerator_anfang:
   }
 
   //Kontrollausgabe
-  INFO_LOG() << QStringLiteral("Groesster Fahrspurabstand: %1").arg(groesster_fahrspurabstand);
+  INFO_LOG(m_logger) << QStringLiteral("Groesster Fahrspurabstand: %1").arg(groesster_fahrspurabstand);
 
 
   ausstattungs_id_t fahrzeug_identitaet_eins;
@@ -2253,11 +2253,11 @@ minengenerator_anfang:
   segmentpunkte_zwei = segmentpunkte;
 
   //Kontrollausgabe
-  INFO_LOG() << QStringLiteral("Stuetzpunkte fuer die eine Fahrspur wurden gebildet.");
+  INFO_LOG(m_logger) << QStringLiteral("Stuetzpunkte fuer die eine Fahrspur wurden gebildet.");
   KontrollausgabeSegmentPunkte(segmentpunkte_eins);
 
   //Kontrollausgabe
-  INFO_LOG() << QStringLiteral("Stuetzpunkte fuer die andere Fahrspur wurden gebildet.");
+  INFO_LOG(m_logger) << QStringLiteral("Stuetzpunkte fuer die andere Fahrspur wurden gebildet.");
   KontrollausgabeSegmentPunkte(segmentpunkte_zwei);
 
   //Es wird auf gleichen Minentyp geprueft und die Gesamtanzahl
@@ -2315,7 +2315,7 @@ minengenerator_anfang:
         }
         while (interne_datenbasis_Fahrspur.iter_modify(1));
 
-        INFO_LOG() << QStringLiteral("Die Minensperre enthaelt mindestens eine einspurige Sperre da verschiedene Minentypen vorkommen...Neubeginn");
+        INFO_LOG(m_logger) << QStringLiteral("Die Minensperre enthaelt mindestens eine einspurige Sperre da verschiedene Minentypen vorkommen...Neubeginn");
         goto minengenerator_anfang;
       }
       minentyp = interne_datenbasis_Verlegedaten.getData()->
@@ -2325,7 +2325,7 @@ minengenerator_anfang:
   if (parameter_eins_key == anfangspunkt_key)
   {
     //dies sollte der absolute Ausnahmefall sein...
-    WARNING_LOG() << QStringLiteral("Minensperre ohne Parameter!");
+    WARNING_LOG(m_logger) << QStringLiteral("Minensperre ohne Parameter!");
     //goto loeschen_mehrere_Fz; //erst mal nicht löschen
   }
 
@@ -2376,7 +2376,7 @@ minengenerator_anfang:
         }
         while (interne_datenbasis_Fahrspur.iter_modify(1));
 
-        INFO_LOG() << QStringLiteral("Die Minensperre enthaelt mindestens eine einspurige Sperre da verschiedene Minentypen vorkommen...Neubeginn");
+        INFO_LOG(m_logger) << QStringLiteral("Die Minensperre enthaelt mindestens eine einspurige Sperre da verschiedene Minentypen vorkommen...Neubeginn");
         goto minengenerator_anfang;
       }
       minentyp = interne_datenbasis_Verlegedaten.getData()->
@@ -2386,7 +2386,7 @@ minengenerator_anfang:
   if (parameter_zwei_key == anfangspunkt_key)
   {
     //dies sollte der absolute Ausnahmefall sein...
-    WARNING_LOG() << QStringLiteral("Minensperre ohne Parameter!");
+    WARNING_LOG(m_logger) << QStringLiteral("Minensperre ohne Parameter!");
     goto loeschen_mehrere_Fz;
   }
 
@@ -2439,7 +2439,7 @@ minengenerator_anfang:
           }
           while (interne_datenbasis_Fahrspur.iter_modify(1));
 
-          INFO_LOG() << QStringLiteral("Die Minensperre enthaelt mindestens eine einspurige Sperre da verschiedene Minentypen vorkommen...Neubeginn");
+          INFO_LOG(m_logger) << QStringLiteral("Die Minensperre enthaelt mindestens eine einspurige Sperre da verschiedene Minentypen vorkommen...Neubeginn");
           goto minengenerator_anfang;
         }
         minentyp = interne_datenbasis_Verlegedaten.getData()->
@@ -2449,20 +2449,20 @@ minengenerator_anfang:
     if (parameter_drei_key == anfangspunkt_key)
     {
       //dies sollte der absolute Ausnahmefall sein...
-      WARNING_LOG() << QStringLiteral("Minensperre ohne Parameter!");
+      WARNING_LOG(m_logger) << QStringLiteral("Minensperre ohne Parameter!");
       goto loeschen_mehrere_Fz;
     }
   }
 
   //Kontrollausgabe
-  INFO_LOG() << QStringLiteral("Anzahl verlegter Minen: %1").arg(gesamte_minenanzahl);
+  INFO_LOG(m_logger) << QStringLiteral("Anzahl verlegter Minen: %1").arg(gesamte_minenanzahl);
 
-  INFO_LOG() << QStringLiteral("1.Fz:%1").arg(fahrzeug_identitaet_eins);
-  INFO_LOG() << QStringLiteral("2.Fz:%1").arg(fahrzeug_identitaet_zwei);
-  INFO_LOG() << QStringLiteral("3.Fz:%1").arg(fahrzeug_identitaet_drei);
-  INFO_LOG() << QStringLiteral("1.Verlegeart:%1").arg(erste_verlegeart);
-  INFO_LOG() << QStringLiteral("2.Verlegeart:%1").arg(zweite_verlegeart);
-  INFO_LOG() << QStringLiteral("3.Verlegeart:%1").arg(dritte_verlegeart);
+  INFO_LOG(m_logger) << QStringLiteral("1.Fz:%1").arg(fahrzeug_identitaet_eins);
+  INFO_LOG(m_logger) << QStringLiteral("2.Fz:%1").arg(fahrzeug_identitaet_zwei);
+  INFO_LOG(m_logger) << QStringLiteral("3.Fz:%1").arg(fahrzeug_identitaet_drei);
+  INFO_LOG(m_logger) << QStringLiteral("1.Verlegeart:%1").arg(erste_verlegeart);
+  INFO_LOG(m_logger) << QStringLiteral("2.Verlegeart:%1").arg(zweite_verlegeart);
+  INFO_LOG(m_logger) << QStringLiteral("3.Verlegeart:%1").arg(dritte_verlegeart);
 
 
   //erste und zweite Verlegeart, muessen nun den beiden aeusseren Fahrspuren
@@ -2474,7 +2474,7 @@ minengenerator_anfang:
   if (interne_datenbasis_Fahrspur.finden_eintrag_container(
         erster_endeeintrag_key))
   {
-    INFO_LOG() << QStringLiteral("Erster Endeeintrag stammt von Fz %1").arg(interne_datenbasis_Fahrspur.getData()->daten.header.identitaet);
+    INFO_LOG(m_logger) << QStringLiteral("Erster Endeeintrag stammt von Fz %1").arg(interne_datenbasis_Fahrspur.getData()->daten.header.identitaet);
 
     if (interne_datenbasis_Fahrspur.getData()->daten.header.identitaet ==
         fahrzeug_identitaet_zwei)
@@ -2489,7 +2489,7 @@ minengenerator_anfang:
   if (interne_datenbasis_Fahrspur.finden_eintrag_container(
         zweiter_endeeintrag_key))
   {
-    INFO_LOG() << QStringLiteral("Zweiter Endeeintrag stammt von Fz %1").arg(interne_datenbasis_Fahrspur.getData()->daten.header.identitaet);
+    INFO_LOG(m_logger) << QStringLiteral("Zweiter Endeeintrag stammt von Fz %1").arg(interne_datenbasis_Fahrspur.getData()->daten.header.identitaet);
 
     if (interne_datenbasis_Fahrspur.getData()->daten.header.identitaet ==
         fahrzeug_identitaet_eins)
@@ -2549,14 +2549,14 @@ minengenerator_anfang:
 
 
   //Kontrollausgabe
-  INFO_LOG() << QStringLiteral("Segmente der einen Fahrspur berechnet...  (das letzte Segment ist nur ein Hilfssegment)");
+  INFO_LOG(m_logger) << QStringLiteral("Segmente der einen Fahrspur berechnet...  (das letzte Segment ist nur ein Hilfssegment)");
   KontrollausgabeSegmente(segmente_eins);
 
   //Die Startpunkte der Segmente muessen dann verschoben werden, wenn die
   //Verlegeart links oder rechts ist
   //Die Verlegeart der ersten Fahrspur steht in erste_verlegeart
 
-  INFO_LOG() << QStringLiteral("Ausstossart der ersten Fahrspur: %1").arg(erste_verlegeart);
+  INFO_LOG(m_logger) << QStringLiteral("Ausstossart der ersten Fahrspur: %1").arg(erste_verlegeart);
 
   segmente = segmente_eins;
 
@@ -2633,13 +2633,13 @@ minengenerator_anfang:
   segmente_zwei.getData()->anzahl = 0;
 
   //Kontrollausgabe
-  INFO_LOG() << QStringLiteral("Segmente der anderen Fahrspur berechnet...  (das letzte Segment ist nur ein Hilfssegment)");
+  INFO_LOG(m_logger) << QStringLiteral("Segmente der anderen Fahrspur berechnet...  (das letzte Segment ist nur ein Hilfssegment)");
   KontrollausgabeSegmente(segmente_zwei);
 
   //Die Startpunkte der Segmente muessen dann verschoben werden, wenn die
   //Verlegeart links oder rechts ist
   //Die Verlegeart der letzten Fahrspur steht in zweite_verlegeart
-  INFO_LOG() << QStringLiteral("Ausstossart der zweiten Fahrspur: %1").arg(zweite_verlegeart);
+  INFO_LOG(m_logger) << QStringLiteral("Ausstossart der zweiten Fahrspur: %1").arg(zweite_verlegeart);
 
   segmente = segmente_zwei;
 
@@ -2672,11 +2672,11 @@ minengenerator_anfang:
 
   //NUN SIND DIE SEGMENTANFANGSPUNKTE DER EINZELNEN FAHRSPUREN VERSCHOBEN
   //Kontrollausgabe
-  INFO_LOG() << QStringLiteral("verschobene Segmente der einen Fahrspur berechnet... ");
+  INFO_LOG(m_logger) << QStringLiteral("verschobene Segmente der einen Fahrspur berechnet... ");
   KontrollausgabeSegmente(segmente_eins);
 
   //Kontrollausgabe
-  INFO_LOG() << QStringLiteral("verschobeneSegmente der anderen Fahrspur berechnet... ");
+  INFO_LOG(m_logger) << QStringLiteral("verschobeneSegmente der anderen Fahrspur berechnet... ");
   KontrollausgabeSegmente(segmente_zwei);
 
   //Die Endpunkte der Fahrspuren werden benoetigt, um alle verschobenen
@@ -2874,13 +2874,13 @@ minengenerator_anfang:
 
 
   //Kontrollausgabe
-  INFO_LOG() << QStringLiteral("Die sortierten Stuetzpunkte der glatteren Fahrspur: ");
+  INFO_LOG(m_logger) << QStringLiteral("Die sortierten Stuetzpunkte der glatteren Fahrspur: ");
   segmentpunkte_zwei.iter_reset();//wird zum zaehlen benutzt, da in _eins mehr
   //Eintraege als gueltig
   segmentpunkte_eins.iter_reset();
   do
   {
-    INFO_LOG() << QStringLiteral("%1/%2").arg(segmentpunkte_eins.getData()->daten.gps_position.utm_ostwert).arg(segmentpunkte_eins.getData()->daten.gps_position.utm_nordwert);
+    INFO_LOG(m_logger) << QStringLiteral("%1/%2").arg(segmentpunkte_eins.getData()->daten.gps_position.utm_ostwert).arg(segmentpunkte_eins.getData()->daten.gps_position.utm_nordwert);
   }
   while ((segmentpunkte_eins.iter_modify(1))
          &&
@@ -2902,7 +2902,7 @@ minengenerator_anfang:
          && (segmentpunkte_zwei.iter_modify(1)));
 
   //Kontrollausgabe
-  INFO_LOG() << QStringLiteral("Groesster Spurabstand: %1").arg(groesster_spurabstand);
+  INFO_LOG(m_logger) << QStringLiteral("Groesster Spurabstand: %1").arg(groesster_spurabstand);
 
   //Nun sind in den beiden segmentpunkte-map-containern gleichviele Eintraege
   //deren jeweiligen Mittelpunkte die Segmentpunkte bilden sollen
@@ -2927,7 +2927,7 @@ minengenerator_anfang:
 
 
   //Kontrollausgabe
-  INFO_LOG() << QStringLiteral("Die endgueltigen Segmentstuetzpunkte sind folgende:");
+  INFO_LOG(m_logger) << QStringLiteral("Die endgueltigen Segmentstuetzpunkte sind folgende:");
   KontrollausgabeSegmentPunkte(segmentpunkte);
 
 
@@ -3031,7 +3031,7 @@ minengenerator_anfang:
       sperrenmodell.verlegedichte = lrint(max_verlegedichte * FAKTOR_VERLEGEDICHTE);
     else if (sperrenmodell.verlegedichte < 1)
       sperrenmodell.verlegedichte = 1;
-    INFO_LOG() << QStringLiteral("verlegedichte = %1 anz=%2 strecke=%3").arg(sperrenmodell.verlegedichte).arg(gesamte_minenanzahl).arg(gesamte_verlege_strecke);
+    INFO_LOG(m_logger) << QStringLiteral("verlegedichte = %1 anz=%2 strecke=%3").arg(sperrenmodell.verlegedichte).arg(gesamte_minenanzahl).arg(gesamte_verlege_strecke);
     //Hier der Test ob die Fahrspuren ueberhaupt zusammengehoeren koennen
     //Die Verlegedichte darf nicht ueber 6 Minen/10 Meter liegen!
     if ((gesamte_minenanzahl * 100) / gesamte_verlege_strecke >
@@ -3043,7 +3043,7 @@ minengenerator_anfang:
       //Die restlichen MVP werden am Ende des Minenfeldgenerators
       //alle auf 0 gesetzt, so dass sie bei Aufruf des
       //Minenfeldinterpreters neu interpretiert werden koennen.
-      INFO_LOG() << QStringLiteral("Die Minensperre enthaelt mindestens eine einspurige Sperre da die Minendichte %1 uebersteigt...Ende").arg(max_verlegedichte);
+      INFO_LOG(m_logger) << QStringLiteral("Die Minensperre enthaelt mindestens eine einspurige Sperre da die Minendichte %1 uebersteigt...Ende").arg(max_verlegedichte);
 
     }
   }
@@ -3055,7 +3055,7 @@ minengenerator_anfang:
     sperrenmodell.segmente.push_back(val.second);
 
   //Kontrollausgabe
-  INFO_LOG() << QStringLiteral("Mehrspuriges Minensperrenmodell (mehrere Fz) wurde erstellt. Wirkbeginn:%1 Wirkdauer:%2 Eckpunkt:%3 %4 Wirkfeldbreite:%5 Wirkfeldtiefe:%6 Verlegetiefe:%7 Verlegedichte:%8 Minentyp:%9 Minenanzahl:%10 Segmentanzahl:%11").arg(sperrenmodell.wirkbeginn.gps_zeit).arg(sperrenmodell.wirkdauer).arg(sperrenmodell.eckpunkt.utm_ostwert).arg(sperrenmodell.eckpunkt.utm_nordwert).arg(sperrenmodell.wirkfeldbreite).arg(sperrenmodell.wirkfeldtiefe).arg(sperrenmodell.verlegetiefe).arg(sperrenmodell.verlegedichte).arg(sperrenmodell.minentyp).arg(sperrenmodell.minenanzahl).arg(sperrenmodell.segmente.size());
+  INFO_LOG(m_logger) << QStringLiteral("Mehrspuriges Minensperrenmodell (mehrere Fz) wurde erstellt. Wirkbeginn:%1 Wirkdauer:%2 Eckpunkt:%3 %4 Wirkfeldbreite:%5 Wirkfeldtiefe:%6 Verlegetiefe:%7 Verlegedichte:%8 Minentyp:%9 Minenanzahl:%10 Segmentanzahl:%11").arg(sperrenmodell.wirkbeginn.gps_zeit).arg(sperrenmodell.wirkdauer).arg(sperrenmodell.eckpunkt.utm_ostwert).arg(sperrenmodell.eckpunkt.utm_nordwert).arg(sperrenmodell.wirkfeldbreite).arg(sperrenmodell.wirkfeldtiefe).arg(sperrenmodell.verlegetiefe).arg(sperrenmodell.verlegedichte).arg(sperrenmodell.minentyp).arg(sperrenmodell.minenanzahl).arg(sperrenmodell.segmente.size());
   KontrollausgabeSegmente(sperrenmodell.segmente);
 
 
@@ -3135,20 +3135,20 @@ minenfeldgenerator_ende: //wenn kein IS==11
   /*
   //Kontrollausgabe
   interne_datenbasis_Fahrspur.iter_reset();
-  INFO_LOG() << QStringLiteral("Fahrspurcontainer am Ende des Generators: ");
+  INFO_LOG(m_logger) << QStringLiteral("Fahrspurcontainer am Ende des Generators: ");
 
   do
   {
-    INFO_LOG() << QStringLiteral("%1/%2IS:%3").arg(interne_datenbasis_Fahrspur.getData()->daten.gps_position.utm_ostwert \).arg(interne_datenbasis_Fahrspur.getData()->                     daten.gps_position.utm_nordwert \).arg(interne_datenbasis_Fahrspur.getData()->intstat \);
+    INFO_LOG(m_logger) << QStringLiteral("%1/%2IS:%3").arg(interne_datenbasis_Fahrspur.getData()->daten.gps_position.utm_ostwert \).arg(interne_datenbasis_Fahrspur.getData()->                     daten.gps_position.utm_nordwert \).arg(interne_datenbasis_Fahrspur.getData()->intstat \);
   } while (interne_datenbasis_Fahrspur.iter_modify(1));
 
   //Kontrollausgabe
   interne_datenbasis_Verlegedaten.iter_reset();
-  INFO_LOG() << QStringLiteral("Verlegedatencontainer am Ende des Generators: ");
+  INFO_LOG(m_logger) << QStringLiteral("Verlegedatencontainer am Ende des Generators: ");
 
   do
   {
-    INFO_LOG() << QStringLiteral("%1/%2 Fz:%3").arg(interne_datenbasis_Verlegedaten.getData()->              daten.gps_position.utm_ostwert \).arg(interne_datenbasis_Verlegedaten.getData()->                     daten.gps_position.utm_nordwert \).arg(interne_datenbasis_Verlegedaten.getData()->                        daten.header.identitaet \);
+    INFO_LOG(m_logger) << QStringLiteral("%1/%2 Fz:%3").arg(interne_datenbasis_Verlegedaten.getData()->              daten.gps_position.utm_ostwert \).arg(interne_datenbasis_Verlegedaten.getData()->                     daten.gps_position.utm_nordwert \).arg(interne_datenbasis_Verlegedaten.getData()->                        daten.header.identitaet \);
   } while (interne_datenbasis_Fahrspur.iter_modify(1));
 
   */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/zssi_wi_Minenfeld_Interpreter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/zssi_wi_Minenfeld_Interpreter.cpp
index c8c3c5c3d..a8a6b1224 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/zssi_wi_Minenfeld_Interpreter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/zssi_wi_Minenfeld_Interpreter.cpp
@@ -369,9 +369,9 @@ void GuezMinelayerProcessing::ZSSI_WI_Minenfeld_Interpreter::ZSSI_WI_Erstelle_ei
   sperrenmodell.segmente[0].drehwinkel              = 0;
 
   //Kontrollausgabe
-  INFO_LOG() << QStringLiteral("Einspuriges Minensperrenmodell wurde erstellt. Wirkbeginn: %1 Wirkdauer:%2 Verlegetiefe:%3 Verlegedichte:%4 Minentyp:%5 Minenanzahl:%6 Segmentanzahl:%7").arg(sperrenmodell.wirkbeginn.gps_zeit).arg(sperrenmodell.wirkdauer).arg(sperrenmodell.verlegetiefe).arg(sperrenmodell.verlegedichte).arg(sperrenmodell.minentyp).arg(sperrenmodell.minenanzahl).arg(sperrenmodell.segmente.size());
+  INFO_LOG(m_logger) << QStringLiteral("Einspuriges Minensperrenmodell wurde erstellt. Wirkbeginn: %1 Wirkdauer:%2 Verlegetiefe:%3 Verlegedichte:%4 Minentyp:%5 Minenanzahl:%6 Segmentanzahl:%7").arg(sperrenmodell.wirkbeginn.gps_zeit).arg(sperrenmodell.wirkdauer).arg(sperrenmodell.verlegetiefe).arg(sperrenmodell.verlegedichte).arg(sperrenmodell.minentyp).arg(sperrenmodell.minenanzahl).arg(sperrenmodell.segmente.size());
   for (unsigned s = 0; s < sperrenmodell.segmente.size(); s++)
-    INFO_LOG() << QStringLiteral("Segment[%1] Startpunkt: %2 %3 Drehwinkel:%4 Anzahl:%5").arg(s)
+    INFO_LOG(m_logger) << QStringLiteral("Segment[%1] Startpunkt: %2 %3 Drehwinkel:%4 Anzahl:%5").arg(s)
                           .arg(sperrenmodell.segmente.at(s).startpunkt.utm_ostwert)
                           .arg(sperrenmodell.segmente.at(s).startpunkt.utm_nordwert)
                           .arg(sperrenmodell.segmente.at(s).drehwinkel)
@@ -435,7 +435,7 @@ void GuezMinelayerProcessing::ZSSI_WI_Minenfeld_Interpreter::ZSSI_WI_modifiziere
   if (gefunden)
   {
     hilfs_daten->daten.verlegedaten.anzahl_verlegter_minen += daten.daten.verlegedaten.anzahl_verlegter_minen;
-    INFO_LOG() << QStringLiteral("Verlegeende gefunden! Anz_Minen = %1").arg(hilfs_daten->daten.verlegedaten.anzahl_verlegter_minen);
+    INFO_LOG(m_logger) << QStringLiteral("Verlegeende gefunden! Anz_Minen = %1").arg(hilfs_daten->daten.verlegedaten.anzahl_verlegter_minen);
   }
   else
     ZSSI_WI_Erstelle_einzel_minensperre(key, daten);
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 3df512655..70e8593c0 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
@@ -42,7 +42,7 @@ IsmImportBuildings::IsmImportBuildings(QObject *parent)
 // ------------------------------------------------------------------------------
 bool IsmImportBuildings::init(int domainId, const QUrl &tcpDiscoveryUrl)
 {
-  INFO_LOG() << "init begin";
+  INFO_LOG(m_logger) << "init begin";
 
   // initialize DDS, always on exercise 0
   m_ddsConnector.reset(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Global, 0, 0, tcpDiscoveryUrl));
@@ -50,13 +50,13 @@ bool IsmImportBuildings::init(int domainId, const QUrl &tcpDiscoveryUrl)
     return false;
   m_ddsConnector->initPublisherSubscriber();
 
-  DEBUG_LOG() << "create dtc";
+  DEBUG_LOG(m_logger) << "create dtc";
   m_dtc = InfrastructureManagement::Interface::Dtc::create(m_ddsConnector);
 
-  DEBUG_LOG() << "create ftc";
+  DEBUG_LOG(m_logger) << "create ftc";
   m_ftc = InfrastructureManagement::Interface::Ftc::create(m_ddsConnector);
 
-  DEBUG_LOG() << "init dtc & ftc";
+  DEBUG_LOG(m_logger) << "init dtc & ftc";
   bool bRet = m_ftc->enableMainStructureElementModify() &&
       m_ftc->enableMainStructureElementRemove() &&
       m_ftc->enableMountingPointAssetRemove() &&
@@ -68,9 +68,9 @@ bool IsmImportBuildings::init(int domainId, const QUrl &tcpDiscoveryUrl)
       m_dtc->enableMountingPointAsset() &&
       m_dtc->enableMainSchedule();
 
-  DEBUG_LOG() << "init dtc, ftc end - bRet = " << bRet;
+  DEBUG_LOG(m_logger) << "init dtc, ftc end - bRet = " << bRet;
 
-  DEBUG_LOG() << "Domain Id = " << domainId;
+  DEBUG_LOG(m_logger) << "Domain Id = " << domainId;
 
   return bRet;
 }
@@ -91,7 +91,7 @@ void IsmImportBuildings::import(const QVector<ImportData> &importData)
     QCoreApplication::quit();
     return;
   }
-  DEBUG_LOG() << "Trying to import " << m_importData.size() << " buildings";
+  DEBUG_LOG(m_logger) << "Trying to import " << m_importData.size() << " buildings";
   m_curImportIdx = 0;
   import(m_importData.at(m_curImportIdx));
 }
@@ -146,11 +146,11 @@ void IsmImportBuildings::remove(int buildingId)
   QMap<int, QVector<InfrastructureManagement::InstrumentationAsset>> assetsMapBuilding;
   m_dtc->getAllAssetsPerBuilding(predicate, assetsMapBuilding);
 
-  DEBUG_LOG() << "assetsMapBuilding.size = " << assetsMapBuilding.size();
+  DEBUG_LOG(m_logger) << "assetsMapBuilding.size = " << assetsMapBuilding.size();
 
   assetsMounted = (assetsMapBuilding[buildingId].size() > 0);
 
-  DEBUG_LOG() << "Building id  = " << buildingId << " has assets mounted = " << assetsMounted;
+  DEBUG_LOG(m_logger) << "Building id  = " << buildingId << " has assets mounted = " << assetsMounted;
 
   // cfroebel 2018-11-30:
   // Currently the ISM service fails to correctly remove a building when it has mounted assets (other than BCU).
@@ -159,7 +159,7 @@ void IsmImportBuildings::remove(int buildingId)
   if (assetsMounted)
   {
     QString   msg = QStringLiteral("Not possible to remove building with id %1 because there are assets mounted!").arg(buildingId);
-    ERROR_LOG() << msg;
+    ERROR_LOG(m_logger) << msg;
     std::cerr << msg << std::endl;
     m_idsToBeRemoved.pop_front();
     IsmImportBuildings::removeNext();
@@ -171,7 +171,7 @@ void IsmImportBuildings::remove(int buildingId)
 // ------------------------------------------------------------------------------
 void IsmImportBuildings::doImport()
 {
-  INFO_LOG() << "trying to Import / Modify";
+  INFO_LOG(m_logger) << "trying to Import / Modify";
   ParseBuildingXml buildingXml(m_currentData.xmlFileName,
                                m_currentData.vulFileName,
                                m_currentData.egcuToRoomFileName,
@@ -180,21 +180,21 @@ void IsmImportBuildings::doImport()
                                m_currentData.angleDegree);
   if (!buildingXml.parseXml())
   {
-    ERROR_LOG() << "Can not parse building files: " << buildingXml.lastError();
+    ERROR_LOG(m_logger) << "Can not parse building files: " << buildingXml.lastError();
     std::cerr << "Can not parse building files name: " << m_currentData.xmlFileName
               << " error: " << buildingXml.lastError() << std::endl;
     QCoreApplication::exit(1);
     return;
   }
-  INFO_LOG() << "Sending request";
+  INFO_LOG(m_logger) << "Sending request";
 
   MainStructureElementModifyRequest req = buildingXml.parsedRequest();
   QByteArray propertiesBa = QByteArray::fromStdString(req.properties());
   QJsonParseError parserError;
   const QJsonDocument doc(QJsonDocument::fromJson(propertiesBa, &parserError));
   if (parserError.error != QJsonParseError::NoError)
-    WARNING_LOG() << "Error parsing json document: " << parserError.errorString() << " '" << propertiesBa << "'";
-  DEBUG_LOG() << "json to parse: " << doc.toJson();
+    WARNING_LOG(m_logger) << "Error parsing json document: " << parserError.errorString() << " '" << propertiesBa << "'";
+  DEBUG_LOG(m_logger) << "json to parse: " << doc.toJson();
   QJsonObject obj(doc.object());
   if (m_currentData.exerciseId > 0)
   {
@@ -220,11 +220,11 @@ void IsmImportBuildings::doImport()
   {
     m_isInRestoringMode = true;
     msg = "Building " + req.name() + " already exists. All related data is now saved.";
-    INFO_LOG() << msg;
+    INFO_LOG(m_logger) << msg;
     std::cerr << msg << std::endl;
 
     msg = "Fetching IDs of MountingPints.";
-    INFO_LOG() << msg;
+    INFO_LOG(m_logger) << msg;
     std::cerr << msg << std::endl;
     QVector<qint32> mountingPointIds;
     for (const StructureElement &structureElement : oldMainStructureElement.elements())
@@ -235,7 +235,7 @@ void IsmImportBuildings::doImport()
     }
 
     msg = "Fetching MountingPointAssets.";
-    INFO_LOG() << msg;
+    INFO_LOG(m_logger) << msg;
     std::cerr << msg << std::endl;
     // get mountings of mounting points of this building
     mountings = mountingsOfStructureElements(mountingPointIds);
@@ -244,7 +244,7 @@ void IsmImportBuildings::doImport()
     if (!mountings.isEmpty())
     {
       msg = "Removing MountingPointAssets.";
-      INFO_LOG() << msg;
+      INFO_LOG(m_logger) << msg;
       std::cerr << msg << std::endl;
       unmountAssetsOfBuliding(oldMainStructureElement.id());
 //      // remove mounting point assets
@@ -256,7 +256,7 @@ void IsmImportBuildings::doImport()
     }
 
     msg = "Fetching MountingPointPlans.";
-    INFO_LOG() << msg;
+    INFO_LOG(m_logger) << msg;
     std::cerr << msg << std::endl;
     // get mounting points in plans of this building
     auto mppsBySchedule = MountingPointPlanByScheduleOfStructureElements(mountingPointIds);
@@ -264,14 +264,14 @@ void IsmImportBuildings::doImport()
     // Don't know, why these are deleted anyways...
     for (auto it = mppsBySchedule.cbegin(); it != mppsBySchedule.cend(); ++it)
     {
-      INFO_LOG() << "Removing MountingPointPlans.";
+      INFO_LOG(m_logger) << "Removing MountingPointPlans.";
       auto copy = it.value();
       for (auto &elem : copy)
         elem.mountingPointState() = MountingPointState_def::Idle;
       m_ftc->mountingPointPlanModifyRequest(MountingPointPlanModifyRequest(it.key(),copy), this);
     }
     msg = "Fetching paths of MountingPoints by name ... for later reconstruction.";
-    INFO_LOG() << msg;
+    INFO_LOG(m_logger) << msg;
     std::cerr << msg << std::endl;
     for (const StructureElement &structureElement : oldMainStructureElement.elements())
       oldNamePaths.insert(structureElement.id(), pathWithNames(structureElement, oldMainStructureElement));
@@ -300,11 +300,11 @@ void IsmImportBuildings::doImport()
 void IsmImportBuildings::doRemove(int buildingId)
 {
   std::string msg = "Trying to Remove building with id " + QString::number(buildingId).toStdString();
-  INFO_LOG() << msg;
+  INFO_LOG(m_logger) << msg;
   std::cerr << msg << std::endl;
   if (!m_ftc->mainStructureElementRemoveRequest(MainStructureElementRemoveRequest(buildingId), this))
   {
-    ERROR_LOG() << "Error requesting remove";
+    ERROR_LOG(m_logger) << "Error requesting remove";
     std::cerr << "Error requesting remove" << std::endl;
     QCoreApplication::exit(1);
     return;
@@ -402,19 +402,19 @@ StructureElement IsmImportBuildings::structureElementById(qint32 id, const MainS
 void IsmImportBuildings::createNewMainStructureElement(const MainStructureElementModifyRequest &request)
 {
   std::string msg = "Creating new MainStructureElement.";
-  INFO_LOG() << msg;
+  INFO_LOG(m_logger) << msg;
   std::cerr << msg << std::endl;
   if (!m_ftc->mainStructureElementModifyRequest(request, this))
   {
     if (m_currentData.buildingId > 0)
-      ERROR_LOG() << "Error requesting update";
+      ERROR_LOG(m_logger) << "Error requesting update";
     else
-      ERROR_LOG() << "Error requesting create";
+      ERROR_LOG(m_logger) << "Error requesting create";
     std::cerr << "Error requesting update/create" << std::endl;
     QCoreApplication::exit(1);
     return;
   }
-  INFO_LOG() << "Waiting for answer";
+  INFO_LOG(m_logger) << "Waiting for answer";
 }
 
 // ------------------------------------------------------------------------------
@@ -442,12 +442,12 @@ void IsmImportBuildings::restoreData(const MainStructureElement &oldMainStructur
     newMountingPointIds.append(structureElement.id());
   }
   QMap<qint32, QVector<std::string> > newNamePaths;
-  INFO_LOG() << "Restoring mounting point data.";
+  INFO_LOG(m_logger) << "Restoring mounting point data.";
   for (const StructureElement &structureElement : newMainStructureElement.elements())
     newNamePaths.insert(structureElement.id(), pathWithNames(structureElement, oldMainStructureElement));
 
   if (oldNamePaths.size() != newNamePaths.size())
-    INFO_LOG() << "old name path size: " + QString::number(oldNamePaths.size()).toStdString() + " , new name path size: " + QString::number(newNamePaths.size()).toStdString();;
+    INFO_LOG(m_logger) << "old name path size: " + QString::number(oldNamePaths.size()).toStdString() + " , new name path size: " + QString::number(newNamePaths.size()).toStdString();;
 
   QMap<qint32, qint32> oldStructureElementIdToNewStructureElementId;
   for (auto it = oldNamePaths.constBegin(); it != oldNamePaths.constEnd(); ++it)
@@ -484,7 +484,7 @@ void IsmImportBuildings::restoreData(const MainStructureElement &oldMainStructur
   if (!mountings.isEmpty())
   {
     msg = "Restoring MountingPointAssets.";
-    INFO_LOG() << msg;
+    INFO_LOG(m_logger) << msg;
     std::cerr << msg << std::endl;
     // restore mountings
     for (const MountingPointAsset &mountingPointAsset : mountings)
@@ -508,7 +508,7 @@ void IsmImportBuildings::restoreData(const MainStructureElement &oldMainStructur
     return;
 
   msg = "Restoring MountingPointPlans.";
-  INFO_LOG() << msg;
+  INFO_LOG(m_logger) << msg;
   std::cerr << msg << std::endl;
   // restore mounting point plans
   MountingPointPlanModifyRequest createRequest;
@@ -546,7 +546,7 @@ void IsmImportBuildings::unmountAssetsOfBuliding(qint32 buildingId)
   {
     msg = "Waiting for socket to open";
     std::cerr << msg << std::endl;
-    INFO_LOG() << msg;
+    INFO_LOG(m_logger) << msg;
     QThread::sleep(1);
   }
 
@@ -563,7 +563,7 @@ void IsmImportBuildings::unmountAssetsOfBuliding(qint32 buildingId)
   {
     std::string msg = "Got reply: " + message.toStdString();
     std::cerr << msg << std::endl;
-    INFO_LOG() << msg;
+    INFO_LOG(m_logger) << msg;
     hasAnswer = true;
   });
 
@@ -573,7 +573,7 @@ void IsmImportBuildings::unmountAssetsOfBuliding(qint32 buildingId)
   {
     msg = "Waiting for socket to answer";
     std::cerr << msg << std::endl;
-    INFO_LOG() << msg;
+    INFO_LOG(m_logger) << msg;
     QThread::sleep(1);
   }
 
@@ -597,13 +597,13 @@ void IsmImportBuildings::onMainStructureElementRemoveReply(const Core::FunctionR
   if (replyObject.error())
   {
     QString   msg = QStringLiteral("Failed to remove building with id %1: %2").arg(buildingId).arg(QString::fromStdString(replyObject()));
-    ERROR_LOG() << msg;
+    ERROR_LOG(m_logger) << msg;
     std::cerr << msg << std::endl;
   }
   else
   {
     QString   msg = QStringLiteral("Removed building with id %1").arg(buildingId);
-    INFO_LOG() << msg;
+    INFO_LOG(m_logger) << msg;
     std::cerr << msg << std::endl;
   }
 
@@ -618,7 +618,7 @@ void IsmImportBuildings::onMountingPointPlanModifyReply(const Core::FunctionRepl
 {
   if (reply.error())
   {
-    ERROR_LOG() << reply.error();
+    ERROR_LOG(m_logger) << reply.error();
     std::cerr << reply.error() << std::endl;
   }
 }
@@ -626,10 +626,10 @@ void IsmImportBuildings::onMountingPointPlanModifyReply(const Core::FunctionRepl
 // ------------------------------------------------------------------
 void IsmImportBuildings::onMountingPointAssetRemoveReply(const Core::FunctionReplyObject &reply)
 {
-  ERROR_LOG() << "REMOVE REPLY";
+  ERROR_LOG(m_logger) << "REMOVE REPLY";
   if (reply.error())
   {
-    ERROR_LOG() << reply.error();
+    ERROR_LOG(m_logger) << reply.error();
     std::cerr << reply.error() << std::endl;
   }
 }
@@ -639,7 +639,7 @@ void IsmImportBuildings::onMountingPointAssetModifyReply(const Core::FunctionRep
 {
   if (reply.error())
   {
-    ERROR_LOG() << reply.error();
+    ERROR_LOG(m_logger) << reply.error();
     std::cerr << reply.error() << std::endl;
   }
 }
@@ -649,7 +649,7 @@ void IsmImportBuildings::onStructureElementModifyReply(const Core::FunctionReply
 {
   if (reply.error())
   {
-    ERROR_LOG() << reply.error();
+    ERROR_LOG(m_logger) << reply.error();
     std::cerr << reply.error() << std::endl;
   }
 }
@@ -659,7 +659,7 @@ bool IsmImportBuildings::handleReply(const Core::FunctionReplyObject &replyObjec
 {
   if (replyObject.error())
   {
-    ERROR_LOG() << "Got Reply error: " << replyObject.translated();
+    ERROR_LOG(m_logger) << "Got Reply error: " << replyObject.translated();
     std::cerr << "Error importing building" << std::endl;
     QCoreApplication::exit(1);
     return false;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ModuleTests/ism_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ModuleTests/ism_tests.cpp
index 637fc424a..ad18a979e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ModuleTests/ism_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ModuleTests/ism_tests.cpp
@@ -63,7 +63,7 @@ IsmTests::~IsmTests()
 // ------------------------------------------------------------------------------
 bool IsmTests::init(int domainId, int testId, int assetId, int mainStructureElementId, int structureElementId, int indexNo)
 {
-  INFO_LOG() << "init begin";
+  INFO_LOG(m_logger) << "init begin";
 
   m_testId = testId;
   m_assetId = assetId;
@@ -81,30 +81,30 @@ bool IsmTests::init(int domainId, int testId, int assetId, int mainStructureElem
   m_dbHandler = std::make_shared<DbHandler>();
   if(!m_dbHandler->init(0, Settings::settings()))
   {
-    ERROR_LOG() << "Initialisation dbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation dbHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation dbHandler succesful.";
   m_db = m_dbHandler->db();
 
-  TRACE_LOG() << "create dtc";
+  TRACE_LOG(m_logger) << "create dtc";
   m_dtc = InfrastructureManagement::Interface::Dtc::create(m_ddsConnector);
-  TRACE_LOG() << "init dtc";
+  TRACE_LOG(m_logger) << "init dtc";
   bool bRet = m_dtc->enableAll();
-  TRACE_LOG() << "init dtc end - bRet = " << bRet;
+  TRACE_LOG(m_logger) << "init dtc end - bRet = " << bRet;
 
-  TRACE_LOG() << "create ftc";
+  TRACE_LOG(m_logger) << "create ftc";
   m_ftc = InfrastructureManagement::Interface::Ftc::create(m_ddsConnector);
-  TRACE_LOG() << "init ftc";
+  TRACE_LOG(m_logger) << "init ftc";
   bRet &= m_ftc->enableAll();
-  TRACE_LOG() << "init ftc end - bRet = " << bRet;
+  TRACE_LOG(m_logger) << "init ftc end - bRet = " << bRet;
 
-  DEBUG_LOG() << "########### Domain Id = " << domainId;
-  DEBUG_LOG() << "########### Test Id = " << testId;
-  DEBUG_LOG() << "########### Asset Id = " << assetId;
-  DEBUG_LOG() << "########### Main Structure Element Id = " << mainStructureElementId;
-  DEBUG_LOG() << "########### Structure Element Id = " << structureElementId;
-  DEBUG_LOG() << "########### Index No = " << indexNo;
+  DEBUG_LOG(m_logger) << "########### Domain Id = " << domainId;
+  DEBUG_LOG(m_logger) << "########### Test Id = " << testId;
+  DEBUG_LOG(m_logger) << "########### Asset Id = " << assetId;
+  DEBUG_LOG(m_logger) << "########### Main Structure Element Id = " << mainStructureElementId;
+  DEBUG_LOG(m_logger) << "########### Structure Element Id = " << structureElementId;
+  DEBUG_LOG(m_logger) << "########### Index No = " << indexNo;
 
   return bRet;
 }
@@ -112,7 +112,7 @@ bool IsmTests::init(int domainId, int testId, int assetId, int mainStructureElem
 // ------------------------------------------------------------------------------
 void IsmTests::startTest()
 {
-  INFO_LOG() << "********* startTest **************";
+  INFO_LOG(m_logger) << "********* startTest **************";
   // main structure elements
   switch (m_testId)
   {
@@ -179,7 +179,7 @@ void IsmTests::startTest()
     failExit();
     break;
   }
-  INFO_LOG() << "*********  endTest  **************";
+  INFO_LOG(m_logger) << "*********  endTest  **************";
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
 
@@ -197,7 +197,7 @@ static void addElementToRequest(MainStructureElementModifyRequest &request,
 // ------------------------------------------------------------------------------
 void IsmTests::tryCreateMainStructureElement()
 {
-  INFO_LOG() << "trying to send MainStructureElementCreateRequest";
+  INFO_LOG(m_logger) << "trying to send MainStructureElementCreateRequest";
 
   MainStructureElementModifyRequest data;
 
@@ -443,7 +443,7 @@ void IsmTests::tryCreateMainStructureElement()
 
 //  if (!m_ftc->mainStructureElementModifyRequest(data, this))
 //  {
-//    ERROR_LOG() << "Error requesting create data (building)";
+//    ERROR_LOG(m_logger) << "Error requesting create data (building)";
 //    failExit();
 //  }
 
@@ -453,18 +453,18 @@ void IsmTests::tryCreateMainStructureElement()
 // ------------------------------------------------------------------------------
 void IsmTests::tryModifyMainStructureElement()
 {
-  INFO_LOG() << "trying to send MainStructureElementModifyRequest ";
+  INFO_LOG(m_logger) << "trying to send MainStructureElementModifyRequest ";
   m_dtc->waitForHistoricalDataMainStructureElement();
   InfrastructureManagement::MainStructureElement mse = m_dtc->mainStructureElement(m_mainStructureElementId);
   InfrastructureManagement::MainStructureElementModifyRequest data;
 
   if (mse.id() == 0)
   {
-    ERROR_LOG() << "Error requesting modify data";
+    ERROR_LOG(m_logger) << "Error requesting modify data";
     failExit();
   }
 
-  DEBUG_LOG() << "Modify MainStructureElement with id = " << mse.id();
+  DEBUG_LOG(m_logger) << "Modify MainStructureElement with id = " << mse.id();
 
   // creating ModifyRequest
   data.id(mse.id());
@@ -484,7 +484,7 @@ void IsmTests::tryModifyMainStructureElement()
   m_replyFinished = false;
   if (!m_ftc->mainStructureElementModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting modify data";
+    ERROR_LOG(m_logger) << "Error requesting modify data";
     failExit();
   }
 
@@ -500,7 +500,7 @@ void IsmTests::tryModifyMainStructureElement()
   for (size_t i = 0; i < mse.elements().size(); ++i)
   {
     se = mse.elements().at(i);
-    DEBUG_LOG() << "Updating barcode for element (" << i << ") with old barcode = " << se.barcode();
+    DEBUG_LOG(m_logger) << "Updating barcode for element (" << i << ") with old barcode = " << se.barcode();
 
     se.barcode("BARCODE");
     seData.elements().push_back(se);
@@ -508,7 +508,7 @@ void IsmTests::tryModifyMainStructureElement()
 
   if (!m_ftc->structureElementModifyRequest(seData, this))
   {
-    ERROR_LOG() << "Error requesting modify data";
+    ERROR_LOG(m_logger) << "Error requesting modify data";
     failExit();
   }
 
@@ -518,20 +518,20 @@ void IsmTests::tryModifyMainStructureElement()
 // ------------------------------------------------------------------------------
 void IsmTests::tryRemoveMainStructureElement()
 {
-  INFO_LOG() << "trying to send MainStructureElementRemoveRequest  for mse id = " << m_mainStructureElementId;
+  INFO_LOG(m_logger) << "trying to send MainStructureElementRemoveRequest  for mse id = " << m_mainStructureElementId;
 
   m_dtc->waitForHistoricalDataMainStructureElement();
   InfrastructureManagement::MainStructureElement mse = m_dtc->mainStructureElement(m_mainStructureElementId);
 
   if (mse.id() == 0)
   {
-    ERROR_LOG() << "Cannot find main structure element with id = " << m_mainStructureElementId;
+    ERROR_LOG(m_logger) << "Cannot find main structure element with id = " << m_mainStructureElementId;
     failExit();
   }
 
   if (!m_ftc->mainStructureElementRemoveRequest(MainStructureElementRemoveRequest(m_mainStructureElementId), this))
   {
-    ERROR_LOG() << "Error requesting delete data";
+    ERROR_LOG(m_logger) << "Error requesting delete data";
     failExit();
   }
 
@@ -541,7 +541,7 @@ void IsmTests::tryRemoveMainStructureElement()
 // ------------------------------------------------------------------------------
 void IsmTests::tryCreateBridge()
 {
-  INFO_LOG() << "trying to send MainStructureElementCreateRequest";
+  INFO_LOG(m_logger) << "trying to send MainStructureElementCreateRequest";
 
   MainStructureElementModifyRequest data;
 
@@ -574,7 +574,7 @@ void IsmTests::tryCreateBridge()
 
   if (!m_ftc->mainStructureElementModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting create data (bridge)";
+    ERROR_LOG(m_logger) << "Error requesting create data (bridge)";
     failExit();
   }
 
@@ -585,18 +585,18 @@ void IsmTests::tryCreateBridge()
 // ------------------------------------------------------------------------------
 void IsmTests::tryChangeBridgeStatus()
 {
-  INFO_LOG() << "trying to send MainStructureElementModifyBridgeStatusRequest ";
+  INFO_LOG(m_logger) << "trying to send MainStructureElementModifyBridgeStatusRequest ";
   m_dtc->waitForHistoricalDataMainStructureElement();
   InfrastructureManagement::MainStructureElement mse = m_dtc->mainStructureElement(m_mainStructureElementId);
   InfrastructureManagement::MainStructureElementModifyBridgeStatusRequest data;
 
   if (mse.id() == 0)
   {
-    ERROR_LOG() << "Error requesting modify data";
+    ERROR_LOG(m_logger) << "Error requesting modify data";
     failExit();
   }
 
-  DEBUG_LOG() << "Modify MainStructureElement with id = " << mse.id();
+  DEBUG_LOG(m_logger) << "Modify MainStructureElement with id = " << mse.id();
 
   // creating ModifyRequest
   data.id(mse.id());
@@ -608,7 +608,7 @@ void IsmTests::tryChangeBridgeStatus()
   m_replyFinished = false;
   if (!m_ftc->mainStructureElementModifyBridgeStatusRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting modify bridge status";
+    ERROR_LOG(m_logger) << "Error requesting modify bridge status";
     failExit();
   }
 
@@ -622,7 +622,7 @@ void IsmTests::tryChangeBridgeStatus()
 // ------------------------------------------------------------------------------
 void IsmTests::tryCreateAsset()
 {
-  INFO_LOG() << "trying to send AssetCreateRequest";
+  INFO_LOG(m_logger) << "trying to send AssetCreateRequest";
 
   InstrumentationAssetModifyRequest data;
 
@@ -633,7 +633,7 @@ void IsmTests::tryCreateAsset()
 
   if (!m_ftc->instrumentationAssetModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
 
@@ -646,7 +646,7 @@ void IsmTests::tryCreateAsset()
 
   if (!m_ftc->instrumentationAssetModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
 
@@ -659,7 +659,7 @@ void IsmTests::tryCreateAsset()
 
   if (!m_ftc->instrumentationAssetModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
 
@@ -672,7 +672,7 @@ void IsmTests::tryCreateAsset()
 
   if (!m_ftc->instrumentationAssetModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
 
@@ -683,21 +683,21 @@ void IsmTests::tryCreateAsset()
 // ------------------------------------------------------------------------------
 void IsmTests::tryModifyAsset()
 {
-  INFO_LOG() << "trying to send asset modify request ";
+  INFO_LOG(m_logger) << "trying to send asset modify request ";
 
-  DEBUG_LOG() << "m_assetId = " << m_assetId;
+  DEBUG_LOG(m_logger) << "m_assetId = " << m_assetId;
 
   m_dtc->waitForHistoricalDataInstrumentationAsset();
   const InfrastructureManagement::InstrumentationAsset &ast = m_dtc->instrumentationAsset(m_assetId);
   //  const InfrastructureManagement::InstrumentationAsset &ast1 = m_dtc->instrumentationAssets()[m_assetId];
   InfrastructureManagement::InstrumentationAssetModifyRequest data;
 
-  DEBUG_LOG() << "ast.id() = " << ast.id();
-  //  DEBUG_LOG() << "ast1.id() = " << ast1.id();
+  DEBUG_LOG(m_logger) << "ast.id() = " << ast.id();
+  //  DEBUG_LOG(m_logger) << "ast1.id() = " << ast1.id();
 
   if (ast.id() == 0)
   {
-    ERROR_LOG() << "Cannot find Asset Id = " << m_assetId;
+    ERROR_LOG(m_logger) << "Cannot find Asset Id = " << m_assetId;
     failExit();
   }
   else
@@ -714,7 +714,7 @@ void IsmTests::tryModifyAsset()
 
     if (!m_ftc->instrumentationAssetModifyRequest(InstrumentationAssetModifyRequest(data), this))
     {
-      ERROR_LOG() << "Error requesting modify data";
+      ERROR_LOG(m_logger) << "Error requesting modify data";
       failExit();
     }
 
@@ -725,20 +725,20 @@ void IsmTests::tryModifyAsset()
 // ------------------------------------------------------------------------------
 void IsmTests::tryRemoveAsset()
 {
-  INFO_LOG() << "trying to send AssetRemoveRequest for id = " << m_assetId;
+  INFO_LOG(m_logger) << "trying to send AssetRemoveRequest for id = " << m_assetId;
 
   m_dtc->waitForHistoricalDataInstrumentationAsset();
   const InfrastructureManagement::InstrumentationAsset &ast = m_dtc->instrumentationAsset(m_assetId);
 
   if (ast.id() == 0)
   {
-    ERROR_LOG() << "Cannot find Asset Id = " << m_assetId;
+    ERROR_LOG(m_logger) << "Cannot find Asset Id = " << m_assetId;
     failExit();
   }
 
   if (!m_ftc->instrumentationAssetRemoveRequest(InstrumentationAssetRemoveRequest(m_assetId), this))
   {
-    ERROR_LOG() << "Error requesting delete data";
+    ERROR_LOG(m_logger) << "Error requesting delete data";
     failExit();
   }
   QTest::qWait(1000);
@@ -747,21 +747,21 @@ void IsmTests::tryRemoveAsset()
 // ------------------------------------------------------------------------------
 void IsmTests::tryUnmountAsset()
 {
-  INFO_LOG() << "trying to send asset state modify request ";
+  INFO_LOG(m_logger) << "trying to send asset state modify request ";
 
-  DEBUG_LOG() << "m_assetId = " << m_assetId;
+  DEBUG_LOG(m_logger) << "m_assetId = " << m_assetId;
 
   m_dtc->waitForHistoricalDataInstrumentationAsset();
   const InfrastructureManagement::InstrumentationAsset &ast = m_dtc->instrumentationAsset(m_assetId);
   //  const InfrastructureManagement::InstrumentationAsset &ast1 = m_dtc->instrumentationAssets()[m_assetId];
   InfrastructureManagement::InstrumentationAssetSetStateRequest data;
 
-  DEBUG_LOG() << "ast.id() = " << ast.id();
-  //  DEBUG_LOG() << "ast1.id() = " << ast1.id();
+  DEBUG_LOG(m_logger) << "ast.id() = " << ast.id();
+  //  DEBUG_LOG(m_logger) << "ast1.id() = " << ast1.id();
 
   if (ast.id() == 0)
   {
-    ERROR_LOG() << "Cannot find Asset Id = " << m_assetId;
+    ERROR_LOG(m_logger) << "Cannot find Asset Id = " << m_assetId;
     failExit();
   }
   else
@@ -771,7 +771,7 @@ void IsmTests::tryUnmountAsset()
 
     if (!m_ftc->instrumentationAssetSetStateRequest(InstrumentationAssetSetStateRequest(data), this))
     {
-      ERROR_LOG() << "Error requesting set asset state";
+      ERROR_LOG(m_logger) << "Error requesting set asset state";
       failExit();
     }
 
@@ -783,7 +783,7 @@ void IsmTests::tryUnmountAsset()
 // ------------------------------------------------------------------------------
 void IsmTests::tryCreateMountingPointAsset()
 {
-  INFO_LOG() << "trying to send AssetCreateRequest";
+  INFO_LOG(m_logger) << "trying to send AssetCreateRequest";
 
   MountingPointAssetModifyRequest data;
 
@@ -793,7 +793,7 @@ void IsmTests::tryCreateMountingPointAsset()
 
   if (!m_ftc->mountingPointAssetModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
 
@@ -803,20 +803,20 @@ void IsmTests::tryCreateMountingPointAsset()
 // ------------------------------------------------------------------------------
 void IsmTests::tryRemoveMountingPointAsset()
 {
-  INFO_LOG() << "trying to send MountingPointAssetRemoveRequest ";
+  INFO_LOG(m_logger) << "trying to send MountingPointAssetRemoveRequest ";
 
   m_dtc->waitForHistoricalDataMountingPointAsset();
   if (!m_dtc->getMountingPointAssetId(m_structureElementId, m_assetId, m_mountingPointAssetId))
   {
-    ERROR_LOG() << "Cannot find requested mounting point asset";
+    ERROR_LOG(m_logger) << "Cannot find requested mounting point asset";
     failExit();
   }
 
-  DEBUG_LOG() << "MountingPointAsset Id = " << m_mountingPointAssetId;
+  DEBUG_LOG(m_logger) << "MountingPointAsset Id = " << m_mountingPointAssetId;
 
   if (!m_ftc->mountingPointAssetRemoveRequest(MountingPointAssetRemoveRequest(m_mountingPointAssetId), this))
   {
-    ERROR_LOG() << "Error requesting delete data";
+    ERROR_LOG(m_logger) << "Error requesting delete data";
     failExit();
   }
 
@@ -827,7 +827,7 @@ void IsmTests::tryRemoveMountingPointAsset()
 // ------------------------------------------------------------------------------
 void IsmTests::tryCreateMainSchedule()
 {
-  INFO_LOG() << "trying to send MainScheduleCreateRequest";
+  INFO_LOG(m_logger) << "trying to send MainScheduleCreateRequest";
 
   MainScheduleModifyRequest data0, data1, data2;
 
@@ -842,7 +842,7 @@ void IsmTests::tryCreateMainSchedule()
 
   if (!m_ftc->mainScheduleModifyRequest(data1, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
 
@@ -859,7 +859,7 @@ void IsmTests::tryCreateMainSchedule()
 
   if (!m_ftc->mainScheduleModifyRequest(data2, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
 
@@ -875,7 +875,7 @@ void IsmTests::tryCreateMainSchedule()
 
   if (!m_ftc->mainScheduleModifyRequest(data0, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
 
@@ -885,16 +885,16 @@ void IsmTests::tryCreateMainSchedule()
 // ------------------------------------------------------------------------------
 void IsmTests::tryModifyMainSchedule()
 {
-  INFO_LOG() << "trying to send mounting point schedule modify request ";
+  INFO_LOG(m_logger) << "trying to send mounting point schedule modify request ";
 
   m_dtc->waitForHistoricalDataMainSchedule();
   // using m_assetId as main schedule id
   InfrastructureManagement::MainSchedule ast = m_dtc->mainSchedule(m_assetId);
   InfrastructureManagement::MainScheduleModifyRequest data;
 
-  DEBUG_LOG() << "m_assetId = " << m_assetId;
+  DEBUG_LOG(m_logger) << "m_assetId = " << m_assetId;
 
-  DEBUG_LOG() << "ast.id() = " << ast.id();
+  DEBUG_LOG(m_logger) << "ast.id() = " << ast.id();
 
   // creating ModifyRequest
   if (ast.id() > 0)
@@ -913,13 +913,13 @@ void IsmTests::tryModifyMainSchedule()
 
     if (!m_ftc->mainScheduleModifyRequest(MainScheduleModifyRequest(data), this))
     {
-      ERROR_LOG() << "Error requesting modify data";
+      ERROR_LOG(m_logger) << "Error requesting modify data";
       failExit();
     }
   }
   else
   {
-    ERROR_LOG() << "Cannot find main schedule id = " << m_assetId;
+    ERROR_LOG(m_logger) << "Cannot find main schedule id = " << m_assetId;
     failExit();
   }
   QTest::qWait(1000);
@@ -928,16 +928,16 @@ void IsmTests::tryModifyMainSchedule()
 // ------------------------------------------------------------------------------
 void IsmTests::tryChangeStatusSchedule()
 {
-  INFO_LOG() << "trying to send mounting point schedule modify request ";
+  INFO_LOG(m_logger) << "trying to send mounting point schedule modify request ";
 
   m_dtc->waitForHistoricalDataMainSchedule();
   // using m_assetId as main schedule id
   InfrastructureManagement::MainSchedule ast = m_dtc->mainSchedule(m_assetId);
   InfrastructureManagement::MainScheduleModifyRequest data;
 
-  DEBUG_LOG() << "m_assetId = " << m_assetId;
+  DEBUG_LOG(m_logger) << "m_assetId = " << m_assetId;
 
-  DEBUG_LOG() << "ast.id() = " << ast.id();
+  DEBUG_LOG(m_logger) << "ast.id() = " << ast.id();
 
   // creating ModifyRequest
   if (ast.id() > 0)
@@ -974,13 +974,13 @@ void IsmTests::tryChangeStatusSchedule()
 
     if (!m_ftc->mainScheduleModifyRequest(MainScheduleModifyRequest(data), this))
     {
-      ERROR_LOG() << "Error requesting modify data";
+      ERROR_LOG(m_logger) << "Error requesting modify data";
       failExit();
     }
   }
   else
   {
-    ERROR_LOG() << "Cannot find main schedule id = " << m_assetId;
+    ERROR_LOG(m_logger) << "Cannot find main schedule id = " << m_assetId;
     failExit();
   }
   QTest::qWait(1000);
@@ -989,20 +989,20 @@ void IsmTests::tryChangeStatusSchedule()
 // ------------------------------------------------------------------------------
 void IsmTests::tryRemoveMainSchedule()
 {
-  INFO_LOG() << "trying to send MainScheduleRemoveRequest for id = " << m_assetId;
+  INFO_LOG(m_logger) << "trying to send MainScheduleRemoveRequest for id = " << m_assetId;
 
   m_dtc->waitForHistoricalDataMainSchedule();
   InfrastructureManagement::MainSchedule ast = m_dtc->mainSchedule(m_assetId);
 
   if (ast.id() == 0)
   {
-    ERROR_LOG() << "Cannot find main schedule id = " << m_assetId;
+    ERROR_LOG(m_logger) << "Cannot find main schedule id = " << m_assetId;
     failExit();
   }
 
   if (!m_ftc->mainScheduleRemoveRequest(MainScheduleRemoveRequest(m_assetId), this))
   {
-    ERROR_LOG() << "Error requesting delete data";
+    ERROR_LOG(m_logger) << "Error requesting delete data";
     failExit();
   }
   QTest::qWait(1000);
@@ -1011,20 +1011,20 @@ void IsmTests::tryRemoveMainSchedule()
 // ------------------------------------------------------------------------------
 void IsmTests::tryCopySchedule()
 {
-  INFO_LOG() << "trying to copy schedule";
+  INFO_LOG(m_logger) << "trying to copy schedule";
 
   m_dtc->waitForHistoricalDataMainSchedule();
   // using m_assetId as main schedule id
   InfrastructureManagement::MainSchedule ms = m_dtc->mainSchedule(m_assetId);
 
-  DEBUG_LOG() << "scheduleId = " << m_assetId;
-  DEBUG_LOG() << "ms.id() = " << ms.id();
+  DEBUG_LOG(m_logger) << "scheduleId = " << m_assetId;
+  DEBUG_LOG(m_logger) << "ms.id() = " << ms.id();
 
   int newId = m_db->copySchedule(ms.id());
 
   if (newId <= 0)
   {
-    ERROR_LOG() << "Error copy schedule, code = " << newId;
+    ERROR_LOG(m_logger) << "Error copy schedule, code = " << newId;
     failExit();
   }
 
@@ -1034,26 +1034,26 @@ void IsmTests::tryCopySchedule()
 // ------------------------------------------------------------------------------
 void IsmTests::checkSchedule()
 {
-  ERROR_LOG() << "check instrumentation plan";
+  ERROR_LOG(m_logger) << "check instrumentation plan";
 
   m_dtc->waitForHistoricalDataMainSchedule();
 
   // using m_assetId as main schedule id
   InfrastructureManagement::MainSchedule ms = m_dtc->mainSchedule(m_assetId);
 
-  DEBUG_LOG() << "scheduleId = " << m_assetId;
-  DEBUG_LOG() << "ms.id() = " << ms.id();
+  DEBUG_LOG(m_logger) << "scheduleId = " << m_assetId;
+  DEBUG_LOG(m_logger) << "ms.id() = " << ms.id();
 
   QList<MountingPointPlan> diff;
   bool ok = m_dtc->getScheduleDifferences(m_assetId, diff);
 
   if (ok)
-    ERROR_LOG() << "Instrumentation plan complete!";
+    ERROR_LOG(m_logger) << "Instrumentation plan complete!";
   else
   {
-    ERROR_LOG() << "Instrumentation plan not complete !!!";
+    ERROR_LOG(m_logger) << "Instrumentation plan not complete !!!";
     for (const MountingPointPlan &mpp : std::as_const(diff))
-      ERROR_LOG() << "Diff - # mpp.structureElementId() = " << mpp.structureElementId();
+      ERROR_LOG(m_logger) << "Diff - # mpp.structureElementId() = " << mpp.structureElementId();
   }
 
   QTest::qWait(1000);
@@ -1064,7 +1064,7 @@ void IsmTests::checkSchedule()
 // ------------------------------------------------------------------------------
 void IsmTests::tryCreateMountingPointPlan()
 {
-  INFO_LOG() << "trying to send MountingPointPlanCreateRequest";
+  INFO_LOG(m_logger) << "trying to send MountingPointPlanCreateRequest";
 
   MountingPointPlanModifyRequest data;
 
@@ -1074,7 +1074,7 @@ void IsmTests::tryCreateMountingPointPlan()
 
   if (!m_ftc->mountingPointPlanModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
 
@@ -1086,7 +1086,7 @@ void IsmTests::tryCreateMountingPointPlan()
 
   if (!m_ftc->mountingPointPlanModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
 
@@ -1098,7 +1098,7 @@ void IsmTests::tryCreateMountingPointPlan()
 // ------------------------------------------------------------------------------
 void IsmTests::onError(const QString &reason)
 {
-  ERROR_LOG() << "Got Reply error: " << reason;
+  ERROR_LOG(m_logger) << "Got Reply error: " << reason;
   failExit();
 }
 
@@ -1110,7 +1110,7 @@ void IsmTests::onCreateReply(const Core::FunctionReplyObject &replyObject)
     onError(replyObject.translated());
     return;
   }
-  INFO_LOG() << "Got createReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got createReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
@@ -1124,7 +1124,7 @@ void IsmTests::onModifyReply(const Core::FunctionReplyObject &replyObject)
     onError(replyObject.translated());
     return;
   }
-  INFO_LOG() << "Got modifyRequest with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got modifyRequest with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
@@ -1137,7 +1137,7 @@ void IsmTests::onRemoveReply(const Core::FunctionReplyObject &replyObject)
     onError(replyObject.translated());
     return;
   }
-  INFO_LOG() << "Got removeReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
@@ -1145,7 +1145,7 @@ void IsmTests::onRemoveReply(const Core::FunctionReplyObject &replyObject)
 // ------------------------------------------------------------------------------
 void IsmTests::failExit()
 {
-  ERROR_LOG() << "FAIL EXIT !";
+  ERROR_LOG(m_logger) << "FAIL EXIT !";
   m_bTestsSuccessful = false;
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/WebSocketInterface/websocket_interface_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/WebSocketInterface/websocket_interface_handler.cpp
index e0bbfbaa1..c22778e3c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/WebSocketInterface/websocket_interface_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/WebSocketInterface/websocket_interface_handler.cpp
@@ -37,34 +37,34 @@ bool WebSocketInterfaceHandler::init()
 {
   cleanup();
 
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "... ok";
 
-  DEBUG_LOG() << "Initialising DataManager";
+  DEBUG_LOG(m_logger) << "Initialising DataManager";
   m_dataManager = new DataManager(m_mainHandler);
   if (!m_dataManager->init())
   {
-    ERROR_LOG() << "Failed to initialise DataManager";
+    ERROR_LOG(m_logger) << "Failed to initialise DataManager";
     return false;
   }
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "... ok";
 
   m_messageFactory = new Messages::ClientMessageFactory(m_dataManager);
   m_webSocketServer = new LtsWebSocket::LtsWebSocketServer(m_messageFactory, this);
 
-  DEBUG_LOG() << "Setting Message Delay to " << Settings::messageDelay();
+  DEBUG_LOG(m_logger) << "Setting Message Delay to " << Settings::messageDelay();
 
   m_webSocketServer->setMessageDelay(Settings::messageDelay());
 
-  DEBUG_LOG() << "Initialising LtsWebSocketServer";
+  DEBUG_LOG(m_logger) << "Initialising LtsWebSocketServer";
   if (!m_webSocketServer->init(QStringLiteral("ISM"),
                                NGL::Connections::port(NGL::Connections::eConnection::ISM_WEBSOCKET)))
   {
-    ERROR_LOG() << "Failed to initialise LtsWebSocketServer";
+    ERROR_LOG(m_logger) << "Failed to initialise LtsWebSocketServer";
     return false;
   }
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "... ok";
 
-  DEBUG_LOG() << "Connection signals and slots";
+  DEBUG_LOG(m_logger) << "Connection signals and slots";
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/base.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/base.h
index 30d2d49d9..7e445261f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/base.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/base.h
@@ -21,6 +21,7 @@ class Base : public QObject
 {
   Q_OBJECT
 protected:
+NGL::INGLLogger &m_logger;
   explicit Base(MainHandler *mainHandler, NGL::INGLLogger &logger);
   virtual ~Base();
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/dds_handler.cpp
index f2a16a556..07ffb8410 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/dds_handler.cpp
@@ -17,14 +17,14 @@ namespace InfrastructureManagement
 DdsHandler::DdsHandler(int domainId)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Any))
 {
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -43,15 +43,15 @@ bool DdsHandler::init(const QStringList &qosFileList)
   try
   {
     bRet = m_ddsFts->enableAll();
-    INFO_LOG() << "Fts initialised";
+    INFO_LOG(m_logger) << "Fts initialised";
     // erst FTS funktioniert komischer Weise nicht (seit MainStructureElementModifyRequest
     // von MainStructureElement abgeleitet ist ... rti/dds - Bug?
     bRet &= m_ddsDts->enableAll();
-    INFO_LOG() << "Dts initialised";
+    INFO_LOG(m_logger) << "Dts initialised";
   }
   catch (const dds::core::Exception &e)
   {
-    ERROR_LOG() << "Exception: " << e.what();
+    ERROR_LOG(m_logger) << "Exception: " << e.what();
     m_pacemaker->setNewState(Core::RunningState::StoppedError);
     return false;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/dds_handler.h
index 2b6cc4f5f..2c9ff6a10 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/dds_handler.h
@@ -50,6 +50,7 @@ public:
   }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector>               m_ddsConnector;
   std::shared_ptr<Core::Pacemaker>                          m_pacemaker;
   std::shared_ptr<Core::TopicLockMaster>                    m_topicLockMaster;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/main_handler.cpp
index eefa1afab..88f7c7b4b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/main_handler.cpp
@@ -48,14 +48,14 @@ MainHandler::~MainHandler()
 //-------------------------------------------------------------------------------------------------------------
 bool MainHandler::init(int domainId)
 {
-  INFO_LOG() << "--- Start InfrastructureManagement MainHandler.";
+  INFO_LOG(m_logger) << "--- Start InfrastructureManagement MainHandler.";
 
   // initialize DDS
   // for InfrastructureManagement => exerciseId = partitionId
   m_ddsHandler = std::make_shared<DdsHandler>(domainId);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation DdsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
     if (m_ddsHandler->pacemaker())
       m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
@@ -66,7 +66,7 @@ bool MainHandler::init(int domainId)
   m_dbHandler = std::make_shared<DbHandler>();
   if (!m_dbHandler->init(0, Settings::settings()))
   {
-    ERROR_LOG() << "Initialisation DbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation DbHandler failed.";
     pm->setNewState(Core::RunningState::StoppedError);
     return false;
   }
@@ -79,7 +79,7 @@ bool MainHandler::init(int domainId)
   m_handlerMainStructureElement = std::make_shared<HandlerMainStructureElement>(this);
   if (!m_handlerMainStructureElement->init())
   {
-    ERROR_LOG() << "Initialisation HandlerMainStructureElement failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerMainStructureElement failed.";
     pm->setNewState(Core::RunningState::StoppedError);
     return false;
   }
@@ -89,7 +89,7 @@ bool MainHandler::init(int domainId)
   m_handlerInstrumentationAsset = std::make_shared<HandlerInstrumentationAsset>(this);
   if (!m_handlerInstrumentationAsset->init())
   {
-    ERROR_LOG() << "Initialisation HandlerInstrumentationAsset failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerInstrumentationAsset failed.";
     pm->setNewState(Core::RunningState::StartingError);
     return false;
   }
@@ -98,7 +98,7 @@ bool MainHandler::init(int domainId)
   m_handlerMountingPointAsset = std::make_shared<HandlerMountingPointAsset>(this);
   if (!m_handlerMountingPointAsset->init())
   {
-    ERROR_LOG() << "Initialisation HandlerMountingPointAsset failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerMountingPointAsset failed.";
     pm->setNewState(Core::RunningState::StartingError);
     return false;
   }
@@ -108,7 +108,7 @@ bool MainHandler::init(int domainId)
   m_handlerEffectArea = std::make_shared<HandlerEffectArea>(this);
   if (!m_handlerEffectArea->init())
   {
-    ERROR_LOG() << "Initialisation HandlerEffectArea failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerEffectArea failed.";
     pm->setNewState(Core::RunningState::StartingError);
     return false;
   }
@@ -117,7 +117,7 @@ bool MainHandler::init(int domainId)
   m_handlerSpecialArea = std::make_shared<HandlerSpecialArea>(this);
   if (!m_handlerSpecialArea->init())
   {
-    ERROR_LOG() << "Initialisation HandlerSpecialArea failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerSpecialArea failed.";
     pm->setNewState(Core::RunningState::StartingError);
     return false;
   }
@@ -126,7 +126,7 @@ bool MainHandler::init(int domainId)
   m_handlerMainSchedule = std::make_shared<HandlerMainSchedule>(this);
   if (!m_handlerMainSchedule->init())
   {
-    ERROR_LOG() << "Initialisation HandlerMainSchedule failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerMainSchedule failed.";
     pm->setNewState(Core::RunningState::StartingError);
     return false;
   }
@@ -141,12 +141,12 @@ bool MainHandler::init(int domainId)
   m_handlerWebSocketInterface = std::make_shared<WebSocketInterfaceHandler>(this);
   if (!m_handlerWebSocketInterface->init())
   {
-    ERROR_LOG() << "Initialisation WebSocketInterface failed.";
+    ERROR_LOG(m_logger) << "Initialisation WebSocketInterface failed.";
     pm->setNewState(Core::RunningState::StartingError);
     return false;
   }
 
-  INFO_LOG() << "ISM MainHandler initialized.";
+  INFO_LOG(m_logger) << "ISM MainHandler initialized.";
   pm->setNewState(Core::RunningState::Running);
   pm->addPort(m_handlerWebSocketInterface->webSocketPort(), Core::PortType::WebSocketServer);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/main_handler.h
index 7e8eea6bd..21784414f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/main_handler.h
@@ -74,6 +74,8 @@ public:
   int exerciseId() const;
 
 private: // attributes
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<DbHandler>                                     m_dbHandler;
   std::shared_ptr<DdsHandler>                                    m_ddsHandler;
   std::shared_ptr<HandlerMainStructureElement>                   m_handlerMainStructureElement;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/parse_building_xml.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/parse_building_xml.cpp
index 4f64f509e..c5d3bbf51 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/parse_building_xml.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/parse_building_xml.cpp
@@ -60,12 +60,12 @@ ParseBuildingXml::ParseBuildingXml(const QString &xmlFilename,
   , m_geoPosition(geoPosition)
   , m_rotationAngleDegree(rotationAngleDegree)
 {
-  DEBUG_LOG() << "m_soundAreaFilename=" << m_soundAreaFilename;
+  DEBUG_LOG(m_logger) << "m_soundAreaFilename=" << m_soundAreaFilename;
 }
 
 QJsonObject ParseBuildingXml::egcusToJson() const
 {
-  DEBUG_LOG() << "egcusToJson";
+  DEBUG_LOG(m_logger) << "egcusToJson";
   if (m_egcus.isEmpty())
     return QJsonObject();
 
@@ -90,7 +90,7 @@ QJsonObject ParseBuildingXml::egcusToJson() const
 
 QJsonObject ParseBuildingXml::soundAreaToJson() const
 {
-  DEBUG_LOG() << "soundAreaToJson";
+  DEBUG_LOG(m_logger) << "soundAreaToJson";
   QJsonObject soundArea;
   QJsonObject json;
   QJsonObject jsonEgcu;
@@ -117,7 +117,7 @@ QJsonObject ParseBuildingXml::soundAreaToJson() const
 //-------------------------------------------------------------------------------------------------------------
 bool ParseBuildingXml::parseXml()
 {
-  DEBUG_LOG() << "parseXml";
+  DEBUG_LOG(m_logger) << "parseXml";
   m_request = MainStructureElementModifyRequest();
   m_request.properties("{}");
   m_lastError.clear();
@@ -141,7 +141,7 @@ bool ParseBuildingXml::parseXml()
 //  catch (const std::exception &ex)
 //  {
 //    m_lastError = QString::fromUtf8(ex.what());
-//    WARNING_LOG() << "Error importing building: " << ex.what();
+//    WARNING_LOG(m_logger) << "Error importing building: " << ex.what();
 //    m_request = MainStructureElementModifyRequest();
 //    return false;
 //  }
@@ -151,17 +151,17 @@ bool ParseBuildingXml::parseXml()
   parseXmlEgcus();
   QJsonObject egcus = egcusToJson();
   properties[QStringLiteral("egcusToRooms")] = egcus[QStringLiteral("egcusToRooms")];
-  DEBUG_LOG() << "parseXml vor isEmpty";
+  DEBUG_LOG(m_logger) << "parseXml vor isEmpty";
   if (!m_soundAreaFilename.isEmpty())
   {
-    DEBUG_LOG() << "parseXml vor parseXmlSoundArea";
+    DEBUG_LOG(m_logger) << "parseXml vor parseXmlSoundArea";
     parseXmlSoundArea();
     properties[QStringLiteral("soundArea")] = soundAreaToJson();
   }
 
   m_request.properties(QJsonDocument(properties).toJson(QJsonDocument::Compact).toStdString());
 
-  DEBUG_LOG() << "Finished import for file " << m_xmlFilename;
+  DEBUG_LOG(m_logger) << "Finished import for file " << m_xmlFilename;
   return bRet;
 }
 
@@ -170,24 +170,24 @@ ParseBuildingXml::Egcu ParseBuildingXml::parseEgcu(const QDomElement &domEgcu)
 {
   ParseBuildingXml::Egcu ret;
 
-  INFO_LOG() << "parseEgcu Egcu: = " << domEgcu.tagName();
+  INFO_LOG(m_logger) << "parseEgcu Egcu: = " << domEgcu.tagName();
   QDomElement mountpoint = domEgcu.firstChildElement(QStringLiteral("Mountpoint"));
-  INFO_LOG() << "Mountpoint=" << mountpoint.tagName();
+  INFO_LOG(m_logger) << "Mountpoint=" << mountpoint.tagName();
   QDomElement mountpointSubId = mountpoint.firstChildElement(QStringLiteral("SubId"));
-  INFO_LOG() << "Mountpoint=" << mountpointSubId.tagName()
+  INFO_LOG(m_logger) << "Mountpoint=" << mountpointSubId.tagName()
                      << " SubId = " << mountpointSubId.attribute(QStringLiteral("SubId"))
                      << " text= " << mountpointSubId.text();
   ret.mountpointEgcu = mountpointSubId.text().toInt();
 
   QDomElement rooms = domEgcu.firstChildElement(QStringLiteral("Rooms"));
-  INFO_LOG() << "Rooms=" << rooms.tagName()
+  INFO_LOG(m_logger) << "Rooms=" << rooms.tagName()
                      << " SubId = " << rooms.attribute(QStringLiteral("SubId"))
                      << " text = " << rooms.text();
 
   QDomElement room = rooms.firstChildElement(QStringLiteral("SubId"));
   for (; !room.isNull(); room = room.nextSiblingElement(room.tagName()))
   {
-    INFO_LOG() << "Room=" << room.tagName()
+    INFO_LOG(m_logger) << "Room=" << room.tagName()
                        << " SubId = " << room.attribute(QStringLiteral("SubId"))
                        << " text = " << room.text();
     ret.rooms.append(room.text().toInt());
@@ -203,27 +203,27 @@ bool ParseBuildingXml::parseXmlEgcus()
   try
   {
     //parseXmlInternal();
-    INFO_LOG() << "parseXmlEgcus " << m_egcuToRoomFilename;
+    INFO_LOG(m_logger) << "parseXmlEgcus " << m_egcuToRoomFilename;
     if (!m_egcuToRoomFilename.isEmpty())
     {
-      INFO_LOG() << "openXml";
+      INFO_LOG(m_logger) << "openXml";
       QDomDocument doc = openXml(m_egcuToRoomFilename);
       if (!doc.isNull())
       {
         // Evaluate xml file and modify properties in m_request
         QDomElement root = doc.documentElement();
-        INFO_LOG() << "root.tagName()=" << root.tagName();
+        INFO_LOG(m_logger) << "root.tagName()=" << root.tagName();
         if (root.tagName() != QStringLiteral("EgcusToRooms"))
         {
-          WARNING_LOG() << "The file is not EgcusToRooms";
+          WARNING_LOG(m_logger) << "The file is not EgcusToRooms";
           return false;
         }
         QDomElement domEgcu = root.firstChildElement(QStringLiteral("Egcu"));
         if (domEgcu.isNull())
-          INFO_LOG() << "Keine EGCU's";
+          INFO_LOG(m_logger) << "Keine EGCU's";
         for (; !domEgcu.isNull(); domEgcu = domEgcu.nextSiblingElement(domEgcu.tagName()))
         {
-          INFO_LOG() << "parseEgcus=" << domEgcu.tagName()
+          INFO_LOG(m_logger) << "parseEgcus=" << domEgcu.tagName()
                              << " text=" << domEgcu.text()
                              << " Name=" << domEgcu.attribute(QStringLiteral("Name"));
           const Egcu egcu = parseEgcu(domEgcu);
@@ -236,7 +236,7 @@ bool ParseBuildingXml::parseXmlEgcus()
   catch (const std::exception &ex)
   {
     m_lastError = QString::fromUtf8(ex.what());
-    WARNING_LOG() << "Error importing building: wrong XML-File EgcuToRooms: " << ex.what();
+    WARNING_LOG(m_logger) << "Error importing building: wrong XML-File EgcuToRooms: " << ex.what();
     bRet = false;
   }
 
@@ -253,34 +253,34 @@ bool ParseBuildingXml::parseXmlSoundArea()
   try
   {
     //parseXmlInternal();
-    INFO_LOG() << "parseXmlSoundArea " << m_soundAreaFilename;
+    INFO_LOG(m_logger) << "parseXmlSoundArea " << m_soundAreaFilename;
     if (!m_soundAreaFilename.isEmpty())
     {
-      INFO_LOG() << "openXml";
+      INFO_LOG(m_logger) << "openXml";
       QDomDocument doc = openXml(m_soundAreaFilename);
       if (!doc.isNull())
       {
         // Evaluate xml file and modify properties in m_request
         QDomElement root = doc.documentElement();
-        INFO_LOG() << "root.tagName()=" << root.tagName();
+        INFO_LOG(m_logger) << "root.tagName()=" << root.tagName();
         if (root.tagName() != QStringLiteral("SoundArea"))
         {
-          WARNING_LOG() << "The file is not SoundArea";
+          WARNING_LOG(m_logger) << "The file is not SoundArea";
           return false;
         }
 
-        INFO_LOG() << "parseSoundArea SoundArea: = " << root.tagName();
+        INFO_LOG(m_logger) << "parseSoundArea SoundArea: = " << root.tagName();
 
         // Id
         m_soundArea.id = root.firstChildElement(QStringLiteral("Id")).text().toInt();
-        INFO_LOG() << "Id=" << m_soundArea.id;
+        INFO_LOG(m_logger) << "Id=" << m_soundArea.id;
 
         // Geometry
         QDomElement geometry = root.firstChildElement(QStringLiteral("Geometry"));
         QDomElement point    = geometry.firstChildElement(QStringLiteral("Point"));
         for (; !point.isNull(); point = point.nextSiblingElement(point.tagName()))
         {
-          INFO_LOG() << "Point=" << point.tagName()
+          INFO_LOG(m_logger) << "Point=" << point.tagName()
                              << " lat = " << point.firstChildElement(QStringLiteral("lat")).text().toDouble()
                              << " lon = " << point.firstChildElement(QStringLiteral("lon")).text().toDouble();
           geoPosition.lat(point.firstChildElement(QStringLiteral("lat")).text().toDouble());
@@ -290,7 +290,7 @@ bool ParseBuildingXml::parseXmlSoundArea()
 
         // MainEgcuMountpoint
         m_soundArea.mainEgcuMountpoint = root.firstChildElement(QStringLiteral("MainEgcuMountpoint")).text().toInt();
-        DEBUG_LOG() << "MainEgcuMountpoint Id=" << m_soundArea.mainEgcuMountpoint;
+        DEBUG_LOG(m_logger) << "MainEgcuMountpoint Id=" << m_soundArea.mainEgcuMountpoint;
 
         // MountpointsEgcu
         QDomElement egcuMountpoints = root.firstChildElement(QStringLiteral("EgcuMountpoints"));
@@ -298,7 +298,7 @@ bool ParseBuildingXml::parseXmlSoundArea()
         for (; !id.isNull(); id = id.nextSiblingElement(id.tagName()))
         {
           int mountpointEgcu = id.text().toInt();
-          DEBUG_LOG() << "mountpointEgcu=" << mountpointEgcu;
+          DEBUG_LOG(m_logger) << "mountpointEgcu=" << mountpointEgcu;
           m_soundArea.egcuMountpoints.push_back(mountpointEgcu);
         }
       }
@@ -308,7 +308,7 @@ bool ParseBuildingXml::parseXmlSoundArea()
   catch (const std::exception &ex)
   {
     m_lastError = QString::fromUtf8(ex.what());
-    WARNING_LOG() << "Error importing building: wrong XML-File EgcuToRooms: " << ex.what();
+    WARNING_LOG(m_logger) << "Error importing building: wrong XML-File EgcuToRooms: " << ex.what();
     bRet = false;
   }
 
@@ -367,16 +367,16 @@ QVector<ParseBuildingXml::BuildingMetaInfo> ParseBuildingXml::parseMetaXml(const
     info.filename = streifElem.attribute(QLatin1String("Name"));
     if (info.filename.isEmpty())
     {
-      WARNING_LOG() << "Empty filename (building)!";
+      WARNING_LOG(m_logger) << "Empty filename (building)!";
       continue;
     }
 
     info.rotationAngleDegree = orientationElem.attribute(QLatin1String("Angle")).toDouble();  // correct rotation?
-    INFO_LOG() << "Found Building angle: " << info.rotationAngleDegree;
+    INFO_LOG(m_logger) << "Found Building angle: " << info.rotationAngleDegree;
 
     info.geoPosition = positionFromElement<Core::GeoPosition>(posElem);
 
-    INFO_LOG() << "Found Building position: (" << info.geoPosition.lon() << ", ("
+    INFO_LOG(m_logger) << "Found Building position: (" << info.geoPosition.lon() << ", ("
                        << info.geoPosition.lat() << ", ("
                        << info.geoPosition.z() << ")";
 
@@ -397,14 +397,14 @@ void ParseBuildingXml::parseXmlInternal()
   const QDomElement headerElem = getChildElement(rootElem, QStringLiteral("Header"));
   const QDomElement baseGroupElem = getChildElement(headerElem, QStringLiteral("Group"));
 
-  DEBUG_LOG() << "Start import for file " << m_xmlFilename;
+  DEBUG_LOG(m_logger) << "Start import for file " << m_xmlFilename;
 
   m_request.angle(m_rotationAngleDegree);
   m_request.geoPosition(m_geoPosition);
   m_request.modelId(getInteger(getChildElement(baseGroupElem, QStringLiteral("ModelId")), QStringLiteral("Id")));
   m_request.name(getChildElement(baseGroupElem, QStringLiteral("Name")).text().toStdString());
   m_request.description(m_request.name());
-  INFO_LOG() <<  "Importing building with name: " << m_request.name();
+  INFO_LOG(m_logger) <<  "Importing building with name: " << m_request.name();
 
   InfrastructureManagement::StructureElement seBuilding;
   seBuilding.name(m_request.name());
@@ -483,15 +483,15 @@ void ParseBuildingXml::importExternalReferences(const QDomElement &parent,
     // we don't care about BCU Mounting positions inside xml file - we create our own
     if (se.mountingPointTypeId() == MountingPointType::BuildingControlUnit)
     {
-      INFO_LOG() << "Ignoring xml-internal BuildingControl mounting point - not needed";
+      INFO_LOG(m_logger) << "Ignoring xml-internal BuildingControl mounting point - not needed";
       continue;
     }
     if (se.mountingPointTypeId() == MountingPointType::Unknown)
     {
-      INFO_LOG() << "Ignoring unknown mounting point type with subId " << se.mountingPointId();
+      INFO_LOG(m_logger) << "Ignoring unknown mounting point type with subId " << se.mountingPointId();
       continue;
     }
-    INFO_LOG() << "importExternalReferences: " << se.displayName() << ", parentIdx = " << parentIdx;
+    INFO_LOG(m_logger) << "importExternalReferences: " << se.displayName() << ", parentIdx = " << parentIdx;
     addElementToRequest(se, parentIdx);
   }
 }
@@ -507,7 +507,7 @@ void ParseBuildingXml::importFloors(const QDomElement &parent,
     if (!nameElement.text().startsWith(QLatin1String("floor_"), Qt::CaseInsensitive))
       continue;
 
-    INFO_LOG() << "importFloors: " << nameElement.text() << ", parentIdx = " << parentIdx;
+    INFO_LOG(m_logger) << "importFloors: " << nameElement.text() << ", parentIdx = " << parentIdx;
 
     StructureElement se;
     se.name(nameElement.text().simplified().toStdString());
@@ -518,12 +518,12 @@ void ParseBuildingXml::importFloors(const QDomElement &parent,
 
 // read base height from xml comment
     const QDomElement commentElement = getChildElement(floorElem, QStringLiteral("Comment"), false);
-    DEBUG_LOG() << "Comment = " << commentElement.text();
+    DEBUG_LOG(m_logger) << "Comment = " << commentElement.text();
     const QStringList comm = commentElement.text().split(QLatin1Char('='));
     double baseHeight = 0.00;
     if (comm.at(0) == QStringLiteral("base_height"))
       baseHeight = comm.at(1).toDouble();
-    DEBUG_LOG() << "base_height = " << baseHeight;
+    DEBUG_LOG(m_logger) << "base_height = " << baseHeight;
     se.relPosition().offsetZ(baseHeight);
 
     addElementToRequest(se, parentIdx);
@@ -552,7 +552,7 @@ void ParseBuildingXml::importRooms(const QDomElement &parent,
     // displayed room names are too long
     roomName.replace(QStringLiteral("SW_room"), QStringLiteral("R"));
 
-    INFO_LOG() << "importRooms: " << roomName << ", parentIdx = " << parentIdx;
+    INFO_LOG(m_logger) << "importRooms: " << roomName << ", parentIdx = " << parentIdx;
 
     se.displayName(roomName.toStdString());
     se.mountingPointId(subId);
@@ -567,7 +567,7 @@ void ParseBuildingXml::importRooms(const QDomElement &parent,
       addElementToRequest(se, parentIdx);
       const int curIdx = m_request.elements().size() - 1;
       importExternalReferences(subRoomElem, curIdx);
-      DEBUG_LOG() << "Room=" << se.name()
+      DEBUG_LOG(m_logger) << "Room=" << se.name()
                           << " Id=" << se.id()
                           << " mountingPointId=" << se.mountingPointId();
     }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/parse_building_xml.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/parse_building_xml.h
index af6c88a38..88eaefb20 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/parse_building_xml.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/parse_building_xml.h
@@ -55,6 +55,7 @@ public:
   QVector<BuildingMetaInfo> parseMetaXml(const QString &metaXml) const;
   const MainStructureElementModifyRequest &parsedRequest() const { return m_request; }
 private:
+  NGL::INGLLogger &m_logger;
   QDomDocument openXml(const QString &fileName) const;
   void parseXmlInternal();
   Egcu parseEgcu(const QDomElement &domEgcu);
@@ -79,6 +80,7 @@ private:
   QDomElement getChildElement(const T &parent, const QString &childTag, bool bThrow = true) const;
   int getInteger(const QDomElement &element, const QString &attribute) const;
 private:
+  NGL::INGLLogger &m_logger;
   QString m_xmlFilename;
   QString m_vulnerabilityFilename;
   QString m_egcuToRoomFilename;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_base.cpp
index c38c0797b..a7dbcd213 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_base.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_base.cpp
@@ -27,7 +27,7 @@ void ScheduleStatusBase::onEntry(QEvent *event)
 {
   QState::onEntry(event);
 
-  DEBUG_LOG() << "Schedule " << scheduleId() << ": onEntry Base: write ScheduleStatus: " << m_scheduleStatus;
+  DEBUG_LOG(m_logger) << "Schedule " << scheduleId() << ": onEntry Base: write ScheduleStatus: " << m_scheduleStatus;
   // write ScheduleStatus to db
   m_schedule->setScheduleStatus(m_scheduleStatus);
 }
@@ -44,7 +44,7 @@ Creation::Creation(ObjectMainSchedule *objSchedule)
 
 void Creation::onEntry(QEvent *event)
 {
-  DEBUG_LOG() << "Schedule " << scheduleId() << ": onEntry Creation ";
+  DEBUG_LOG(m_logger) << "Schedule " << scheduleId() << ": onEntry Creation ";
   ScheduleStatusBase::onEntry(event);
 }
 
@@ -60,7 +60,7 @@ Activation::Activation(ObjectMainSchedule *objSchedule)
 
 void Activation::onEntry(QEvent *event)
 {
-  DEBUG_LOG() << "Schedule " << scheduleId() << ": onEntry Activation: write ScheduleStatus:Activated";
+  DEBUG_LOG(m_logger) << "Schedule " << scheduleId() << ": onEntry Activation: write ScheduleStatus:Activated";
   ScheduleStatusBase::onEntry(event);
 }
 
@@ -71,7 +71,7 @@ Expiration::Expiration(ObjectMainSchedule *objSchedule)
 
 void Expiration::onEntry(QEvent *event)
 {
-  DEBUG_LOG() << "Schedule " << scheduleId() << ": onEntry Expiration ";
+  DEBUG_LOG(m_logger) << "Schedule " << scheduleId() << ": onEntry Expiration ";
   ScheduleStatusBase::onEntry(event);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_base.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_base.h
index cbb161da1..6609d4d33 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_base.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_base.h
@@ -22,12 +22,14 @@ namespace InfrastructureManagement
     InfrastructureManagement::ScheduleStatus scheduleStatus() const { return m_scheduleStatus; }
 
   protected:
+  NGL::INGLLogger &m_logger;
     ScheduleStatusBase(const QString &objectName, const ScheduleStatus &scheduleStatus, ObjectMainSchedule* objSchedule);
     void onEntry(QEvent *event);
 
     int scheduleId() const { return m_schedule ? m_schedule->getId() : -1; }
 
   protected:
+  NGL::INGLLogger &m_logger;
     ObjectMainSchedule  *m_schedule;
   private:
     const InfrastructureManagement::ScheduleStatus m_scheduleStatus;
@@ -46,6 +48,7 @@ namespace InfrastructureManagement
     public:
       explicit Creation(ObjectMainSchedule *objSchedule);
     protected:
+  NGL::INGLLogger &m_logger;
       void onEntry(QEvent *event);
   };
 
@@ -62,6 +65,7 @@ namespace InfrastructureManagement
     public:
       explicit Activation(ObjectMainSchedule *objSchedule);
     protected:
+  NGL::INGLLogger &m_logger;
       void onEntry(QEvent *event);
   };
 
@@ -71,6 +75,7 @@ namespace InfrastructureManagement
     public:
       explicit Expiration(ObjectMainSchedule *objSchedule);
     protected:
+  NGL::INGLLogger &m_logger;
       void onEntry(QEvent *event);
   };
 
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 59a23fb08..f635b3f7c 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
@@ -30,11 +30,11 @@ namespace InfrastructureManagement
 
   bool ScheduleStatusManager::triggerSwitchState(InfrastructureManagement::ScheduleStatus state)
   {
-    INFO_LOG() << "Schedule " << scheduleId() << ": Trying to switch to state " << toString(state);
+    INFO_LOG(m_logger) << "Schedule " << scheduleId() << ": Trying to switch to state " << toString(state);
     std::function<void()> f = m_stateSignals.value(state);
     if (f)
     {
-      //DEBUG_LOG() << "function: emit signal";
+      //DEBUG_LOG(m_logger) << "function: emit signal";
       emit f();
     }
     return (f != nullptr);
@@ -78,13 +78,13 @@ namespace InfrastructureManagement
 
   void ScheduleStatusManager::setStateInternal(InfrastructureManagement::ScheduleStatus state)
   {
-    INFO_LOG() << "Schedule " << scheduleId() << ": In setStateInternal: new state " << toString(state);
+    INFO_LOG(m_logger) << "Schedule " << scheduleId() << ": In setStateInternal: new state " << toString(state);
     if(m_ScheduleStatus == state)
       return;
 
     m_ScheduleStatus = state;
 
-    INFO_LOG() << "Schedule " << scheduleId() << ": Changed schedule state to " << toString(state);
+    INFO_LOG(m_logger) << "Schedule " << scheduleId() << ": Changed schedule state to " << toString(state);
   }
 
   int ScheduleStatusManager::scheduleId() const
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_manager.h
index aefa8a488..511780f2e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_manager.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_manager.h
@@ -45,6 +45,8 @@ namespace InfrastructureManagement
       void stateFalse();
 
     private:
+
+    NGL::INGLLogger &m_logger;
       void setStateInternal(InfrastructureManagement::ScheduleStatus state);
       int scheduleId() const;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_state_machine.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_state_machine.cpp
index c24043c37..f04a354d1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_state_machine.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_state_machine.cpp
@@ -76,12 +76,12 @@ ScheduleStatusMachine::ScheduleStatusMachine(ObjectMainSchedule* objSchedule, QO
   //States zur StateMachine hinzufügen
   for (ScheduleStatusBase *state : std::as_const(m_ScheduleStatuses))
   {
-    DEBUG_LOG() << "Schedule " << scheduleId() << ": state: " << state->scheduleStatus();
+    DEBUG_LOG(m_logger) << "Schedule " << scheduleId() << ": state: " << state->scheduleStatus();
     m_stateMachine->addState(state);
     connect(state, &ScheduleStatusBase::entered, this, &ScheduleStatusMachine::onEnteredState);
   }
 
-  DEBUG_LOG() << "Schedule " << scheduleId() << ": Constructor ScheduleStatusMachine: size m_ScheduleStatuses = " << m_ScheduleStatuses.size();
+  DEBUG_LOG(m_logger) << "Schedule " << scheduleId() << ": Constructor ScheduleStatusMachine: size m_ScheduleStatuses = " << m_ScheduleStatuses.size();
 }
 
 ScheduleStatusMachine::~ScheduleStatusMachine()
@@ -96,11 +96,11 @@ bool ScheduleStatusMachine::init()
   if (m_stateMachine->isRunning())
     return false;
 
-  DEBUG_LOG() << "Schedule " << scheduleId() << ": Init ScheduleStatusMachine ";
+  DEBUG_LOG(m_logger) << "Schedule " << scheduleId() << ": Init ScheduleStatusMachine ";
   // initialise current ScheduleStatus
   ScheduleStatusBase *currentScheduleStatus = getStateFromId(m_schedule->scheduleStatus());
 
-  DEBUG_LOG() << "Schedule " << scheduleId() << ": State = "
+  DEBUG_LOG(m_logger) << "Schedule " << scheduleId() << ": State = "
                       << ScheduleStatusManager::toString(m_schedule->scheduleStatus());
 
   m_stateMachine->setInitialState(currentScheduleStatus);
@@ -108,7 +108,7 @@ bool ScheduleStatusMachine::init()
 
   m_stateManager->setInitial(m_schedule->scheduleStatus());
 
-  DEBUG_LOG() << "Schedule " << scheduleId() << ": ==> Done Init ScheduleStatusMachine ";
+  DEBUG_LOG(m_logger) << "Schedule " << scheduleId() << ": ==> Done Init ScheduleStatusMachine ";
 
   return true;
 }
@@ -125,13 +125,13 @@ bool ScheduleStatusMachine::switchToState(ScheduleStatus newScheduleStatus)
 
 void ScheduleStatusMachine::onEnteredState()
 {
-  DEBUG_LOG() << "Schedule " << scheduleId() << ": ScheduleStatusMachine - onEnteredState";
+  DEBUG_LOG(m_logger) << "Schedule " << scheduleId() << ": ScheduleStatusMachine - onEnteredState";
 
   ScheduleStatusBase *s = qobject_cast<ScheduleStatusBase*>(sender());
   if (!s)
     return;
 
-  DEBUG_LOG() << "Schedule " << scheduleId() << ": ScheduleStatusBase : " << s->scheduleStatus();
+  DEBUG_LOG(m_logger) << "Schedule " << scheduleId() << ": ScheduleStatusBase : " << s->scheduleStatus();
 
   m_stateManager->setCurrent(s->scheduleStatus());
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_state_machine.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_state_machine.h
index 651cabd95..6f6cd4908 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_state_machine.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_state_machine.h
@@ -45,6 +45,8 @@ namespace InfrastructureManagement
       void onEnteredState();
 
     private:
+
+    NGL::INGLLogger &m_logger;
       ScheduleStatusBase *getStateFromId(InfrastructureManagement::ScheduleStatus ScheduleStatus);
       int scheduleId() const;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/ModuleTests/mrk_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/ModuleTests/mrk_tests.cpp
index 5db48304f..f956f6b79 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/ModuleTests/mrk_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/ModuleTests/mrk_tests.cpp
@@ -39,7 +39,7 @@ MrkTests::~MrkTests()
 //-----------------------------------------------------------------------------
 bool MrkTests::init(int domainId, int exerciseId, int testId, int markerId, int snapshotId)
 {
-  INFO_LOG() << "MrkTests::init() "
+  INFO_LOG(m_logger) << "MrkTests::init() "
                      << " domainId:" << domainId
                      << " exerciseId:" << exerciseId
                      << " testId: " << testId
@@ -58,18 +58,18 @@ bool MrkTests::init(int domainId, int exerciseId, int testId, int markerId, int
   m_ddsConnector->initPublisherSubscriber();
 
   // Access to FTC
-  DEBUG_LOG() << "create ftc";
+  DEBUG_LOG(m_logger) << "create ftc";
   m_ftc = MarkerManagement::Interface::Ftc::create(m_ddsConnector);
-  DEBUG_LOG() << "init ftc";
+  DEBUG_LOG(m_logger) << "init ftc";
   bool bRet = m_ftc->enableAll();
-  DEBUG_LOG() << "init end - bRet = " << bRet;
+  DEBUG_LOG(m_logger) << "init end - bRet = " << bRet;
 
   // Access to DTC
-  DEBUG_LOG() << "create dtc";
+  DEBUG_LOG(m_logger) << "create dtc";
   m_dtc = MarkerManagement::Interface::Dtc::create(m_ddsConnector);
-  DEBUG_LOG() << "init dtc";
+  DEBUG_LOG(m_logger) << "init dtc";
   bRet = m_dtc->enableAll();
-  DEBUG_LOG() << "init end - bRet = " << bRet;
+  DEBUG_LOG(m_logger) << "init end - bRet = " << bRet;
 
   return bRet;
 } // end of init()
@@ -77,7 +77,7 @@ bool MrkTests::init(int domainId, int exerciseId, int testId, int markerId, int
 //-----------------------------------------------------------------------------
 void MrkTests::startTest()
 {
-  INFO_LOG() << "startTest() exerciseId:" << m_exerciseId
+  INFO_LOG(m_logger) << "startTest() exerciseId:" << m_exerciseId
                      << " testId:" << m_testId
                      << " markerId:" << m_markerId
                      ;
@@ -112,10 +112,10 @@ void MrkTests::tryCreate()
   MarkerModifyRequest data;
   getMarkerCreateRequestData(data);
 
-  INFO_LOG() << "trying to send MarkerCreateRequest";
+  INFO_LOG(m_logger) << "trying to send MarkerCreateRequest";
   if (!m_ftc->markerModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
 } // end of tryCreate()
@@ -127,10 +127,10 @@ void MrkTests::tryModify()
   MarkerModifyRequest data;
   getMarkerModifyRequestData(data);
 
-  INFO_LOG() << "trying to send MarkerModifyRequest for markerId:" << data.id();
+  INFO_LOG(m_logger) << "trying to send MarkerModifyRequest for markerId:" << data.id();
   if (!m_ftc->markerModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting modify data for markerId:" << data.id();
+    ERROR_LOG(m_logger) << "Error requesting modify data for markerId:" << data.id();
     failExit();
   }
 } // end of tryModify()
@@ -143,10 +143,10 @@ void MrkTests::tryRemove()
 
   data.id(m_markerId);
 
-  INFO_LOG() << "trying to send remove request for markerId:" << data.id();
+  INFO_LOG(m_logger) << "trying to send remove request for markerId:" << data.id();
   if (!m_ftc->markerRemoveRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting remove data for markerId:" << data.id();
+    ERROR_LOG(m_logger) << "Error requesting remove data for markerId:" << data.id();
     failExit();
   }
 } // end of tryRemove()
@@ -155,22 +155,22 @@ void MrkTests::tryRemove()
 void MrkTests::tryGetAllMarkers()
 {
   m_eTestStep = eGetAllMarkers;
-  DEBUG_LOG() << "trying to get all markers";
+  DEBUG_LOG(m_logger) << "trying to get all markers";
 
   m_dtc->waitForHistoricalDataMarker();
   const QMap<qint32, MarkerManagement::Marker> map = m_dtc->markers();
   if (map.isEmpty())
   {
-    ERROR_LOG() << "Error requesting all marker data";
+    ERROR_LOG(m_logger) << "Error requesting all marker data";
     QTimer::singleShot(0, qApp, &QCoreApplication::quit);
     return;
   }
 
-  INFO_LOG() << "Amout of existing markers:" << map.size();
+  INFO_LOG(m_logger) << "Amout of existing markers:" << map.size();
   m_markerId = map.firstKey();
   for (auto it = map.begin(); it != map.end(); ++it)
   {
-    INFO_LOG() << "Mrk(" << it.key() << ") :"
+    INFO_LOG(m_logger) << "Mrk(" << it.key() << ") :"
                        << " note:"            << it.value().note()
                        << " operatorId:"      << it.value().operatorId()
                        << " timeStamp:"       << it.value().timeStamp()
@@ -185,14 +185,14 @@ void MrkTests::tryGetAllMarkers()
 //-----------------------------------------------------------------------------
 void MrkTests::tryGetMarker()
 {
-  DEBUG_LOG() << "trying to get marker with id:" << m_markerId;
+  DEBUG_LOG(m_logger) << "trying to get marker with id:" << m_markerId;
 
   if (m_testId > 1)
     m_eTestStep = eGetMarker;
 
   if (m_markerId <= 0)
   {
-    ERROR_LOG() << "invalid markerId - test aborted.";
+    ERROR_LOG(m_logger) << "invalid markerId - test aborted.";
     failExit();
   }
 
@@ -201,12 +201,12 @@ void MrkTests::tryGetMarker()
 
   if (data.id() <= 0)
   {
-    ERROR_LOG() << "Error receiving data for markerId " << m_markerId << " returnVal:" << data.id();
+    ERROR_LOG(m_logger) << "Error receiving data for markerId " << m_markerId << " returnVal:" << data.id();
     failExit();
   }
   else
   {
-    INFO_LOG() << "Mrk(" << data.id() << ") :"
+    INFO_LOG(m_logger) << "Mrk(" << data.id() << ") :"
                        << " note:"            << data.note()
                        << " operatorId:"      << data.operatorId()
                        << " timeStamp:"       << data.timeStamp()
@@ -220,7 +220,7 @@ void MrkTests::tryGetMarker()
     {
       if (! onCompareCreatedData(data))
       {
-        ERROR_LOG() << "Compare created data failed!";
+        ERROR_LOG(m_logger) << "Compare created data failed!";
         failExit();
       }
       else
@@ -233,7 +233,7 @@ void MrkTests::tryGetMarker()
     {
       if (! onCompareModifiedData(data))
       {
-        ERROR_LOG() << "Compare modified data failed!";
+        ERROR_LOG(m_logger) << "Compare modified data failed!";
         failExit();
       }
       else
@@ -263,10 +263,10 @@ void MrkTests::tryCreateSnapshot()
   data.timeStamp(QDateTime::currentMSecsSinceEpoch());
   data.planOverlay("Plan Overlay");
 
-  INFO_LOG() << "trying to send SnapshotCreateRequest";
+  INFO_LOG(m_logger) << "trying to send SnapshotCreateRequest";
   if (!m_ftc->snapshotModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
 } // end of tryCreateSnapshot()
@@ -282,10 +282,10 @@ void MrkTests::tryModifySnapshot()
   data.description("Dies ist ein Test modify");
   data.planOverlay("Plan Overlay updated");
 
-  INFO_LOG() << "trying to send SnapshotModifyRequest for snapshotId:" << data.id();
+  INFO_LOG(m_logger) << "trying to send SnapshotModifyRequest for snapshotId:" << data.id();
   if (!m_ftc->snapshotModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting modify data for snapshotId:" << data.id();
+    ERROR_LOG(m_logger) << "Error requesting modify data for snapshotId:" << data.id();
     failExit();
   }
 } // end of tryModifySnapshot()
@@ -298,10 +298,10 @@ void MrkTests::tryRemoveSnapshot()
 
   data.id(m_snapshotId);
 
-  INFO_LOG() << "trying to send remove request for snapshotId:" << data.id();
+  INFO_LOG(m_logger) << "trying to send remove request for snapshotId:" << data.id();
   if (!m_ftc->snapshotRemoveRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting remove data for snapshotId:" << data.id();
+    ERROR_LOG(m_logger) << "Error requesting remove data for snapshotId:" << data.id();
     failExit();
   }
 } // end of tryRemoveSnapshot()
@@ -310,19 +310,19 @@ void MrkTests::tryRemoveSnapshot()
 //-----------------------------------------------------------------------------
 void MrkTests::onMarkerCreateReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got createReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got createReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   m_markerId = replyObject.id();
 
   if (replyObject.error())
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
     return;
   }
   else
-    DEBUG_LOG() << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
+    DEBUG_LOG(m_logger) << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
 
   if (m_testId == 0)
     //    QTimer::singleShot(0, this, &MrkTests::tryModify()));
@@ -338,17 +338,17 @@ void MrkTests::onMarkerModifyReply(const Core::FunctionReplyObject &replyObject)
   if (m_eTestStep == TestStep::eCreate)
     return onMarkerCreateReply(replyObject);
 
-  INFO_LOG() << "Got modifyRequest with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got modifyRequest with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   if (replyObject.error())
   {
-    ERROR_LOG() << "Error requesting modify data for id:" << replyObject.id();
+    ERROR_LOG(m_logger) << "Error requesting modify data for id:" << replyObject.id();
     failExit();
     return;
   }
   else
-    DEBUG_LOG() << "Requesting modify data for id:" << replyObject.id() << " ... ok.";
+    DEBUG_LOG(m_logger) << "Requesting modify data for id:" << replyObject.id() << " ... ok.";
 
   if (m_testId == 0)
     //    QTimer::singleShot(0, this, &MrkTests::tryDelete()));
@@ -361,17 +361,17 @@ void MrkTests::onMarkerModifyReply(const Core::FunctionReplyObject &replyObject)
 //-----------------------------------------------------------------------------
 void MrkTests::onMarkerRemoveReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got removeReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   if (replyObject.error())
   {
-    ERROR_LOG() << "Error requesting remove data for markerId:" << replyObject.id();
+    ERROR_LOG(m_logger) << "Error requesting remove data for markerId:" << replyObject.id();
     failExit();
     return;
   }
   else
-    DEBUG_LOG() << "Requesting remove data for markerId:" << replyObject.id() << " ... ok.";
+    DEBUG_LOG(m_logger) << "Requesting remove data for markerId:" << replyObject.id() << " ... ok.";
 
   if (m_testId == 0)
   {
@@ -386,19 +386,19 @@ void MrkTests::onMarkerRemoveReply(const Core::FunctionReplyObject &replyObject)
 //-----------------------------------------------------------------------------
 void MrkTests::onSnapshotCreateReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got createReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got createReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   m_snapshotId = replyObject.id();
 
   if (replyObject.error())
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
     return;
   }
   else
-    DEBUG_LOG() << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
+    DEBUG_LOG(m_logger) << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
 
   if (m_testId == 0)
     QTimer::singleShot(0, this, &MrkTests::tryModifySnapshot);
@@ -413,17 +413,17 @@ void MrkTests::onSnapshotModifyReply(const Core::FunctionReplyObject &replyObjec
   if (m_eTestStep == TestStep::eCreate)
     return onSnapshotCreateReply(replyObject);
 
-  INFO_LOG() << "Got modifyRequest with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got modifyRequest with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   if (replyObject.error())
   {
-    ERROR_LOG() << "Error requesting modify data for id:" << replyObject.id();
+    ERROR_LOG(m_logger) << "Error requesting modify data for id:" << replyObject.id();
     failExit();
     return;
   }
   else
-    DEBUG_LOG() << "Requesting modify data for id:" << replyObject.id() << " ... ok.";
+    DEBUG_LOG(m_logger) << "Requesting modify data for id:" << replyObject.id() << " ... ok.";
 
   if (m_testId == 0)
     QTimer::singleShot(0, this, &MrkTests::tryRemoveSnapshot);
@@ -435,21 +435,21 @@ void MrkTests::onSnapshotModifyReply(const Core::FunctionReplyObject &replyObjec
 //-----------------------------------------------------------------------------
 void MrkTests::onSnapshotRemoveReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got removeReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   if (replyObject.error())
   {
-    ERROR_LOG() << "Error requesting remove data for markerId:" << replyObject.id();
+    ERROR_LOG(m_logger) << "Error requesting remove data for markerId:" << replyObject.id();
     failExit();
     return;
   }
   else
-    DEBUG_LOG() << "Requesting remove data for markerId:" << replyObject.id() << " ... ok.";
+    DEBUG_LOG(m_logger) << "Requesting remove data for markerId:" << replyObject.id() << " ... ok.";
 
   if (m_testId == 0)
   {
-    INFO_LOG() << "***** FTC/TDC test successfully finished. (used snapshotId:" << replyObject.id() << ") *****";
+    INFO_LOG(m_logger) << "***** FTC/TDC test successfully finished. (used snapshotId:" << replyObject.id() << ") *****";
     // ansonsten verheriger Ausstieg mit Errorlog.
   }
 
@@ -461,21 +461,21 @@ void MrkTests::onSnapshotRemoveReply(const Core::FunctionReplyObject &replyObjec
 //-----------------------------------------------------------------------------
 void MrkTests::onReceiveMarkerChanged(const Marker &data, DataModification modType)
 {
-  //  INFO_LOG() << "onReceiveMarkerChanged()  markerId:" << data.id()
+  //  INFO_LOG(m_logger) << "onReceiveMarkerChanged()  markerId:" << data.id()
   //                     << " modificationType: = " << (int)modType<< " received";
 
   switch (modType)
   {
   case DataModification::eAdded:
-    INFO_LOG() << "*** Marker added received. markerId:" << data.id();
+    INFO_LOG(m_logger) << "*** Marker added received. markerId:" << data.id();
     break;
 
   case DataModification::eModified:
-    INFO_LOG() << "*** Marker modified received. markerId:" << data.id();
+    INFO_LOG(m_logger) << "*** Marker modified received. markerId:" << data.id();
     break;
 
   case DataModification::eRemoved:
-    INFO_LOG() << "*** Marker removed received. markerId:" << data.id();
+    INFO_LOG(m_logger) << "*** Marker removed received. markerId:" << data.id();
     break;
   }
 
@@ -534,7 +534,7 @@ void MrkTests::getMarkerModifyRequestData(MarkerModifyRequest &data)
 //-----------------------------------------------------------------------------
 bool MrkTests::onCompareCreatedData(Marker &data)
 {
-  DEBUG_LOG() << "start onCompareCreatedData() for id :" << data.id();
+  DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id();
 
   // Vergleicht die zurueckgelesen Datan mit den statischen create Daten
 
@@ -558,7 +558,7 @@ bool MrkTests::onCompareCreatedData(Marker &data)
 
   if (createData.descriptions().size() != data.descriptions().size())
   {
-    ERROR_LOG() << "Error onCompareCreatedData() different number of description data.";
+    ERROR_LOG(m_logger) << "Error onCompareCreatedData() different number of description data.";
     failExit();
     return false;
   }
@@ -575,7 +575,7 @@ bool MrkTests::onCompareCreatedData(Marker &data)
 
       if (got.content() != expected.content())
       {
-        ERROR_LOG() << "Content for description does not match: "
+        ERROR_LOG(m_logger) << "Content for description does not match: "
                             << got.content() << " - "
                             << expected.content();
         failExit();
@@ -585,12 +585,12 @@ bool MrkTests::onCompareCreatedData(Marker &data)
   }
   if (foundCount != 3)
   {
-    ERROR_LOG() << "Did not found all three expected descriptions";
+    ERROR_LOG(m_logger) << "Did not found all three expected descriptions";
     failExit();
     return false;
   }
 
-  DEBUG_LOG() << "successfull finished onCompareCreatedData() for id :" << data.id();
+  DEBUG_LOG(m_logger) << "successfull finished onCompareCreatedData() for id :" << data.id();
 
   return true;
 } // end of onCompareCreatedData()
@@ -598,7 +598,7 @@ bool MrkTests::onCompareCreatedData(Marker &data)
 //-----------------------------------------------------------------------------
 bool MrkTests::onCompareModifiedData(Marker &data)
 {
-  DEBUG_LOG() << "start onCompareModifiedData() for id :" << data.id();
+  DEBUG_LOG(m_logger) << "start onCompareModifiedData() for id :" << data.id();
 
   MarkerModifyRequest modifyData;
 
@@ -632,7 +632,7 @@ bool MrkTests::onCompareModifiedData(Marker &data)
 
       if (got.content() != expected.content())
       {
-        ERROR_LOG() << "Content for description does not match: "
+        ERROR_LOG(m_logger) << "Content for description does not match: "
                             << got.content() << " - "
                             << expected.content();
         failExit();
@@ -642,12 +642,12 @@ bool MrkTests::onCompareModifiedData(Marker &data)
   }
   if (foundCount != 3)
   {
-    ERROR_LOG() << "Did not found all three expected descriptions";
+    ERROR_LOG(m_logger) << "Did not found all three expected descriptions";
     failExit();
     return false;
   }
 
-  DEBUG_LOG() << "successfull finished onCompareModifiedData() for id :" << data.id();
+  DEBUG_LOG(m_logger) << "successfull finished onCompareModifiedData() for id :" << data.id();
 
   return true;
 } // end of onCompareModifiedData()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/ModuleTests/mrk_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/ModuleTests/mrk_tests.h
index 04886cbb2..93e34a29f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/ModuleTests/mrk_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/ModuleTests/mrk_tests.h
@@ -65,6 +65,7 @@ protected Q_SLOTS:
   void onReceiveMarkerChanged(const Marker &data, DataModification modType);
 
 protected:
+  NGL::INGLLogger &m_logger;
   // Callbackfunctions for FTC
   void onMarkerCreateReply(const Core::FunctionReplyObject &replyObject);
   void onMarkerModifyReply(const Core::FunctionReplyObject &replyObject) override final;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/dds_handler.cpp
index 323326ce8..6a9b72c47 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/dds_handler.cpp
@@ -14,16 +14,16 @@ namespace MarkerManagement
 DdsHandler::DdsHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
   : m_ddsConnector(ddsConnector)
 {
-  DEBUG_LOG() << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
-  INFO_LOG() << "--- Start MarkerManagement DDSHandler.";
+  INFO_LOG(m_logger) << "--- Start MarkerManagement DDSHandler.";
 
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -36,10 +36,10 @@ bool DdsHandler::init(const QStringList &qosFileList)
   m_ddsFts = MarkerManagement::Interface::Fts::create(m_ddsConnector);
 
   bool bRet = m_ddsDts->enableAll();
-  INFO_LOG() << "Dts initialised";
+  INFO_LOG(m_logger) << "Dts initialised";
 
   bRet &= m_ddsFts->enableAll();
-  INFO_LOG() << "Fts initialised";
+  INFO_LOG(m_logger) << "Fts initialised";
 
   return bRet;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/dds_handler.h
index cac5d5de0..ad0a35611 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/dds_handler.h
@@ -29,6 +29,7 @@ public:
   std::shared_ptr<MarkerManagement::Interface::Fts> fts() const { return m_ddsFts; }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector>       m_ddsConnector;
   std::shared_ptr<Core::TopicLockMaster>            m_topicLockMaster;
   std::shared_ptr<MarkerManagement::Interface::Dts> m_ddsDts;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/handler_marker.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/handler_marker.cpp
index c3bcf37cd..63a21da14 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/handler_marker.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/handler_marker.cpp
@@ -32,14 +32,14 @@ HandlerMarker::~HandlerMarker()
 
 bool HandlerMarker::init()
 {
-  INFO_LOG() << "--- Start MarkerManagement HandlerMarker.";
+  INFO_LOG(m_logger) << "--- Start MarkerManagement HandlerMarker.";
 
   QVector<Database::MrkMarkerDescription> dataDescriptionVec;
 
   // read all marker from database
   if (!m_db->select(dataDescriptionVec))
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
 
@@ -63,7 +63,7 @@ bool HandlerMarker::init()
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       bRet = false;
       return;
     }
@@ -71,15 +71,15 @@ bool HandlerMarker::init()
   };
   if (!m_db->select(cb) || !bRet)
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
 
-  DEBUG_LOG() << "m_objectMarkerMap.size() = " << m_objectMarkerMap.size();
+  DEBUG_LOG(m_logger) << "m_objectMarkerMap.size() = " << m_objectMarkerMap.size();
 
   if (m_ddsHandler->fts() == nullptr)
   {
-    ERROR_LOG() << "m_ddsHandler->fts() == nullptr!";
+    ERROR_LOG(m_logger) << "m_ddsHandler->fts() == nullptr!";
     return false;
   }
 
@@ -90,10 +90,10 @@ bool HandlerMarker::init()
 void HandlerMarker::onMarkerModifyRequest(const rti::core::SampleIdentity &cookie,
                                           const Marker &request)
 {
-  DEBUG_LOG() << "MarkerModifyRequest: " << request;
+  DEBUG_LOG(m_logger) << "MarkerModifyRequest: " << request;
   auto ret = request.id() > 0 ? markerModifyRequest(request) : markerCreateRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_ddsHandler->fts()->markerModifyReply(cookie, ret);
 }
 //-----------------------------------------------------------------------------
@@ -132,10 +132,10 @@ Core::FunctionReplyObject HandlerMarker::markerModifyRequest(const Marker &reque
 void HandlerMarker::onMarkerRemoveRequest(const rti::core::SampleIdentity &cookie,
                                           const Core::RemoveElementRequest &request)
 {
-  DEBUG_LOG() << "MarkerRemoveRequest: " << request;
+  DEBUG_LOG(m_logger) << "MarkerRemoveRequest: " << request;
   auto ret = markerRemoveRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_ddsHandler->fts()->markerRemoveReply(cookie, ret);
 }
 //-----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/handler_marker.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/handler_marker.h
index 68d29db43..b4dfbade1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/handler_marker.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/handler_marker.h
@@ -29,6 +29,8 @@ public:
   bool init();
 
 private: // methods
+
+NGL::INGLLogger &m_logger;
   void onMarkerModifyRequest(const rti::core::SampleIdentity &cookie,
                              const Marker &request) override final;
   Core::FunctionReplyObject markerCreateRequest(const Marker &request);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/handler_snapshot.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/handler_snapshot.cpp
index d7b996989..255d09a8e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/handler_snapshot.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/handler_snapshot.cpp
@@ -31,7 +31,7 @@ HandlerSnapshot::~HandlerSnapshot()
 
 bool HandlerSnapshot::init()
 {
-  INFO_LOG() << "--- Start MarkerManagement HandlerSnapshot.";
+  INFO_LOG(m_logger) << "--- Start MarkerManagement HandlerSnapshot.";
 
   bool bRet = true;
   // create markerObjects
@@ -44,7 +44,7 @@ bool HandlerSnapshot::init()
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       bRet = false;
       return;
     }
@@ -52,11 +52,11 @@ bool HandlerSnapshot::init()
   };
   if (!m_db->select(cb) || !bRet)
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
 
-  DEBUG_LOG() << "m_objectSnapshotMap.size() = " << m_objectSnapshotMap.size();
+  DEBUG_LOG(m_logger) << "m_objectSnapshotMap.size() = " << m_objectSnapshotMap.size();
 
   return true;
 } // end of init()
@@ -65,10 +65,10 @@ bool HandlerSnapshot::init()
 void HandlerSnapshot::onSnapshotModifyRequest(const rti::core::SampleIdentity &cookie,
                                               const Snapshot &request)
 {
-  DEBUG_LOG() << "SnapshotModifyRequest: " << request;
+  DEBUG_LOG(m_logger) << "SnapshotModifyRequest: " << request;
   auto ret = request.id() > 0 ? snapshotModifyRequest(request) : snapshotCreateRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_ddsHandler->fts()->snapshotModifyReply(cookie, ret);
 
 } // end of onSnapshotModifyRequest()
@@ -118,7 +118,7 @@ Core::FunctionReplyObject HandlerSnapshot::snapshotModifyRequest(const Snapshot
 void HandlerSnapshot::onSnapshotRemoveRequest(const rti::core::SampleIdentity &cookie,
                                               const Core::RemoveElementRequest &request)
 {
-  DEBUG_LOG() << "onSnapshotRemoveRequest() id:" << request.id();
+  DEBUG_LOG(m_logger) << "onSnapshotRemoveRequest() id:" << request.id();
 
   Core::FunctionReplyObject ret;
   ObjectSnapshot *ifs = m_objectSnapshotMap.value(request.id());
@@ -136,7 +136,7 @@ void HandlerSnapshot::onSnapshotRemoveRequest(const rti::core::SampleIdentity &c
   }
 
   if (ret.error())
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
   else
   {
     // delete ObjectSnapshot
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/handler_snapshot.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/handler_snapshot.h
index e17bcef4e..780f2cff2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/handler_snapshot.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/handler_snapshot.h
@@ -29,6 +29,8 @@ public:
   bool init();
 
 private: // methods
+
+NGL::INGLLogger &m_logger;
   void onSnapshotModifyRequest(const rti::core::SampleIdentity &cookie,
                                const Snapshot &request) override final;
   Core::FunctionReplyObject snapshotCreateRequest(const Snapshot &request);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/initialization.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/initialization.cpp
index 2d4c807ce..e7b9135b7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/initialization.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/initialization.cpp
@@ -36,14 +36,14 @@ Initialization::~Initialization()
 
 bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector, const QSqlDatabase &sqlDb)
 {
-  INFO_LOG() << "--- Start MarkerManagement Initialization.";
+  INFO_LOG(m_logger) << "--- Start MarkerManagement Initialization.";
 
   // initialize DDS
   // for MarkerManagement => exerciseId = partitionId
   m_ddsHandler = std::make_shared<DdsHandler>(ddsConnector);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation DdsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
     return false;
   }
 
@@ -51,7 +51,7 @@ bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector
   m_dbHandler = std::make_shared<DbHandler>();
   if (!m_dbHandler->init(ddsConnector->getPartitionId(), sqlDb))
   {
-    ERROR_LOG() << "Initialisation dbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
     return false;
   }
 
@@ -61,7 +61,7 @@ bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector
   m_handlerMarker.reset(new HandlerMarker(m_ddsHandler, m_dbHandler->db()));
   m_handlerSnapshot.reset(new HandlerSnapshot(m_ddsHandler, m_dbHandler->db()));
 
-  INFO_LOG() << "MRK Handler initialized.";
+  INFO_LOG(m_logger) << "MRK Handler initialized.";
 
   return true;
 } // end of initialize()
@@ -72,16 +72,16 @@ bool Initialization::loadFromDatabase()
 {
   if (!m_handlerMarker || !m_handlerMarker->init())
   {
-    ERROR_LOG() << "Initialisation HandlerMarker failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerMarker failed.";
     return false;
   }
   if (!m_handlerSnapshot || !m_handlerSnapshot->init())
   {
-    ERROR_LOG() << "Initialisation HandlerSnapshot failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerSnapshot failed.";
     return false;
   }
 
-  INFO_LOG() << "MRK Handler initialized.";
+  INFO_LOG(m_logger) << "MRK Handler initialized.";
   return true;
 } // end of loadFromDatabase()
 //-----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/initialization.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/initialization.h
index 6b45f33f5..1d09bbda2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/initialization.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/initialization.h
@@ -37,6 +37,8 @@ public:
   bool loadFromDatabase();
 
 private: // attributes
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<DbHandler>                m_dbHandler;
   std::shared_ptr<DdsHandler>               m_ddsHandler;
   std::unique_ptr<HandlerMarker>            m_handlerMarker;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_marker.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_marker.cpp
index 2b656fb39..04035bfe4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_marker.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_marker.cpp
@@ -39,9 +39,9 @@ Core::FunctionReplyObject ObjectMarker::createObject(const Marker &data)
 
     // Neue DB Id in lokale Struktur uebernehmen
     m_dataMarkerObject.id(dbDataMarker.id);
-    DEBUG_LOG() << "New MarkerId: " << dbDataMarker.id;
+    DEBUG_LOG(m_logger) << "New MarkerId: " << dbDataMarker.id;
 
-    DEBUG_LOG() << "Handle MarkerDescription for markerId:" << dbDataMarker.id << "  number of depending descriptions: " << data.descriptions().size();
+    DEBUG_LOG(m_logger) << "Handle MarkerDescription for markerId:" << dbDataMarker.id << "  number of depending descriptions: " << data.descriptions().size();
 
     // Behandlung von MarkerDescription
     for (size_t i = 0; i < data.descriptions().size(); ++i)
@@ -81,10 +81,10 @@ Core::FunctionReplyObject ObjectMarker::updateObject(const Marker &data)
   if (!m_db->update(dbDataMarker))
     return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating MrkMarker-data into database"));
 
-  DEBUG_LOG() << "Data changed for markerId: " << m_dataMarkerObject.id();
+  DEBUG_LOG(m_logger) << "Data changed for markerId: " << m_dataMarkerObject.id();
 
 
-  INFO_LOG() << "Handle MarkerDescriptions for markerId:" << data.id()
+  INFO_LOG(m_logger) << "Handle MarkerDescriptions for markerId:" << data.id()
                      << ". Number of pending descriptions (new/previous):"
                      << data.descriptions().size() << "/" << m_dataMarkerObject.descriptions().size();
 
@@ -122,7 +122,7 @@ Core::FunctionReplyObject ObjectMarker::updateObject(const Marker &data)
     }
     if (!bFound)
     {
-      DEBUG_LOG() << "Description with id " << oldDesc.id() << " was removed - removing from db";
+      DEBUG_LOG(m_logger) << "Description with id " << oldDesc.id() << " was removed - removing from db";
       if (!m_db->removeMrkMarkerDescription(oldDesc.id()))
         return Core::FunctionReplyObject(data.id(),
                                          tr_lts("dds", "MarkerDescription with id %1 can not be removed"))
@@ -184,10 +184,10 @@ bool ObjectMarker::isUsed() const
 
 void ObjectMarker::onPublishData()
 {
-  INFO_LOG() << "Publish MrkMarker-data to dds   markerId:" << m_dataMarkerObject.id() ;
+  INFO_LOG(m_logger) << "Publish MrkMarker-data to dds   markerId:" << m_dataMarkerObject.id() ;
 
   if (!m_ddsHandler->dts()->publish(m_dataMarkerObject))
-    WARNING_LOG() << "Error publishing MrkMarker-data to dds";
+    WARNING_LOG(m_logger) << "Error publishing MrkMarker-data to dds";
 
 } // end of onPublishData()
 //-----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_marker.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_marker.h
index 51ae0f144..1d8174a08 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_marker.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_marker.h
@@ -48,9 +48,11 @@ public:
   static MarkerDescription toDdsData(const Database::MrkMarkerDescription &dbData);  // db -> dds
 
 private:
+  NGL::INGLLogger &m_logger;
   void onPublishData();
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>        m_ddsHandler;
   std::shared_ptr<DatabaseInterface> m_db;
   Marker                             m_dataMarkerObject;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_snapshot.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_snapshot.cpp
index 8055f9f49..ab1802935 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_snapshot.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_snapshot.cpp
@@ -37,7 +37,7 @@ Core::FunctionReplyObject ObjectSnapshot::createObject(const MarkerManagement::S
   }
   // Neue DB Id in lokale Struktur uebernehmen
   m_dataSnapshot.id(dbDataSnapshot.id);
-  DEBUG_LOG() << "New SnapshotrId: " << dbDataSnapshot.id;
+  DEBUG_LOG(m_logger) << "New SnapshotrId: " << dbDataSnapshot.id;
 
   // Publish Data via DTS
   onPublishData();
@@ -58,7 +58,7 @@ Core::FunctionReplyObject ObjectSnapshot::updateObject(const Snapshot &data)
     return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating MrkSnapshot-data into database"));
 
   m_dataSnapshot = data;
-  DEBUG_LOG() << "Data changed for snapshotId: " << m_dataSnapshot.id();
+  DEBUG_LOG(m_logger) << "Data changed for snapshotId: " << m_dataSnapshot.id();
 
   // Publish Data via DTS
   onPublishData();
@@ -88,10 +88,10 @@ bool ObjectSnapshot::isValid() const
 
 void ObjectSnapshot::onPublishData()
 {
-  INFO_LOG() << "Publish MrkSnapshot -data to dds   snapshotId:" << m_dataSnapshot.id() ;
+  INFO_LOG(m_logger) << "Publish MrkSnapshot -data to dds   snapshotId:" << m_dataSnapshot.id() ;
 
   if (!m_ddsHandler->dts()->publish(m_dataSnapshot))
-    ERROR_LOG() << "Error publishing MrkMarker-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing MrkMarker-data to dds";
 
 } // end of onPublishData()
 //-----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_snapshot.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_snapshot.h
index 056103c7e..d61cf2cf5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_snapshot.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_snapshot.h
@@ -41,10 +41,12 @@ public:
   static Snapshot toDdsData(const Database::MrkSnapshot &dbData);  // db -> dds
 
 private:
+  NGL::INGLLogger &m_logger;
   void onPublishData();
 
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler> m_ddsHandler;
   std::shared_ptr<DatabaseInterface>  m_db;
   MarkerManagement::Snapshot  m_dataSnapshot;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/ModuleTests/msg_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/ModuleTests/msg_tests.cpp
index fa84c0c81..b0494f47e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/ModuleTests/msg_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/ModuleTests/msg_tests.cpp
@@ -59,7 +59,7 @@ MsgTests::~MsgTests()
 
 bool MsgTests::init(int domainId, int testId)
 {
-  INFO_LOG() << "init begin";
+  INFO_LOG(m_logger) << "init begin";
 
   m_testId = testId;
 
@@ -79,7 +79,7 @@ bool MsgTests::init(int domainId, int testId)
 
 void MsgTests::startTest()
 {
-  INFO_LOG() << "startTest m_testId=" << m_testId;
+  INFO_LOG(m_logger) << "startTest m_testId=" << m_testId;
   if (m_testId <= 1) // CreateOperatorMessage
   {
     m_testStep = TestCase::CreateOperator;
@@ -109,7 +109,7 @@ void MsgTests::startTest()
 
 void MsgTests::tryCreateOperatorMessage()
 {
-  INFO_LOG() << "trying to send createRequest Operator Message";
+  INFO_LOG(m_logger) << "trying to send createRequest Operator Message";
   Messaging::AddressType receiverType;
   Messaging::AddressType senderType;
 
@@ -155,7 +155,7 @@ void MsgTests::tryCreateOperatorMessage()
 
   if (!m_ftc->createOperatorMessageRequest(CreateOperatorMessageRequest(recipientIds, exerciseId, sender, subject, m_expectedMessage, senderType, receiverType), this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
 } // tryCreateOperatorMessage
@@ -169,29 +169,29 @@ void MsgTests::checkMessageOnDdsAfterCreate()
   const QMap<int, Messaging::OperatorMessage> messages = m_dtc->operatorMessages();
   for (const auto &om : messages)
   {
-    INFO_LOG() << "checkMessageOnDdsAfterCreate om.id = " << om.id();
+    INFO_LOG(m_logger) << "checkMessageOnDdsAfterCreate om.id = " << om.id();
 
     if (om.message() == m_expectedMessage)
     {
-      DEBUG_LOG() << "senderId: " << om.senderId() << ", recipientId: " << om.recipientId();
+      DEBUG_LOG(m_logger) << "senderId: " << om.senderId() << ", recipientId: " << om.recipientId();
       if (om.senderId() != 0 && om.recipientId() == 0)
       {
         m_msgIdSendMessage = om.id();
-        DEBUG_LOG() << "m_msgIdSendMessage=" << m_msgIdSendMessage;
+        DEBUG_LOG(m_logger) << "m_msgIdSendMessage=" << m_msgIdSendMessage;
         ++m_messageCount;
       }
 
       if (om.senderId() != 0 && om.recipientId() != 0)
       {
         m_msgIdRecvMessage = om.id();
-        DEBUG_LOG() << "m_msgIdRecvMessage=" << m_msgIdRecvMessage;
+        DEBUG_LOG(m_logger) << "m_msgIdRecvMessage=" << m_msgIdRecvMessage;
         ++m_messageCount;
       }
     }
     // msg count == 3 -> one for sender, two for receiver
     if (m_messageCount == 3)
     {
-      INFO_LOG() << "Success: receiving messages - got: " << m_messageCount << " expected: 3";
+      INFO_LOG(m_logger) << "Success: receiving messages - got: " << m_messageCount << " expected: 3";
       ExitSuccess();
       return;
     }
@@ -203,7 +203,7 @@ void MsgTests::checkMessageOnDdsAfterCreate()
     return;
   }
 
-  ERROR_LOG() << "Error receiving messages - got: " << m_messageCount << " expected: 3";
+  ERROR_LOG(m_logger) << "Error receiving messages - got: " << m_messageCount << " expected: 3";
   failExit();
 } // checkMessageOnDdsAfterCreate
 
@@ -211,7 +211,7 @@ void MsgTests::checkMessageOnDdsAfterModify()
 {
   // read from dds, check if data is as expected
   int isRead = 0;
-  INFO_LOG() << "checkMessageOnDdsAfterModify";
+  INFO_LOG(m_logger) << "checkMessageOnDdsAfterModify";
   m_dtc->waitForHistoricalDataOperatorMessage();
   const QMap<int, Messaging::OperatorMessage> messages = m_dtc->operatorMessages();
   switch (m_testStep)
@@ -220,18 +220,18 @@ void MsgTests::checkMessageOnDdsAfterModify()
   {
     for (const auto &om : messages)
     {
-      DEBUG_LOG() << "om.id()=" << om.id() << " om.isRead()=" << om.isRead();
+      DEBUG_LOG(m_logger) << "om.id()=" << om.id() << " om.isRead()=" << om.isRead();
       if (om.id() == m_msgIdRecvMessage && om.isRead() == true)
         ++isRead;
     }
     if (isRead == 1)
     {
-      INFO_LOG() << "modify messages isRead = TRUE: Success ";
+      INFO_LOG(m_logger) << "modify messages isRead = TRUE: Success ";
       ExitSuccess();
       return;
     }
 
-    ERROR_LOG() << "Error modify messages - got: " << isRead << " expected: 1";
+    ERROR_LOG(m_logger) << "Error modify messages - got: " << isRead << " expected: 1";
     failExit();
     break;
   }
@@ -239,34 +239,34 @@ void MsgTests::checkMessageOnDdsAfterModify()
   {
     // Message removed from DDS
 
-    DEBUG_LOG() << "m_numberMessages= " << m_numberMessages << " messages.size()= " << messages.size();
+    DEBUG_LOG(m_logger) << "m_numberMessages= " << m_numberMessages << " messages.size()= " << messages.size();
     if (m_numberMessages > messages.size())
     {
-      INFO_LOG() << "modify messages isDeleted = TRUE: Success ";
+      INFO_LOG(m_logger) << "modify messages isDeleted = TRUE: Success ";
       ExitSuccess();
       return;
     }
 
 
-    ERROR_LOG() << "Error modify messages - got: " << messages.size() << " expected less than " << m_numberMessages;
+    ERROR_LOG(m_logger) << "Error modify messages - got: " << messages.size() << " expected less than " << m_numberMessages;
     failExit();
     break;
   }
   case TestCase::SendToTetra:
   {
-    DEBUG_LOG() << "SendToTetra reply m_numberMessages= " << m_numberMessages << " messages.size()= " << messages.size();
+    DEBUG_LOG(m_logger) << "SendToTetra reply m_numberMessages= " << m_numberMessages << " messages.size()= " << messages.size();
     ExitSuccess();
     break;
   }
   case TestCase::ReceiveFromTetra:
   {
-    DEBUG_LOG() << "ReceiveFromTetra reply m_numberMessages= " << m_numberMessages << " messages.size()= " << messages.size();
+    DEBUG_LOG(m_logger) << "ReceiveFromTetra reply m_numberMessages= " << m_numberMessages << " messages.size()= " << messages.size();
     ExitSuccess();
     break;
   }
   default:
   {
-    INFO_LOG() << "Nothing to do in this TestCase";
+    INFO_LOG(m_logger) << "Nothing to do in this TestCase";
   }
   }
 } // checkMessageOnDdsAfterModify
@@ -275,7 +275,7 @@ void MsgTests::checkMessageOnDdsAfterDelete()
 {
   // read from dds, check if data is as expected
   int isDeleted = 0;
-  INFO_LOG() << "checkMessageOnDdsAfterModify";
+  INFO_LOG(m_logger) << "checkMessageOnDdsAfterModify";
   m_dtc->waitForHistoricalDataOperatorMessage();
   const QMap<int, Messaging::OperatorMessage> messages = m_dtc->operatorMessages();
   for (const auto &om : messages)
@@ -285,18 +285,18 @@ void MsgTests::checkMessageOnDdsAfterDelete()
   }
   if (isDeleted == 1)
   {
-    INFO_LOG() << "modify messages delete: Success ";
+    INFO_LOG(m_logger) << "modify messages delete: Success ";
     return;
   }
 
 
-  ERROR_LOG() << "Error modify messages - got: " << isDeleted << " expected: 1";
+  ERROR_LOG(m_logger) << "Error modify messages - got: " << isDeleted << " expected: 1";
   failExit();
 } // checkMessageOnDdsAfterDelete
 
 void MsgTests::markMessageAsRead()
 {
-  INFO_LOG() << "trying to mark Message as read m_msgIdRecvMessage =" << m_msgIdRecvMessage;
+  INFO_LOG(m_logger) << "trying to mark Message as read m_msgIdRecvMessage =" << m_msgIdRecvMessage;
 
   int32_t id = m_msgIdRecvMessage;
   bool isRead = true;
@@ -305,14 +305,14 @@ void MsgTests::markMessageAsRead()
 
   if (!m_ftc->modifyOperatorMessageRequest(ModifyOperatorMessageRequest(id, isRead, isSend, isDeleted), this))
   {
-    ERROR_LOG() << "Error mark Message as read";
+    ERROR_LOG(m_logger) << "Error mark Message as read";
     failExit();
   }
 } // markMessageAsRead
 
 void MsgTests::markMessageAsDeleted()
 {
-  INFO_LOG() << "trying to mark Message as deleted m_msgIdRecvMessage =" << m_msgIdRecvMessage;
+  INFO_LOG(m_logger) << "trying to mark Message as deleted m_msgIdRecvMessage =" << m_msgIdRecvMessage;
 
   int32_t id = m_msgIdRecvMessage;
   bool isRead = true;
@@ -320,21 +320,21 @@ void MsgTests::markMessageAsDeleted()
   bool isDeleted = true;
 
   m_dtc->waitForHistoricalDataOperatorMessage();
-  DEBUG_LOG() << "m_numberMessages =" << m_numberMessages;
+  DEBUG_LOG(m_logger) << "m_numberMessages =" << m_numberMessages;
 
   if (!m_ftc->modifyOperatorMessageRequest(ModifyOperatorMessageRequest(id, isRead, isSend, isDeleted), this))
   {
-    ERROR_LOG() << "Error mark Message as deleted";
+    ERROR_LOG(m_logger) << "Error mark Message as deleted";
     failExit();
   }
 } // markMessageAsDeleted
 
 void MsgTests::onCreateOperatorMessageReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "onCreateOperatorMessageReply, error = " << replyObject.error();
+  INFO_LOG(m_logger) << "onCreateOperatorMessageReply, error = " << replyObject.error();
   if (replyObject.error())
   {
-    ERROR_LOG() << "Error creating new message - aborting";
+    ERROR_LOG(m_logger) << "Error creating new message - aborting";
     failExit();
   }
   else
@@ -348,17 +348,17 @@ void MsgTests::onCreateOperatorMessageReply(const Core::FunctionReplyObject &rep
       QTimer::singleShot(1000, this, &MsgTests::checkMessageOnDdsAfterCreate);
       break;
     default:
-      INFO_LOG() << "Nothing to do in this Case";
+      INFO_LOG(m_logger) << "Nothing to do in this Case";
     }
   }
 } // onCreateOperatorMessageReply
 
 void MsgTests::onModifyOperatorMessageReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "onModifyOperatorMessageReply, error = " << replyObject.error();
+  INFO_LOG(m_logger) << "onModifyOperatorMessageReply, error = " << replyObject.error();
   if (replyObject.error())
   {
-    ERROR_LOG() << "Error modify message - aborting";
+    ERROR_LOG(m_logger) << "Error modify message - aborting";
     failExit();
   }
   else
@@ -371,7 +371,7 @@ void MsgTests::onModifyOperatorMessageReply(const Core::FunctionReplyObject &rep
 /*
 void MsgTests::onSendEquipmentMessageReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "************** onSendEquipmentMessageReply TODO isRead = TRUE setzen: id = **********************";
+  INFO_LOG(m_logger) << "************** onSendEquipmentMessageReply TODO isRead = TRUE setzen: id = **********************";
 }
 
 */
@@ -383,7 +383,7 @@ void MsgTests::failExit()
 
 void MsgTests::ExitSuccess()
 {
-  DEBUG_LOG() << "SUCCESS";
+  DEBUG_LOG(m_logger) << "SUCCESS";
   m_bTestsSuccessful = true;
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 } // ExitSuccess
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/ModuleTests/msg_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/ModuleTests/msg_tests.h
index 1db859d7e..c9d922d70 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/ModuleTests/msg_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/ModuleTests/msg_tests.h
@@ -52,6 +52,7 @@ protected Q_SLOTS:
   void markMessageAsRead();
   void markMessageAsDeleted();
 protected:
+  NGL::INGLLogger &m_logger;
   void onCreateOperatorMessageReply(const Core::FunctionReplyObject &replyObject) override final;
   void onModifyOperatorMessageReply(const Core::FunctionReplyObject &replyObject) override final;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/dds_handler.cpp
index 7733123d2..13db90f77 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/dds_handler.cpp
@@ -16,7 +16,7 @@ namespace Messaging
 DdsHandler::DdsHandler(int domainId)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::AllExercises))
 {
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 } // end of ctor()DdsHandler
 //-----------------------------------------------------------------------------
 
@@ -24,7 +24,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -41,12 +41,12 @@ bool DdsHandler::init(const QStringList &qosFileList)
   // DTS
   m_ddsDts = Messaging::Interface::Dts::create(m_ddsConnector);
   bool bRet = m_ddsDts->enableAll();
-  INFO_LOG() << "Dts initialised";
+  INFO_LOG(m_logger) << "Dts initialised";
 
   // FTS
   m_ddsFts = Messaging::Interface::Fts::create(m_ddsConnector);
   bRet &= m_ddsFts->enableAll();
-  INFO_LOG() << "Fts initialised";
+  INFO_LOG(m_logger) << "Fts initialised";
 
   return bRet;
 } // end of init()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/dds_handler.h
index 8c4f2fe25..8f8b5d0ef 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/dds_handler.h
@@ -44,6 +44,7 @@ public:
 private:
 
 
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<Core::Interface::Dtc>       m_dtcCore;
   std::shared_ptr<Core::Pacemaker>            m_pacemaker;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/exercise_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/exercise_handler.cpp
index c2f780a59..062644b11 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/exercise_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/exercise_handler.cpp
@@ -26,7 +26,7 @@ ExerciseHandler::ExerciseHandler(const std::shared_ptr<DDSConnector::DdsConnecto
 bool ExerciseHandler::init()
 {
   m_ddsConnector->initPublisherSubscriber();
-  DEBUG_LOG() << "ExerciseHandler::init m_ddsConnector=" << m_ddsConnector
+  DEBUG_LOG(m_logger) << "ExerciseHandler::init m_ddsConnector=" << m_ddsConnector
                       << " m_exerciseId=" << m_exerciseId;
   m_tabFtc = TrainingAreaBase::Interface::Ftc::create(m_ddsConnector);
   bool retVal = m_tabFtc->enableSendEquipmentMessage();
@@ -43,7 +43,7 @@ bool ExerciseHandler::sendEquipmentMessage(const TrainingAreaBase::SendEquipment
 {
   if (!m_tabFtc)
     return false;
-  DEBUG_LOG() << "ExerciseHandler::sendEquipmentMessage: " << request;
+  DEBUG_LOG(m_logger) << "ExerciseHandler::sendEquipmentMessage: " << request;
   m_idleTimer->stop();
   return m_tabFtc->sendEquipmentMessageRequest(request, this);
 }
@@ -52,7 +52,7 @@ bool ExerciseHandler::sendOcEquipmentMessage(const OcSituationServer::SendEquipm
 {
   if (!m_ossFtc)
     return false;
-  DEBUG_LOG() << "ExerciseHandler::sendOcEquipmentMessage: "<< request;
+  DEBUG_LOG(m_logger) << "ExerciseHandler::sendOcEquipmentMessage: "<< request;
   m_idleTimer->stop();
   return m_ossFtc->sendEquipmentMessageOcRequest(request, this);
 }
@@ -64,19 +64,19 @@ int ExerciseHandler::exerciseId() const
 
 void ExerciseHandler::onSendEquipmentMessageReply(const Core::FunctionReplyObject &replyObject)
 {
-  DEBUG_LOG()<<"ExerciseHandler::onSendEquipmentMessageReply";
+  DEBUG_LOG(m_logger)<<"ExerciseHandler::onSendEquipmentMessageReply";
   m_idleTimer->start();
   if (replyObject.error())
-    ERROR_LOG() << replyObject();
+    ERROR_LOG(m_logger) << replyObject();
   emit equipmentMessageReply(replyObject.id(), !replyObject.error());
 }
 
 void ExerciseHandler::onSendEquipmentMessageOcReply(const Core::FunctionReplyObject &replyObject)
 {
-  DEBUG_LOG()<<"ExerciseHandler::onSendEquipmentMessageOcReply";
+  DEBUG_LOG(m_logger)<<"ExerciseHandler::onSendEquipmentMessageOcReply";
   m_idleTimer->start();
   if (replyObject.error())
-    ERROR_LOG() << replyObject();
+    ERROR_LOG(m_logger) << replyObject();
   emit equipmentMessageOcReply(replyObject.id(), !replyObject.error());
 }
 } // namespace Messaging
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/exercise_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/exercise_handler.h
index fad28d11d..c20db984c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/exercise_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/exercise_handler.h
@@ -35,9 +35,11 @@ Q_SIGNALS:
   void equipmentMessageReply(int msgId, bool sentSuccessful);
   void equipmentMessageOcReply(int replyId, bool sentSuccessful);
 private:
+  NGL::INGLLogger &m_logger;
   void onSendEquipmentMessageReply(const Core::FunctionReplyObject &replyObject) override;
   void onSendEquipmentMessageOcReply(const Core::FunctionReplyObject &replyObject) override;
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<TrainingAreaBase::Interface::Ftc> m_tabFtc;
   std::shared_ptr<OcSituationServer::Interface::Ftc> m_ossFtc;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/exercises_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/exercises_handler.cpp
index 994a3a56e..1d93a8860 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/exercises_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/exercises_handler.cpp
@@ -36,7 +36,7 @@ bool ExercisesHandler::init()
   if (!m_ppmDtc->enableEquipmentExerciseMapping())
     return false;
 
-  ERROR_LOG() << "# eem: " << m_ppmDtc->equipmentExerciseMappings().size();
+  ERROR_LOG(m_logger) << "# eem: " << m_ppmDtc->equipmentExerciseMappings().size();
   return true;
 }
 
@@ -56,7 +56,7 @@ bool ExercisesHandler::sendEquipmentMessage(const TrainingAreaBase::SendEquipmen
   auto it = m_equipNo2ExerciseId.constFind(equipmentNumber);
   if (it == m_equipNo2ExerciseId.cend())
   {
-    ERROR_LOG() << "Can not send equipment message to training area - equipment number "
+    ERROR_LOG(m_logger) << "Can not send equipment message to training area - equipment number "
                         << equipmentNumber << " not known";
     return false;
   }
@@ -72,7 +72,7 @@ bool ExercisesHandler::sendOcEquipmentMessage(const OcSituationServer::SendEquip
   auto it = m_equipNo2ExerciseId.constFind(equipmentNumber);
   if (it == m_equipNo2ExerciseId.cend())
   {
-    ERROR_LOG() << "Can not send equipment message to training area - equipment number "
+    ERROR_LOG(m_logger) << "Can not send equipment message to training area - equipment number "
                         << equipmentNumber << " not known";
     return false;
   }
@@ -86,10 +86,10 @@ ExerciseHandler *ExercisesHandler::exerciseHandlerForExerciseId(int exerciseId)
   if (itEH != m_exerciseHandler.end())
     return itEH.value();
 
-  DEBUG_LOG() << "new ExerciseHandler for id " << exerciseId;
+  DEBUG_LOG(m_logger) << "new ExerciseHandler for id " << exerciseId;
   auto exH = new ExerciseHandler(m_ddsHandler->ddsConnector(), exerciseId);
   bool result = exH->init();
-  DEBUG_LOG()<<"result init ="<<result;
+  DEBUG_LOG(m_logger)<<"result init ="<<result;
   connect(exH, &ExerciseHandler::exerciseHandlerIdleTimeout,
           this, &ExercisesHandler::onExerciseHandlerIdleTimeout);
   m_exerciseHandler[exerciseId] = exH;
@@ -99,7 +99,7 @@ ExerciseHandler *ExercisesHandler::exerciseHandlerForExerciseId(int exerciseId)
 void ExercisesHandler::onEquipmentExerciseMappingChanged(const ParticipantManagement::EquipmentExerciseMapping &data,
                                                          DataModification modType)
 {
-  DEBUG_LOG() << "onEquipmentExerciseMappingChanged";
+  DEBUG_LOG(m_logger) << "onEquipmentExerciseMappingChanged";
 
   for (auto it = m_equipNo2ExerciseId.begin(); it != m_equipNo2ExerciseId.end(); )
   {
@@ -129,7 +129,7 @@ void ExercisesHandler::onEquipmentExerciseMappingChanged(const ParticipantManage
 
 void ExercisesHandler::onEquipmentMessageChanged(const TrainingAreaBase::EquipmentMessage &data, const DataModification modType)
 {
-  DEBUG_LOG() << "onEquipmentMessageChanged";
+  DEBUG_LOG(m_logger) << "onEquipmentMessageChanged";
   if (modType != DataModification::eAdded &&
       modType != DataModification::eModified)
     return;
@@ -137,7 +137,7 @@ void ExercisesHandler::onEquipmentMessageChanged(const TrainingAreaBase::Equipme
   const auto it = m_equipNo2ExerciseId.constFind(equipmentNumber);
   if (it == m_equipNo2ExerciseId.constEnd())
   {
-    ERROR_LOG() << "Got EquipmentMessage from unknown participant with equipment number " << equipmentNumber;
+    ERROR_LOG(m_logger) << "Got EquipmentMessage from unknown participant with equipment number " << equipmentNumber;
     return;
   }
   emit messageFromTrainingArea(data);
@@ -145,7 +145,7 @@ void ExercisesHandler::onEquipmentMessageChanged(const TrainingAreaBase::Equipme
 
 void ExercisesHandler::onExerciseHandlerIdleTimeout()
 {
-  DEBUG_LOG()<<"onExerciseHandlerIdleTimeout";
+  DEBUG_LOG(m_logger)<<"onExerciseHandlerIdleTimeout";
   ExerciseHandler *exH = qobject_cast<ExerciseHandler *>(sender());
   if (!exH)
     return;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/exercises_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/exercises_handler.h
index 8281756fe..16473eae3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/exercises_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/exercises_handler.h
@@ -40,8 +40,10 @@ private Q_SLOTS:
   void onEquipmentMessageChanged(const TrainingAreaBase::EquipmentMessage &data, const DataModification modType);
   void onExerciseHandlerIdleTimeout();
 private:
+  NGL::INGLLogger &m_logger;
   ExerciseHandler *exerciseHandlerForExerciseId(int exerciseId);
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler> m_ddsHandler;
   std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
   QHash<int, ExerciseHandler *> m_exerciseHandler;
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 fe54f2584..5158223ac 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
@@ -28,7 +28,7 @@ HandlerOperatorMessage::HandlerOperatorMessage(const std::shared_ptr<DdsHandler>
 //-----------------------------------------------------------------------------
 bool HandlerOperatorMessage::init()
 {
-  INFO_LOG() << "Start HandlerOperatorMessage.";
+  INFO_LOG(m_logger) << "Start HandlerOperatorMessage.";
 
   // read data from db-table 'msg_message_data'
   // add to internal buffer
@@ -41,7 +41,7 @@ bool HandlerOperatorMessage::init()
   };
   if (!m_db->select(cbMsgData)) // TODO (CE): nicht alle selektieren, nur die, die nicht gelöscht sind
   {
-    ERROR_LOG() << "Error reading data from database 'msg_message_data'!";
+    ERROR_LOG(m_logger) << "Error reading data from database 'msg_message_data'!";
     return false;
   }
 
@@ -66,10 +66,10 @@ bool HandlerOperatorMessage::init()
 void HandlerOperatorMessage::onCreateOperatorMessageRequest(const rti::core::SampleIdentity &cookie,
                                                             const CreateOperatorMessageRequest &request)
 {
-  DEBUG_LOG() << "onCreateOperatorMessageRequest" << request;
+  DEBUG_LOG(m_logger) << "onCreateOperatorMessageRequest" << request;
   auto ret = createOperatorMessageRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_ddsHandler->fts()->createOperatorMessageReply(cookie, ret);
 }
 
@@ -83,12 +83,12 @@ Core::FunctionReplyObject HandlerOperatorMessage::createOperatorMessageRequest(c
   Database::MsgMessageData newMsg;
   newMsg.timeStamp = m_ddsHandler->currentPartitionTime();
   newMsg.senderId = request.senderId();
-  INFO_LOG() << "newMsg.senderId=" << newMsg.senderId;
+  INFO_LOG(m_logger) << "newMsg.senderId=" << newMsg.senderId;
   newMsg.subject = QString::fromStdString(request.subject());
   newMsg.message = QString::fromStdString(request.message());
   newMsg.senderType = request.senderType();
 
-  INFO_LOG() << "newMsg.senderType.underlying()=" <<  newMsg.senderType.underlying();
+  INFO_LOG(m_logger) << "newMsg.senderType.underlying()=" <<  newMsg.senderType.underlying();
   newMsg.senderText = toAddressStr(newMsg.senderType, newMsg.senderId, request.exerciseId());
   newMsg.recipientType = request.recipientType();
   newMsg.exerciseId = request.exerciseId();
@@ -102,7 +102,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::createOperatorMessageRequest(c
   newMsg.isRead = false;
   newMsg.isDeleted = false;
 
-  INFO_LOG() << "newMsg.senderType=" << newMsg.senderType << " newMsg.receiverType=" << newMsg.recipientType;
+  INFO_LOG(m_logger) << "newMsg.senderType=" << newMsg.senderType << " newMsg.receiverType=" << newMsg.recipientType;
   // Insert message for sender
   newMsg.recipientId = 0;
   newMsg.recipientText = recipientText;
@@ -115,7 +115,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::createOperatorMessageRequest(c
 
   if (!ret.error() )
   {
-    INFO_LOG() << "insert message for each receiver";
+    INFO_LOG(m_logger) << "insert message for each receiver";
     // Insert message for each receiver
     //newMsg.senderId = 0; WHY?
     //if (correspondingOutboxMsgId > 0) // messages received from TETRA dont have a corresponding outbox id
@@ -125,14 +125,14 @@ Core::FunctionReplyObject HandlerOperatorMessage::createOperatorMessageRequest(c
     {
       newMsg.recipientId = recipientId;
       newMsg.recipientText = toAddressStr(newMsg.recipientType, newMsg.recipientId, newMsg.exerciseId);
-      INFO_LOG() << "recipientId: " << newMsg.recipientId;
+      INFO_LOG(m_logger) << "recipientId: " << newMsg.recipientId;
       ret = insertInDbAndPublish(newMsg);
       if (ret.error())
         break;
     }
   }
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
 
   return ret;
 
@@ -201,7 +201,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::insertInDbAndPublish(Database:
     newMsg.subject = newMsg.subject.left(m_maxSubjectLength);
     newMsg.message.clear();
   }
-  DEBUG_LOG() << "newMsg.senderId = " << newMsg.senderId;
+  DEBUG_LOG(m_logger) << "newMsg.senderId = " << newMsg.senderId;
   if (!m_db->insert(newMsg))
     return Core::FunctionReplyObject(0, tr_lts("dds", "Error adding message to database"));
 
@@ -214,20 +214,20 @@ Core::FunctionReplyObject HandlerOperatorMessage::insertInDbAndPublish(Database:
     int32_t equipmentNumber = m_exercisesHandler->findEquipmentNumber(newMsg.recipientId, newMsg.exerciseId);
     int32_t participantId = newMsg.recipientId;
 
-    INFO_LOG() << "equipmentNumber: " << equipmentNumber << ", participantId: " << participantId << ", exerciseId: " << newMsg.exerciseId;
+    INFO_LOG(m_logger) << "equipmentNumber: " << equipmentNumber << ", participantId: " << participantId << ", exerciseId: " << newMsg.exerciseId;
 
     // Length Check:
     const auto subject = newMsg.subject.toStdString();
     const auto message = newMsg.message.toStdString();
-    INFO_LOG() << "Message to OC: subject =" << subject << " Message =" << message;
+    INFO_LOG(m_logger) << "Message to OC: subject =" << subject << " Message =" << message;
 
     // only send to Tetra:
     if (newMsg.recipientId > 0)
     {
       int senderId = m_dbOperatorMessageData[newMsg.correspondingOutboxMessageId].senderId;
       AddressType senderType = m_dbOperatorMessageData[newMsg.correspondingOutboxMessageId].senderType;
-      INFO_LOG() << "SendEquipmentMessageRequest id =" << newMsg.id;
-      INFO_LOG() << " equipmentNumber=" << equipmentNumber
+      INFO_LOG(m_logger) << "SendEquipmentMessageRequest id =" << newMsg.id;
+      INFO_LOG(m_logger) << " equipmentNumber=" << equipmentNumber
                          << " participantId=" << participantId
                          << " newMsg.id=" << newMsg.id
                          << " newMsg.senderId=" << senderId
@@ -237,7 +237,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::insertInDbAndPublish(Database:
       static int s_requestId = 1;
       if (newMsg.recipientType == Messaging::AddressType_def::type::ObserverController)
       {
-        INFO_LOG() << "Send to OC senderId=" << newMsg.senderId << " sendertype: " << newMsg.senderType << "  subject " << subject;
+        INFO_LOG(m_logger) << "Send to OC senderId=" << newMsg.senderId << " sendertype: " << newMsg.senderType << "  subject " << subject;
         m_exercisesHandler->sendOcEquipmentMessage({s_requestId++,
                                                     {equipmentNumber},
                                                     //newMsg.id,
@@ -265,10 +265,10 @@ Core::FunctionReplyObject HandlerOperatorMessage::insertInDbAndPublish(Database:
 
   m_ddsHandler->dts()->publish(toDdsData(newMsg));
 
-  INFO_LOG() << "insertInDbAndPublish id=" << newMsg.id;
+  INFO_LOG(m_logger) << "insertInDbAndPublish id=" << newMsg.id;
   if (newMsg.recipientType == Messaging::AddressType_def::type::ObserverController && newMsg.recipientId > 0)
   {
-    INFO_LOG() << "O/C-Message in Member-Variable kopieren: id = " << newMsg.id;
+    INFO_LOG(m_logger) << "O/C-Message in Member-Variable kopieren: id = " << newMsg.id;
   }
 
   return Core::FunctionReplyObject(newMsg.id);
@@ -278,7 +278,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::insertInDbAndPublish(Database:
 // Modify db and publish
 Core::FunctionReplyObject HandlerOperatorMessage::modifyDbAndPublish(const Database::MsgMessageData &modMsg)
 {
-  INFO_LOG() << "modifyDbAndPublish" << " id=" << modMsg.id <<
+  INFO_LOG(m_logger) << "modifyDbAndPublish" << " id=" << modMsg.id <<
                         " isDeleted=" << modMsg.isDeleted <<
                         " modMsg.isRead=" << modMsg.isRead <<
                         " modMsg.isSend=" << modMsg.isSend <<
@@ -291,7 +291,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::modifyDbAndPublish(const Datab
   m_dbOperatorMessageData[modMsg.id] = modMsg;
   if (modMsg.isDeleted)
   {
-    INFO_LOG() << "Remove LTS_OperatorMessage from DDS id=" << modMsg.id;
+    INFO_LOG(m_logger) << "Remove LTS_OperatorMessage from DDS id=" << modMsg.id;
     m_ddsHandler->dts()->removeOperatorMessageByKey(modMsg.id);
   }
   else
@@ -303,7 +303,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::modifyDbAndPublish(const Datab
 // Receive from Tetra
 void HandlerOperatorMessage::onMesssageFromTrainingArea(const TrainingAreaBase::EquipmentMessage &data)
 {
-  INFO_LOG() << "************ onMesssageFromTrainingArea ********************";
+  INFO_LOG(m_logger) << "************ onMesssageFromTrainingArea ********************";
   onEquipmentMessageChanged(data, DataModification::eAdded);
 }
 
@@ -314,11 +314,11 @@ void HandlerOperatorMessage::onEquipmentMessageChanged(const TrainingAreaBase::E
     return;
 
   CreateOperatorMessageRequest request;
-  DEBUG_LOG() << "onEquipmentMessageChanged: " << data;
+  DEBUG_LOG(m_logger) << "onEquipmentMessageChanged: " << data;
 
   request.senderType() = Messaging::AddressType_def::type::Participant;
   request.senderId(data.sender());
-  DEBUG_LOG() << "request.senderId = " << request.senderId();
+  DEBUG_LOG(m_logger) << "request.senderId = " << request.senderId();
   request.recipientType(Messaging::AddressType_def::type::Operator);
   request.recipientIds().push_back(data.receiver());
   request.subject() = data.subject();
@@ -330,7 +330,7 @@ void HandlerOperatorMessage::onEquipmentMessageChanged(const TrainingAreaBase::E
 
 void HandlerOperatorMessage::onOperatorChanged(const OperatorManagement::User &data)
 {
-  DEBUG_LOG() << "************** onOperatorChanged ";
+  DEBUG_LOG(m_logger) << "************** onOperatorChanged ";
   m_operatorMap.insert(data.id(), data.name());
 } // end of onOperatorChanged
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/handler_operator_message.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/handler_operator_message.h
index bd01110a0..865f483ba 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/handler_operator_message.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/handler_operator_message.h
@@ -43,6 +43,8 @@ private Q_SLOTS:
   void onOperatorChanged(const OperatorManagement::User &data);
 
 private: // methods
+
+NGL::INGLLogger &m_logger;
   void onCreateOperatorMessageRequest(const rti::core::SampleIdentity &cookie,
                                       const CreateOperatorMessageRequest &request) override;
   Core::FunctionReplyObject createOperatorMessageRequest(const CreateOperatorMessageRequest &request);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/main_handler.cpp
index 2de360ffe..67b3cd398 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/main_handler.cpp
@@ -18,13 +18,13 @@ namespace Messaging
 MainHandler::MainHandler()
   : m_logger(getLogger("MainHandler"))
 {
-  INFO_LOG() << "MainHandler::MainHandler";
+  INFO_LOG(m_logger) << "MainHandler::MainHandler";
 } // end of ctor()
 //-----------------------------------------------------------------------------
 
 MainHandler::~MainHandler()
 {
-  INFO_LOG() << "MainHandler::~MainHandler";
+  INFO_LOG(m_logger) << "MainHandler::~MainHandler";
   m_handlerOperatorMessage = nullptr;
   m_exercisesHandler = nullptr;
   m_ddsHandler = nullptr;
@@ -34,53 +34,53 @@ MainHandler::~MainHandler()
 
 bool MainHandler::init(int domainId)
 {
-  INFO_LOG() << "Start MessageDataManagement MainHandler. domainId ="<<domainId;
+  INFO_LOG(m_logger) << "Start MessageDataManagement MainHandler. domainId ="<<domainId;
 
   // initialize DDS
   m_ddsHandler = std::make_shared<DdsHandler>(domainId);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation DdsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
     if (m_ddsHandler->pacemaker())
       m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
   }
-  INFO_LOG() << "m_ddsHandler initialized. ";
+  INFO_LOG(m_logger) << "m_ddsHandler initialized. ";
 
   // initialize database
   m_dbHandler = std::make_shared<DbHandler>();
   if (!m_dbHandler->init(0, Settings::settings()))
   {
-    ERROR_LOG() << "Initialisation DbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation DbHandler failed.";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
   }
-  INFO_LOG() << "DbHandler initialized. ";
+  INFO_LOG(m_logger) << "DbHandler initialized. ";
 
 
-  INFO_LOG() << "create HandlerExercises. ";
+  INFO_LOG(m_logger) << "create HandlerExercises. ";
   m_exercisesHandler = std::make_shared<ExercisesHandler>(m_ddsHandler);
   if (!m_exercisesHandler->init())
   {
-    ERROR_LOG() << "create HandlerExercise failed.";
+    ERROR_LOG(m_logger) << "create HandlerExercise failed.";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
   }
-  INFO_LOG() << "m_exercisesHandler="<<m_exercisesHandler;
+  INFO_LOG(m_logger) << "m_exercisesHandler="<<m_exercisesHandler;
 
 
 
   // create HandlerCreate
-  INFO_LOG() << "create HandlerCreate. ";
+  INFO_LOG(m_logger) << "create HandlerCreate. ";
   m_handlerOperatorMessage = std::make_shared<HandlerOperatorMessage>(m_ddsHandler, m_dbHandler->db(), m_exercisesHandler);
   if (!m_handlerOperatorMessage->init())
   {
-    ERROR_LOG() << "create HandlerMarkAsDelete failed.";
+    ERROR_LOG(m_logger) << "create HandlerMarkAsDelete failed.";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
   }
 
-  INFO_LOG() << "HandlerCreate initialized. ";
+  INFO_LOG(m_logger) << "HandlerCreate initialized. ";
 
   m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
   //m_ddsHandler->enableEquipmentMessage();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/main_handler.h
index ae6948775..e397722b6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/main_handler.h
@@ -33,6 +33,8 @@ public:
   bool init(int domainId);
 
 private: // attributes
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>                m_ddsHandler;                ///< Pointer to DDS handler
   std::shared_ptr<DbHandler>                 m_dbHandler;                 ///< Pointer to DB handler
   std::shared_ptr<ExercisesHandler>          m_exercisesHandler;          ///<Messages from OC
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/dds_handler.cpp
index 8b0a67c2e..f990b6a71 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/dds_handler.cpp
@@ -12,10 +12,9 @@
 
 namespace MeteoDataManagement
 {
-DdsHandler::DdsHandler(int domainId)
-  : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::AllExercises))
-{
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+DdsHandler::DdsHandler(int domainId) : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::AllExercises)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 } // end of ctor()
 //-----------------------------------------------------------------------------
 
@@ -31,11 +30,11 @@ DdsHandler::~DdsHandler()
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
-  INFO_LOG() << "--- Start MeteoDataManagement DDSHandler.";
+  INFO_LOG(m_logger) << "--- Start MeteoDataManagement DDSHandler.";
 
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -52,12 +51,12 @@ bool DdsHandler::init(const QStringList &qosFileList)
   // DTS
   m_ddsDts = MeteoDataManagement::Interface::Dts::create(m_ddsConnector);
   bool bRet = m_ddsDts->enableAll();
-  INFO_LOG() << "Dts initialised";
+  INFO_LOG(m_logger) << "Dts initialised";
 
   // FTS
   m_ddsFts = MeteoDataManagement::Interface::Fts::create(m_ddsConnector);
   bRet &= m_ddsFts->enableAll();
-  INFO_LOG() << "Fts initialised";
+  INFO_LOG(m_logger) << "Fts initialised";
 
 
   return bRet;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/dds_handler.h
index dc644a1fa..5b4aa2be6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/dds_handler.h
@@ -39,6 +39,7 @@ public:
   qint64 currentPartitionTime() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector>          m_ddsConnector;
   std::shared_ptr<Core::Interface::Dtc>                m_dtcCore;
   std::shared_ptr<Core::Pacemaker>                     m_pacemaker;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_infrastructure_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_infrastructure_data.cpp
index f8674869a..aeecc5362 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_infrastructure_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_infrastructure_data.cpp
@@ -16,30 +16,29 @@ using namespace MeteoDataManagement;
 
 HandlerInfrastructureData::HandlerInfrastructureData(const std::shared_ptr<DdsHandler> &ddsHandler,
                                                      const std::shared_ptr<HandlerMeteoDataUnits> &handlerMeteoDataUnits,
-                                                     QObject *parent)
-  : QObject(parent)
+                                                     QObject *parent) : QObject(parent)
   , m_ddsHandler(ddsHandler)
-  , m_handlerMeteoDataUnits(handlerMeteoDataUnits)
-{
+  , m_handlerMeteoDataUnits(handlerMeteoDataUnits),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 } // end of ctor()
 //-----------------------------------------------------------------------------
 
 bool HandlerInfrastructureData::init()
 {
-  INFO_LOG() << "start init() DTC InfrastructureManagement ";
+  INFO_LOG(m_logger) << "start init() DTC InfrastructureManagement ";
 
   // DTC InfrastructureManagement
   m_dtc = InfrastructureManagement::Interface::Dtc::create(m_ddsHandler->dds());
   if (m_dtc == nullptr)
   {
-    ERROR_LOG() << "Could not create DTC InfrastructureManagement";
+    ERROR_LOG(m_logger) << "Could not create DTC InfrastructureManagement";
     return false;
   }
 
   if (!m_dtc->enableMountingPointAsset() ||
       !m_dtc->enableMainStructureElement())
   {
-    ERROR_LOG() << "init() DTC InfrastructureManagement failed";
+    ERROR_LOG(m_logger) << "init() DTC InfrastructureManagement failed";
     return false;
   }
 
@@ -49,7 +48,7 @@ bool HandlerInfrastructureData::init()
     m_dtcInstrumentationAssetCF.reset(m_ddsHandler->dds()->createDTC<DTC::InstrumentationAssetCFImpl>(filter));
     if (!m_dtcInstrumentationAssetCF)
     {
-      ERROR_LOG() << "init() DTC InfrastructureManagement failed";
+      ERROR_LOG(m_logger) << "init() DTC InfrastructureManagement failed";
       return false;
     }
     m_dtcInstrumentationAssetCF->setSubscriberCallback([this](const InfrastructureManagement::InstrumentationAsset &data, DataModification modType)
@@ -82,7 +81,7 @@ void HandlerInfrastructureData::onAssetChanged(const InfrastructureManagement::I
   if (data.mountingPointTypeId() != InfrastructureManagement::MountingPointType::MeteoDataUnit)
     return;
 
-  INFO_LOG() << "onAssetChanged()"
+  INFO_LOG(m_logger) << "onAssetChanged()"
                      << " assetId: " << data.id()
                      << " mountingPointTypeId: " << data.mountingPointTypeId()
                      << " name: " << data.name();
@@ -136,7 +135,7 @@ Core::GeoPosition HandlerInfrastructureData::getStructureElementPosition(int ass
   const int seId = m_mountingPointAssetsMap.value(assetId);
   if (seId <= 0)
   {
-    WARNING_LOG() << "Could not find mountingPointAsset for asset id " << assetId;
+    WARNING_LOG(m_logger) << "Could not find mountingPointAsset for asset id " << assetId;
     return Core::GeoPosition();
   }
   // Go through all MainStructureElements and search structureElementId
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_infrastructure_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_infrastructure_data.h
index a9b67341c..db6497115 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_infrastructure_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_infrastructure_data.h
@@ -57,6 +57,8 @@ private Q_SLOTS:
   void onMainStructureElementChanged(const InfrastructureManagement::MainStructureElement &data, DataModification modType = DataModification::eAdded);
 
 private: // attributes
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>                m_ddsHandler;                ///< Pointer to MDM DDS handler
   std::shared_ptr<HandlerMeteoDataUnits>     m_handlerMeteoDataUnits;     ///< Pointer to meteo data units handler
   std::shared_ptr<InfrastructureManagement::Interface::Dtc> m_dtc;   ///< Pointer to DTC InfrastructureManagement interface object
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_meteo_data_unit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_meteo_data_unit.cpp
index 88f510cc4..8de69f8c1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_meteo_data_unit.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_meteo_data_unit.cpp
@@ -19,12 +19,11 @@ using namespace MeteoDataManagement;
 
 HandlerMeteoDataUnit::HandlerMeteoDataUnit(MainHandler *mainHandler,
                                            const InfrastructureManagement::InstrumentationAsset &asset,
-                                           QObject *parent)
-  : QObject(parent)
+                                           QObject *parent) : QObject(parent)
   , m_mainHandler(mainHandler)
   , m_asset(asset)
-  , m_tcpWS(nullptr)
-{
+  , m_tcpWS(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   init();
 } // end of ctor()
 //-----------------------------------------------------------------------------
@@ -43,7 +42,7 @@ bool HandlerMeteoDataUnit::init()
   if (jError.error != QJsonParseError::NoError ||
       !doc.isObject())
   {
-    ERROR_LOG() << "Can not initialize meteo data unit - properties are not parsable: "
+    ERROR_LOG(m_logger) << "Can not initialize meteo data unit - properties are not parsable: "
                         << jError.errorString() << " - '" << m_asset.properties() << "'";
     return false;
   }
@@ -52,7 +51,7 @@ bool HandlerMeteoDataUnit::init()
   quint16 windPort = obj[QStringLiteral("windPort")].toInt();
   if (climatePort == 0 || windPort == 0)
   {
-    ERROR_LOG() << "Can not parse climate and/or wind port from properties: '" <<
+    ERROR_LOG(m_logger) << "Can not parse climate and/or wind port from properties: '" <<
                         m_asset.properties() << "'";
     return false;
   }
@@ -135,10 +134,10 @@ void HandlerMeteoDataUnit::onPublishData()
   ddsData = m_newMeteoData;
   ddsData.timeStamp(m_mainHandler->dds()->currentPartitionTime());
 
-  INFO_LOG() << "Publish dynamic MeteoData to dds: " << ddsData;
+  INFO_LOG(m_logger) << "Publish dynamic MeteoData to dds: " << ddsData;
 
   if (!m_mainHandler->dds()->dts()->publish(ddsData))
-    ERROR_LOG() << "Error publishing MdmMeteoData to dds";
+    ERROR_LOG(m_logger) << "Error publishing MdmMeteoData to dds";
 } // end of onPublishData()
 //-----------------------------------------------------------------------------
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_meteo_data_unit.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_meteo_data_unit.h
index 2fe1cb92f..5054a32c2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_meteo_data_unit.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_meteo_data_unit.h
@@ -32,6 +32,7 @@ public:
   ~HandlerMeteoDataUnit();
 
 private:
+  NGL::INGLLogger &m_logger;
   bool init();
 
 protected Q_SLOTS:
@@ -53,6 +54,7 @@ protected Q_SLOTS:
 
 
 private:
+  NGL::INGLLogger &m_logger;
   MainHandler *m_mainHandler;    ///< Pointer to MDM DDS handler
   InfrastructureManagement::InstrumentationAsset m_asset;         ///< meteo unit data asset
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_meteo_data_units.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_meteo_data_units.cpp
index 9a5ceb8e5..98558e80e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_meteo_data_units.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_meteo_data_units.cpp
@@ -14,9 +14,8 @@
 namespace MeteoDataManagement
 {
 
-HandlerMeteoDataUnits::HandlerMeteoDataUnits(MainHandler *mainHandler)
-  : m_mainHandler(mainHandler)
-{
+HandlerMeteoDataUnits::HandlerMeteoDataUnits(MainHandler *mainHandler) : m_mainHandler(mainHandler),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 } // end of ctor()
 //-----------------------------------------------------------------------------
 
@@ -28,7 +27,7 @@ HandlerMeteoDataUnits::~HandlerMeteoDataUnits()
 
 bool HandlerMeteoDataUnits::init()
 {
-  INFO_LOG() << "HandlerMeteoDataUnits::init().... Initialisation of MDU's will be started from ISM directly. ";
+  INFO_LOG(m_logger) << "HandlerMeteoDataUnits::init().... Initialisation of MDU's will be started from ISM directly. ";
 
   return true;
 } // end of init()
@@ -36,7 +35,7 @@ bool HandlerMeteoDataUnits::init()
 
 bool HandlerMeteoDataUnits::addMeteoDataUnit(const InfrastructureManagement::InstrumentationAsset &asset)
 {
-  INFO_LOG() << "addMeteoDataUnit: " << asset;
+  INFO_LOG(m_logger) << "addMeteoDataUnit: " << asset;
   removeMeteoDataUnit(asset); // just to be sure
 
   HandlerMeteoDataUnit *hMDU = new HandlerMeteoDataUnit(m_mainHandler, asset);
@@ -48,7 +47,7 @@ bool HandlerMeteoDataUnits::addMeteoDataUnit(const InfrastructureManagement::Ins
 
 bool HandlerMeteoDataUnits::removeMeteoDataUnit(const InfrastructureManagement::InstrumentationAsset &asset)
 {
-  INFO_LOG() << "removeMeteoDataUnit: " << asset;
+  INFO_LOG(m_logger) << "removeMeteoDataUnit: " << asset;
   auto it = m_handlerMeteoDataUnitsMap.find(asset.id());
   if (it == m_handlerMeteoDataUnitsMap.end())
     return false;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_meteo_data_units.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_meteo_data_units.h
index 01ea6003b..cae052b59 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_meteo_data_units.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_meteo_data_units.h
@@ -28,6 +28,7 @@ public:
   bool removeMeteoDataUnit(const InfrastructureManagement::InstrumentationAsset &asset);
 
 private:
+  NGL::INGLLogger &m_logger;
   QMap <int, HandlerMeteoDataUnit *> m_handlerMeteoDataUnitsMap; ///< Hold all meteo data unit handler
   MainHandler                       *m_mainHandler;              ///< Pointer to DDS handler
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_static_meteo_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_static_meteo_data.cpp
index a4ae302df..4ea6077fb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_static_meteo_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_static_meteo_data.cpp
@@ -21,23 +21,23 @@ HandlerStaticMeteoData::HandlerStaticMeteoData(const std::shared_ptr<DdsHandler>
 
 bool HandlerStaticMeteoData::init()
 {
-  INFO_LOG() << "Start HandlerStaticMeteoData.";
+  INFO_LOG(m_logger) << "Start HandlerStaticMeteoData.";
 
   // read data from db-table 'mdm_static_meteo_data'
   QVector<Database::MdmStaticMeteoData> dataVec;
   if (!m_db->select(dataVec))
   {
-    ERROR_LOG() << "Error reading data from database 'mdm_static_meteo_data'!";
+    ERROR_LOG(m_logger) << "Error reading data from database 'mdm_static_meteo_data'!";
     return false;
   }
 
   if (dataVec.isEmpty())
   {
-    WARNING_LOG() << "DB table 'mdm_static_meteo_data' is empty! Try to create default entry.";
+    WARNING_LOG(m_logger) << "DB table 'mdm_static_meteo_data' is empty! Try to create default entry.";
 
     if (!insertDefaultStaticMeteoDataEntry())
     {
-      ERROR_LOG() << "Insert DB table 'mdm_static_meteo_data' failed! No static meteo data may be handled!";
+      ERROR_LOG(m_logger) << "Insert DB table 'mdm_static_meteo_data' failed! No static meteo data may be handled!";
       return false;     // Damit werden alle moeglicherweise erreichbaren MDU's nicht bearbeitet,
       // da die Initialisierung des Service im 'SCM' mit Error beendet wird.
     }
@@ -47,7 +47,7 @@ bool HandlerStaticMeteoData::init()
 
     m_dbStaticMeteoData.timeStamp = QDateTime::currentMSecsSinceEpoch();
 
-    INFO_LOG() << "Insert into DB table 'mdm_static_meteo_data' successfully. id: "
+    INFO_LOG(m_logger) << "Insert into DB table 'mdm_static_meteo_data' successfully. id: "
                        << m_dbStaticMeteoData.id;
 
     onPublishData();
@@ -56,7 +56,7 @@ bool HandlerStaticMeteoData::init()
 
   if (dataVec.size() > 1)
   {
-    WARNING_LOG() << "Invalid number of table entries for 'mdm_static_meteo_data' size:"
+    WARNING_LOG(m_logger) << "Invalid number of table entries for 'mdm_static_meteo_data' size:"
                           << dataVec.size()
                           << " The first entry will be used only!";
   }
@@ -70,7 +70,7 @@ bool HandlerStaticMeteoData::init()
 void HandlerStaticMeteoData::onStaticMeteoDataModifyRequest(const rti::core::SampleIdentity &cookie,
                                                             const StaticMeteoDataModifyRequest &request)
 {
-  INFO_LOG() << "onStaticMeteoDataModifyRequest: " << request;
+  INFO_LOG(m_logger) << "onStaticMeteoDataModifyRequest: " << request;
 
   Core::FunctionReplyObject rep(request.id());
 
@@ -93,7 +93,7 @@ bool HandlerStaticMeteoData::updateStaticMeteoDatainDB(const StaticMeteoDataModi
 {
   if (request.id() != m_dbStaticMeteoData.id)
   {
-    WARNING_LOG() << "Invalid id for db-table 'mdm_static_meteo_data'"
+    WARNING_LOG(m_logger) << "Invalid id for db-table 'mdm_static_meteo_data'"
                           << m_dbStaticMeteoData.id
                           << " correct id: " << m_dbStaticMeteoData.id;
     return false;
@@ -119,10 +119,10 @@ void HandlerStaticMeteoData::onPublishData()
   ddsData.note(note);
   ddsData.weatherStationId(ddsData.id());  // MDUid == dbId
 
-  INFO_LOG() << "Publish static MeteoData to dds: " << ddsData;
+  INFO_LOG(m_logger) << "Publish static MeteoData to dds: " << ddsData;
 
   if (!m_ddsHandler->dts()->publish(ddsData))
-    ERROR_LOG() << "Error publishing static MdmMeteoData to dds";
+    ERROR_LOG(m_logger) << "Error publishing static MdmMeteoData to dds";
 
 } // end of onPublishData()
 //-----------------------------------------------------------------------------
@@ -141,7 +141,7 @@ bool HandlerStaticMeteoData::insertDefaultStaticMeteoDataEntry()
 
   if (!m_db->insert(dbData))
   {
-    ERROR_LOG() << "insertDefaultStaticMeteoDataEntry for db-table 'mdm_static_meteo_data' failed!";
+    ERROR_LOG(m_logger) << "insertDefaultStaticMeteoDataEntry for db-table 'mdm_static_meteo_data' failed!";
     return false;
   }
   return true;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_static_meteo_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_static_meteo_data.h
index e657002a9..4ddd10700 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_static_meteo_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_static_meteo_data.h
@@ -24,6 +24,8 @@ public:
   bool init();
 
 private: // methods
+
+NGL::INGLLogger &m_logger;
   void onStaticMeteoDataModifyRequest(const rti::core::SampleIdentity &cookie,
                                       const StaticMeteoDataModifyRequest &request) override final;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/main_handler.cpp
index 816784663..c4511f576 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/main_handler.cpp
@@ -16,14 +16,13 @@
 namespace MeteoDataManagement
 {
 
-MainHandler::MainHandler()
-  : m_ddsHandler(nullptr)
+MainHandler::MainHandler() : m_ddsHandler(nullptr)
   , m_dbHandler(nullptr)
   , m_handlerMeteoDataUnits(nullptr)
   , m_handlerInfrastructureData(nullptr)
   , m_handlerStaticMeteoData(nullptr)
-  , m_gnaService(nullptr)
-{
+  , m_gnaService(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 } // end of ctor()
 //-----------------------------------------------------------------------------
 
@@ -40,17 +39,17 @@ MainHandler::~MainHandler()
 
 bool MainHandler::init(int domainId)
 {
-  INFO_LOG() << "Start MeteoDataManagement MainHandler.";
+  INFO_LOG(m_logger) << "Start MeteoDataManagement MainHandler.";
   const QString errStr = initInternal(domainId);
   if (!errStr.isEmpty())
   {
-    ERROR_LOG() << errStr;
+    ERROR_LOG(m_logger) << errStr;
     if (m_ddsHandler && m_ddsHandler->pacemaker())
       m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError, errStr);
     return false;
   }
   m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
-  INFO_LOG() << "MeteoDataManagement MainHandler initialized.";
+  INFO_LOG(m_logger) << "MeteoDataManagement MainHandler initialized.";
   return true;
 }
 
@@ -68,7 +67,7 @@ QString MainHandler::initInternal(int domainId)
     return QStringLiteral("Initialisation DbHandler failed.");
 
   // create HandlerMeteoDataUnits
-  INFO_LOG() << "create HandlerMeteoDataUnits.";
+  INFO_LOG(m_logger) << "create HandlerMeteoDataUnits.";
   m_handlerMeteoDataUnits = std::make_shared<HandlerMeteoDataUnits>(this);
   if (!m_handlerMeteoDataUnits->init())
     return QStringLiteral("create HandlerMeteoDataUnits failed.");
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/main_handler.h
index 595b397f5..41fec98d2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/main_handler.h
@@ -41,6 +41,7 @@ public:
   std::shared_ptr<DatabaseInterface> db() const;
   std::shared_ptr<HandlerInfrastructureData> ism() const { return m_handlerInfrastructureData; }
 private:
+  NGL::INGLLogger &m_logger;
   QString initInternal(int domainId);
 private: // attributes
   std::shared_ptr<DdsHandler>                m_ddsHandler;                ///< Pointer to DDS handler
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpclimate.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpclimate.h
index e45e61b4b..b6965bffc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpclimate.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpclimate.h
@@ -48,6 +48,8 @@ protected Q_SLOTS:
   void onRequestTimeout();
 
 protected:
+
+NGL::INGLLogger &m_logger;
   /**
     * pure virtual function from TcpSocket to initialize the especially sensor device
     */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpsocket.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpsocket.cpp
index c2aa67bf6..8a443fe19 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpsocket.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpsocket.cpp
@@ -26,7 +26,7 @@ TcpSocket::TcpSocket(const char *logName, QObject *parent)
   , m_bSocketErrorWarnedOnce(false)
   , m_logger(getLogger(logName))
 {
-  DEBUG_LOG() << "CTOR  TCP-Socket... " ;
+  DEBUG_LOG(m_logger) << "CTOR  TCP-Socket... " ;
 
   doConnect();
 }
@@ -43,7 +43,7 @@ TcpSocket::~TcpSocket()
 
 void TcpSocket::doConnect()
 {
-  DEBUG_LOG() << "doConnect TCP-Socket " ;
+  DEBUG_LOG(m_logger) << "doConnect TCP-Socket " ;
 
   if (m_socket)
     m_socket->deleteLater();
@@ -60,7 +60,7 @@ void TcpSocket::doConnect()
 
   if (m_tryReconnect)
   {
-    INFO_LOG() << "Try reconnect to host " <<  m_hostName
+    INFO_LOG(m_logger) << "Try reconnect to host " <<  m_hostName
                        << ":" << m_hostPort;
     m_socket->connectToHost(m_hostName, m_hostPort);
   }
@@ -69,7 +69,7 @@ void TcpSocket::doConnect()
 
 void TcpSocket::start(const QString &hostName, quint16 port)
 {
-  INFO_LOG() << "Try connect to host: " << hostName
+  INFO_LOG(m_logger) << "Try connect to host: " << hostName
                      << ": " << port;
 
   m_hostName     = hostName;
@@ -81,7 +81,7 @@ void TcpSocket::start(const QString &hostName, quint16 port)
 
 void TcpSocket::onConnected()
 {
-  INFO_LOG() << "Connected to "
+  INFO_LOG(m_logger) << "Connected to "
                      << m_socket->peerAddress().toString()
                      << ":" << m_socket->peerPort();
   m_bSocketErrorWarnedOnce = false;
@@ -95,46 +95,46 @@ void TcpSocket::onConnected()
 //  Das Setzen der Systemvariablen war ebenfalls ohne Auswirkung.
 //  Da diese Programmteile unter Windows eh so nicht zu uebersetzen sind, ist der Codeteil hier in Kommentar gesetzt.
 
-//  INFO_LOG() << "----Set TCP_KEEPIDLE parameter ";
+//  INFO_LOG(m_logger) << "----Set TCP_KEEPIDLE parameter ";
 
 //  const int keepAliveOption = 1; // on
 //  if (setsockopt(m_socket->socketDescriptor(), SOL_SOCKET, SO_KEEPALIVE, &keepAliveOption, sizeof(keepAliveOption)) != 0)
 //  {
-//    ERROR_LOG() << "Error setting SO_KEEPALIVE: " << errno;
+//    ERROR_LOG(m_logger) << "Error setting SO_KEEPALIVE: " << errno;
 //  }
 
 //  const int idleTimeout = 5; // sec
 //  if (setsockopt(m_socket->socketDescriptor(), SOL_TCP, TCP_KEEPIDLE, &idleTimeout, sizeof(idleTimeout)) != 0)
 //  {
-//    ERROR_LOG() << "Error setting TCP_KEEPIDLE: " << errno;
+//    ERROR_LOG(m_logger) << "Error setting TCP_KEEPIDLE: " << errno;
 //  }
 
 //  const int keepIntervalCnt = 10; // sec
 //  if (setsockopt(m_socket->socketDescriptor(), SOL_TCP, TCP_KEEPINTVL, &keepIntervalCnt, sizeof(keepIntervalCnt)) != 0)
 //  {
-//    ERROR_LOG() << "Error setting TCP_KEEPINTVL: " << errno;
+//    ERROR_LOG(m_logger) << "Error setting TCP_KEEPINTVL: " << errno;
 //  }
 
 //  const int idlePaketCnt = 2; // 2 probes -> detection shoud be comes after 5s + 2 * 10s  => 25 sec
 //  if (setsockopt(m_socket->socketDescriptor(), SOL_TCP, TCP_KEEPCNT, &idlePaketCnt, sizeof(idlePaketCnt)) != 0)
 //  {
-//    ERROR_LOG() << "Error setting TCP_KEEPCNT: " << errno;
+//    ERROR_LOG(m_logger) << "Error setting TCP_KEEPCNT: " << errno;
 //  }
 
 //  //----- Testausgaben
 //  int getOption = 0;
 //  socklen_t optlen = sizeof(getOption);
 //  getsockopt(m_socket->socketDescriptor(), SOL_SOCKET, SO_KEEPALIVE, &getOption, &optlen);
-//  ERROR_LOG() << "...SO_KEEPALIVE set to:  " << getOption;
+//  ERROR_LOG(m_logger) << "...SO_KEEPALIVE set to:  " << getOption;
 
 //  getsockopt(m_socket->socketDescriptor(), SOL_TCP, TCP_KEEPIDLE, &getOption, &optlen);
-//  ERROR_LOG() << "...TCP_KEEPIDLE set to:  " << getOption;
+//  ERROR_LOG(m_logger) << "...TCP_KEEPIDLE set to:  " << getOption;
 
 //  getsockopt(m_socket->socketDescriptor(), SOL_TCP, TCP_KEEPINTVL, &getOption, &optlen);
-//  ERROR_LOG() << "...TCP_KEEPINTVL set to:  " << getOption;
+//  ERROR_LOG(m_logger) << "...TCP_KEEPINTVL set to:  " << getOption;
 
 //  getsockopt(m_socket->socketDescriptor(), SOL_TCP, TCP_KEEPCNT, &getOption, &optlen);
-//  ERROR_LOG() << "...TCP_KEEPCNT set to:  " << getOption;
+//  ERROR_LOG(m_logger) << "...TCP_KEEPCNT set to:  " << getOption;
 
   init();  // pure virtual function
   // Auspraegung mit spezieller Sensorinitialisierung durchfuehren
@@ -143,14 +143,14 @@ void TcpSocket::onConnected()
 
 void TcpSocket::onDisonnected()
 {
-  INFO_LOG() << "Disconnected from " << m_socket->peerAddress().toString()
+  INFO_LOG(m_logger) << "Disconnected from " << m_socket->peerAddress().toString()
                      << ":" << m_socket->peerPort();
 }
 //-------------------------------------------------------------------
 
 void TcpSocket::onError(QAbstractSocket::SocketError err)
 {
-  ERROR_LOG() << "Socket error: " << err
+  ERROR_LOG(m_logger) << "Socket error: " << err
                       << " \""  << m_socket->errorString() << "\""
                       << " Hostname: " << m_hostName
                       << " Serial Port:" << m_hostPort
@@ -178,7 +178,7 @@ void TcpSocket::onReadyRead()
   while (m_socket->canReadLine())
   {
     const QByteArray line = m_socket->readLine();
-    DEBUG_LOG() << "Read line from sensor: " << line;
+    DEBUG_LOG(m_logger) << "Read line from sensor: " << line;
 
     dataAvailable(line);  // pure virtual function
     // Auspraegung mit spezieller Sensordatenauswertung durchfuehren
@@ -190,14 +190,14 @@ bool TcpSocket::sendCommand(const QByteArray &qba)
 {
   bool bOk = true;
 
-  INFO_LOG() << "Send command: " << qba;
+  INFO_LOG(m_logger) << "Send command: " << qba;
 
   if (m_socket->state() != QTcpSocket::ConnectedState)
   {
     if (m_bSocketErrorWarnedOnce)
     {
       m_bSocketErrorWarnedOnce = true;
-      WARNING_LOG() << "Error on sendCommand().  No socket connection estabilished."
+      WARNING_LOG(m_logger) << "Error on sendCommand().  No socket connection estabilished."
                             << " Hostname: " << m_hostName;
     }
     return false;
@@ -208,7 +208,7 @@ bool TcpSocket::sendCommand(const QByteArray &qba)
   if (trxBytes != qba.size())
   {
     bOk = false;
-    ERROR_LOG() << "Insufficient number of tansfered bytes."
+    ERROR_LOG(m_logger) << "Insufficient number of tansfered bytes."
                         << " Soll: " << trxBytes << " Ist: " << qba.size();
   }
   m_socket->flush();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpsocket.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpsocket.h
index f93c85af5..3636b90bb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpsocket.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpsocket.h
@@ -23,6 +23,7 @@ public:
   ~TcpSocket();
 
 protected:
+  NGL::INGLLogger &m_logger;
   /**
     * Connect to converter
     * @param[in] hostName      Hostname or Ip address of the RS232-LAN Converter
@@ -47,6 +48,7 @@ protected Q_SLOTS:
   bool sendCommand(const QByteArray &qba);
 
 protected:
+  NGL::INGLLogger &m_logger;
   /**
     *  pure virtual function to initialize the especially sensor device
     */
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpweatherstation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpweatherstation.cpp
index 15976375c..bf2517872 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpweatherstation.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpweatherstation.cpp
@@ -18,8 +18,7 @@ TcpWeatherStation::TcpWeatherStation(int id,
                                      const QString &converterIp,
                                      quint16 climatePort,
                                      quint16 windPort,
-                                     QObject *parent)
-  : QObject(parent)
+                                     QObject *parent) : QObject(parent)
   , m_id(id)
   , m_converterIp(converterIp)
   , m_climatePort(climatePort)
@@ -32,9 +31,9 @@ TcpWeatherStation::TcpWeatherStation(int id,
   , m_direction(0.0)
   , m_speed(0.0)
   , m_climateOk(false)
-  , m_windOk(false)
-{
-  INFO_LOG() << "Start TcpWeatherStation ip/(hostname): " << m_converterIp
+  , m_windOk(false),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  INFO_LOG(m_logger) << "Start TcpWeatherStation ip/(hostname): " << m_converterIp
                      << " climatePort: " << m_climatePort
                      << " windPort: " << m_windPort;
 
@@ -42,7 +41,7 @@ TcpWeatherStation::TcpWeatherStation(int id,
   {
     m_tcpClimate = new TcpClimate(this);
 
-    INFO_LOG() << "m_tcpClimate->start(" << m_converterIp << ", "
+    INFO_LOG(m_logger) << "m_tcpClimate->start(" << m_converterIp << ", "
                        << QString::number(m_climatePort) << ")";
     m_tcpClimate->start(m_converterIp, m_climatePort);
 
@@ -54,7 +53,7 @@ TcpWeatherStation::TcpWeatherStation(int id,
   {
     m_tcpWind = new TcpWind(this);
 
-    INFO_LOG() << "m_tcpWind->start(" << m_converterIp << ", "
+    INFO_LOG(m_logger) << "m_tcpWind->start(" << m_converterIp << ", "
                        << QString::number(m_windPort) << ")";
 
     m_tcpWind->start(m_converterIp, m_windPort);
@@ -68,7 +67,7 @@ TcpWeatherStation::TcpWeatherStation(int id,
 
 void TcpWeatherStation::onClimateDataChanged(float pressure, float temperature, float humidity, bool climateOk)
 {
-  INFO_LOG() << "onClimateDataChanged()"
+  INFO_LOG(m_logger) << "onClimateDataChanged()"
                      << " MDU AssetId: " << m_id
                      << " pressure: " << pressure
                      << " temperature: " << temperature
@@ -87,7 +86,7 @@ void TcpWeatherStation::onClimateDataChanged(float pressure, float temperature,
 
 void TcpWeatherStation::onWindDataChanged(float direction, float speed, bool windOk)
 {
-  INFO_LOG() << "onWindDataChanged()"
+  INFO_LOG(m_logger) << "onWindDataChanged()"
                      << " MDU AssetId: " << m_id
                      << " direction: " << direction
                      << " speed: " << speed
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpweatherstation.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpweatherstation.h
index 0560d54b4..ac36ffd59 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpweatherstation.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpweatherstation.h
@@ -70,6 +70,7 @@ protected Q_SLOTS:
 
 
 protected:
+  NGL::INGLLogger &m_logger;
   int     m_id;             ///< weatherstation id
   QString m_converterIp;    ///< IP address of the RS232-LAN Converter
   quint16 m_climatePort;    ///< Access port number of climate sensor on the RS232-LAN Converter
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/dds_handler.cpp
index 264958b19..c4a884e47 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/dds_handler.cpp
@@ -20,7 +20,7 @@ namespace NmeaManagement
 DdsHandler::DdsHandler(int domainId)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Any))
 {
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 DdsHandler::~DdsHandler()
@@ -30,7 +30,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -46,36 +46,36 @@ bool DdsHandler::init(const QStringList &qosFileList)
 
   if (!m_ddsDts->enableBatteryAlarm())
   {
-    ERROR_LOG() << "Could not initialize NmeaManagement enableBatteryAlarm data topic server";
+    ERROR_LOG(m_logger) << "Could not initialize NmeaManagement enableBatteryAlarm data topic server";
     return false;
   }
 
   if (!m_ddsDts->enableServiceControl())
   {
-    ERROR_LOG() << "Could not initialize NmeaManagement enableServiceControl data topic server";
+    ERROR_LOG(m_logger) << "Could not initialize NmeaManagement enableServiceControl data topic server";
     return false;
   }
 
   if (!m_ddsDts->enableBatteryState())
   {
-    ERROR_LOG() << "Could not initialize NmeaManagement enableBatteryState data topic server";
+    ERROR_LOG(m_logger) << "Could not initialize NmeaManagement enableBatteryState data topic server";
     return false;
   }
 
   if (!m_ddsDts->enablePositionExcon())
   {
-    ERROR_LOG() << "Could not initialize NmeaManagement enablePositionExcon data topic server";
+    ERROR_LOG(m_logger) << "Could not initialize NmeaManagement enablePositionExcon data topic server";
     return false;
   }
-  INFO_LOG() << "Dts initialised";
+  INFO_LOG(m_logger) << "Dts initialised";
 
 
   if (!m_ddsFts->enableAll())
   {
-    ERROR_LOG() << "Could not initialize NmeaManagement enableAll function topic";
+    ERROR_LOG(m_logger) << "Could not initialize NmeaManagement enableAll function topic";
     return false;
   }
-  INFO_LOG() << "Fts initialised";
+  INFO_LOG(m_logger) << "Fts initialised";
 
   // TODO: call at the end of main_handler init:
   this->pacemaker()->setNewState(Core::RunningState::Running);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/dds_handler.h
index 61b0b800d..4fa08ca97 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/dds_handler.h
@@ -44,6 +44,7 @@ public:
   std::shared_ptr<NmeaManagement::Interface::Fts> fts() const { return m_ddsFts;}
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<DTS::CurrentRunningState>   m_dtsCurrentRunningState;
   std::shared_ptr<Core::Pacemaker>            m_pacemaker;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/main_handler.cpp
index 2834e600d..2d5883317 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/main_handler.cpp
@@ -14,9 +14,8 @@
 namespace NmeaManagement
 {
 
-MainHandler::MainHandler(QObject *parent)
-  : QObject(parent)
-{}
+MainHandler::MainHandler(QObject *parent) : QObject(parent),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 MainHandler::~MainHandler()
 {
@@ -32,10 +31,10 @@ bool MainHandler::init(int domainId)
   m_ddsHandler = std::make_shared<DdsHandler>(domainId);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation ddsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation ddsHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation ddsHandler succesful.";
 
   m_nmeaHandler = std::make_shared<NmeaHandler>(m_ddsHandler, this);
   m_nmeaHandler->init();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/main_handler.h
index 181197c2a..f8705a815 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/main_handler.h
@@ -29,6 +29,7 @@ public:
   std::shared_ptr<DdsHandler> dds() const { return m_ddsHandler; }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>            m_ddsHandler;
   std::shared_ptr<SocketHandler>         m_socketHandler;
   std::shared_ptr<NmeaHandler>           m_nmeaHandler;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/nmea_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/nmea_handler.cpp
index f34362e90..07220a933 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/nmea_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/nmea_handler.cpp
@@ -65,29 +65,29 @@ void NmeaHandler::IIXDR(QString package)
   NmeaManagement::ServiceControl  serviceControl;
   QRegExp sep(QStringLiteral("(\\,|\\*)"));
   QStringList pkt_data = package.split(sep);
-  INFO_LOG() << "----------------------------------------------------";
-  INFO_LOG() << "batteryState pkt_data.size=" << pkt_data.size();
+  INFO_LOG(m_logger) << "----------------------------------------------------";
+  INFO_LOG(m_logger) << "batteryState pkt_data.size=" << pkt_data.size();
   for (int i = 0; i < pkt_data.size(); i++)
-    INFO_LOG() << "i=" << i << "Value=" << pkt_data[i];
+    INFO_LOG(m_logger) << "i=" << i << "Value=" << pkt_data[i];
 
 
   int index = pkt_data.indexOf(QLatin1String("S")) + 1;
   if ( index >= 1)
   {
-    INFO_LOG() << "Ausschalten!!!";
+    INFO_LOG(m_logger) << "Ausschalten!!!";
     if (pkt_data[4] == QStringLiteral("SERVICE_CONTROL_PRESHUTDOWN"))
     {
-        INFO_LOG() << "SERVICE_CONTROL_PRESHUTDOWN";
+        INFO_LOG(m_logger) << "SERVICE_CONTROL_PRESHUTDOWN";
         serviceControl.ServiceControlState(ServiceControlEnum_def::PRESHUTDOWN);
     }
     if (pkt_data[4] == QStringLiteral("SERVICE_CONTROL_SHUTDOWN"))
     {
-        INFO_LOG() << "SERVICE_CONTROL_SHUTDOWN";
+        INFO_LOG(m_logger) << "SERVICE_CONTROL_SHUTDOWN";
         serviceControl.ServiceControlState(ServiceControlEnum_def::SHUTDOWN);
     }
     if (pkt_data[4] == QStringLiteral("SERVICE_CONTROL_STOP"))
     {
-        INFO_LOG() << "SERVICE_CONTROL_STOP";
+        INFO_LOG(m_logger) << "SERVICE_CONTROL_STOP";
         serviceControl.ServiceControlState(ServiceControlEnum_def::STOP);
     }
     m_ddsHandler->dts()->publish(serviceControl);
@@ -160,7 +160,7 @@ void NmeaHandler::IIXDR(QString package)
   batteryState.voltage(voltage);
 
   batteryState.serialNumber(serialNumber.toStdString()) ;
-  INFO_LOG() << "publish batteryState serialNumber=" << serialNumber;
+  INFO_LOG(m_logger) << "publish batteryState serialNumber=" << serialNumber;
   m_ddsHandler->dts()->publish(batteryState);
 }
 
@@ -187,10 +187,10 @@ void NmeaHandler::IIALR(QString package)
   QRegExp sep(QStringLiteral("(\\,|\\*)"));
   QStringList pkt_data = package.split(sep);
   alarm_state packageData;
-  INFO_LOG() << "pkt_data.size=" << pkt_data.size();
+  INFO_LOG(m_logger) << "pkt_data.size=" << pkt_data.size();
   //    for ( int i = 0; i < pkt_data.size(); i++)
   //    {
-  //        INFO_LOG()<< "i=" << i << "Value=" << pkt_data[i];
+  //        INFO_LOG(m_logger)<< "i=" << i << "Value=" << pkt_data[i];
   //    }
   packageData.time = pkt_data[1];
   packageData.number = pkt_data[2].toInt();
@@ -206,7 +206,7 @@ void NmeaHandler::IIALR(QString package)
 
   qint64 timeAlarm = getDateTime(packageData.time);
 
-  INFO_LOG() << "time=" << packageData.time
+  INFO_LOG(m_logger) << "time=" << packageData.time
                      << " timeAlarm=" << timeAlarm
                      << " number=" << packageData.number
                      << " condition=" <<  packageData.condition
@@ -276,10 +276,10 @@ void NmeaHandler::GPGGA(QString package)
 
   if (packageData.C_latitude_dir == 'S' || packageData.C_latitude_dir == 's')
     latDecimal = ((real / 60) + inteiro) * -1;
-  //INFO_LOG() << QString::number(((real / 60) + inteiro) * -1, 'g', 9);
+  //INFO_LOG(m_logger) << QString::number(((real / 60) + inteiro) * -1, 'g', 9);
   else
     latDecimal = ((real / 60) + inteiro);
-  //INFO_LOG() << "latitude=" << QString::number(((real / 60) + inteiro), 'g', 9);
+  //INFO_LOG(m_logger) << "latitude=" << QString::number(((real / 60) + inteiro), 'g', 9);
 
 
   while (packageData.D_longitude[0] == QStringLiteral("0"))
@@ -300,7 +300,7 @@ void NmeaHandler::GPGGA(QString package)
     lonDecimal = ((real / 60) + inteiro);
   }
 
-  INFO_LOG() << "longitude=" << lonDecimal
+  INFO_LOG(m_logger) << "longitude=" << lonDecimal
                      << " latitude=" << latDecimal;
 
 
@@ -332,7 +332,7 @@ void NmeaHandler::GPRMC(QString package)
   packageData.K_variacao_magnetica_coord = pkt_data[11].toStdString()[0];
 
 
-  INFO_LOG() << "velocidade=" << QString::number(packageData.G_velocity * 1.852);
+  INFO_LOG(m_logger) << "velocidade=" << QString::number(packageData.G_velocity * 1.852);
 
 }
 
@@ -357,7 +357,7 @@ void NmeaHandler::decode(QString nmeaPackage)
   nmeaPackage.remove(0, startingPoint);
 
   nmeaType = nmeaPackage.mid(1, 5);
-  INFO_LOG() << "nmeaType=" << nmeaType;
+  INFO_LOG(m_logger) << "nmeaType=" << nmeaType;
 
   if (nmeaType == QStringLiteral("IIXDR"))
   {
@@ -366,10 +366,10 @@ void NmeaHandler::decode(QString nmeaPackage)
 
   if (nmeaType == QStringLiteral("GPGGA"))
   {
-    INFO_LOG() << "Eigenposition";
+    INFO_LOG(m_logger) << "Eigenposition";
     if (checksum(nmeaPackage))
     {
-      INFO_LOG() << "Eigenposition checksum ok";
+      INFO_LOG(m_logger) << "Eigenposition checksum ok";
       GPGGA(nmeaPackage);
     }
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/socket_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/socket_handler.cpp
index 694b9fae1..ef891d8a5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/socket_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/socket_handler.cpp
@@ -44,8 +44,8 @@ void SocketHandler::init(QString nmeaHost, int nmeaPort)
 
   connect(socket, SIGNAL(bytesWritten(qint64)), this, SLOT(bytesWritten(qint64)));
 
-  INFO_LOG() << "Connecting,..";
-  INFO_LOG() << nmeaHost << " port: " << nmeaPort;
+  INFO_LOG(m_logger) << "Connecting,..";
+  INFO_LOG(m_logger) << nmeaHost << " port: " << nmeaPort;
   //socket->connectToHost(QHostAddress::LocalHost, nmeaPort);
   //socket->connectToHost(nmeaHost, nmeaPort);
   reconnect();
@@ -54,12 +54,12 @@ void SocketHandler::init(QString nmeaHost, int nmeaPort)
 
 void SocketHandler::reconnect()
 {
-    INFO_LOG() << "Connecting,.." << " host = " << m_nmeaHost
+    INFO_LOG(m_logger) << "Connecting,.." << " host = " << m_nmeaHost
                      <<  " port = " << m_nmeaPort;;
 
   if(!socket->bind(m_nmeaPort, QAbstractSocket::BindFlag::ShareAddress))
   {
-    ERROR_LOG() << "Error from Socket: " << socket->errorString();
+    ERROR_LOG(m_logger) << "Error from Socket: " << socket->errorString();
     m_reconnectTimer->start(10000);
   }
 
@@ -69,24 +69,24 @@ void SocketHandler::connected()
 {
   m_reconnectTimer->stop();
 
-  INFO_LOG() << "Connected!";
+  INFO_LOG(m_logger) << "Connected!";
 }
 
 
 void SocketHandler::disconnected()
 {
-  INFO_LOG() << "Disconnected!";
+  INFO_LOG(m_logger) << "Disconnected!";
 }
 
 void SocketHandler::bytesWritten(qint64 bytes)
 {
-  TRACE_LOG() << "We wrote: " << bytes;
+  TRACE_LOG(m_logger) << "We wrote: " << bytes;
 }
 
 void SocketHandler::reconnectTimerSlot()
 {
   m_reconnectTimer->stop();
-  INFO_LOG() << "Reconnect NMEA-Socket "
+  INFO_LOG(m_logger) << "Reconnect NMEA-Socket "
                       << " host = " << m_nmeaHost
                       <<  " port = " << m_nmeaPort;
   reconnect();
@@ -96,7 +96,7 @@ void SocketHandler::reconnectTimerSlot()
 void SocketHandler::readyRead()
 {
   bool hasData = true;
-  INFO_LOG() << "Reading...";
+  INFO_LOG(m_logger) << "Reading...";
  // QByteArray ba = socket->readDatagram();
  
   QByteArray ba;
@@ -106,18 +106,18 @@ void SocketHandler::readyRead()
 
     ba.resize(int(socket->pendingDatagramSize()));
     socket->readDatagram(ba.data(), ba.size());
-    INFO_LOG() << ba;
+    INFO_LOG(m_logger) << ba;
     QByteArray nmeaDataBa = ba; // ba.mid(startNmeaData, endNmeaData);
     std::string nmeaDataStd = nmeaDataBa.toStdString() ;
     QString nmeaData = QString::fromLocal8Bit(nmeaDataStd.c_str());
 
 
-    INFO_LOG() << "nmeaDecoder :" << nmeaData;
+    INFO_LOG(m_logger) << "nmeaDecoder :" << nmeaData;
     //ba = ba.mid(endNmeaData, ba.length());
     m_nmeaHandler->decode(nmeaData);
 
-    INFO_LOG() << "NMEA-Data=" << nmeaData;
-    INFO_LOG() << "NMEA-Data ba=" << ba;
+    INFO_LOG(m_logger) << "NMEA-Data=" << nmeaData;
+    INFO_LOG(m_logger) << "NMEA-Data ba=" << ba;
   }
 }
 
@@ -127,7 +127,7 @@ void SocketHandler::onTurnRadioMasterOffRequest(const rti::core::SampleIdentity
 
   Core::FunctionReplyObject reply;
   if (reply.error())
-    WARNING_LOG() << "onTurnRadioMasterOffReply: " << reply();
+    WARNING_LOG(m_logger) << "onTurnRadioMasterOffReply: " << reply();
 
   m_ddsHandler->fts()->turnRadioMasterOffReply(cookie, reply);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/ModuleTests/nom_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/ModuleTests/nom_tests.cpp
index fa605d89b..b74ea5a5b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/ModuleTests/nom_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/ModuleTests/nom_tests.cpp
@@ -47,7 +47,7 @@ NomTests::~NomTests()
 //-----------------------------------------------------------------------------
 bool NomTests::init(int domainId, int exerciseId, int testId, int notificationId)
 {
-  INFO_LOG() << "MrkTests::init() "
+  INFO_LOG(m_logger) << "MrkTests::init() "
                      << " domainId:" << domainId
                      << " exerciseId:" << exerciseId
                      << " testId: " << testId
@@ -65,22 +65,22 @@ bool NomTests::init(int domainId, int exerciseId, int testId, int notificationId
   m_ddsConnector->initPublisherSubscriber();
 
   // Access to FTC
-  TRACE_LOG() << "create ftc";
+  TRACE_LOG(m_logger) << "create ftc";
   m_ftc = NotificationManagement::Interface::Ftc::create(m_ddsConnector);
-  TRACE_LOG() << "init ftc";
+  TRACE_LOG(m_logger) << "init ftc";
   bool bRet = m_ftc->enableAll();
-  TRACE_LOG() << "init end - bRet = " << bRet;
+  TRACE_LOG(m_logger) << "init end - bRet = " << bRet;
 
   // Access to DTC
-  TRACE_LOG() << "create dtc";
+  TRACE_LOG(m_logger) << "create dtc";
   m_dtc = NotificationManagement::Interface::Dtc::create(m_ddsConnector);
-  TRACE_LOG() << "init dtc";
+  TRACE_LOG(m_logger) << "init dtc";
   bRet &= m_dtc->enableAll();
-  TRACE_LOG() << "init end - bRet = " << bRet;
+  TRACE_LOG(m_logger) << "init end - bRet = " << bRet;
 
 
   // Access to OPM DTC
-  TRACE_LOG() << "create opmDtc";
+  TRACE_LOG(m_logger) << "create opmDtc";
   m_opmDtc = OperatorManagement::Interface::Dtc::create(m_ddsConnector);
   m_opmDtc->enableUser();
 
@@ -90,7 +90,7 @@ bool NomTests::init(int domainId, int exerciseId, int testId, int notificationId
 //-----------------------------------------------------------------------------
 void NomTests::startTest()
 {
-  INFO_LOG() << "startTest() exerciseId:" << m_exerciseId
+  INFO_LOG(m_logger) << "startTest() exerciseId:" << m_exerciseId
                      << " testId:" << m_testId
                      << " notificationId:" << m_notificationId
                      ;
@@ -129,10 +129,10 @@ void NomTests::tryCreate()
   CreateNotificationRequest data;
   getCreateNotificationRequestData(data);
 
-  INFO_LOG() << "trying to send CreateNotificationRequest";
+  INFO_LOG(m_logger) << "trying to send CreateNotificationRequest";
   if (!m_ftc->createNotificationRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
 }
@@ -191,7 +191,7 @@ void NomTests::tryCreateHQ()
   notifReq.notification(notif);
 
   if (!m_ftc->createNotificationRequest(notifReq, this))
-    ERROR_LOG() << "Error requesting create Notification data";
+    ERROR_LOG(m_logger) << "Error requesting create Notification data";
 
 } // end of tryCreate()
 
@@ -213,10 +213,10 @@ void NomTests::tryReadReceipt()
   request.notificationIds({m_notificationId});
   request.processed(true);
 
-  INFO_LOG() << "trying to send CreateNotificationRequest";
+  INFO_LOG(m_logger) << "trying to send CreateNotificationRequest";
   if (!m_ftc->readReceiptRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting readReceipt data";
+    ERROR_LOG(m_logger) << "Error requesting readReceipt data";
     failExit();
   }
 } // end of tryReadReceipt
@@ -230,10 +230,10 @@ void NomTests::tryRemove()
 
   data.id(m_notificationId);
 
-  INFO_LOG() << "trying to send remove request for notificationId:" << data.id();
+  INFO_LOG(m_logger) << "trying to send remove request for notificationId:" << data.id();
   if (!m_ftc->notificationRemoveRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting remove data for notificationId:" << data.id();
+    ERROR_LOG(m_logger) << "Error requesting remove data for notificationId:" << data.id();
     failExit();
   }
 */
@@ -244,12 +244,12 @@ void NomTests::tryRemove()
 void NomTests::tryGetAllNotifications()
 {
   m_eTestStep = eGetAllNotifications;
-  DEBUG_LOG() << "trying to get all notifications";
+  DEBUG_LOG(m_logger) << "trying to get all notifications";
 
   m_dtc->waitForHistoricalDataNomNotification();
   if (m_dtc->nomNotifications().isEmpty())
   {
-    ERROR_LOG() << "Error requesting all notification data";
+    ERROR_LOG(m_logger) << "Error requesting all notification data";
     QTimer::singleShot(0, qApp, &QCoreApplication::quit);
     return;
   }
@@ -259,7 +259,7 @@ void NomTests::tryGetAllNotifications()
     // needed for Test 11 tryGetNotification
     m_notificationId = notif.id();
 
-    INFO_LOG() << "Nom(" << notif.id() << ") :"
+    INFO_LOG(m_logger) << "Nom(" << notif.id() << ") :"
                        << " title:"           << notif.title()
                        << " content:"         << notif.content()
                        << " timeStamp:"       << notif.timeStamp()
@@ -269,7 +269,7 @@ void NomTests::tryGetAllNotifications()
                        << " processPrio: "    << notif.processedPriority()
                        << " recipient count:" << notif.recipientIds().size();
 
-    INFO_LOG() << "SenderAddress("      << notif.sender().id() << ") :"
+    INFO_LOG(m_logger) << "SenderAddress("      << notif.sender().id() << ") :"
                        << " name: "             << notif.sender().name()
                        << ", addressId: "       << notif.sender().addressId()
                        << ", addressSubId: "    << notif.sender().addressSubId()
@@ -284,14 +284,14 @@ void NomTests::tryGetAllNotifications()
 //-----------------------------------------------------------------------------
 void NomTests::tryGetNotification()
 {
-  DEBUG_LOG() << "trying to get notification with id:" << m_notificationId;
+  DEBUG_LOG(m_logger) << "trying to get notification with id:" << m_notificationId;
 
   if (m_testId > 1)
     m_eTestStep = eGetNotification;
 
   if (m_notificationId <= 0)
   {
-    ERROR_LOG() << "invalid notificationId - test aborted.";
+    ERROR_LOG(m_logger) << "invalid notificationId - test aborted.";
     failExit();
   }
 
@@ -300,12 +300,12 @@ void NomTests::tryGetNotification()
 
   if (notif.id() <= 0)
   {
-    ERROR_LOG() << "Error receiving data for notificationId " << m_notificationId << " returnVal:" << notif.id();
+    ERROR_LOG(m_logger) << "Error receiving data for notificationId " << m_notificationId << " returnVal:" << notif.id();
     failExit();
   }
   else
   {
-    INFO_LOG() << "NomNotification("     << notif.id() << ") :"
+    INFO_LOG(m_logger) << "NomNotification("     << notif.id() << ") :"
                        << " title:"           << notif.title()
                        << " content:"         << notif.content()
                        << " timeStamp:"       << notif.timeStamp()
@@ -317,7 +317,7 @@ void NomTests::tryGetNotification()
 
     for (const NotificationManagement::Address &addr : notif.recipientIds())
     {
-      INFO_LOG() << "Recipient("          << addr.id() << ") :"
+      INFO_LOG(m_logger) << "Recipient("          << addr.id() << ") :"
                          << " name: "             << addr.name()
                          << ", addressId: "       << addr.addressId()
                          << ", addressSubId: "    << addr.addressSubId()
@@ -326,7 +326,7 @@ void NomTests::tryGetNotification()
                          << ", isRead: "          << addr.isRead();
     }
 
-    INFO_LOG() << "SenderAddress("      << notif.sender().id() << ") :"
+    INFO_LOG(m_logger) << "SenderAddress("      << notif.sender().id() << ") :"
                        << " name: "             << notif.sender().name()
                        << ", addressId: "       << notif.sender().addressId()
                        << ", addressSubId: "    << notif.sender().addressSubId()
@@ -340,7 +340,7 @@ void NomTests::tryGetNotification()
     {
       if (! onCompareCreatedData(notif))
       {
-        ERROR_LOG() << "Compare created data failed!";
+        ERROR_LOG(m_logger) << "Compare created data failed!";
         failExit();
       }
       else
@@ -359,19 +359,19 @@ void NomTests::tryGetNotification()
 //-----------------------------------------------------------------------------
 void NomTests::onCreateNotificationReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got createReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got createReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   m_notificationId = replyObject.id();
 
   if (replyObject.error())
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
     return;
   }
   else
-    DEBUG_LOG() << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
+    DEBUG_LOG(m_logger) << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
 
   if (m_testId == 0)
     //    QTimer::singleShot(0, this, &NomTests::tryModify()));
@@ -385,17 +385,17 @@ void NomTests::onCreateNotificationReply(const Core::FunctionReplyObject &replyO
 void NomTests::onReadReceiptReply(const Core::FunctionReplyObject &replyObject)
 {
 
-  INFO_LOG() << "Got onReadReceipt with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got onReadReceipt with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   if (replyObject.error())
   {
-    ERROR_LOG() << "Error requesting ReadReceipt data for id:" << replyObject.id();
+    ERROR_LOG(m_logger) << "Error requesting ReadReceipt data for id:" << replyObject.id();
     failExit();
     return;
   }
   else
-    DEBUG_LOG() << "Requesting ReadReceipt data for id:" << replyObject.id() << " ... ok.";
+    DEBUG_LOG(m_logger) << "Requesting ReadReceipt data for id:" << replyObject.id() << " ... ok.";
 
   if (m_testId == 0)
     //    QTimer::singleShot(0, this, &MrkTests::tryDelete()));
@@ -409,17 +409,17 @@ void NomTests::onReadReceiptReply(const Core::FunctionReplyObject &replyObject)
 /*
 void NomTests::onNotificationRemoveReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got removeReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   if (replyObject.error())
   {
-    ERROR_LOG() << "Error requesting remove data for NotificationId:" << replyObject.id();
+    ERROR_LOG(m_logger) << "Error requesting remove data for NotificationId:" << replyObject.id();
     failExit();
     return;
   }
   else
-    DEBUG_LOG() << "Requesting remove data for NotificationId:" << replyObject.id() << " ... ok.";
+    DEBUG_LOG(m_logger) << "Requesting remove data for NotificationId:" << replyObject.id() << " ... ok.";
 
   if (m_testId == 0)
   {
@@ -435,21 +435,21 @@ void NomTests::onNotificationRemoveReply(const Core::FunctionReplyObject &replyO
 //-----------------------------------------------------------------------------
 void NomTests::onReceiveNotificationChanged(const NomNotification &data, DataModification modType)
 {
-  //  INFO_LOG() << "onReceiveNotificationChanged()  notificationId:" << data.id()
+  //  INFO_LOG(m_logger) << "onReceiveNotificationChanged()  notificationId:" << data.id()
   //                     << " modificationType: = " << (int)modType<< " received";
 
   switch (modType)
   {
   case DataModification::eAdded:
-    INFO_LOG() << "*** NomNotification added received. notificationId:" << data.id();
+    INFO_LOG(m_logger) << "*** NomNotification added received. notificationId:" << data.id();
     break;  
 
   case DataModification::eModified:
-    INFO_LOG() << "*** NomNotification modified received. notificationId:" << data.id();
+    INFO_LOG(m_logger) << "*** NomNotification modified received. notificationId:" << data.id();
     break;
 
   case DataModification::eRemoved:
-    INFO_LOG() << "*** NomNotification removed received. notificationId:" << data.id();
+    INFO_LOG(m_logger) << "*** NomNotification removed received. notificationId:" << data.id();
     break;
 
   }
@@ -505,7 +505,7 @@ void NomTests::getCreateNotificationRequestData(CreateNotificationRequest &data)
 //-----------------------------------------------------------------------------
 bool NomTests::onCompareCreatedData(NomNotification &data)
 {
-  DEBUG_LOG() << "start onCompareCreatedData() for id :" << data.id();
+  DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id();
 
   // Vergleicht die zurueckgelesen Datan mit den statischen create Daten
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/ModuleTests/nom_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/ModuleTests/nom_tests.h
index 56fa43643..37a960855 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/ModuleTests/nom_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/ModuleTests/nom_tests.h
@@ -63,6 +63,7 @@ protected Q_SLOTS:
   void onReceiveNotificationChanged(const NomNotification &data, DataModification modType);
 
 protected:
+  NGL::INGLLogger &m_logger;
   // Callbackfunctions for FTC
   void onCreateNotificationReply(const Core::FunctionReplyObject &replyObject) override final;
   void onReadReceiptReply(const Core::FunctionReplyObject &reply) override final;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/dds_handler.cpp
index 117eae09d..26c889359 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/dds_handler.cpp
@@ -16,7 +16,7 @@ namespace NotificationManagement
 DdsHandler::DdsHandler(int domainId)
     : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::AllExercises))
 {
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 } // end of ctor()DdsHandler
 //-----------------------------------------------------------------------------
 
@@ -24,7 +24,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -41,22 +41,22 @@ bool DdsHandler::init(const QStringList &qosFileList)
   // DTS
   m_ddsDts = NotificationManagement::Interface::Dts::create(m_ddsConnector);
   bool bRet = m_ddsDts->enableAll();
-  INFO_LOG() << "Dts initialised";
+  INFO_LOG(m_logger) << "Dts initialised";
 
   // FTS
   m_ddsFts = NotificationManagement::Interface::Fts::create(m_ddsConnector);
   bRet &= m_ddsFts->enableAll();
-  INFO_LOG() << "Fts initialised";
+  INFO_LOG(m_logger) << "Fts initialised";
 
   // DtcExm
   m_dtcExm = ExerciseManagement::Interface::Dtc::create(m_ddsConnector);
   bRet &= m_dtcExm->enableExercise();
-  INFO_LOG() << "DtcExm initialised";
+  INFO_LOG(m_logger) << "DtcExm initialised";
 
   // DtcOpm
   m_dtcOpm = OperatorManagement::Interface::Dtc::create(m_ddsConnector);
   bRet &= m_dtcOpm->enableUser();
-  INFO_LOG() << "DtcOpm initialised";
+  INFO_LOG(m_logger) << "DtcOpm initialised";
 
   return bRet;
 } // end of init()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/dds_handler.h
index 62339b119..4a6579f8c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/dds_handler.h
@@ -47,6 +47,7 @@ public:
 private:
 
 
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<Core::Interface::Dtc>       m_dtcCore;
   std::shared_ptr<Core::Pacemaker>            m_pacemaker;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/handler_notification.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/handler_notification.cpp
index af613b59a..36166eb8f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/handler_notification.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/handler_notification.cpp
@@ -37,14 +37,14 @@ HandlerNotification::~HandlerNotification()
 
 bool HandlerNotification::init()
 {
-  INFO_LOG() << "--- Start NotificationManagement HandlerNotification.";
+  INFO_LOG(m_logger) << "--- Start NotificationManagement HandlerNotification.";
 
   QVector<Database::NomAddress> dataAddressVec;
 
   // read all addresses from database
   if (!m_db->select(dataAddressVec))
   {
-    ERROR_LOG() << "Error reading address data from database!";
+    ERROR_LOG(m_logger) << "Error reading address data from database!";
     return false;
   }
 
@@ -58,7 +58,7 @@ bool HandlerNotification::init()
     // Remove old notifications
     if (isRemoveable(notif))
     {
-      INFO_LOG() << "Remove old notification " << notif.title() << ", id = " << notif.id();
+      INFO_LOG(m_logger) << "Remove old notification " << notif.title() << ", id = " << notif.id();
       removeNotificationIds.append(notif.id());
       return;
     }
@@ -81,7 +81,7 @@ bool HandlerNotification::init()
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       bRet = false;
       return;
     }
@@ -89,7 +89,7 @@ bool HandlerNotification::init()
   };
   if (!m_db->select(cb) || !bRet)
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
 
@@ -99,11 +99,11 @@ bool HandlerNotification::init()
     m_db->removeNomNotification(notificationId);
   trans.commit();
 
-  DEBUG_LOG() << "m_objectNotificationMap.size() = " << m_objectNotificationMap.size();
+  DEBUG_LOG(m_logger) << "m_objectNotificationMap.size() = " << m_objectNotificationMap.size();
 
   if (!m_ddsHandler->fts())
   {
-    ERROR_LOG() << "m_ddsHandler->fts() == nullptr!";
+    ERROR_LOG(m_logger) << "m_ddsHandler->fts() == nullptr!";
     return false;
   }
 
@@ -118,8 +118,8 @@ bool HandlerNotification::init()
   connect(m_removeNotificationTimer, &QTimer::timeout, this, &HandlerNotification::onCheckRemove);
   m_removeNotificationTimer->start();
 
-  DEBUG_LOG() << "removeTimerInterval: " << Settings::removeTimerIntervalMSec();
-  DEBUG_LOG() << "expiryTime: " << Settings::expiryIntervalMSec();
+  DEBUG_LOG(m_logger) << "removeTimerInterval: " << Settings::removeTimerIntervalMSec();
+  DEBUG_LOG(m_logger) << "expiryTime: " << Settings::expiryIntervalMSec();
 
   return true;
 } // end of init()
@@ -128,14 +128,14 @@ bool HandlerNotification::init()
 void HandlerNotification::onCreateNotificationRequest(const rti::core::SampleIdentity &cookie,
                                           const CreateNotification &request)
 {
-  DEBUG_LOG() << "onCreateNotificationRequest: " << request;
+  DEBUG_LOG(m_logger) << "onCreateNotificationRequest: " << request;
 
   ObjectNotification *ifs(new ObjectNotification(m_ddsHandler, m_db));
   const Core::FunctionReplyObject ret = ifs->createObject(request.notification());
   if (ret.error())
   {
     delete ifs;
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
     m_ddsHandler->fts()->createNotificationReply(cookie, ret);
     return;
   }
@@ -149,7 +149,7 @@ void HandlerNotification::onCreateNotificationRequest(const rti::core::SampleIde
 void HandlerNotification::onReadReceiptRequest(const rti::core::SampleIdentity &cookie,
                           const ReadReceipt &request)
 {
-  DEBUG_LOG() << "onReadReceiptRequest: " << request;
+  DEBUG_LOG(m_logger) << "onReadReceiptRequest: " << request;
   Core::FunctionReplyObject ret;
 
   for (const auto notificationId : request.notificationIds())
@@ -170,7 +170,7 @@ void HandlerNotification::onReadReceiptRequest(const rti::core::SampleIdentity &
 
 void HandlerNotification::onDeleteMessageRequest(const rti::core::SampleIdentity &cookie, const DeleteMessage &request)
 {
-  DEBUG_LOG() << "onDeleteMessageRequest: " << request;
+  DEBUG_LOG(m_logger) << "onDeleteMessageRequest: " << request;
   Core::FunctionReplyObject ret;
 
   for (const auto notificationId : request.notificationIds())
@@ -203,10 +203,10 @@ void HandlerNotification::onExerciseChanged(const ExerciseManagement::Exercise &
     if (obj->notification().exerciseId() != data.id())
       continue;
 
-    DEBUG_LOG() << "Remove notification " << obj->id();
+    DEBUG_LOG(m_logger) << "Remove notification " << obj->id();
     Core::FunctionReplyObject ret = obj->removeObject();
     if (ret.error())
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
     else
     {
       // delete ObjectNotification
@@ -229,10 +229,10 @@ void HandlerNotification::onCheckRemove()
     if (!isRemoveable(notif))
       continue;
 
-    DEBUG_LOG() << "Remove notification " << obj->id();
+    DEBUG_LOG(m_logger) << "Remove notification " << obj->id();
     Core::FunctionReplyObject ret = obj->removeObject();
     if (ret.error())
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
     else
     {
       // delete ObjectNotification
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/handler_notification.h b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/handler_notification.h
index e5e026357..eb25ccff3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/handler_notification.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/handler_notification.h
@@ -33,6 +33,8 @@ public:
   bool init();
 
 private: // methods
+
+NGL::INGLLogger &m_logger;
   void onCreateNotificationRequest(const rti::core::SampleIdentity &cookie,
                              const CreateNotification &request) override final;
   void onReadReceiptRequest(const rti::core::SampleIdentity &cookie,
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/main_handler.cpp
index 3fe6c7958..abe510243 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/main_handler.cpp
@@ -18,13 +18,13 @@ namespace NotificationManagement
 MainHandler::MainHandler()
   : m_logger(getLogger("MainHandler"))
 {
-  INFO_LOG() << "MainHandler::MainHandler";
+  INFO_LOG(m_logger) << "MainHandler::MainHandler";
 } // end of ctor()
 //-----------------------------------------------------------------------------
 
 MainHandler::~MainHandler()
 {
-  INFO_LOG() << "MainHandler::~MainHandler";
+  INFO_LOG(m_logger) << "MainHandler::~MainHandler";
   m_ddsHandler = nullptr;
   m_dbHandler = nullptr;
 } // end of dtor()
@@ -32,38 +32,38 @@ MainHandler::~MainHandler()
 
 bool MainHandler::init(int domainId)
 {
-  INFO_LOG() << "Start MessageDataManagement MainHandler. domainId ="<<domainId;
+  INFO_LOG(m_logger) << "Start MessageDataManagement MainHandler. domainId ="<<domainId;
 
   // initialize DDS
   m_ddsHandler = std::make_shared<DdsHandler>(domainId);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation DdsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
     if (m_ddsHandler->pacemaker())
       m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
   }
-  INFO_LOG() << "m_ddsHandler initialized. ";
+  INFO_LOG(m_logger) << "m_ddsHandler initialized. ";
 
   // initialize database
   m_dbHandler = std::make_shared<DbHandler>();
   if (!m_dbHandler->init(0, Settings::settings()))
   {
-    ERROR_LOG() << "Initialisation DbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation DbHandler failed.";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
   }
-  INFO_LOG() << "DbHandler initialized. ";
+  INFO_LOG(m_logger) << "DbHandler initialized. ";
 
-  INFO_LOG() << "create HandlerNotification. ";
+  INFO_LOG(m_logger) << "create HandlerNotification. ";
   m_handlerNotification = std::make_shared<HandlerNotification>(m_ddsHandler, m_dbHandler->db());
   if (!m_handlerNotification->init())
   {
-    ERROR_LOG() << "create HandlerNotification failed.";
+    ERROR_LOG(m_logger) << "create HandlerNotification failed.";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
   }
-  INFO_LOG() << "HandlerNotification initialized";
+  INFO_LOG(m_logger) << "HandlerNotification initialized";
 
   m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
   //m_ddsHandler->enableEquipmentMessage();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/main_handler.h
index 02d3e88c8..b2465833b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/main_handler.h
@@ -32,6 +32,8 @@ public:
   bool init(int domainId);
 
 private: // attributes
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>          m_ddsHandler;                ///< Pointer to DDS handler
   std::shared_ptr<DbHandler>           m_dbHandler;                 ///< Pointer to DB handler
   std::shared_ptr<HandlerNotification> m_handlerNotification;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/object_notification.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/object_notification.cpp
index 60a7dff52..bb22c8a42 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/object_notification.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/object_notification.cpp
@@ -46,9 +46,9 @@ Core::FunctionReplyObject ObjectNotification::createObject(const NomNotification
 
     // Neue DB Id in lokale Struktur uebernehmen
     m_dataNotificationObject.id(dbDataNotification.id);
-    DEBUG_LOG() << "New NotificationId: " << dbDataNotification.id;
+    DEBUG_LOG(m_logger) << "New NotificationId: " << dbDataNotification.id;
 
-    DEBUG_LOG() << "Handle Address for notificationId:" << dbDataNotification.id << "  number of depending recipients: " << data.recipientIds().size();
+    DEBUG_LOG(m_logger) << "Handle Address for notificationId:" << dbDataNotification.id << "  number of depending recipients: " << data.recipientIds().size();
 
     // Behandlung von Recipients
     for (size_t i = 0; i < data.recipientIds().size(); ++i)
@@ -98,7 +98,7 @@ QString ObjectNotification::contentArgsToJson()
 
   for (const std::string& arg : std::as_const(m_dataNotificationObject.contentArgs()))
   {
-    DEBUG_LOG() << ".arg() ersetzt immer den kleinsten freien Platzhalter"
+    DEBUG_LOG(m_logger) << ".arg() ersetzt immer den kleinsten freien Platzhalter"
                         << ", arg=" << arg;
     QJsonObject argObj;
     argObj[CONTENT_ID] = i;
@@ -110,18 +110,18 @@ QString ObjectNotification::contentArgsToJson()
   mainObject[TRANSLATION_ARGS] = jsonArray;
 
   QJsonDocument doc(mainObject);
-  DEBUG_LOG() << "ObjectNotification::contentArgsToJson properties=" << QString::fromUtf8(doc.toJson(QJsonDocument::Compact));
+  DEBUG_LOG(m_logger) << "ObjectNotification::contentArgsToJson properties=" << QString::fromUtf8(doc.toJson(QJsonDocument::Compact));
   return QString::fromUtf8(doc.toJson(QJsonDocument::Compact));
 }
 
 std::vector<std::string> ObjectNotification::jsonToContentArgs(const QString &jsonString)
 {
-  //DEBUG_LOG() << "jsonToContentArgs jsonString=" << jsonString;
+  //DEBUG_LOG(m_logger) << "jsonToContentArgs jsonString=" << jsonString;
   std::vector<std::string> result;
   // 1. String parsen
   QJsonDocument doc = QJsonDocument::fromJson(jsonString.toUtf8());
   if (!doc.isObject()) {
-    //WARNING_LOG() << "properties: Invalid JSON-Object";
+    //WARNING_LOG(m_logger) << "properties: Invalid JSON-Object";
     return result;
   }
 
@@ -129,7 +129,7 @@ std::vector<std::string> ObjectNotification::jsonToContentArgs(const QString &js
 
   // 2. Das Array aus "translationsArgs" herausholen
   if (!hauptObjekt.contains(TRANSLATION_ARGS) || !hauptObjekt[TRANSLATION_ARGS].isArray()) {
-    //WARNING_LOG() << "Missing or invalid 'translationsArgs' key (must be an array).";
+    //WARNING_LOG(m_logger) << "Missing or invalid 'translationsArgs' key (must be an array).";
     return result;
   }
   QJsonArray jsonArray = hauptObjekt[TRANSLATION_ARGS].toArray();
@@ -148,8 +148,8 @@ std::vector<std::string> ObjectNotification::jsonToContentArgs(const QString &js
     // 4. Zugriff über die ID testen
     if (sucheMap.contains(gesuchteId)) {
       QJsonObject treffer = sucheMap[gesuchteId];
-      //DEBUG_LOG() << "ID" << gesuchteId << "gefunden!";
-      //DEBUG_LOG() << "Inhalt:" << treffer[CONTENT_ARG].toString();
+      //DEBUG_LOG(m_logger) << "ID" << gesuchteId << "gefunden!";
+      //DEBUG_LOG(m_logger) << "Inhalt:" << treffer[CONTENT_ARG].toString();
       QString contentStr = treffer[CONTENT_ARG].toString();
       result.emplace_back(contentStr.toStdString());
     } else {
@@ -177,7 +177,7 @@ Core::FunctionReplyObject ObjectNotification::readReceipt(const ReadReceipt &dat
       continue;
 
     dbDataAddr = toDbData(recipientAddr);
-    DEBUG_LOG() << "Found Operator " << data.operatorId() << " with repicpentID " << dbDataAddr.id;
+    DEBUG_LOG(m_logger) << "Found Operator " << data.operatorId() << " with repicpentID " << dbDataAddr.id;
     dbDataAddr.notificationId = dbDataNotification.id;
 
     break;
@@ -206,7 +206,7 @@ Core::FunctionReplyObject ObjectNotification::readReceipt(const ReadReceipt &dat
     }
     else
     {
-      DEBUG_LOG() << "Notification already processed id=" << notificationId;
+      DEBUG_LOG(m_logger) << "Notification already processed id=" << notificationId;
       return Core::FunctionReplyObject(dbDataNotification.processed, {}, {}, tr_lts("dds", "Notification already processed"));
     }
   }
@@ -216,7 +216,7 @@ Core::FunctionReplyObject ObjectNotification::readReceipt(const ReadReceipt &dat
 
   trans.commit();
 
-  INFO_LOG() << "Data changed for NotificationId: " << m_dataNotificationObject.id();
+  INFO_LOG(m_logger) << "Data changed for NotificationId: " << m_dataNotificationObject.id();
 
   const std::vector<Address> recipients = m_dataNotificationObject.recipientIds();
   const Address sender = m_dataNotificationObject.sender();
@@ -249,7 +249,7 @@ Core::FunctionReplyObject ObjectNotification::deleteMessage(const DeleteMessage
 
   for (const Address &recipientAddr : std::as_const(m_dataNotificationObject.recipientIds()))
   {
-    DEBUG_LOG() << "recipientAddr="
+    DEBUG_LOG(m_logger) << "recipientAddr="
                         << ", id: " << recipientAddr.id() << ", addressId: " << recipientAddr.addressId() << ", isDeleted: " << recipientAddr.isDeleted();
     if (data.operatorId() > 0 && recipientAddr.addressType() == AddressType_def::Operator && recipientAddr.addressId() != data.operatorId())
       continue;
@@ -275,7 +275,7 @@ Core::FunctionReplyObject ObjectNotification::deleteMessage(const DeleteMessage
 
   trans.commit();
 
-  INFO_LOG() << "Data changed for NotificationId: " << m_dataNotificationObject.id();
+  INFO_LOG(m_logger) << "Data changed for NotificationId: " << m_dataNotificationObject.id();
 
   std::vector<Address> recipients = m_dataNotificationObject.recipientIds();
   Address sender = m_dataNotificationObject.sender();
@@ -284,7 +284,7 @@ Core::FunctionReplyObject ObjectNotification::deleteMessage(const DeleteMessage
 
   for (const Address &addr : std::as_const(recipients))
   {
-    DEBUG_LOG() << "addr="
+    DEBUG_LOG(m_logger) << "addr="
                         << ", id: " << addr.id() << ", addressId: " << addr.addressId() << ", isDeleted: " << addr.isDeleted();
 
     if (addr.id() == dbDataAddr.id)
@@ -302,7 +302,7 @@ Core::FunctionReplyObject ObjectNotification::deleteMessage(const DeleteMessage
 
 Core::FunctionReplyObject ObjectNotification::deleteObject(const DeleteMessage &data, int notificationId)
 {
-  DEBUG_LOG() << "ObjectNotification::deleteObject"
+  DEBUG_LOG(m_logger) << "ObjectNotification::deleteObject"
                       << ", notificationId: " << notificationId << ", addressId: " << data.addressId() << ", operatorId: " << data.operatorId()
                       << ", workstationId: " << data.workstationId();
   deleteMessage(data, notificationId);
@@ -328,10 +328,10 @@ bool ObjectNotification::isValid() const { return m_dataNotificationObject.id()
 
 void ObjectNotification::onPublishData()
 {
-  INFO_LOG() << "Publish NomNotification-data to dds   notificationId:" << m_dataNotificationObject.id();
+  INFO_LOG(m_logger) << "Publish NomNotification-data to dds   notificationId:" << m_dataNotificationObject.id();
 
   if (!m_ddsHandler->dts()->publish(m_dataNotificationObject))
-    WARNING_LOG() << "Error publishing NomNotification-data to dds";
+    WARNING_LOG(m_logger) << "Error publishing NomNotification-data to dds";
 
 } // end of onPublishData()
 //-----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/object_notification.h b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/object_notification.h
index 797351da7..eff748728 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/object_notification.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/object_notification.h
@@ -50,11 +50,13 @@ public:
   static Address toDdsData(const Database::NomAddress &dbData);  // db -> dds
 
 private:
+  NGL::INGLLogger &m_logger;
   void onPublishData();
   QString contentArgsToJson();
   static std::vector<std::string> jsonToContentArgs(const QString &properties);
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>        m_ddsHandler;
   std::shared_ptr<DatabaseInterface> m_db;
   NomNotification                    m_dataNotificationObject;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/client_message.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/client_message.cpp
index a621504fa..3a5f4aac2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/client_message.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/client_message.cpp
@@ -127,9 +127,8 @@ ClientMessage::ClientMessage(DataManager *dataManager, LtsWebSocket::ReplyHandle
 // ####### ClientMessage end #######
 
 // ####### ServicesInformation begin #######
-ErrorMessage::ErrorMessage(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const int typeId, const QString &uuid, const QJsonValue &data)
-  : ClientMessage(dataManager, client, type, typeId, uuid, data)
-{}
+ErrorMessage::ErrorMessage(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const int typeId, const QString &uuid, const QJsonValue &data) : ClientMessage(dataManager, client, type, typeId, uuid, data),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 void ErrorMessage::process()
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/data_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/data_manager.cpp
index 802d45ad1..fd7082880 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/data_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/data_manager.cpp
@@ -27,13 +27,13 @@ DataManager::DataManager(MainHandler *mainHandler)
 //---------------------------------------------------------------------------------------------------------
 void DataManager::handleErrorMessage(const OcBaseDownload::WebSocketInterface::Messages::ErrorMessage::ErrorData &errData)
 {
-  ERROR_LOG() << "uuid: " << errData.uuid << " error class: " << errData.errorClass << " text: " << errData.errorMessage;
+  ERROR_LOG(m_logger) << "uuid: " << errData.uuid << " error class: " << errData.errorClass << " text: " << errData.errorMessage;
 }
 
 //---------------------------------------------------------------------------------------------------------
 void DataManager::servicePortsInformation(const QVector<Messages::ServicePortsInformation::ExerciseInformation> &exerciseInformation)
 {
-  DEBUG_LOG() << "Got ServicePortsInformation from websocket";
+  DEBUG_LOG(m_logger) << "Got ServicePortsInformation from websocket";
   switch (m_currentDownload)
   {
   case CurrentDownload::PDF:
@@ -44,7 +44,7 @@ void DataManager::servicePortsInformation(const QVector<Messages::ServicePortsIn
     break;
   case CurrentDownload::NOTHING:
   default:
-    WARNING_LOG() << "Got Ports Information in neither BASE nor PDF download mode";
+    WARNING_LOG(m_logger) << "Got Ports Information in neither BASE nor PDF download mode";
     break;
   }
 }
@@ -52,7 +52,7 @@ void DataManager::servicePortsInformation(const QVector<Messages::ServicePortsIn
 //---------------------------------------------------------------------------------------------------------
 void DataManager::handlePdfListMessage(const Messages::PdfListMessage::PdfListData &pdfListData)
 {
-  DEBUG_LOG() << "Got PDF list from websocket";
+  DEBUG_LOG(m_logger) << "Got PDF list from websocket";
   m_mainHandler->handlerPdfDownload()->handlePdfListData(pdfListData);
 }
 
@@ -64,19 +64,19 @@ void DataManager::setCurrentDownload(CurrentDownload currentDownload)
   switch (m_currentDownload)
   {
   case CurrentDownload::PDF:
-    DEBUG_LOG() << "Setting current download mode to PDF";
+    DEBUG_LOG(m_logger) << "Setting current download mode to PDF";
     m_mainHandler->dds()->fts()->enableStartBaseDownload(false);
     m_mainHandler->dds()->fts()->enableGetPdfList();
     m_mainHandler->dds()->fts()->enableStartPdfDownload();
     break;
   case CurrentDownload::BASE:
-    DEBUG_LOG() << "Setting current download mode to BASE";
+    DEBUG_LOG(m_logger) << "Setting current download mode to BASE";
     m_mainHandler->dds()->fts()->enableStartBaseDownload();
     m_mainHandler->dds()->fts()->enableGetPdfList(false);
     m_mainHandler->dds()->fts()->enableStartPdfDownload(false);
     break;
   case CurrentDownload::NOTHING:
-    DEBUG_LOG() << "Setting current download mode to NOTHING";
+    DEBUG_LOG(m_logger) << "Setting current download mode to NOTHING";
     m_mainHandler->dds()->fts()->enableAll();
     break;
   default:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/websocket_interface_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/websocket_interface_handler.cpp
index d5c410c08..e36a5372a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/websocket_interface_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/websocket_interface_handler.cpp
@@ -43,9 +43,9 @@ bool WebSocketInterfaceHandler::init()
 {
   cleanup();
 
-  DEBUG_LOG() << "WebSocketInterfaceHandler::init";
+  DEBUG_LOG(m_logger) << "WebSocketInterfaceHandler::init";
   m_dataManager = new DataManager(m_mainHandler);
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "... ok";
 
   m_messageFactory = new Messages::ClientMessageFactory(m_dataManager);
 
@@ -55,7 +55,7 @@ bool WebSocketInterfaceHandler::init()
 void WebSocketInterfaceHandler::open(const QString &hostname, int port)
 {
 
-  DEBUG_LOG() << "Opening " << hostname << ":" << port;
+  DEBUG_LOG(m_logger) << "Opening " << hostname << ":" << port;
 
   recreateWebSocket();
 
@@ -79,7 +79,7 @@ void WebSocketInterfaceHandler::close()
 bool WebSocketInterfaceHandler::send(LtsWebSocket::ReplyMessage *message)
 {
 
-  DEBUG_LOG() << "Sending: " << message->toJsonString();
+  DEBUG_LOG(m_logger) << "Sending: " << message->toJsonString();
 
   if (!m_webSocketClient)
     return false;
@@ -112,7 +112,7 @@ void WebSocketInterfaceHandler::recreateWebSocket()
   connect(m_webSocketClient, &LtsWebSocket::LtsWebSocketClient::dataReceived,
           this, [this]()
   {
-    DEBUG_LOG() << "data received restart timer";
+    DEBUG_LOG(m_logger) << "data received restart timer";
     m_webSocketActivityTimer->start();
   });
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/copy_database.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/copy_database.cpp
index 671d48c93..02cb44b0a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/copy_database.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/copy_database.cpp
@@ -40,7 +40,7 @@ bool CopyDatabase::doCopy()
 {
   if (!runPgDump())
   {
-    ERROR_LOG() << "Error running pg_dump";
+    ERROR_LOG(m_logger) << "Error running pg_dump";
     emit copyDbFailed();
     return false;
   }
@@ -74,7 +74,7 @@ void CopyDatabase::onDropDbFinished(int exitCode, QProcess::ExitStatus exitStatu
 
   if (exitCode > 0)
   {
-    ERROR_LOG() << "DropDb failed";
+    ERROR_LOG(m_logger) << "DropDb failed";
     emit dropDatabaseFailed();
     return;
   }
@@ -129,7 +129,7 @@ void CopyDatabase::onCreateDbFinished(int exitCode, QProcess::ExitStatus exitSta
 
   if (exitCode > 0)
   {
-    ERROR_LOG() << "CreateDB failed";
+    ERROR_LOG(m_logger) << "CreateDB failed";
     emit copyDbFailed();
     return;
   }
@@ -179,7 +179,7 @@ void CopyDatabase::onPgLoadFinished(int exitCode, QProcess::ExitStatus exitStatu
 
   if (exitCode > 0)
   {
-    ERROR_LOG() << "Loading db failed";
+    ERROR_LOG(m_logger) << "Loading db failed";
     emit copyDbFailed();
     return;
   }
@@ -207,7 +207,7 @@ void CopyDatabase::onPgSetGrantFinished(int exitCode, QProcess::ExitStatus exitS
 
   if (exitCode > 0)
   {
-    ERROR_LOG() << "Set grants to ets_admin failed";
+    ERROR_LOG(m_logger) << "Set grants to ets_admin failed";
     emit copyDbFailed();
     return;
   }
@@ -241,7 +241,7 @@ void CopyDatabase::handleProcFinished(int exitCode, QProcess::ExitStatus exitSta
     if (!out.isEmpty())
       out += '\n';
     out += m_proc->readAllStandardOutput();
-    ERROR_LOG() << "Process finished - exitCode: " << exitCode << ", exitStatus = " << exitStatus << ", " << out;
+    ERROR_LOG(m_logger) << "Process finished - exitCode: " << exitCode << ", exitStatus = " << exitStatus << ", " << out;
   }
   m_proc->disconnect(this);
   m_proc->deleteLater();
@@ -250,7 +250,7 @@ void CopyDatabase::handleProcFinished(int exitCode, QProcess::ExitStatus exitSta
 
 void CopyDatabase::onErrorOccured(QProcess::ProcessError error)
 {
-  ERROR_LOG() << "error: " << error << ", " << m_proc->readAllStandardOutput() << ", " << m_proc->readAllStandardError();
+  ERROR_LOG(m_logger) << "error: " << error << ", " << m_proc->readAllStandardOutput() << ", " << m_proc->readAllStandardError();
 }
 
 QString CopyDatabase::getDumpFile() const
@@ -263,7 +263,7 @@ QString CopyDatabase::executablePath(const QString &program)
   QString errStr;
   const QString ret = NGL::postgresExecutablePath(program, errStr);
   if (!errStr.isEmpty())
-    WARNING_LOG() << errStr;
+    WARNING_LOG(m_logger) << errStr;
   return ret;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/copy_database.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/copy_database.h
index 49c3b8a9d..2141f2f6e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/copy_database.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/copy_database.h
@@ -33,6 +33,7 @@ Q_SIGNALS:
   void dropDatabaseFailed();
   void dropDatabaseFinished();
 private:
+  NGL::INGLLogger &m_logger;
   bool runDropDb(const QString &dbName);
   void onDropDbFinished(int exitCode, QProcess::ExitStatus exitStatus);
   void runGrant();
@@ -52,6 +53,7 @@ private:
 
   QString executablePath(const QString &program);
 private:
+  NGL::INGLLogger &m_logger;
   QString          m_dbHost;
   QString          m_srcDbName;
   QString          m_dstDbName;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/dds_handler.cpp
index 79581fef8..27facfe23 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/dds_handler.cpp
@@ -17,14 +17,14 @@ namespace OcBaseDownload
 DdsHandler::DdsHandler(int domainId)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Global, 0))
 {
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
   if(!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -38,7 +38,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
   m_ddsFts = OcBaseDownload::Interface::Fts::create(m_ddsConnector);
 
   bool bRet = m_ddsFts->enableAll();
-  INFO_LOG() << "Fts initialised";
+  INFO_LOG(m_logger) << "Fts initialised";
 
   return bRet;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/dds_handler.h
index 680615093..216bc0742 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/dds_handler.h
@@ -36,6 +36,7 @@ public:
   std::shared_ptr<OcBaseDownload::Interface::Fts> fts() const { return m_ddsFts; }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<DTS::CurrentRunningState>   m_dtsCurrentRunningState;
   std::shared_ptr<Core::Pacemaker>            m_pacemaker;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_base_download.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_base_download.cpp
index 31842649a..88d53c020 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_base_download.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_base_download.cpp
@@ -84,7 +84,7 @@ bool HandlerBaseDownload::init()
   if (!m_scmDtc->enableServiceInformation() ||
       !m_scmDtc->enableGroupInformation())
   {
-    ERROR_LOG() << "Enabling SCM Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling SCM Data-Topics failed.";
     return false;
   }
 
@@ -92,11 +92,11 @@ bool HandlerBaseDownload::init()
   if (!m_scmFtc->enableRestartGroup() ||
       !m_scmFtc->enableStopGroup())
   {
-    ERROR_LOG() << "Enabling SCM Function-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling SCM Function-Topics failed.";
     return false;
   }
 
-  INFO_LOG() << "HandlerBaseDownload initialised!";
+  INFO_LOG(m_logger) << "HandlerBaseDownload initialised!";
 
   return true;
 }
@@ -559,7 +559,7 @@ void HandlerBaseDownload::receiveFlmData()
                                       " FROM ") + tableName + where + where2);
 
 
-    ERROR_LOG() << "FUCK FUCK WE ARE HERE!" << " snapshid id is= " << snapshotFolderId << " also my statement: " << stmt;
+    ERROR_LOG(m_logger) << "FUCK FUCK WE ARE HERE!" << " snapshid id is= " << snapshotFolderId << " also my statement: " << stmt;
     std::unique_ptr<NSqlQuery> query = std::unique_ptr<NSqlQuery>(new NSqlQuery(remoteDbIfc->database(), m_logger));
     query->prepare(stmt);
     QVector<Database::FlmFileContent> dataVec;
@@ -591,10 +591,10 @@ void HandlerBaseDownload::receiveFlmData()
              data.fileTypeId == FileManagement::FileType::Png)
             && data.folderId != snapshotFolderId)
         {
-          DEBUG_LOG() << "skip";
+          DEBUG_LOG(m_logger) << "skip";
           continue;
         }
-       // ERROR_LOG() << "ADD " << data.name;
+       // ERROR_LOG(m_logger) << "ADD " << data.name;
 
         dataVec.append(data);
       }
@@ -602,7 +602,7 @@ void HandlerBaseDownload::receiveFlmData()
 
     if (!dataVec.isEmpty())
     {
-      ERROR_LOG() << "Data vec has sisze: " << dataVec.size();
+      ERROR_LOG(m_logger) << "Data vec has sisze: " << dataVec.size();
       storeToDataVecMap(DbDataType::FlmFileContent, std::vector<Database::FlmFileContent>(dataVec.begin(), dataVec.end()));
       m_remoteDbRetryCounter = 0;
     }
@@ -682,10 +682,10 @@ QSqlDatabase HandlerBaseDownload::openDb(const QString &databaseName, bool remot
                                                  s->databaseDriver(),
                                                  remote ? m_hostname : s->databaseHostname(),
                                                  remote ? Settings::remoteDbName() : databaseName);
-  DEBUG_LOG() << "Trying to open database " << s->databaseHostname() << ":" << databaseName;
+  DEBUG_LOG(m_logger) << "Trying to open database " << s->databaseHostname() << ":" << databaseName;
   if (!dbConnection.isOpen())
   {
-    ERROR_LOG() << "Error opening database " << s->databaseHostname() << ":" << databaseName;
+    ERROR_LOG(m_logger) << "Error opening database " << s->databaseHostname() << ":" << databaseName;
     if (bOk)
       *bOk = false;
   }
@@ -725,11 +725,11 @@ void HandlerBaseDownload::updateBaseDownloadReply()
 
 void HandlerBaseDownload::onStartBaseDownloadRequest(const rti::core::SampleIdentity &cookie, const StartBaseDownloadRequest &request)
 {
-  DEBUG_LOG() << "Got Request, check for old one : " << request.hostname();
+  DEBUG_LOG(m_logger) << "Got Request, check for old one : " << request.hostname();
 
   if (request.timeStamp() < (QDateTime::currentMSecsSinceEpoch() - 10 * 1000)) //(5Sekunden)
   {
-    DEBUG_LOG() << "old call? ignore! ";
+    DEBUG_LOG(m_logger) << "old call? ignore! ";
     m_reply.progress(0);
     m_reply.errorString(std::string());
     m_reply.currentStep(std::string());
@@ -937,7 +937,7 @@ void HandlerBaseDownload::switchState()
     break;
   default:
   {
-    ERROR_LOG() << "State " << m_currentState << " is not handled properly.";
+    ERROR_LOG(m_logger) << "State " << m_currentState << " is not handled properly.";
     break;
   }
   }
@@ -970,7 +970,7 @@ void HandlerBaseDownload::dropOldDatabase()
     const int revId = val.midRef(idx + 1).toInt(&bOk);
     if (!bOk)
       continue;
-    DEBUG_LOG() << val << ", " << revId << ", " << curId;
+    DEBUG_LOG(m_logger) << val << ", " << revId << ", " << curId;
     if (revId < curId - 1 || revId >= curId)
       m_databasesToDrop += val;
   }
@@ -1017,14 +1017,14 @@ void HandlerBaseDownload::onCopyDbFinished()
 
 void HandlerBaseDownload::checkForAsmFinished()
 {
-  DEBUG_LOG() << "Checking if all ASM base data arrived.";
+  DEBUG_LOG(m_logger) << "Checking if all ASM base data arrived.";
 
   if (m_dataVecMap.contains(AsmTrainingArea) &&
       m_dataVecMap.contains(AsmLocation) &&
       m_dataVecMap.contains(AsmAsset) &&
       m_dataVecMap.contains(AsmTechnicalArea))
   {
-    INFO_LOG() << "All ASM base data arrived.";
+    INFO_LOG(m_logger) << "All ASM base data arrived.";
     stateFinished();
   }
   checkAliveTimer();
@@ -1032,12 +1032,12 @@ void HandlerBaseDownload::checkForAsmFinished()
 
 void HandlerBaseDownload::checkForExmFinished()
 {
-  DEBUG_LOG() << "Checking if all EXM base data arrived.";
+  DEBUG_LOG(m_logger) << "Checking if all EXM base data arrived.";
   if (m_dataVecMap.contains(ExmExercise) &&
       m_dataVecMap.contains(ExmExercisePhase) &&
       m_dataVecMap.contains(ExmExerciseStateChange))
   {
-    INFO_LOG() << "All EXM base data arrived.";
+    INFO_LOG(m_logger) << "All EXM base data arrived.";
     stateFinished();
   }
   checkAliveTimer();
@@ -1045,7 +1045,7 @@ void HandlerBaseDownload::checkForExmFinished()
 
 void HandlerBaseDownload::checkForIsmFinished()
 {
-  DEBUG_LOG() << "Checking if all ISM base data arrived.";
+  DEBUG_LOG(m_logger) << "Checking if all ISM base data arrived.";
   if (m_dataVecMap.contains(IsmAsset) &&
       m_dataVecMap.contains(IsmMainStructureElement) &&
       m_dataVecMap.contains(IsmStructureElement) &&
@@ -1054,7 +1054,7 @@ void HandlerBaseDownload::checkForIsmFinished()
       m_dataVecMap.contains(IsmMountingPointSchedule) &&
       m_dataVecMap.contains(IsmMountingPointPlan))
   {
-    INFO_LOG() << "All ISM base data arrived.";
+    INFO_LOG(m_logger) << "All ISM base data arrived.";
     stateFinished();
   }
   checkAliveTimer();
@@ -1062,22 +1062,22 @@ void HandlerBaseDownload::checkForIsmFinished()
 
 void HandlerBaseDownload::checkForPpmEx0Finished()
 {
-  DEBUG_LOG() << "Checking if all PPM Ex0 base data arrived.";
+  DEBUG_LOG(m_logger) << "Checking if all PPM Ex0 base data arrived.";
   if (m_dataVecMap.contains(PpmEquipmentType) &&
       m_dataVecMap.contains(PpmType))
   {
-    INFO_LOG() << "All PPM Ex0 base data arrived.";
+    INFO_LOG(m_logger) << "All PPM Ex0 base data arrived.";
     stateFinished();
   }
 }
 
 void HandlerBaseDownload::checkForPpmExNFinished()
 {
-  DEBUG_LOG() << "Checking if all PPM ExN base data arrived.";
+  DEBUG_LOG(m_logger) << "Checking if all PPM ExN base data arrived.";
   if (m_dataVecMap.contains(PpmParty) &&
       m_dataVecMap.contains(PpmParticipant))
   {
-    INFO_LOG() << "All PPM ExN base data arrived.";
+    INFO_LOG(m_logger) << "All PPM ExN base data arrived.";
     stateFinished();
   }
   checkAliveTimer();
@@ -1085,7 +1085,7 @@ void HandlerBaseDownload::checkForPpmExNFinished()
 
 void HandlerBaseDownload::checkForOpmFinished()
 {
-  DEBUG_LOG() << "Checking if all OPM base data arrived.";
+  DEBUG_LOG(m_logger) << "Checking if all OPM base data arrived.";
   if (m_dataVecMap.contains(OpmGroup) &&
       m_dataVecMap.contains(OpmGroupGroup) &&
       m_dataVecMap.contains(OpmOperator) &&
@@ -1095,7 +1095,7 @@ void HandlerBaseDownload::checkForOpmFinished()
       m_dataVecMap.contains(OpmAclAllow) &&
       m_dataVecMap.contains(OpmAclDeny))
   {
-    INFO_LOG() << "All OPM base data arrived.";
+    INFO_LOG(m_logger) << "All OPM base data arrived.";
     stateFinished();
   }
   checkAliveTimer();
@@ -1103,11 +1103,11 @@ void HandlerBaseDownload::checkForOpmFinished()
 
 void HandlerBaseDownload::checkForFlmFinished()
 {
-  DEBUG_LOG() << "Checking if all FLM base data arrived.";
+  DEBUG_LOG(m_logger) << "Checking if all FLM base data arrived.";
   if (m_dataVecMap.contains(FlmFolder) &&
       m_dataVecMap.contains(FlmFileContent))
   {
-    INFO_LOG() << "All FLM base data arrived.";
+    INFO_LOG(m_logger) << "All FLM base data arrived.";
     stateFinished();
   }
   checkAliveTimer();
@@ -1442,13 +1442,13 @@ void HandlerBaseDownload::insertPpmExNDbData(bool live)
       participantData.push_back(newEntry);
       partyToUnit.insert(party.id, newEntry.id);
 
-      TRACE_LOG() << "Adding: " << newEntry.name << " to participantData.";
+      TRACE_LOG(m_logger) << "Adding: " << newEntry.name << " to participantData.";
     }
     // insert pseudo-units
     ppmDbHandler->db()->upsert(participantData);
 #endif
   }
-  DEBUG_LOG() << "Now add participants: " << getDbDataVec<ParticipantManagement::Database::PpmParticipant>(PpmParticipant).size();
+  DEBUG_LOG(m_logger) << "Now add participants: " << getDbDataVec<ParticipantManagement::Database::PpmParticipant>(PpmParticipant).size();
   for (const auto &participant : getDbDataVec<ParticipantManagement::Database::PpmParticipant>(PpmParticipant))
   {
     if (participant.partyId == 0)
@@ -1464,7 +1464,7 @@ void HandlerBaseDownload::insertPpmExNDbData(bool live)
     newParticipant.superiorId = partyToUnit.value(participant.partyId);
     newParticipant.hierarchyNumber = participant.id;
 #endif
-    DEBUG_LOG() << "XXXXXXXX Adding Participant: " << newParticipant.id << " typeId: " << newParticipant.typeId << " typeClass: " << typeClass << " supperioer " << newParticipant.superiorId;
+    DEBUG_LOG(m_logger) << "XXXXXXXX Adding Participant: " << newParticipant.id << " typeId: " << newParticipant.typeId << " typeClass: " << typeClass << " supperioer " << newParticipant.superiorId;
 
     newParticipants.push_back(std::move(newParticipant));
   }
@@ -1587,7 +1587,7 @@ inline void resetVector(QPair<bool, QVector<T>> &dbVector)
 void HandlerBaseDownload::cleanup(const Core::FtReplyState &replyState, const std::string &errStr)
 {
   if (errStr.size() > 0)
-    ERROR_LOG() << "Base Download ended with error: " << errStr;
+    ERROR_LOG(m_logger) << "Base Download ended with error: " << errStr;
 
   // cleanup db data
   qDeleteAll(m_dataVecMap);
@@ -1649,7 +1649,7 @@ void HandlerBaseDownload::copyFromOldDatabase()
   const QString schemaName = QLatin1String("ex_") + QString::number(m_exerciseId);
   if (m_exTblGen->existsSchema(schemaName, dbIn))
   {
-    DEBUG_LOG() << "### Copying old files from schema " << schemaName;
+    DEBUG_LOG(m_logger) << "### Copying old files from schema " << schemaName;
     {
       // own transaction when old ex_N schema does not exist.
       DBTransaction trans(m_dbConnection);
@@ -1721,7 +1721,7 @@ void HandlerBaseDownload::copyFromOldDatabase()
       for (const QString &table : std::as_const(tableList))
       {
         if (!copyTable(dbIn, m_dbConnection, table))
-          ERROR_LOG() << "Failed to copy table " << table;
+          ERROR_LOG(m_logger) << "Failed to copy table " << table;
         checkAliveTimer();
       }
       trans.commit();
@@ -2187,7 +2187,7 @@ void HandlerBaseDownload::onStopGroupReply(const Core::FunctionReplyObject &repl
     return;
   }
   if (!m_stopGroupIds.remove(reply.id()))
-    WARNING_LOG() << "Got unknown reply id for stop group request: " << reply.id();
+    WARNING_LOG(m_logger) << "Got unknown reply id for stop group request: " << reply.id();
 
   if (!m_stopGroupIds.isEmpty())
     return;
@@ -2214,7 +2214,7 @@ void HandlerBaseDownload::restartCoreGroup()
   // we are also restarted... so answer here directly with 'finished'
   stateFinished();
   if (request.type() != Core::ServiceGroupType::Core)
-    WARNING_LOG() << "Could not find core group to restart...";
+    WARNING_LOG(m_logger) << "Could not find core group to restart...";
 
   const auto restartCb = [this, request]()
   {
@@ -2231,7 +2231,7 @@ void HandlerBaseDownload::onRestartGroupReply(const Core::FunctionReplyObject &r
     return;
   }
   // we won't get here since we're restarted too
-  ERROR_LOG() << "onRestartGroupReply?";
+  ERROR_LOG(m_logger) << "onRestartGroupReply?";
   stateFinished();
 }
 
@@ -2266,11 +2266,11 @@ bool HandlerBaseDownload::copyTable(const QSqlDatabase &dbIn, const QSqlDatabase
   NSqlQuery qIn(dbIn);
   NSqlQuery qOut(dbOut);
 
-  DEBUG_LOG() << "Copying " << tableName << " started";
+  DEBUG_LOG(m_logger) << "Copying " << tableName << " started";
   const QSqlRecord record = dbIn.record(tableName);
   if (record.isEmpty())
   {
-    ERROR_LOG() << "Empty record for " << tableName;
+    ERROR_LOG(m_logger) << "Empty record for " << tableName;
     return false;
   }
   QStringList selectTableColumns;
@@ -2291,18 +2291,18 @@ bool HandlerBaseDownload::copyTable(const QSqlDatabase &dbIn, const QSqlDatabase
                                         selectTableColumns.join(QStringLiteral(", ")),
                                         insertTablePlaceholder.join(QStringLiteral(", "))));
 
-  DEBUG_LOG() << selectTableCommand;
-  DEBUG_LOG() << insertTableCommand;
+  DEBUG_LOG(m_logger) << selectTableCommand;
+  DEBUG_LOG(m_logger) << insertTableCommand;
 
   if (!qOut.prepare(insertTableCommand))
   {
-    ERROR_LOG() << "qOut prepare failed... " << qOut.lastError().text();
+    ERROR_LOG(m_logger) << "qOut prepare failed... " << qOut.lastError().text();
     return false;
   }
   if (!qIn.exec(selectTableCommand))
   {
-    ERROR_LOG() << "qIn select failed... " << qIn.lastError().text();
-    DEBUG_LOG() << "FAILED statement: " << selectTableCommand;
+    ERROR_LOG(m_logger) << "qIn select failed... " << qIn.lastError().text();
+    DEBUG_LOG(m_logger) << "FAILED statement: " << selectTableCommand;
     qIn.finish();
     return false;
   }
@@ -2312,17 +2312,17 @@ bool HandlerBaseDownload::copyTable(const QSqlDatabase &dbIn, const QSqlDatabase
       qOut.bindValue(insertTablePlaceholder.at(i), qIn.value(i));
     if (!qOut.exec())
     {
-      ERROR_LOG() << "qOut insert failed.. " << qOut.lastError().text();
-      DEBUG_LOG() << "FAILED statement: " << insertTableCommand;
+      ERROR_LOG(m_logger) << "qOut insert failed.. " << qOut.lastError().text();
+      DEBUG_LOG(m_logger) << "FAILED statement: " << insertTableCommand;
       qOut.finish();
       return false;
     }
     checkAliveTimer();
   }
-  DEBUG_LOG() << "Copying " << tableName << " finished";
+  DEBUG_LOG(m_logger) << "Copying " << tableName << " finished";
 
   if (!fixUpSequence(dbOut, tableName))
-    WARNING_LOG() << "Failed to update sequence for table " << tableName;
+    WARNING_LOG(m_logger) << "Failed to update sequence for table " << tableName;
 
   return true;
 }
@@ -2344,14 +2344,14 @@ bool HandlerBaseDownload::fixUpSequence(const QSqlDatabase &dbOut, const QString
     keyField = QStringLiteral("id");
   }
 
-  DEBUG_LOG() << "Updating sequence " << seqName << " for table " << tableName;
+  DEBUG_LOG(m_logger) << "Updating sequence " << seqName << " for table " << tableName;
 
   const QString stmt(QStringLiteral("SELECT setval('%1', COALESCE((SELECT MAX(%2)+1 FROM %3), 1), false)").arg(seqName, keyField, tableName));
 
   if (!qOut.exec(stmt))
   {
-    ERROR_LOG() << "FAILED to update sequence for table " << tableName << " : " << qOut.lastError().text();
-    DEBUG_LOG() << "FAILED statement: " << stmt;
+    ERROR_LOG(m_logger) << "FAILED to update sequence for table " << tableName << " : " << qOut.lastError().text();
+    DEBUG_LOG(m_logger) << "FAILED statement: " << stmt;
     qOut.finish();
     return false;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_pdf_download.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_pdf_download.cpp
index 259f308fa..6f6975a70 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_pdf_download.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_pdf_download.cpp
@@ -52,7 +52,7 @@ HandlerPdfDownload::~HandlerPdfDownload()
 
 bool HandlerPdfDownload::init()
 {
-  INFO_LOG() << "HandlerPdfDownload initialised!";
+  INFO_LOG(m_logger) << "HandlerPdfDownload initialised!";
 
   return true;
 }
@@ -89,7 +89,7 @@ void HandlerPdfDownload::handleServicePortsInformation(const QVector<WebSocketIn
     m_webSocket->open(m_hostname, flmPort);
   else
   {
-    ERROR_LOG() << "Could not connect to FileManagement WebSocket server.";
+    ERROR_LOG(m_logger) << "Could not connect to FileManagement WebSocket server.";
     m_currentMode = Mode::PORT_REQUEST;
   }
 }
@@ -139,7 +139,7 @@ void HandlerPdfDownload::onGetPdfListRequest(const rti::core::SampleIdentity &co
 void HandlerPdfDownload::onStartPdfDownloadRequest(const rti::core::SampleIdentity &cookie, const StartPdfDownloadRequest &request)
 {
 
-  ERROR_LOG() <<" onOcPdfDownloadRequest  START" ;
+  ERROR_LOG(m_logger) <<" onOcPdfDownloadRequest  START" ;
   m_downloadReply = PdfDownloadReply();
   m_downloadCookie = cookie;
 
@@ -150,13 +150,13 @@ void HandlerPdfDownload::onStartPdfDownloadRequest(const rti::core::SampleIdenti
     for (int32_t id : request.documentIds())
       str.append(QString::number(id) + QStringLiteral(" "));
 
-    DEBUG_LOG() << str;
+    DEBUG_LOG(m_logger) << str;
   }
 
   if (m_hostname.isEmpty())
   {
     QString errorStr = QStringLiteral("Not able to start PDF download. Hostname not set.");
-    ERROR_LOG() << errorStr;
+    ERROR_LOG(m_logger) << errorStr;
     m_downloadReply.errorString(errorStr.toStdString());
     m_fts->startPdfDownloadReply(m_downloadCookie, m_downloadReply);
     return;
@@ -200,26 +200,26 @@ void HandlerPdfDownload::onStartPdfDownloadRequest(const rti::core::SampleIdenti
 
 void HandlerPdfDownload::onOcPdfDownloadRequest(const rti::core::SampleIdentity &cookie, const OcPdfDownloadRequest &request)
 {
-  DEBUG_LOG() <<Q_FUNC_INFO<<" START OcPdfDownloadRequest" ;
+  DEBUG_LOG(m_logger) <<Q_FUNC_INFO<<" START OcPdfDownloadRequest" ;
   m_ocPdfDownloadCookie = cookie;
   m_ocPdfDownloadReply = Core::FunctionReply();
 
   if(openRemoteDbConnection(QStringLiteral("lts_ets_pro")) == false)
   {
     QString errorStr = QStringLiteral("Not able to open remote connection to DB");
-    ERROR_LOG() << errorStr;
+    ERROR_LOG(m_logger) << errorStr;
     m_ocPdfDownloadReply.errorString(errorStr.toStdString());
     m_fts->ocPdfDownloadReply(m_ocPdfDownloadCookie, m_ocPdfDownloadReply);
     return;
   }
 
-  DEBUG_LOG() << "Got PDF download request for ids: "<< request.folderId();
+  DEBUG_LOG(m_logger) << "Got PDF download request for ids: "<< request.folderId();
 
   m_folderId = request.folderId();
   if(m_folderId == -1)
   {
     QString errorStr = QStringLiteral("Not able to start PDF download. Folder id not valid.");
-    ERROR_LOG() << errorStr;
+    ERROR_LOG(m_logger) << errorStr;
     m_ocPdfDownloadReply.errorString(errorStr.toStdString());
     m_fts->ocPdfDownloadReply(m_ocPdfDownloadCookie, m_ocPdfDownloadReply);
     return;
@@ -228,7 +228,7 @@ void HandlerPdfDownload::onOcPdfDownloadRequest(const rti::core::SampleIdentity
   if (m_hostname.isEmpty())
   {
     QString errorStr = QStringLiteral("Not able to start PDF download. Hostname not set.");
-    ERROR_LOG() << errorStr;
+    ERROR_LOG(m_logger) << errorStr;
     m_ocPdfDownloadReply.errorString(errorStr.toStdString());
     m_fts->ocPdfDownloadReply(m_ocPdfDownloadCookie, m_ocPdfDownloadReply);
     return;
@@ -255,7 +255,7 @@ void HandlerPdfDownload::exportOcPdfFileContent()
 
   auto remoteDbIfc = remoteDb->db();
   const QString dir = QStringLiteral("%1/OcPdf/%2/").arg(QDir::tempPath()).arg(m_operatorName);
-  DEBUG_LOG()<<" export path: "<<dir;
+  DEBUG_LOG(m_logger)<<" export path: "<<dir;
   QDir directory(dir);
   if(!directory.exists())
     directory.mkpath(dir);
@@ -266,7 +266,7 @@ void HandlerPdfDownload::exportOcPdfFileContent()
   QString strm = QStringLiteral("Select id from flm.flm_folder WHERE name = '" ) + m_operatorName + QStringLiteral("' and '") +
       QString::number(m_folderId) + QStringLiteral("' = ANY(path) LIMIT 1;");
 
-  DEBUG_LOG() << "folder content ID querry" << strm;
+  DEBUG_LOG(m_logger) << "folder content ID querry" << strm;
 
   std::unique_ptr<NSqlQuery> query = std::unique_ptr<NSqlQuery>(new NSqlQuery(remoteDbIfc->database(), m_logger));
   query->prepare(strm);
@@ -321,7 +321,7 @@ void HandlerPdfDownload::exportOcPdfFileContent()
 
   if(idsList.isEmpty())
   {
-    WARNING_LOG()<< " pdf files outdated! ";
+    WARNING_LOG(m_logger)<< " pdf files outdated! ";
 
     return;
   }
@@ -334,7 +334,7 @@ void HandlerPdfDownload::exportOcPdfFileContent()
   tableName = (QStringLiteral("flm.flm_file_content"));
   stmt      = (QStringLiteral("SELECT id, name, file_status_id, content, last_modified FROM ") + tableName + where);
 
-  DEBUG_LOG() << "### statement: " << stmt;
+  DEBUG_LOG(m_logger) << "### statement: " << stmt;
 
   query->prepare(stmt);
 
@@ -353,7 +353,7 @@ void HandlerPdfDownload::exportOcPdfFileContent()
 
       if(data.fileStatusId == FileManagement::FileStatus::Deleted)
       {
-        DEBUG_LOG()<< " skip ";
+        DEBUG_LOG(m_logger)<< " skip ";
         continue;
       }
       dataVec.append(data);
@@ -362,7 +362,7 @@ void HandlerPdfDownload::exportOcPdfFileContent()
   else
   {
     const QString errorStr = tr("Not able to export PDF.");
-    ERROR_LOG() << errorStr;
+    ERROR_LOG(m_logger) << errorStr;
     m_ocPdfDownloadReply.errorString(errorStr.toStdString());
     return;
   }
@@ -377,7 +377,7 @@ void HandlerPdfDownload::exportOcPdfFileContent()
     if(fileInfo.exists() && file.remove() == false)
     {
       QString err = QStringLiteral("Couldn't replace existing file: ") + data.name;
-      WARNING_LOG()<< err;
+      WARNING_LOG(m_logger)<< err;
       continue;
     }
 
@@ -395,7 +395,7 @@ void HandlerPdfDownload::exportOcPdfFileContent()
 
 bool HandlerPdfDownload::openRemoteDbConnection(const QString &remoteDatabaseName)
 {
-  DEBUG_LOG() <<" Open RemoteDb Connection..." ;
+  DEBUG_LOG(m_logger) <<" Open RemoteDb Connection..." ;
   if (m_remoteDbConnection.isValid())
     closeDb(m_remoteDbConnection);
 
@@ -420,10 +420,10 @@ QSqlDatabase HandlerPdfDownload::openDb(const QString &databaseName, bool remote
                                                  s->databaseDriver(),
                                                  remote ? m_remoteHostName : s->databaseHostname(),
                                                  remote ? Settings::remoteDbName() : databaseName);
-  DEBUG_LOG() << "Trying to open database " << s->databaseHostname() << ":" << databaseName;
+  DEBUG_LOG(m_logger) << "Trying to open database " << s->databaseHostname() << ":" << databaseName;
   if (!dbConnection.isOpen())
   {
-    ERROR_LOG() << "Error opening database " << s->databaseHostname() << ":" << databaseName;
+    ERROR_LOG(m_logger) << "Error opening database " << s->databaseHostname() << ":" << databaseName;
     if (bOk)
       *bOk = false;
   }
@@ -443,7 +443,7 @@ void HandlerPdfDownload::closeDb(QSqlDatabase &dbConn)
 
 void HandlerPdfDownload::onConnected()
 {
-  INFO_LOG() << "Connected to WebSocket server";
+  INFO_LOG(m_logger) << "Connected to WebSocket server";
 
   switch (m_currentMode)
   {
@@ -458,12 +458,12 @@ void HandlerPdfDownload::onConnected()
 
 void HandlerPdfDownload::onDisconnected()
 {
-  INFO_LOG() << "Disconnected from server.";
+  INFO_LOG(m_logger) << "Disconnected from server.";
 }
 
 void HandlerPdfDownload::onNewDownloadState(int progress, const QString &msg)
 {
-  DEBUG_LOG() << msg;
+  DEBUG_LOG(m_logger) << msg;
   m_downloadReply.replyState(Core::FtReplyState::InProgress);
   m_downloadReply.progress(progress);
   m_downloadReply.currentStep(msg.toStdString());
@@ -472,7 +472,7 @@ void HandlerPdfDownload::onNewDownloadState(int progress, const QString &msg)
 
 void HandlerPdfDownload::onAllDownloadsFinished()
 {
-  DEBUG_LOG() << "Downloads finished";
+  DEBUG_LOG(m_logger) << "Downloads finished";
   m_downloadReply.replyState(Core::FtReplyState::Completed);
   m_downloadReply.currentStep(tr("Downloads finished").toStdString());
   m_downloadReply.progress(100);
@@ -481,7 +481,7 @@ void HandlerPdfDownload::onAllDownloadsFinished()
 
 void HandlerPdfDownload::openWebSocket()
 {
-  DEBUG_LOG() << "Opening websocket to: " << m_hostname << ":" << m_currentPort;
+  DEBUG_LOG(m_logger) << "Opening websocket to: " << m_hostname << ":" << m_currentPort;
   m_webSocket->open(m_hostname, m_currentPort);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/main_handler.cpp
index 75ec5cb6c..7891f8166 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/main_handler.cpp
@@ -13,15 +13,14 @@
 namespace OcBaseDownload
 {
 
-MainHandler::MainHandler(QObject *parent)
-  : QObject(parent)
+MainHandler::MainHandler(QObject *parent) : QObject(parent)
   , m_ddsHandler(nullptr)
   , m_handlerBaseDownload(nullptr)
   , m_handlerPdfDownload(nullptr)
   , m_handlerWebSocket(nullptr)
   , m_scmDtc(nullptr)
-  , m_scmFtc(nullptr)
-{}
+  , m_scmFtc(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 MainHandler::~MainHandler()
 {
@@ -39,24 +38,24 @@ bool MainHandler::init(int domainId)
   m_ddsHandler = std::make_shared<DdsHandler>(domainId);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation ddsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation ddsHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation ddsHandler succesful.";
 
   // create SCM Dtc
   m_scmDtc = ServiceManagement::Interface::Dtc::create(m_ddsHandler->dds());
-  DEBUG_LOG() << "Created SCM Dtc";
+  DEBUG_LOG(m_logger) << "Created SCM Dtc";
 
   // create SCM Ftc
   m_scmFtc = ServiceManagement::Interface::Ftc::create(m_ddsHandler->dds());
-  DEBUG_LOG() << "Created SCM Ftc";
+  DEBUG_LOG(m_logger) << "Created SCM Ftc";
 
   // create handler base download
   m_handlerWebSocket = std::make_shared<WebSocketInterface::WebSocketInterfaceHandler>(this);
   if (!m_handlerWebSocket->init())
   {
-    ERROR_LOG() << "Initialisation HandlerWebSocket failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerWebSocket failed.";
     return false;
   }
 
@@ -64,7 +63,7 @@ bool MainHandler::init(int domainId)
   m_handlerBaseDownload = std::make_shared<HandlerBaseDownload>(this, this);
   if (!m_handlerBaseDownload->init())
   {
-    ERROR_LOG() << "Initialisation HandlerBaseDownload failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerBaseDownload failed.";
     return false;
   }
 
@@ -72,7 +71,7 @@ bool MainHandler::init(int domainId)
   m_handlerPdfDownload = std::make_shared<HandlerPdfDownload>(this, this);
   if (!m_handlerBaseDownload->init())
   {
-    ERROR_LOG() << "Initialisation HandlerPdfDownload failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerPdfDownload failed.";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/main_handler.h
index 6f2d04896..c75a9ed42 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/main_handler.h
@@ -42,6 +42,7 @@ public:
   std::shared_ptr<ServiceManagement::Interface::Ftc> scmFtc() const { return m_scmFtc; }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>            m_ddsHandler;
   std::shared_ptr<HandlerBaseDownload> m_handlerBaseDownload;
   std::shared_ptr<HandlerPdfDownload> m_handlerPdfDownload;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_download_socket.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_download_socket.cpp
index ad7d83e3f..a9b3321d8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_download_socket.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_download_socket.cpp
@@ -15,20 +15,19 @@
 
 namespace OcBaseDownload
 {
-PdfDownloadSocket::PdfDownloadSocket(const QString &hostName, QObject *parent)
-  : QObject(parent)
+PdfDownloadSocket::PdfDownloadSocket(const QString &hostName, QObject *parent) : QObject(parent)
   , m_socket(new QTcpSocket(this))
   , m_readTimeout(new QTimer(this))
-  , m_sizeToDownload(0)
-{
-  DEBUG_LOG() << "PdfDownloadSocket::PdfDownloadSocket";
+  , m_sizeToDownload(0),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  DEBUG_LOG(m_logger) << "PdfDownloadSocket::PdfDownloadSocket";
   connect(m_socket, &QTcpSocket::connected, this, &PdfDownloadSocket::connected);
   connect(m_socket, &QTcpSocket::readyRead, this, &PdfDownloadSocket::readyRead);
   unsigned short port = NGL::Connections::port(NGL::Connections::eConnection::FLM_PDF_SERVER);
   m_socket->connectToHost(hostName, port);
   m_socket->waitForConnected();
 
-  DEBUG_LOG() << "hostname " << hostName << " port " << port;
+  DEBUG_LOG(m_logger) << "hostname " << hostName << " port " << port;
 
   m_readTimeout->setInterval(10000);
   m_readTimeout->setSingleShot(false);
@@ -37,23 +36,23 @@ PdfDownloadSocket::PdfDownloadSocket(const QString &hostName, QObject *parent)
 
 PdfDownloadSocket::~PdfDownloadSocket()
 {
-  DEBUG_LOG() << "~PdfDownloadSocket";
+  DEBUG_LOG(m_logger) << "~PdfDownloadSocket";
   m_socket->close();
 }
 
 void PdfDownloadSocket::readyRead()
 {
-  DEBUG_LOG() << "reading...";
+  DEBUG_LOG(m_logger) << "reading...";
   m_readTimeout->stop();
 
   m_downloadedData.append(m_socket->readAll());
 
-  DEBUG_LOG() << m_downloadedData.size() << " of " << m_sizeToDownload << " bytes downloaded";
+  DEBUG_LOG(m_logger) << m_downloadedData.size() << " of " << m_sizeToDownload << " bytes downloaded";
 
   if (m_downloadedData.size() >= m_sizeToDownload)
   {
     m_sizeToDownload = 0;
-    DEBUG_LOG() << "Download finished";
+    DEBUG_LOG(m_logger) << "Download finished";
     emit downloadFinished(m_downloadedData);
   }
   else
@@ -62,17 +61,17 @@ void PdfDownloadSocket::readyRead()
 
 void PdfDownloadSocket::connected()
 {
-  DEBUG_LOG() << "connected...";
+  DEBUG_LOG(m_logger) << "connected...";
 }
 
 void PdfDownloadSocket::onReadTimeout()
 {
   //check for filesize
   m_readTimeout->stop();
-  DEBUG_LOG() << "TimerEnd" << m_downloadedData.size() << " expected " << m_sizeToDownload;
+  DEBUG_LOG(m_logger) << "TimerEnd" << m_downloadedData.size() << " expected " << m_sizeToDownload;
 
   if (m_downloadedData.size() < m_sizeToDownload)
-    WARNING_LOG() << "not enough data: got " << m_downloadedData.size() << " expected " << m_sizeToDownload;
+    WARNING_LOG(m_logger) << "not enough data: got " << m_downloadedData.size() << " expected " << m_sizeToDownload;
 
   emit downloadFinished(m_downloadedData);
 }
@@ -89,7 +88,7 @@ void PdfDownloadSocket::downloadFromHost(const int fileId, const qint64 fileSize
   m_socket->readAll();
 
   int writeHeaderSize = m_socket->write(cmd);
-  DEBUG_LOG() << "writeHeaderSize = " << writeHeaderSize;
+  DEBUG_LOG(m_logger) << "writeHeaderSize = " << writeHeaderSize;
   m_readTimeout->start();
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_download_socket.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_download_socket.h
index 1740af463..b6b8a649f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_download_socket.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_download_socket.h
@@ -35,6 +35,7 @@ private slots:
   void onReadTimeout();
 
 private:
+  NGL::INGLLogger &m_logger;
   QTcpSocket      *m_socket;
   QTimer          *m_readTimeout;
   int              m_sizeToDownload;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_downloader.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_downloader.cpp
index b79e2ccac..6e362a0f3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_downloader.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_downloader.cpp
@@ -21,16 +21,15 @@
 
 namespace OcBaseDownload
 {
-PdfDownloader::PdfDownloader(const QVector<WebSocketInterface::Messages::PdfListMessage::PdfInformation> &pdfInfoVec, MainHandler *mainHandler, const QString &hostName, int exerciseId, QObject *parent)
-  : QObject(parent)
+PdfDownloader::PdfDownloader(const QVector<WebSocketInterface::Messages::PdfListMessage::PdfInformation> &pdfInfoVec, MainHandler *mainHandler, const QString &hostName, int exerciseId, QObject *parent) : QObject(parent)
   , m_pdfInfoVec(pdfInfoVec)
   , m_socket(new PdfDownloadSocket(hostName, this))
   , m_mainHandler(mainHandler)
   , m_exerciseId(exerciseId)
   , m_exTblGen(new DBAdministration::ExerciseTableGenerator(getLogger("ExerciseTableGenerator"), NGL::directory(NGL::FileType::ConfigFile, QLatin1String("xml")), this))
   , m_downloadCount(0)
-  , m_totalDownloads(pdfInfoVec.size())
-{
+  , m_totalDownloads(pdfInfoVec.size()),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   connect(m_socket, &PdfDownloadSocket::downloadFinished,
           this, &PdfDownloader::onSingleDownloadFinished);
 }
@@ -42,17 +41,17 @@ PdfDownloader::~PdfDownloader()
 
 bool PdfDownloader::startDownload()
 {
-  DEBUG_LOG() << "Downloading startet";
+  DEBUG_LOG(m_logger) << "Downloading startet";
 
   if (!m_socket->isConnected())
   {
-    ERROR_LOG() << "Download could not be startet. Socket not connected.";
+    ERROR_LOG(m_logger) << "Download could not be startet. Socket not connected.";
     return false;
   }
 
   if (!openDbConnection())
   {
-    ERROR_LOG() << "Could not open database connection";
+    ERROR_LOG(m_logger) << "Could not open database connection";
     return false;
   }
 
@@ -61,24 +60,24 @@ bool PdfDownloader::startDownload()
 
 void PdfDownloader::onSingleDownloadFinished(const QByteArray &data)
 {
-  DEBUG_LOG() << "Downloading file " << m_currentDownload.name << " finished.";
+  DEBUG_LOG(m_logger) << "Downloading file " << m_currentDownload.name << " finished.";
 
   ++m_downloadCount;
 
   if (!data.size())
-    WARNING_LOG() << "Got finished download without data";
+    WARNING_LOG(m_logger) << "Got finished download without data";
 
   QString msg = QString::fromUtf8(data);
   if (msg.startsWith(QStringLiteral("ERROR")))
   {
-    ERROR_LOG() << msg;
+    ERROR_LOG(m_logger) << msg;
     startNextDownload();
     return;
   }
 
   if (!m_dbConnection.isValid())
   {
-    ERROR_LOG() << "Database not open";
+    ERROR_LOG(m_logger) << "Database not open";
     return;
   }
 
@@ -86,7 +85,7 @@ void PdfDownloader::onSingleDownloadFinished(const QByteArray &data)
 
   if (!flmDbHandler->init(0, m_dbConnection))
   {
-    ERROR_LOG() << "Couldn't initialise flmDbHandler";
+    ERROR_LOG(m_logger) << "Couldn't initialise flmDbHandler";
     return;
   }
 
@@ -110,7 +109,7 @@ void PdfDownloader::onSingleDownloadFinished(const QByteArray &data)
   flmDbHandler->db()->insert(dbData);
 
   if (!trans.commit())
-    ERROR_LOG() << "Error while inserting FLM data into database.";
+    ERROR_LOG(m_logger) << "Error while inserting FLM data into database.";
 
   startNextDownload();
 }
@@ -119,7 +118,7 @@ bool PdfDownloader::startNextDownload()
 {
   if (m_pdfInfoVec.isEmpty())
   {
-    DEBUG_LOG() << "No more pending downloads.";
+    DEBUG_LOG(m_logger) << "No more pending downloads.";
 
     closeDb(m_dbConnection);
     emit allDownloadsFinished();
@@ -131,7 +130,7 @@ bool PdfDownloader::startNextDownload()
 
   emit newState(100 / m_totalDownloads * m_downloadCount, tr("Downloading file \"%1\"").arg(m_currentDownload.name));
 
-  DEBUG_LOG() << "Downloading file " << m_currentDownload.name;
+  DEBUG_LOG(m_logger) << "Downloading file " << m_currentDownload.name;
 
   m_socket->downloadFromHost(m_currentDownload.id, m_currentDownload.fileSize);
 
@@ -168,10 +167,10 @@ QSqlDatabase PdfDownloader::openDb(bool *bOk)
                                                  s->databaseDriver(),
                                                  s->databaseHostname(),
                                                  s->databaseName());
-  DEBUG_LOG() << "Trying to open database " << s->databaseHostname() << ":" << s->databaseName();
+  DEBUG_LOG(m_logger) << "Trying to open database " << s->databaseHostname() << ":" << s->databaseName();
   if (!dbConnection.isOpen())
   {
-    ERROR_LOG() << "Error opening database " << s->databaseHostname() << ":" << s->databaseName();
+    ERROR_LOG(m_logger) << "Error opening database " << s->databaseHostname() << ":" << s->databaseName();
     if (bOk)
       *bOk = false;
   }
@@ -182,7 +181,7 @@ void PdfDownloader::closeDb(QSqlDatabase &dbConn)
 {
   const QString connName = dbConn.connectionName();
 
-  DEBUG_LOG() << "Closing database: " << connName;
+  DEBUG_LOG(m_logger) << "Closing database: " << connName;
 
   dbConn.close();
   dbConn = QSqlDatabase();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_downloader.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_downloader.h
index 171653709..271a01915 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_downloader.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/pdf_downloader.h
@@ -47,6 +47,8 @@ private Q_SLOTS:
   void onSingleDownloadFinished(const QByteArray &data);
 
 private: // other
+
+NGL::INGLLogger &m_logger;
   typedef WebSocketInterface::Messages::PdfListMessage::PdfInformation PdfInfo;
 
 private: // methods
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/data_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/data_manager.cpp
index 94df509a3..7e1e7d391 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/data_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/data_manager.cpp
@@ -31,7 +31,7 @@ DataManager::DataManager(MainHandler *mainHandler)
 //---------------------------------------------------------------------------------------------------------
 void DataManager::servicePortsInformation(const QVector<Messages::ServicePortsInformation::ExerciseInformation> &exerciseInformation)
 {
-  DEBUG_LOG() << "Got ServicePortsInformation from websocket";
+  DEBUG_LOG(m_logger) << "Got ServicePortsInformation from websocket";
 
   m_mainHandler->handlerBaseDownload()->handleServicePortsInformation(exerciseInformation);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/websocket_interface_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/websocket_interface_handler.cpp
index 4c3eff5be..4678d8660 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/websocket_interface_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/websocket_interface_handler.cpp
@@ -35,17 +35,17 @@ bool WebSocketInterfaceHandler::init()
 {
   cleanup();
 
-  DEBUG_LOG() << "Initialising DataManager";
+  DEBUG_LOG(m_logger) << "Initialising DataManager";
   m_dataManager = new DataManager(m_mainHandler);
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "... ok";
 
   m_messageFactory = new Messages::ClientMessageFactory(m_dataManager);
   m_webSocketClient = new LtsWebSocket::LtsWebSocketClient(m_messageFactory, this);
 
-  DEBUG_LOG() << "Connection signals and slots";
+  DEBUG_LOG(m_logger) << "Connection signals and slots";
   connect(m_webSocketClient, &LtsWebSocket::LtsWebSocketClient::connected, this, &WebSocketInterfaceHandler::connected);
   connect(m_webSocketClient, &LtsWebSocket::LtsWebSocketClient::disconnected, this, &WebSocketInterfaceHandler::disconnected);
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "... ok";
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/central_aes_byte_reader.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/central_aes_byte_reader.cpp
index e01ee24ec..be831238b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/central_aes_byte_reader.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/central_aes_byte_reader.cpp
@@ -16,16 +16,15 @@
 namespace OcSituationClient
 {
 
-CentralAesByteReader::CentralAesByteReader(const QByteArray &data)
-  : m_data(data)
-{}
+CentralAesByteReader::CentralAesByteReader(const QByteArray &data) : m_data(data),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 bool CentralAesByteReader::getRemoveMessage(size_t &pos, CentralAesByteReader::RemoveMessage &removeMessage) const
 {
   bool result = getAesItemId(pos, removeMessage.aesItemId);
   result &= getAesType(pos, removeMessage.aesType);
 
-  DEBUG_LOG() << "Got remove message:"
+  DEBUG_LOG(m_logger) << "Got remove message:"
                       << "\naesItemId = " << removeMessage.aesItemId
                       << "\naesType = " << removeMessage.aesType;
 
@@ -50,7 +49,7 @@ bool CentralAesByteReader::getNContamination(size_t &pos, AreaEffectSimulation::
 
   nContamination.weatherSource(AreaEffectSimulation::AesWeatherSource::AwsNoUpdate);
 
-  DEBUG_LOG() << "Got NContamination:"
+  DEBUG_LOG(m_logger) << "Got NContamination:"
                       << "\nid = " << nContamination.id()
                       << "\nname = " << nContamination.name()
                       << "\neffectStart = " << nContamination.effectStart()
@@ -83,7 +82,7 @@ bool CentralAesByteReader::getBCContamination(size_t &pos, AreaEffectSimulation:
 
   bCContamination.weatherSource(AreaEffectSimulation::AesWeatherSource::AwsNoUpdate);
 
-  DEBUG_LOG() << "Got BCContamination:"
+  DEBUG_LOG(m_logger) << "Got BCContamination:"
                       << "\nid = " << bCContamination.id()
                       << "\nname = " << bCContamination.name()
                       << "\neffectStart = " << bCContamination.effectStart()
@@ -116,7 +115,7 @@ bool CentralAesByteReader::getExplosionArea(size_t &pos, AreaEffectSimulation::E
   result &= getAltitude(pos, explosionArea.altitude());
   result &= getPurpose(pos, explosionArea.purpose());
 
-  DEBUG_LOG() << "Got ExplosionArea:"
+  DEBUG_LOG(m_logger) << "Got ExplosionArea:"
                       << "\nid = " << explosionArea.id()
                       << "\nname = " << explosionArea.name()
                       << "\neffectStart = " << explosionArea.effectStart()
@@ -145,7 +144,7 @@ bool CentralAesByteReader::getExplosionSingle(size_t &pos, AreaEffectSimulation:
   result &= getAltitude(pos, explosionSingle.altitude());
   result &= getPurpose(pos, explosionSingle.purpose());
 
-  DEBUG_LOG() << "Got ExplosionSingle:"
+  DEBUG_LOG(m_logger) << "Got ExplosionSingle:"
                       << "\nid = " << explosionSingle.id()
                       << "\nname = " << explosionSingle.name()
                       << "\neffectStart = " << explosionSingle.effectStart()
@@ -174,7 +173,7 @@ bool CentralAesByteReader::getMineArea(size_t &pos, AreaEffectSimulation::MineAr
   result &= getIsCenterLine(pos, mineArea.isCenterLine());
   result &= getSegments(pos, mineArea.segments());
 
-  DEBUG_LOG() << "Got MineArea:"
+  DEBUG_LOG(m_logger) << "Got MineArea:"
                       << "\nid = " << mineArea.id()
                       << "\nname = " << mineArea.name()
                       << "\neffectStart = " << mineArea.effectStart()
@@ -212,7 +211,7 @@ bool CentralAesByteReader::getFunctionalArea(size_t &pos, AreaEffectSimulation::
   result &= getMedicMode(pos, functionalArea.medicMode());
   result &= getMedicTime(pos, functionalArea.medicTime());
 
-  DEBUG_LOG() << "Got MineArea:"
+  DEBUG_LOG(m_logger) << "Got MineArea:"
                       << "\nid = " << functionalArea.id()
                       << "\nname = " << functionalArea.name()
                       << "\neffectStart = " << functionalArea.effectStart()
@@ -246,7 +245,7 @@ bool CentralAesByteReader::getBoobyTrap(size_t &pos, AreaEffectSimulation::Booby
   result &= getOptionalNumber(pos, boobyTrap.effectStart(), &CentralAesByteReader::getEffectStart);
   result &= getOptionalNumber(pos, boobyTrap.partyId(), &CentralAesByteReader::getPartyId);
 
-  DEBUG_LOG() << "Got BoobyTrap:"
+  DEBUG_LOG(m_logger) << "Got BoobyTrap:"
                       << "\nid = " << boobyTrap.id()
                       << "\nname = " << boobyTrap.name()
                       << "\neffectDuration = " << boobyTrap.effectDuration()
@@ -273,7 +272,7 @@ bool CentralAesByteReader::getOffRouteMine(size_t &pos, AreaEffectSimulation::Of
   result &= getOptionalNumber(pos, offRouteMine.effectStart(), &CentralAesByteReader::getEffectStart);
   result &= getOptionalNumber(pos, offRouteMine.partyId(), &CentralAesByteReader::getPartyId);
 
-  DEBUG_LOG() << "Got OffRouteMine: "
+  DEBUG_LOG(m_logger) << "Got OffRouteMine: "
                       << "\nid: " << offRouteMine.id()
                       << "\nname = " << offRouteMine.name()
                       << "\neffectDuration = " << offRouteMine.effectDuration()
@@ -299,7 +298,7 @@ bool CentralAesByteReader::getExplosionCluster(size_t &pos, AreaEffectSimulation
   result &= getChargeTypeId(pos, explosionCluster.chargeStruct().chargeTypeId());
   result &= getPartyId(pos, explosionCluster.partyId());
 
-  DEBUG_LOG() << "Got ExplosionCluster:"
+  DEBUG_LOG(m_logger) << "Got ExplosionCluster:"
                       << "\nid: " << explosionCluster.id()
                       << "\nname: " << explosionCluster.name()
                       << "\neffectStart: " << explosionCluster.effectStart()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/dds_handler.cpp
index b145a214a..dac811fdc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/dds_handler.cpp
@@ -16,14 +16,14 @@ namespace OcSituationClient
 DdsHandler::DdsHandler(int domainId, int exerciseId)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise, exerciseId))
 {
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -40,7 +40,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
   m_ddsFts = OcSituationClient::Interface::Fts::create(m_ddsConnector);
 
   bRet &= m_ddsFts->enableAll();
-  INFO_LOG() << "Fts initialised";
+  INFO_LOG(m_logger) << "Fts initialised";
 
   return bRet;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/dds_handler.h
index 2922c19f0..410b1e3ce 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/dds_handler.h
@@ -40,6 +40,7 @@ public:
   qint64 currentPartitionTime() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<Core::Pacemaker>            m_pacemaker;
   std::shared_ptr<Core::TopicLockMaster>      m_topicLockMaster;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_aes_data.cpp
index e3bb15777..2e04b7b5d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_aes_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_aes_data.cpp
@@ -38,7 +38,7 @@ bool HandlerOcAesData::init()
   // AES DTC enable
   if (!m_aesDtc->enableDangerArea())
   {
-    ERROR_LOG() << "Enabling AES Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling AES Data-Topics failed.";
     return false;
   }
 
@@ -46,27 +46,27 @@ bool HandlerOcAesData::init()
   if (!m_aesFtc->enableDangerAreaModify() ||
       !m_aesFtc->enableDangerAreaRemove())
   {
-    ERROR_LOG() << "Enabling AES Function-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling AES Function-Topics failed.";
     return false;
   }
 
   // GIM DTC enable
   if (!m_gimDtc->enableIed())
   {
-    ERROR_LOG() << "Enabling GIM Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling GIM Data-Topics failed.";
     return false;
   }
   // TAB DTS enable
   if (!m_tabDts->enableDefinitionIed())
   {
-    ERROR_LOG() << "Enabling TAB DTS Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling TAB DTS Data-Topics failed.";
     return false;
   }
 
   // TABOC DTC enable
   if (!m_tabocDtc->enableSpecificsExercise())
   {
-    ERROR_LOG() << "Enabling TABOC Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling TABOC Data-Topics failed.";
     return false;
   }
   connect(m_tabocDtc.get(), &TrainingAreaBaseOC::Interface::Dtc::specificsExerciseChanged, this, &HandlerOcAesData::onSpecificsExerciseChanged);
@@ -81,11 +81,11 @@ bool HandlerOcAesData::init()
 
 void HandlerOcAesData::process(const QByteArray &data)
 {
-  DEBUG_LOG() << "Compressed binary data: " << data.toHex(' ');
+  DEBUG_LOG(m_logger) << "Compressed binary data: " << data.toHex(' ');
 
   QByteArray uncompressed = MainHandler::tryUncompress(data, true);
 
-  DEBUG_LOG() << "Uncompressed binary data: " << uncompressed.toHex(' ');
+  DEBUG_LOG(m_logger) << "Uncompressed binary data: " << uncompressed.toHex(' ');
   OcSituation::AesType aesType;
   LtsUtils::get1Byte(uncompressed, aesType);
 
@@ -109,7 +109,7 @@ void HandlerOcAesData::process(const QByteArray &data)
   }
   default:
   {
-    WARNING_LOG() << "Aes type: " << aesType << " is currently not handled.";
+    WARNING_LOG(m_logger) << "Aes type: " << aesType << " is currently not handled.";
   }
   }
 }
@@ -117,23 +117,23 @@ void HandlerOcAesData::process(const QByteArray &data)
 void HandlerOcAesData::onDangerAreaModifyReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "Danger area modify failed: " << reply.translated();
+    ERROR_LOG(m_logger) << "Danger area modify failed: " << reply.translated();
   else
-    DEBUG_LOG() << "Danger area modify successfull. Id: " << reply.id();
+    DEBUG_LOG(m_logger) << "Danger area modify successfull. Id: " << reply.id();
 }
 
 void HandlerOcAesData::onDangerAreaRemoveReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "Danger area remove failed: " << reply.translated();
+    ERROR_LOG(m_logger) << "Danger area remove failed: " << reply.translated();
   else
-    DEBUG_LOG() << "Danger area remove successfull. Id: " << reply.id();
+    DEBUG_LOG(m_logger) << "Danger area remove successfull. Id: " << reply.id();
 }
 
 void HandlerOcAesData::handleDangerAreas(const QByteArray &data, size_t pos)
 {
-  INFO_LOG() << "Got new danger area data";
-  DEBUG_LOG() << "Binary data: " << data.toHex(' ');
+  INFO_LOG(m_logger) << "Got new danger area data";
+  DEBUG_LOG(m_logger) << "Binary data: " << data.toHex(' ');
 
   QList<int> aesToBeDeleted = m_aesDtc->dangerAreas().keys();
 
@@ -170,7 +170,7 @@ void HandlerOcAesData::handleDangerAreas(const QByteArray &data, size_t pos)
     }
     req.segments(segments);
 
-    DEBUG_LOG() << (aesToBeDeleted.contains(req.id()) ? "Modifying " : "Creating ") << "danger area: " << req;
+    DEBUG_LOG(m_logger) << (aesToBeDeleted.contains(req.id()) ? "Modifying " : "Creating ") << "danger area: " << req;
 
     aesToBeDeleted.removeAll(req.id()); // item was created/modified -> does not need to be deleted
     req.id(req.id() * -1); // inverted id to mark as for oc
@@ -183,7 +183,7 @@ void HandlerOcAesData::handleDangerAreas(const QByteArray &data, size_t pos)
       continue;
     if (m_aesDtc->dangerArea(id).effectStateId().underlying() > AreaEffectSimulation::AesEffectState::EsRemoved)
     {
-      DEBUG_LOG() << "Removing danger area id: " << id;
+      DEBUG_LOG(m_logger) << "Removing danger area id: " << id;
       m_aesFtc->dangerAreaRemoveRequest(Core::RemoveElementRequest(id), this);
     }
   }
@@ -191,8 +191,8 @@ void HandlerOcAesData::handleDangerAreas(const QByteArray &data, size_t pos)
 
 void HandlerOcAesData::handleIeds(const QByteArray &data, size_t pos)
 {
-  INFO_LOG() << "Got new ied data";
-  DEBUG_LOG() << "Binary data: " << data.toHex(' ');
+  INFO_LOG(m_logger) << "Got new ied data";
+  DEBUG_LOG(m_logger) << "Binary data: " << data.toHex(' ');
 
   int cnt;
   LtsUtils::get1Byte(data, pos, cnt);
@@ -224,7 +224,7 @@ void HandlerOcAesData::handleIeds(const QByteArray &data, size_t pos)
     LtsUtils::get3Byte(data, pos, y);
     def.position(relativeFromGeoPosition(x, y));
 
-    DEBUG_LOG() << "Publishing definition ied: " << def;
+    DEBUG_LOG(m_logger) << "Publishing definition ied: " << def;
 
     m_tabDts->publish(def);
   }
@@ -232,8 +232,8 @@ void HandlerOcAesData::handleIeds(const QByteArray &data, size_t pos)
 
 void HandlerOcAesData::handleIedPositions(const QByteArray &data, size_t pos)
 {
-  INFO_LOG() << "Got new ied positions data";
-  DEBUG_LOG() << "Binary data: " << data.toHex(' ');
+  INFO_LOG(m_logger) << "Got new ied positions data";
+  DEBUG_LOG(m_logger) << "Binary data: " << data.toHex(' ');
 
   int cnt;
   LtsUtils::get1Byte(data, pos, cnt);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_central_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_central_aes_data.cpp
index b45834e1f..f28d2e181 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_central_aes_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_central_aes_data.cpp
@@ -38,7 +38,7 @@ bool HandlerOcCentralAesData::init()
       || !m_aesDtc->enableMineArea() || !m_aesDtc->enableFunctionalArea() || !m_aesDtc->enableBoobyTrap() || !m_aesDtc->enableOffRouteMine()
       || !m_aesDtc->enableExplosionCluster())
   {
-    ERROR_LOG() << "Enabling AES Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling AES Data-Topics failed.";
     return false;
   }
 
@@ -50,14 +50,14 @@ bool HandlerOcCentralAesData::init()
       || !m_aesFtc->enableOffRouteMineModify() || !m_aesFtc->enableOffRouteMineRemove() || !m_aesFtc->enableExplosionClusterOcModify()
       || !m_aesFtc->enableExplosionClusterRemove() || !m_aesFtc->enableMineAreaReferenceModify())
   {
-    ERROR_LOG() << "Enabling AES Function-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling AES Function-Topics failed.";
     return false;
   }
 
   // TABOC DTS enable
   if (!m_tabocDts->enableCentralAesOverload())
   {
-    ERROR_LOG() << "Enabling TABOC Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling TABOC Data-Topics failed.";
     return false;
   }
 
@@ -152,18 +152,18 @@ bool HandlerOcCentralAesData::init()
   connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::offRouteMineChanged, this, &HandlerOcCentralAesData::onOffRouteMineChanged);
   connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::explosionClusterChanged, this, &HandlerOcCentralAesData::onExplosionClusterChanged);
 
-  DEBUG_LOG() << "Initialisation HandlerOcCentralAesData succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation HandlerOcCentralAesData succesful.";
 
   return true;
 }
 
 void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
 {
-  DEBUG_LOG() << "Starting to parse central aes data.";
+  DEBUG_LOG(m_logger) << "Starting to parse central aes data.";
 
   if (bIsInitial)
   {
-    DEBUG_LOG() << "Data is initial --> removing central aes items.";
+    DEBUG_LOG(m_logger) << "Data is initial --> removing central aes items.";
     removeAllCentralAesItems();
 
     if (!m_allCentralAesItems.isEmpty())
@@ -176,7 +176,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
 
   if (data.isEmpty())
   {
-    ERROR_LOG() << "Got an empty QByteArray to decode.";
+    ERROR_LOG(m_logger) << "Got an empty QByteArray to decode.";
     return;
   }
 
@@ -189,7 +189,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
   centralAesOverload.hasOverload(centralAesItemsOverloaded);
   m_tabocDts->publish(centralAesOverload);
 
-  DEBUG_LOG() << "Central AesItems overloaded: " << centralAesItemsOverloaded;
+  DEBUG_LOG(m_logger) << "Central AesItems overloaded: " << centralAesItemsOverloaded;
   // TODO: Further processing of overloaded info
 
   QByteArray data2 = data;
@@ -199,13 +199,13 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
   QByteArray uncompressed = MainHandler::tryUncompress(data2, m_bWithCompression);
   if (uncompressed.isEmpty())
   {
-    INFO_LOG() << "Got an empty QByteArray after uncompression.";
+    INFO_LOG(m_logger) << "Got an empty QByteArray after uncompression.";
     return;
   }
 
   CentralAesByteReader reader(uncompressed);
 
-  TRACE_LOG() << "Uncompressed Data: " << uncompressed.toHex(' ');
+  TRACE_LOG(m_logger) << "Uncompressed Data: " << uncompressed.toHex(' ');
 
   size_t pos = 0;
   AreaEffectSimulation::AesType aesType;
@@ -219,7 +219,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
       return;
     }
 
-    DEBUG_LOG() << "Got AesChangeType " << changeType;
+    DEBUG_LOG(m_logger) << "Got AesChangeType " << changeType;
 
     switch (changeType)
     {
@@ -230,7 +230,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
           return;
         }
 
-        DEBUG_LOG() << "Got AesType " << aesType;
+        DEBUG_LOG(m_logger) << "Got AesType " << aesType;
 
         switch (aesType.underlying())
         {
@@ -261,7 +261,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
               return;
             }
             else
-              DEBUG_LOG() << "NContamination added/modified.";
+              DEBUG_LOG(m_logger) << "NContamination added/modified.";
 
             checkId(nContamination);
 
@@ -279,7 +279,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
               return;
             }
             else
-              DEBUG_LOG() << "BCContamination added/modified.";
+              DEBUG_LOG(m_logger) << "BCContamination added/modified.";
 
             checkId(bCContamination);
 
@@ -297,7 +297,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
               return;
             }
             else
-              DEBUG_LOG() << "ExplosionArea added/modified.";
+              DEBUG_LOG(m_logger) << "ExplosionArea added/modified.";
 
             checkId(explosionArea);
 
@@ -315,7 +315,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
               return;
             }
             else
-              DEBUG_LOG() << "ExplosionSingle added/modified.";
+              DEBUG_LOG(m_logger) << "ExplosionSingle added/modified.";
 
             checkId(explosionSingle);
 
@@ -333,7 +333,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
               return;
             }
             else
-              DEBUG_LOG() << "MineArea added/modified.";
+              DEBUG_LOG(m_logger) << "MineArea added/modified.";
 
             mineArea.distance() = 0.5;
             checkId(mineArea);
@@ -352,7 +352,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
               return;
             }
             else
-              DEBUG_LOG() << "FunctionalArea added/modified.";
+              DEBUG_LOG(m_logger) << "FunctionalArea added/modified.";
 
             checkId(functionalArea);
 
@@ -370,7 +370,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
               return;
             }
             else
-              DEBUG_LOG() << "BoobyTrap added/modified.";
+              DEBUG_LOG(m_logger) << "BoobyTrap added/modified.";
 
             checkId(boobyTrap);
 
@@ -388,7 +388,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
               return;
             }
             else
-              DEBUG_LOG() << "OffRouteMine added/modified.";
+              DEBUG_LOG(m_logger) << "OffRouteMine added/modified.";
 
             checkId(offRouteMine);
 
@@ -406,7 +406,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
               return;
             }
             else
-              DEBUG_LOG() << "ExplosionCluster added/modified.";
+              DEBUG_LOG(m_logger) << "ExplosionCluster added/modified.";
 
             checkId(explosionCluster);
 
@@ -431,12 +431,12 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
 
         if (!m_allCentralAesItems.contains(removeMessage.aesItemId))
         {
-          INFO_LOG() << "Got remove message for unknown aesItemId " << removeMessage.aesItemId;
+          INFO_LOG(m_logger) << "Got remove message for unknown aesItemId " << removeMessage.aesItemId;
 
           break;
         }
 
-        DEBUG_LOG() << "Sending remove request: aesItemId = " << removeMessage.aesItemId << " ,aesType = " << removeMessage.aesType;
+        DEBUG_LOG(m_logger) << "Sending remove request: aesItemId = " << removeMessage.aesItemId << " ,aesType = " << removeMessage.aesType;
 
         tryRemoveAesItem(removeMessage.aesItemId, removeMessage.aesType);
 
@@ -445,7 +445,7 @@ void HandlerOcCentralAesData::process(const QByteArray &data, bool bIsInitial)
     }
   }
 
-  DEBUG_LOG() << "All central aes data parsed.";
+  DEBUG_LOG(m_logger) << "All central aes data parsed.";
 }
 
 void HandlerOcCentralAesData::removeAllCentralAesItems()
@@ -522,7 +522,7 @@ void HandlerOcCentralAesData::tryRemoveAesItem(qint32 aesItemId, AreaEffectSimul
     case AesType::AtExplosionSingleCentralTrajectory:
     case AesType::AtBoobyTrapSecondary:
     case AesType::AtOffRouteMineSecondary:
-      WARNING_LOG() << "Got false AesType: " << aesType.underlying() << " --> aborting.";
+      WARNING_LOG(m_logger) << "Got false AesType: " << aesType.underlying() << " --> aborting.";
       break;
     case AesType::AtNContamination:
       removeAesItem(aesItemId, &AreaEffectSimulation::Interface::Ftc::nContaminationRemoveRequest);
@@ -577,7 +577,7 @@ void HandlerOcCentralAesData::onExplosionClusterOcModifyReply(const Core::Functi
 void HandlerOcCentralAesData::onReply(const Core::FunctionReplyObject &reply) const
 {
   if (reply.error())
-    ERROR_LOG() << reply.str();
+    ERROR_LOG(m_logger) << reply.str();
 }
 
 template <typename T> void HandlerOcCentralAesData::onAesItemChanged(const T &aesItem, DataModification modType, AreaEffectSimulation::AesType aesType)
@@ -589,11 +589,11 @@ template <typename T> void HandlerOcCentralAesData::onAesItemChanged(const T &ae
   {
     case DataModification::eAdded:
       m_allCentralAesItems[aesItem.id()] = aesType;
-      DEBUG_LOG() << "Added new AES Item: id=" << aesItem.id() << ", type=" << aesType;
+      DEBUG_LOG(m_logger) << "Added new AES Item: id=" << aesItem.id() << ", type=" << aesType;
       break;
     case DataModification::eRemoved:
       m_allCentralAesItems.remove(aesItem.id());
-      DEBUG_LOG() << "Removed AES Item with id=" << aesItem.id();
+      DEBUG_LOG(m_logger) << "Removed AES Item with id=" << aesItem.id();
       break;
     case DataModification::eModified:
     default:
@@ -615,7 +615,7 @@ void HandlerOcCentralAesData::removeAesItem(
                                     [this](const Core::FunctionReplyObject &replyObject)
                                     {
                                       if (replyObject.error())
-                                        ERROR_LOG() << replyObject.str();
+                                        ERROR_LOG(m_logger) << replyObject.str();
                                     });
 }
 
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 0e9009793..281a7394f 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
@@ -70,7 +70,7 @@ bool HandlerOcData::init()
   // read all reset counter from database
   if (!m_dbHandler->select(dataVec))
   {
-    ERROR_LOG() << "Error reading reset counter from database!";
+    ERROR_LOG(m_logger) << "Error reading reset counter from database!";
     return false;
   }
 
@@ -90,7 +90,7 @@ bool HandlerOcData::init()
     }
     default:
     {
-      WARNING_LOG() << "Reset counter for aes type: " << data.aesTypeId << " read from db is not handled.";
+      WARNING_LOG(m_logger) << "Reset counter for aes type: " << data.aesTypeId << " read from db is not handled.";
       break;
     }
     }
@@ -99,14 +99,14 @@ bool HandlerOcData::init()
   // EVL FTC enable
   if (!m_evlFtc->enableEvlSchemaModify())
   {
-    ERROR_LOG() << "Enabling EVL Function-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling EVL Function-Topics failed.";
     return false;
   }
 
   // MSG DTC enable
   if (!m_msgDtc->enableOperatorMessage())
   {
-    ERROR_LOG() << "Enabling MSG Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling MSG Data-Topics failed.";
     return false;
   }
   connect(m_msgDtc.get(), &Messaging::Interface::Dtc::operatorMessageChanged, this, &HandlerOcData::onOperatorMessageChanged);
@@ -115,41 +115,41 @@ bool HandlerOcData::init()
   if (!m_msgFtc->enableCreateOperatorMessage() ||
       !m_msgFtc->enableModifyOperatorMessage())
   {
-    ERROR_LOG() << "Enabling MSG Function-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling MSG Function-Topics failed.";
     return false;
   }
 
   // OPM DTC enable
   if (!m_opmDtc->enableUser())
   {
-    ERROR_LOG() << "Enabling OPM Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling OPM Data-Topics failed.";
     return false;
   }
 
   // OSS FTS enable
   if (!m_ossFts->enableSendEquipmentMessageOc())
   {
-    ERROR_LOG() << "Enabling OSS Function-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling OSS Function-Topics failed.";
     return false;
   }
 
   // PPM DTC enable
   if (!m_ppmDtc->enableParticipant())
   {
-    ERROR_LOG() << "Enabling PPM Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling PPM Data-Topics failed.";
     return false;
   }
 
   if (!m_ppmDtc->waitForHistoricalDataParticipant(10000))
   {
-    ERROR_LOG() << "Waiting for historical data PPM-participant failed.";
+    ERROR_LOG(m_logger) << "Waiting for historical data PPM-participant failed.";
     return false;
   }
 
   // TAB DTC enable
   if (!m_tabDtc->enableOcData())
   {
-    ERROR_LOG() << "Enabling TAB Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling TAB Data-Topics failed.";
     return false;
   }
   connect(m_tabDtc.get(), &TrainingAreaBase::Interface::Dtc::ocDataChanged, this, &HandlerOcData::onOcDataChanged);
@@ -157,14 +157,14 @@ bool HandlerOcData::init()
   // TAB DTC enable
   if (!m_tabDtc->enableEquipmentPosition())
   {
-    ERROR_LOG() << "Enabling TAB DTS Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling TAB DTS Data-Topics failed.";
     return false;
   }
 
   // TAB FTC enable
   if (!m_tabFtc->enableSendOcData())
   {
-    ERROR_LOG() << "Enabling TAB Function-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling TAB Function-Topics failed.";
     return false;
   }
 
@@ -173,7 +173,7 @@ bool HandlerOcData::init()
       !m_tabocDtc->enableOwnPosition() ||
       !m_tabocDtc->enableSpecificsEquipment())
   {
-    ERROR_LOG() << "Enabling TABOC Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling TABOC Data-Topics failed.";
     return false;
   }
   connect(m_tabocDtc.get(), &TrainingAreaBaseOC::Interface::Dtc::ownPositionChanged, this, &HandlerOcData::onOwnPosition);
@@ -187,21 +187,21 @@ bool HandlerOcData::init()
   // handler oc situation data
   if (!m_handlerOcSituationData->init())
   {
-    ERROR_LOG() << "Initialising HandlerOcSituationData failed.";
+    ERROR_LOG(m_logger) << "Initialising HandlerOcSituationData failed.";
     return false;
   }
 
   // handler oc central aes data
   if (!m_handlerOcCentralAesData->init())
   {
-    ERROR_LOG() << "Initialising HandlerOcCentralAesData failed.";
+    ERROR_LOG(m_logger) << "Initialising HandlerOcCentralAesData failed.";
     return false;
   }
 
   // Handler aes data
   if (!m_handlerOcAesData->init())
   {
-    ERROR_LOG() << "Initialising HandlerOcAesData failed.";
+    ERROR_LOG(m_logger) << "Initialising HandlerOcAesData failed.";
     return false;
   }
 
@@ -211,40 +211,40 @@ bool HandlerOcData::init()
   connect(m_opmDtc.get(), &OperatorManagement::Interface::Dtc::userChanged,
           this, &HandlerOcData::onUserChanged);
 
-  DEBUG_LOG() << "Initialisation HandlerOcData succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation HandlerOcData succesful.";
   return true;
 }
 
 void HandlerOcData::onEvlSchemaModifyReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "Schema could not be transmitted to EVL: " << reply.translated();
+    ERROR_LOG(m_logger) << "Schema could not be transmitted to EVL: " << reply.translated();
   else
-    DEBUG_LOG() << "Schema successfully transmitted to EVL!";
+    DEBUG_LOG(m_logger) << "Schema successfully transmitted to EVL!";
 }
 
 void HandlerOcData::onCreateOperatorMessageReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "Msg could not be created: " << reply.translated();
+    ERROR_LOG(m_logger) << "Msg could not be created: " << reply.translated();
   else
-    DEBUG_LOG() << "Msg created successfully!";
+    DEBUG_LOG(m_logger) << "Msg created successfully!";
 }
 
 void HandlerOcData::onModifyOperatorMessageReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "Msg could not be modified: " << reply.translated();
+    ERROR_LOG(m_logger) << "Msg could not be modified: " << reply.translated();
   else
-    DEBUG_LOG() << "Msg modified successfully!";
+    DEBUG_LOG(m_logger) << "Msg modified successfully!";
 }
 
 void HandlerOcData::onSendOcDataReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "Oc data could not be send: " << reply.translated();
+    ERROR_LOG(m_logger) << "Oc data could not be send: " << reply.translated();
   else
-    DEBUG_LOG() << "Oc data send successfully to TAB!";
+    DEBUG_LOG(m_logger) << "Oc data send successfully to TAB!";
 }
 
 void HandlerOcData::onOcDataChanged(const TrainingAreaBase::OcData &data, DataModification modType)
@@ -297,7 +297,7 @@ void HandlerOcData::onOcDataChanged(const TrainingAreaBase::OcData &data, DataMo
   }
   default:
   {
-    INFO_LOG() << "OC-data with telegram ID: " << telegramId << " is not handled by HandlerOcData OSC!";
+    INFO_LOG(m_logger) << "OC-data with telegram ID: " << telegramId << " is not handled by HandlerOcData OSC!";
     break;
   }
   }
@@ -314,7 +314,7 @@ void HandlerOcData::onTechnicalStateSfmChanged(const TrainingAreaBaseOC::Technic
     m_licensed = data.licensed();
     if (data.licensed())
     {
-      DEBUG_LOG() << "Newly licensed -> demanding situation / sending messages";
+      DEBUG_LOG(m_logger) << "Newly licensed -> demanding situation / sending messages";
       demandSituation(true);
       sendNewMessages();
     }
@@ -342,7 +342,7 @@ void HandlerOcData::onOperatorMessageChanged(const Messaging::OperatorMessage &d
 {
   if (DataModification::eRemoved == modType)
     return;
-  DEBUG_LOG() << data.recipientId() << "new message changed  is send" << data.isSend() << " id" << data.id() ;
+  DEBUG_LOG(m_logger) << data.recipientId() << "new message changed  is send" << data.isSend() << " id" << data.id() ;
   const int ownEqNo = m_tabocDtc->specificsEquipment(1).equipmentNumber();
   if (data.recipientId() > 0)
   {
@@ -365,7 +365,7 @@ void HandlerOcData::onOperatorMessageChanged(const Messaging::OperatorMessage &d
       const auto participantEqNo = m_ppmDtc->participant(data.recipientId()).equipmentNumber();
       if (!participantEqNo.is_set())
       {
-        WARNING_LOG() << "Recipient with id " << data.recipientId() << " has no equipment number set - can not send message";
+        WARNING_LOG(m_logger) << "Recipient with id " << data.recipientId() << " has no equipment number set - can not send message";
         return;
       }
       LtsUtils::set2Byte(participantEqNo.get(), payload);
@@ -384,7 +384,7 @@ void HandlerOcData::onOperatorMessageChanged(const Messaging::OperatorMessage &d
     TrainingAreaBase::SendOcDataRequest out;
     out.payload(LtsUtils::convert<std::vector<uint8_t>>(payload));
 
-    DEBUG_LOG() << "Sending operator message: " << data;
+    DEBUG_LOG(m_logger) << "Sending operator message: " << data;
 
     m_tabFtc->sendOcDataRequest(out, this);
 
@@ -399,7 +399,7 @@ void HandlerOcData::situationRequestCycleTimeout()
 
 void HandlerOcData::onUserChanged(const OperatorManagement::User &data, DataModification modType)
 {
-  TRACE_LOG() << Q_FUNC_INFO;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO;
 
   if (modType != DataModification::eModified || data.id() == 99) // id 99 = Organisator
     return;
@@ -408,7 +408,7 @@ void HandlerOcData::onUserChanged(const OperatorManagement::User &data, DataModi
   // user changes, we remember the user. now we are able to see, if the user logs out
   if (data.workstationId() != 0)
   {
-    DEBUG_LOG() << "User " << data.name() << " logged in.";
+    DEBUG_LOG(m_logger) << "User " << data.name() << " logged in.";
 
     m_user = data;
 
@@ -419,11 +419,11 @@ void HandlerOcData::onUserChanged(const OperatorManagement::User &data, DataModi
   // or all applications are closed. now we have to stop situation data (if already requested) and forget the user.
   if (m_user.id() == data.id() && data.workstationId() == 0)
   {
-    DEBUG_LOG() << "User " << m_user.name() << " logged out.";
+    DEBUG_LOG(m_logger) << "User " << m_user.name() << " logged out.";
 
     if (m_centerEquipmentId > 0 || m_position.is_set())
     {
-      DEBUG_LOG() << "Stopping situation requests.";
+      DEBUG_LOG(m_logger) << "Stopping situation requests.";
 
       // stopping situation data
       m_centerEquipmentId = 0;
@@ -473,7 +473,7 @@ void HandlerOcData::onSendEvaluationRequest(const rti::core::SampleIdentity &coo
 
 void HandlerOcData::onSendDemandSituationRequest(const rti::core::SampleIdentity &cookie, const SendDemandSituationRequest &request)
 {
-  DEBUG_LOG() << "New demand situation request from UI: " << request;
+  DEBUG_LOG(m_logger) << "New demand situation request from UI: " << request;
 
   m_centerEquipmentId = request.centerEquipmentId();
   m_radius = request.radius();
@@ -532,14 +532,14 @@ void HandlerOcData::onSendEquipmentRegistrationRequest(const rti::core::SampleId
   TrainingAreaBase::SendOcDataRequest out;
   out.payload(LtsUtils::convert<std::vector<uint8_t>>(payload));
   m_tabFtc->sendOcDataRequest(out, this);
-  DEBUG_LOG() << "try send out to OcData";
+  DEBUG_LOG(m_logger) << "try send out to OcData";
 
   m_fts->sendEquipmentRegistrationReply(cookie, Core::FunctionReplyObject());
 }
 
 void HandlerOcData::demandEvaluationSchema(int schemaId)
 {
-  INFO_LOG() << "Demand evaluation schema: " << schemaId;
+  INFO_LOG(m_logger) << "Demand evaluation schema: " << schemaId;
 
   QByteArray payload;
 
@@ -559,7 +559,7 @@ void HandlerOcData::demandSituation(bool initial)
 
   if (m_centerEquipmentId < -1)
   {
-    DEBUG_LOG() << "No situation requested as tlnId < -1!";
+    DEBUG_LOG(m_logger) << "No situation requested as tlnId < -1!";
     return;
   }
 
@@ -573,17 +573,17 @@ void HandlerOcData::demandSituation(bool initial)
 
   if (m_centerEquipmentId == -1)
   {
-    INFO_LOG() << "Last demand situation m_centerEquipmentId < -1!";
+    INFO_LOG(m_logger) << "Last demand situation m_centerEquipmentId < -1!";
 
     // PlayerId -2 setzen, damit keine weiteren Telegramme uebertragen werden
     m_centerEquipmentId = -2;
   }
 
   if (m_centerEquipmentId > 0)
-    INFO_LOG() << "Demand OC situation around m_centerEquipmentId: " << m_centerEquipmentId
+    INFO_LOG(m_logger) << "Demand OC situation around m_centerEquipmentId: " << m_centerEquipmentId
                        << " radius: " << m_radius;
   else if (m_position.is_set())
-    INFO_LOG() << "Demand OC situation around position: " << m_position.get()
+    INFO_LOG(m_logger) << "Demand OC situation around position: " << m_position.get()
                        << " radius: " << m_radius;
 
   QByteArray payload;
@@ -628,7 +628,7 @@ void HandlerOcData::demandSituation(bool initial)
 
 void HandlerOcData::demandAesItems(OcSituation::AesType aesType)
 {
-  INFO_LOG() << "Demand aes items type: " << aesType;
+  INFO_LOG(m_logger) << "Demand aes items type: " << aesType;
   QByteArray payload;
 
   LtsUtils::set1Byte(OcSituation::TelegramId::DemandAesItems, payload);
@@ -642,7 +642,7 @@ void HandlerOcData::demandAesItems(OcSituation::AesType aesType)
 
 void HandlerOcData::sendNewMessages()
 {
-  DEBUG_LOG() << "Sending operator messages that havn't been send yet.";
+  DEBUG_LOG(m_logger) << "Sending operator messages that havn't been send yet.";
 
   auto cb = [this](const Messaging::OperatorMessage & message)
   {
@@ -667,7 +667,7 @@ void HandlerOcData::handleMessage(const QByteArray &data)
     out.recipientIds().push_back(ownParticipantId);
   else
   {
-    ERROR_LOG() << "Receiver invalid, do not publish message.";
+    ERROR_LOG(m_logger) << "Receiver invalid, do not publish message.";
     return;
   }
 
@@ -691,7 +691,7 @@ void HandlerOcData::handleMessage(const QByteArray &data)
     }
     else
     {
-      WARNING_LOG() << "Sender equipment number: " << tmp << " is unknown. Setting senderId to 0.";
+      WARNING_LOG(m_logger) << "Sender equipment number: " << tmp << " is unknown. Setting senderId to 0.";
       out.senderId(0);
     }
   }
@@ -713,7 +713,7 @@ void HandlerOcData::handleMessage(const QByteArray &data)
     out.message(msg.mid(idx + 1).constData());
   }
 
-  DEBUG_LOG() << "Got new message: " << out;
+  DEBUG_LOG(m_logger) << "Got new message: " << out;
 
   m_msgFtc->createOperatorMessageRequest(out, this);
 }
@@ -733,7 +733,7 @@ void HandlerOcData::handleEvaluationSchema(const QByteArray &data)
   // set sendToTa true
   out.sendToTa(true);
 
-  DEBUG_LOG() << "Got new evaluation schema: ";
+  DEBUG_LOG(m_logger) << "Got new evaluation schema: ";
 
   m_evlFtc->evlSchemaModifyRequest(out, this);
 }
@@ -787,14 +787,14 @@ void HandlerOcData::setResetCnt(OcSituation::AesType aesType, int resetCnt)
   }
   default:
   {
-    WARNING_LOG() << "Setting reset counter for aes type: " << aesType << " is not handled.";
+    WARNING_LOG(m_logger) << "Setting reset counter for aes type: " << aesType << " is not handled.";
     break;
   }
   }
 
   // update db
   if (!m_dbHandler->update(data))
-    ERROR_LOG() << "Error updating reset counter in db.";
+    ERROR_LOG(m_logger) << "Error updating reset counter in db.";
 }
 
 int HandlerOcData::getParticipantIdByEquipmentNumber(int eqNumber)
@@ -802,7 +802,7 @@ int HandlerOcData::getParticipantIdByEquipmentNumber(int eqNumber)
   int partId = m_ppmDtc->participantIdByEquipmentNumber(eqNumber);
 
   if (partId <= 0)
-    ERROR_LOG() << "Couldn't find our own ID in ppm!";
+    ERROR_LOG(m_logger) << "Couldn't find our own ID in ppm!";
 
   return partId;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.h
index 5376f11f7..19c16e759 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.h
@@ -43,6 +43,7 @@ public:
   bool init();
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onEvlSchemaModifyReply(const Core::FunctionReplyObject &reply) override final;
   void onCreateOperatorMessageReply(const Core::FunctionReplyObject &reply) override final;
   void onModifyOperatorMessageReply(const Core::FunctionReplyObject &reply) override final;
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 a3ee36bd6..aa58b75f5 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
@@ -49,14 +49,14 @@ bool HandlerOcSituationData::init()
       !m_ppmDtc->enableParty() ||
       !m_ppmDtc->enableType())
   {
-    ERROR_LOG() << "Enabling PPM Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling PPM Data-Topics failed.";
     return false;
   }
 
   // PPM FTC enable
   if (!m_ppmFtc->enableModifyParticipantData())
   {
-    ERROR_LOG() << "Enabling PPM Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling PPM Data-Topics failed.";
     return false;
   }
 
@@ -67,25 +67,25 @@ bool HandlerOcSituationData::init()
       !m_tabDts->enableParticipantSanitation() ||
       !m_tabDts->enableSpecialSensorData())
   {
-    ERROR_LOG() << "Enabling TAB DTS Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling TAB DTS Data-Topics failed.";
     return false;
   }
 
   // TAOBOC DTC enable
   if (!m_tabocDtc->enableSpecificsEquipment())
   {
-    ERROR_LOG() << "Enabling TABOC Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling TABOC Data-Topics failed.";
     return false;
   }
 
   if (!m_tabocDts->enableParticipantsOverload())
   {
-    ERROR_LOG() << "Enabling TABOC fts-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling TABOC fts-Topics failed.";
     return false;
   }
 
 
-  DEBUG_LOG() << "Initialisation HandlerOcSituationData succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation HandlerOcSituationData succesful.";
   return true;
 }
 
@@ -93,7 +93,7 @@ void HandlerOcSituationData::process(const QByteArray &data, bool bIsInitial)
 {
   if (bIsInitial)
   {
-    DEBUG_LOG() << "Processing initial situation data.";
+    DEBUG_LOG(m_logger) << "Processing initial situation data.";
 
     int ownEquipmentNumber = m_tabocDtc->specificsEquipment(1).equipmentNumber();
     int ownParticipantId = -1;
@@ -115,7 +115,7 @@ void HandlerOcSituationData::process(const QByteArray &data, bool bIsInitial)
     m_participantId2EqId.clear();
 
     if (ownParticipantId == -1)
-      ERROR_LOG() << "Mapping of own participant id and equipment number is unknown.";
+      ERROR_LOG(m_logger) << "Mapping of own participant id and equipment number is unknown.";
     else
       m_participantId2EqId.insert(ownParticipantId, ownEquipmentNumber);
   } // if
@@ -160,15 +160,15 @@ void HandlerOcSituationData::onModifyParticipantDataReply(const Core::FunctionRe
 {
   if (!m_modifiyRequests.contains(reply.id()))
   {
-    ERROR_LOG() << "Got a ModifyParticipantDataReply without matching ID!";
+    ERROR_LOG(m_logger) << "Got a ModifyParticipantDataReply without matching ID!";
     return;
   }
 
   if (reply.error())
-    ERROR_LOG() << "ModifyParticipantDataRequest " << reply.id() << " could not be handled: " << reply.str();
+    ERROR_LOG(m_logger) << "ModifyParticipantDataRequest " << reply.id() << " could not be handled: " << reply.str();
   else
   {
-    DEBUG_LOG() << "ModifyParticipantDataRequest " << reply.id() << " handled successfully by PPM!";
+    DEBUG_LOG(m_logger) << "ModifyParticipantDataRequest " << reply.id() << " handled successfully by PPM!";
     delete (m_modifiyRequests.value(reply.id()));
     m_modifiyRequests.remove(reply.id());
     sendTrainingAreaBaseData(); // send TAB data for new participants
@@ -179,7 +179,7 @@ bool HandlerOcSituationData::decodeSituationData(const QByteArray &data)
 {
   if (data.isEmpty())
   {
-    ERROR_LOG() << "Got an empty QByteArray to decode.";
+    ERROR_LOG(m_logger) << "Got an empty QByteArray to decode.";
     return false;
   }
 
@@ -190,7 +190,7 @@ bool HandlerOcSituationData::decodeSituationData(const QByteArray &data)
   participantsOverload.id(1);
   participantsOverload.hasOverload(participantOverloaded);
   m_tabocDts->publish(participantsOverload);
-  DEBUG_LOG() << "publish overload: " << participantOverloaded;
+  DEBUG_LOG(m_logger) << "publish overload: " << participantOverloaded;
 
   QByteArray data2 = data;
   data2.remove(0, 1);
@@ -203,13 +203,13 @@ bool HandlerOcSituationData::decodeSituationData(const QByteArray &data)
   QByteArray uncompressed = MainHandler::tryUncompress(data2, m_bWithCompression);
   if (uncompressed.isEmpty())
   {
-    INFO_LOG() << "Got an empty QByteArray after uncompression.";
+    INFO_LOG(m_logger) << "Got an empty QByteArray after uncompression.";
     return false;
   }
 
-  TRACE_LOG() << "Uncompressed Data: " << uncompressed.toHex(' ');
+  TRACE_LOG(m_logger) << "Uncompressed Data: " << uncompressed.toHex(' ');
 
-  DEBUG_LOG() << " m_equipmentPositions size before decode: " << m_equipmentPositions.size()
+  DEBUG_LOG(m_logger) << " m_equipmentPositions size before decode: " << m_equipmentPositions.size()
                       << " m_equipmentStates size before decode: " << m_equipmentStates.size()
                       << " m_equipmentOperationalStates size before decode: " << m_equipmentOperationalStates.size()
                       << " m_specialSensorData size before decode: " << m_specialSensorData.size();
@@ -220,7 +220,7 @@ bool HandlerOcSituationData::decodeSituationData(const QByteArray &data)
   int modId = 1000000;
   while (getParticipantId(uncompressed, pos, participantId, modifiedFlag) && participantId != 0)
   {
-    INFO_LOG() << "Participant: " << participantId << " is modified: " << modifiedFlag;
+    INFO_LOG(m_logger) << "Participant: " << participantId << " is modified: " << modifiedFlag;
 
     // outdated handling
     if (modifiedFlag == OcSituation::ModificationFlag::eNone)
@@ -245,10 +245,10 @@ bool HandlerOcSituationData::decodeSituationData(const QByteArray &data)
     bRet = getVBG(uncompressed, pos, state, sanitaion, (modifiedFlag & OcSituation::ModificationFlag::eVBG) == OcSituation::ModificationFlag::eVBG);
     if (bRet)
     {
-      DEBUG_LOG() << "Adding EquipmentState to internal map: " << state;
+      DEBUG_LOG(m_logger) << "Adding EquipmentState to internal map: " << state;
       m_equipmentStates.insert(participantId, state);
 
-      DEBUG_LOG() << "Adding ParticipantSanitation to internal map: " << sanitaion;
+      DEBUG_LOG(m_logger) << "Adding ParticipantSanitation to internal map: " << sanitaion;
       m_participantSanitations.insert(participantId, sanitaion);
 
     }
@@ -259,8 +259,8 @@ bool HandlerOcSituationData::decodeSituationData(const QByteArray &data)
     bRet = getState(uncompressed, pos, sensorData, opState, (modifiedFlag & OcSituation::ModificationFlag::eState) == OcSituation::ModificationFlag::eState);
     if (bRet)
     {
-      DEBUG_LOG() << "Adding SpecialSensorData to internal map: " << sensorData;
-      DEBUG_LOG() << "Adding EquipmentOperationalState to internal map: " << opState;
+      DEBUG_LOG(m_logger) << "Adding SpecialSensorData to internal map: " << sensorData;
+      DEBUG_LOG(m_logger) << "Adding EquipmentOperationalState to internal map: " << opState;
       m_specialSensorData.insert(participantId, sensorData);
       m_equipmentOperationalStates.insert(participantId, opState);
     }
@@ -294,11 +294,11 @@ bool HandlerOcSituationData::decodeSituationData(const QByteArray &data)
       if (!m_participantData.contains(unitId)) // Adding Unit to participantData, if not already added
       {
         m_participantData.insert(unitId, m_ppmDtc->convertParticipantToParticipantData(m_participants.value(unitId)));
-        DEBUG_LOG() << "Adding unit to m_participantData: " << m_participantData.value(unitId);
+        DEBUG_LOG(m_logger) << "Adding unit to m_participantData: " << m_participantData.value(unitId);
       }
 
       m_participantData.insert(participantId, participantData);
-      DEBUG_LOG() << "Adding ParticipantData to internal map: " << participantData;
+      DEBUG_LOG(m_logger) << "Adding ParticipantData to internal map: " << participantData;
 
       if (participantData.equipmentNumber().is_set())
         m_participantId2EqId[participantId] = participantData.equipmentNumber().get();
@@ -311,7 +311,7 @@ bool HandlerOcSituationData::decodeSituationData(const QByteArray &data)
       m_equipmentPositions.remove(participantId);
   }
 
-  DEBUG_LOG() << " m_equipmentPositions size after decode: " << m_equipmentPositions.size()
+  DEBUG_LOG(m_logger) << " m_equipmentPositions size after decode: " << m_equipmentPositions.size()
                       << " m_equipmentStates size after decode: " << m_equipmentStates.size()
                       << " m_equipmentOperationalStates size after decode: " << m_equipmentOperationalStates.size()
                       << " m_specialSensorData size after decode: " << m_specialSensorData.size();
@@ -323,7 +323,7 @@ void HandlerOcSituationData::sendParticipantData(int requestId)
 {
   if (m_modifiyRequests.contains(requestId))
   {
-    WARNING_LOG() << "Resending modfiyParticipantDataRequest: " << requestId;
+    WARNING_LOG(m_logger) << "Resending modfiyParticipantDataRequest: " << requestId;
     m_ppmFtc->modifyParticipantDataRequest(*m_modifiyRequests.value(requestId), this);
     return;
   }
@@ -335,7 +335,7 @@ void HandlerOcSituationData::sendParticipantData(int requestId)
   m_modifiyRequests.insert(requestId, newRequest);
   m_participantData.clear();
 
-  INFO_LOG() << "Sending modfiyParticipantDataRequest: " << requestId;
+  INFO_LOG(m_logger) << "Sending modfiyParticipantDataRequest: " << requestId;
   m_ppmFtc->modifyParticipantDataRequest(*newRequest, this);
 }
 
@@ -438,7 +438,7 @@ bool HandlerOcSituationData::getVBG(const QByteArray &buf, size_t &pos, Training
   if (!m_knownParties.contains(tmp))
   {
 
-    WARNING_LOG() << "Party: " << tmp << " unknown, setting equipmentState.originatorId() to "
+    WARNING_LOG(m_logger) << "Party: " << tmp << " unknown, setting equipmentState.originatorId() to "
                           << Settings::unitOffset() + 1;
     //Sollte nicht passieren, doch falls ja gibt es goldene Kreuze beim Ausfall
     tmp = 1;
@@ -510,7 +510,7 @@ bool HandlerOcSituationData::getStructure(const QByteArray &buf, size_t &pos, Pa
     participant.partyId(tmp);
   else
   {
-    WARNING_LOG() << "Not setting new party: " << tmp << " for participant: " << participant.id() << " as the party is unknown -> do a base download.";
+    WARNING_LOG(m_logger) << "Not setting new party: " << tmp << " for participant: " << participant.id() << " as the party is unknown -> do a base download.";
     bRet = false;
   }
 
@@ -519,7 +519,7 @@ bool HandlerOcSituationData::getStructure(const QByteArray &buf, size_t &pos, Pa
   if (m_participants.contains(tmp))
     participant.superiorModId(tmp);
   else
-    WARNING_LOG() << "Not setting new superioir ID: " << tmp << " for participant: " << participant.id() << " as the superior is unknown -> do a base download.";
+    WARNING_LOG(m_logger) << "Not setting new superioir ID: " << tmp << " for participant: " << participant.id() << " as the superior is unknown -> do a base download.";
 #endif
 
   return bRet;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/main_handler.cpp
index e7356a0ba..c288d08ec 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/main_handler.cpp
@@ -16,8 +16,7 @@
 namespace OcSituationClient
 {
 
-MainHandler::MainHandler(QObject *parent)
-  : QObject(parent)
+MainHandler::MainHandler(QObject *parent) : QObject(parent)
   , m_ddsHandler(nullptr)
   , m_handlerOcData(nullptr)
   , m_dbHandler(nullptr)
@@ -35,8 +34,8 @@ MainHandler::MainHandler(QObject *parent)
   , m_tabDtc(nullptr)
   , m_tabFtc(nullptr)
   , m_tabocDtc(nullptr)
-  , m_tabocDts(nullptr)
-{}
+  , m_tabocDts(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 MainHandler::~MainHandler()
 {
@@ -66,89 +65,89 @@ bool MainHandler::init(int domainId, int exerciseId)
 
   if (!m_dbHandler->init(exerciseId, Settings::settings()))
   {
-    ERROR_LOG() << "Initialisation dbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation dbHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation dbHandler succesful.";
 
   // initialize DDS
   m_ddsHandler = std::make_shared<DdsHandler>(domainId, exerciseId);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation ddsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation ddsHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation ddsHandler succesful.";
 
   // create AES Dtc
   m_aesDtc = AreaEffectSimulation::Interface::Dtc::create(m_ddsHandler->dds());
-  DEBUG_LOG() << "Created AES Dtc";
+  DEBUG_LOG(m_logger) << "Created AES Dtc";
 
   // create AES Ftc
   m_aesFtc = AreaEffectSimulation::Interface::Ftc::create(m_ddsHandler->dds());
-  DEBUG_LOG() << "Created AES Ftc";
+  DEBUG_LOG(m_logger) << "Created AES Ftc";
 
   // create EVL Ftc
   m_evlFtc = Evaluations::Interface::Ftc::create(m_ddsHandler->dds());
-  DEBUG_LOG() << "Created EVL Ftc";
+  DEBUG_LOG(m_logger) << "Created EVL Ftc";
 
   // create GIM Dtc
   m_gimDtc = GuezIedManagement::Interface::Dtc::create(m_ddsHandler->dds());
-  DEBUG_LOG() << "Created GIM Dtc";
+  DEBUG_LOG(m_logger) << "Created GIM Dtc";
 
   // create MSG Dtc
   m_msgDtc = Messaging::Interface::Dtc::create(m_ddsHandler->dds());
-  DEBUG_LOG() << "Created MSG Dtc";
+  DEBUG_LOG(m_logger) << "Created MSG Dtc";
 
   // create MSG Ftc
   m_msgFtc = Messaging::Interface::Ftc::create(m_ddsHandler->dds());
-  DEBUG_LOG() << "Created MSG Ftc";
+  DEBUG_LOG(m_logger) << "Created MSG Ftc";
 
   // create OPM Dtc
   m_opmDtc = OperatorManagement::Interface::Dtc::create(m_ddsHandler->dds());
-  DEBUG_LOG() << "Created OPM Dtc";
+  DEBUG_LOG(m_logger) << "Created OPM Dtc";
 
   // create OSS Dts
   m_ossDts = OcSituationServer::Interface::Dts::create(m_ddsHandler->dds());
-  DEBUG_LOG() << "Created OSS Dts";
+  DEBUG_LOG(m_logger) << "Created OSS Dts";
 
   // create OSS Fts
   m_ossFts = OcSituationServer::Interface::Fts::create(m_ddsHandler->dds());
-  DEBUG_LOG() << "Created OSS Fts";
+  DEBUG_LOG(m_logger) << "Created OSS Fts";
 
   // create PPM Dtc
   m_ppmDtc = ParticipantManagement::Interface::Dtc::create(m_ddsHandler->dds());
-  DEBUG_LOG() << "Created PPM Dtc";
+  DEBUG_LOG(m_logger) << "Created PPM Dtc";
 
   // create PPM Ftc
   m_ppmFtc = ParticipantManagement::Interface::Ftc::create(m_ddsHandler->dds());
-  DEBUG_LOG() << "Created PPM Ftc";
+  DEBUG_LOG(m_logger) << "Created PPM Ftc";
 
   // create TAB Dtc
   m_tabDtc = TrainingAreaBase::Interface::Dtc::create(m_ddsHandler->dds());
-  DEBUG_LOG() << "Created TAB Dtc";
+  DEBUG_LOG(m_logger) << "Created TAB Dtc";
 
   // create TAB Dts
   m_tabDts = TrainingAreaBase::Interface::Dts::create(m_ddsHandler->dds());
-  DEBUG_LOG() << "Created TAB Dts";
+  DEBUG_LOG(m_logger) << "Created TAB Dts";
 
   // create TAB Ftc
   m_tabFtc = TrainingAreaBase::Interface::Ftc::create(m_ddsHandler->dds());
-  DEBUG_LOG() << "Created TAB Ftc";
+  DEBUG_LOG(m_logger) << "Created TAB Ftc";
 
   // create TABOC Dtc
   m_tabocDtc = TrainingAreaBaseOC::Interface::Dtc::create(m_ddsHandler->dds());
-  DEBUG_LOG() << "Created TABOC Dtc";
+  DEBUG_LOG(m_logger) << "Created TABOC Dtc";
 
   // create TABOC Dts
   m_tabocDts = TrainingAreaBaseOC::Interface::Dts::create(m_ddsHandler->dds());
-  DEBUG_LOG() << "Created TABOC Dts";
+  DEBUG_LOG(m_logger) << "Created TABOC Dts";
 
   // create handler oc-data
   m_handlerOcData = std::make_shared<HandlerOcData>(this, this);
   if (!m_handlerOcData->init())
   {
-    ERROR_LOG() << "Initialisation HandlerOcData failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerOcData failed.";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/main_handler.h
index 91ee6f54f..adab38b9a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/main_handler.h
@@ -84,6 +84,7 @@ public:
     return {};
   }
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>    m_ddsHandler;
   std::shared_ptr<HandlerOcData> m_handlerOcData;
   std::shared_ptr<DbHandler>     m_dbHandler;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/central_aes_data_queue.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/central_aes_data_queue.cpp
index efa4e43f7..68a282eb9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/central_aes_data_queue.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/central_aes_data_queue.cpp
@@ -11,9 +11,8 @@
 namespace OcSituationServer
 {
 
-CentralAesDataQueue::CentralAesDataQueue(QObject *parent)
-  : QObject(parent)
-{
+CentralAesDataQueue::CentralAesDataQueue(QObject *parent) : QObject(parent),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 
 }
 
@@ -35,7 +34,7 @@ void CentralAesDataQueue::addRemoveMessage(int32_t aesItemId, AreaEffectSimulati
   else
     m_internalQueue.prepend({aesItemId, OcSituation::Remove, data});
 
-  DEBUG_LOG() << "New remove-message added: Id = " << aesItemId
+  DEBUG_LOG(m_logger) << "New remove-message added: Id = " << aesItemId
                       << ", aesType = " << aesType << ". "
                       << m_internalQueue.size() << " normal, "
                       << m_internalPrioritizedQueue.size() << " prioritized and "
@@ -114,7 +113,7 @@ QByteArray CentralAesDataQueue::getSendingData(qint32 size)
 
     ++messageCounter;
 
-    WARNING_LOG() << "Could not build data with max size of " << size << " bytes. Delivering data with " << result.size() << " bytes.";
+    WARNING_LOG(m_logger) << "Could not build data with max size of " << size << " bytes. Delivering data with " << result.size() << " bytes.";
   }
 
   while (!m_internalQueue.isEmpty() && ((result.size() + m_internalQueue.head().data.size()) <= size))
@@ -131,11 +130,11 @@ QByteArray CentralAesDataQueue::getSendingData(qint32 size)
 
     ++messageCounter;
 
-    WARNING_LOG() << "Could not build data with max size of " << size << " bytes. Delivering data with " << result.size() << " bytes.";
+    WARNING_LOG(m_logger) << "Could not build data with max size of " << size << " bytes. Delivering data with " << result.size() << " bytes.";
   }
 
-  DEBUG_LOG() << "Data with max size = " << size << "requestet. " << result.size() << " bytes delivered.";
-  DEBUG_LOG() << messageCounter << " messages are sent. "
+  DEBUG_LOG(m_logger) << "Data with max size = " << size << "requestet. " << result.size() << " bytes delivered.";
+  DEBUG_LOG(m_logger) << messageCounter << " messages are sent. "
                       << m_internalQueue.size() << " normal, "
                       << m_internalPrioritizedQueue.size() << " prioritized and "
                       << m_internalQueue.size() + m_internalPrioritizedQueue.size() << " remaining messages in total.";
@@ -162,7 +161,7 @@ void CentralAesDataQueue::clearSpecificMessage(int32_t aesItemId, OcSituation::C
     {
       m_internalQueue.removeAt(counter);
 
-      DEBUG_LOG() << "Removed already existing message. aesItemId = " << aesItemId << ", changeType = " << changeType;
+      DEBUG_LOG(m_logger) << "Removed already existing message. aesItemId = " << aesItemId << ", changeType = " << changeType;
 
       return;
     }
@@ -174,7 +173,7 @@ void CentralAesDataQueue::clearSpecificMessage(int32_t aesItemId, OcSituation::C
     {
       m_internalPrioritizedQueue.removeAt(counter);
 
-      DEBUG_LOG() << "Removed already existing message. aesItemId = " << aesItemId << ", changeType = " << changeType;
+      DEBUG_LOG(m_logger) << "Removed already existing message. aesItemId = " << aesItemId << ", changeType = " << changeType;
 
       return;
     }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/dds_handler.cpp
index 45b07c1bb..38d14b994 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/dds_handler.cpp
@@ -16,14 +16,14 @@ namespace OcSituationServer
 DdsHandler::DdsHandler(int domainId, int exerciseId)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise, exerciseId))
 {
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -42,10 +42,10 @@ bool DdsHandler::init(const QStringList &qosFileList)
   m_ddsFts = OcSituationServer::Interface::Fts::create(m_ddsConnector);
 
   bRet &= m_ddsDts->enableAll();
-  INFO_LOG() << "Dts initialised";
+  INFO_LOG(m_logger) << "Dts initialised";
 
   bRet &= m_ddsFts->enableAll();
-  INFO_LOG() << "Fts initialised";
+  INFO_LOG(m_logger) << "Fts initialised";
 
   return bRet;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/dds_handler.h
index d7f9ee17e..76d7c0530 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/dds_handler.h
@@ -39,6 +39,7 @@ public:
 Q_SIGNALS:
   void partitionTimeChanged(qint64 partitionTime);
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<Core::Pacemaker>            m_pacemaker;
   std::shared_ptr<Core::Interface::Dtc>               m_dtcCore;
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 52551611e..8a13395b7 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
@@ -57,7 +57,7 @@ bool HandlerOcAesData::init()
   // read all Ieds from database
   if (!m_dbHandler->select(dataVec))
   {
-    ERROR_LOG() << "Error reading reset counter from database!";
+    ERROR_LOG(m_logger) << "Error reading reset counter from database!";
     return false;
   }
 
@@ -77,7 +77,7 @@ bool HandlerOcAesData::init()
     }
     default:
     {
-      WARNING_LOG() << "Reset counter for aes type: " << data.aesTypeId << " read from db is not handled.";
+      WARNING_LOG(m_logger) << "Reset counter for aes type: " << data.aesTypeId << " read from db is not handled.";
       break;
     }
     }
@@ -86,7 +86,7 @@ bool HandlerOcAesData::init()
   // AES DTC enable
   if (!m_aesDtc->enableDangerArea())
   {
-    ERROR_LOG() << "Enabling AES Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling AES Data-Topics failed.";
     return false;
   }
   connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::dangerAreaChanged, this, &HandlerOcAesData::onDangerAreaChanged);
@@ -95,7 +95,7 @@ bool HandlerOcAesData::init()
   if (!m_gimDtc->enableIed() ||
       !m_gimDtc->enableIedPosition())
   {
-    ERROR_LOG() << "Enabling GIM Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling GIM Data-Topics failed.";
     return false;
   }
   connect(m_gimDtc.get(), &GuezIedManagement::Interface::Dtc::iedChanged, this, &HandlerOcAesData::onIedChanged);
@@ -103,7 +103,7 @@ bool HandlerOcAesData::init()
 
   connect(m_iedPositionCycleTimer, &QTimer::timeout, this, &HandlerOcAesData::sendIedPositions);
   m_iedPositionCycleTimer->setInterval(Settings::iedPositionCycleTime());
-  DEBUG_LOG() << "Starting ied position timer with interval: " << m_iedPositionCycleTimer->interval();
+  DEBUG_LOG(m_logger) << "Starting ied position timer with interval: " << m_iedPositionCycleTimer->interval();
   m_iedPositionCycleTimer->start();
 
   return true;
@@ -116,7 +116,7 @@ void HandlerOcAesData::demandAesItems(OcSituation::AesType aesType, int eqNumber
   case OcSituation::AesType::DangerArea:
   case OcSituation::AesType::Ied:
   {
-    DEBUG_LOG() << "Got demand for aes type: " << aesType << " from equipment: " << eqNumber;
+    DEBUG_LOG(m_logger) << "Got demand for aes type: " << aesType << " from equipment: " << eqNumber;
 
     if (!m_collectionTimer[aesType]->isActive())
       m_collectionTimer[aesType]->start();
@@ -126,7 +126,7 @@ void HandlerOcAesData::demandAesItems(OcSituation::AesType aesType, int eqNumber
   }
   default:
   {
-    WARNING_LOG() << "Aes type: " << aesType << " is currently not handled.";
+    WARNING_LOG(m_logger) << "Aes type: " << aesType << " is currently not handled.";
   }
   }
 }
@@ -134,9 +134,9 @@ void HandlerOcAesData::demandAesItems(OcSituation::AesType aesType, int eqNumber
 void HandlerOcAesData::onSendOcDataReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "Oc data could not be send: " << reply.translated();
+    ERROR_LOG(m_logger) << "Oc data could not be send: " << reply.translated();
   else
-    DEBUG_LOG() << "Oc data send successfully to TAB!";
+    DEBUG_LOG(m_logger) << "Oc data send successfully to TAB!";
 }
 
 void HandlerOcAesData::onDangerAreaChanged(const AreaEffectSimulation::DangerArea &data, DataModification mod)
@@ -165,7 +165,7 @@ void HandlerOcAesData::onIedPositionChanged(const GuezIedManagement::IedPosition
       m_iedPositionsToBeSend.insert(data.id(), data);
   }
   else
-    ERROR_LOG() << "Got ied position for not existing ID: " << data.id();
+    ERROR_LOG(m_logger) << "Got ied position for not existing ID: " << data.id();
 }
 
 void HandlerOcAesData::onCollectionTimeOutDemandDangerAreas()
@@ -184,7 +184,7 @@ void HandlerOcAesData::sendIedPositions()
 {
   if (m_iedPositionsToBeSend.size() == 0)
   {
-    DEBUG_LOG() << "No new ied positions to be send.";
+    DEBUG_LOG(m_logger) << "No new ied positions to be send.";
     return;
   }
 
@@ -209,14 +209,14 @@ void HandlerOcAesData::sendIedPositions()
     data[1] = ++cnt;
 
     QByteArray ba = qCompress(data);
-    DEBUG_LOG() << "Added ied position " << pos
+    DEBUG_LOG(m_logger) << "Added ied position " << pos
                         << " data size: " << data.size()
                         << " compressed size: " << ba.size();
 
     if (ba.size() > Settings::maxNumOfBytePerAesTxCycle()) // one cycle is full -> send
     {
-      DEBUG_LOG() << "Uncompressed Data: " << data.toHex(' ');
-      DEBUG_LOG() << "Compressed Data: " << ba.toHex(' ');
+      DEBUG_LOG(m_logger) << "Uncompressed Data: " << data.toHex(' ');
+      DEBUG_LOG(m_logger) << "Compressed Data: " << ba.toHex(' ');
       payload.append(ba);
       req.payload(LtsUtils::convert<std::vector<uint8_t>>(payload));
       m_tabFtc->sendOcDataRequest(req, this);
@@ -234,8 +234,8 @@ void HandlerOcAesData::sendIedPositions()
 
   if (cnt > 0) // is still data to be send?
   {
-    DEBUG_LOG() << "Uncompressed Data: " << data.toHex(' ');
-    DEBUG_LOG() << "Compressed Data: " << qCompress(data).toHex(' ');
+    DEBUG_LOG(m_logger) << "Uncompressed Data: " << data.toHex(' ');
+    DEBUG_LOG(m_logger) << "Compressed Data: " << qCompress(data).toHex(' ');
     payload.append(qCompress(data));
     req.payload(LtsUtils::convert<std::vector<uint8_t>>(payload));
     m_tabFtc->sendOcDataRequest(req, this);
@@ -246,7 +246,7 @@ void HandlerOcAesData::sendIedPositions()
 
 void HandlerOcAesData::collectionTimeout(OcSituation::AesType type, const std::function<void (int)> &sendFunction)
 {
-  DEBUG_LOG() << "There are " << m_demandingEquipments[type].size() << " requests for aes type: " << type
+  DEBUG_LOG(m_logger) << "There are " << m_demandingEquipments[type].size() << " requests for aes type: " << type
                       << " sending Items as " << ((m_demandingEquipments[type].size() > 5) ? QStringLiteral("broadcast") : QStringLiteral("direct")) << " telegram(s)";
 
   if (m_demandingEquipments[type].size() > 5)
@@ -296,13 +296,13 @@ void HandlerOcAesData::sendDangerAreasToTab(int eqNumber)
       data[1] = ++cnt;
 
       QByteArray ba = qCompress(data);
-      DEBUG_LOG() << "Added danger area " << dangerArea
+      DEBUG_LOG(m_logger) << "Added danger area " << dangerArea
                           << " data size: " << data.size()
                           << " compressed size: " << ba.size();
       if (ba.size() > Settings::maxNumOfBytePerAesTxCycle()) // one cycle is full -> send
       {
-        DEBUG_LOG() << "Uncompressed Data: " << data.toHex(' ');
-        DEBUG_LOG() << "Compressed Data: " << ba.toHex(' ');
+        DEBUG_LOG(m_logger) << "Uncompressed Data: " << data.toHex(' ');
+        DEBUG_LOG(m_logger) << "Compressed Data: " << ba.toHex(' ');
         payload.append(ba);
         req.payload(LtsUtils::convert<std::vector<uint8_t>>(payload));
         m_tabFtc->sendOcDataRequest(req, this);
@@ -321,8 +321,8 @@ void HandlerOcAesData::sendDangerAreasToTab(int eqNumber)
 
   if (cnt > 0) // is still data to be send?
   {
-    DEBUG_LOG() << "Uncompressed Data: " << data.toHex(' ');
-    DEBUG_LOG() << "Compressed Data: " << qCompress(data).toHex(' ');
+    DEBUG_LOG(m_logger) << "Uncompressed Data: " << data.toHex(' ');
+    DEBUG_LOG(m_logger) << "Compressed Data: " << qCompress(data).toHex(' ');
     payload.append(qCompress(data));
     req.payload(LtsUtils::convert<std::vector<uint8_t>>(payload));
     m_tabFtc->sendOcDataRequest(req, this);
@@ -365,14 +365,14 @@ void HandlerOcAesData::sendIedsToTab(int eqNumber)
     data[1] = ++cnt;
 
     QByteArray ba = qCompress(data);
-    DEBUG_LOG() << "Added ied " << ied
+    DEBUG_LOG(m_logger) << "Added ied " << ied
                         << " data size: " << data.size()
                         << " compressed size: " << ba.size();
 
     if (ba.size() > Settings::maxNumOfBytePerAesTxCycle()) // one cycle is full -> send
     {
-      DEBUG_LOG() << "Uncompressed Data: " << data.toHex(' ');
-      DEBUG_LOG() << "Compressed Data: " << ba.toHex(' ');
+      DEBUG_LOG(m_logger) << "Uncompressed Data: " << data.toHex(' ');
+      DEBUG_LOG(m_logger) << "Compressed Data: " << ba.toHex(' ');
       payload.append(ba);
       req.payload(LtsUtils::convert<std::vector<uint8_t>>(payload));
       m_tabFtc->sendOcDataRequest(req, this);
@@ -390,8 +390,8 @@ void HandlerOcAesData::sendIedsToTab(int eqNumber)
 
   if (cnt > 0) // is still data to be send?
   {
-    DEBUG_LOG() << "Uncompressed Data: " << data.toHex(' ');
-    DEBUG_LOG() << "Compressed Data: " << qCompress(data).toHex(' ');
+    DEBUG_LOG(m_logger) << "Uncompressed Data: " << data.toHex(' ');
+    DEBUG_LOG(m_logger) << "Compressed Data: " << qCompress(data).toHex(' ');
     payload.append(qCompress(data));
     req.payload(LtsUtils::convert<std::vector<uint8_t>>(payload));
     m_tabFtc->sendOcDataRequest(req, this);
@@ -414,7 +414,7 @@ void HandlerOcAesData::incrementResetCnt(OcSituation::AesType aesType)
   }
   default:
   {
-    WARNING_LOG() << "Reset counter for aes type: " << aesType << " is not handled in incrementResetCnt.";
+    WARNING_LOG(m_logger) << "Reset counter for aes type: " << aesType << " is not handled in incrementResetCnt.";
     break;
   }
   }
@@ -440,14 +440,14 @@ void HandlerOcAesData::setResetCnt(OcSituation::AesType aesType, int resetCnt)
   }
   default:
   {
-    WARNING_LOG() << "Reset counter for aes type: " << aesType << " is not handled in setResetCnt.";
+    WARNING_LOG(m_logger) << "Reset counter for aes type: " << aesType << " is not handled in setResetCnt.";
     break;
   }
   }
 
   // update db
   if (!m_dbHandler->update(data))
-    ERROR_LOG() << "Error updating reset counter in db.";
+    ERROR_LOG(m_logger) << "Error updating reset counter in db.";
 }
 
 } // namespace OcSituationServer
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_central_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_central_aes_data.cpp
index c3a6d5a08..96ee41e65 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_central_aes_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_central_aes_data.cpp
@@ -43,7 +43,7 @@ void ThreadOcCentralAesData::requestOcCentralAesData(OcSituation::SituationCente
                                                      int radius,
                                                      bool initial)
 {
-  INFO_LOG() << "OC-Situation Request for centerEquipmentId: " << centerEquipmentId
+  INFO_LOG(m_logger) << "OC-Situation Request for centerEquipmentId: " << centerEquipmentId
                      << " from O/C-laptop-Id: " << m_equipmentId
                      << " with radius of " << radius
                      << "m, initial: " << initial;
@@ -58,7 +58,7 @@ void ThreadOcCentralAesData::requestOcCentralAesData(OcSituation::SituationCente
   if (m_handler)
     m_handler->setRequestCentralAesData(centerType, centerEquipmentId, position, radius, initial);
   else
-    DEBUG_LOG() << "Thread doesn't exist up to now! Do nothing.";
+    DEBUG_LOG(m_logger) << "Thread doesn't exist up to now! Do nothing.";
 }
 
 void ThreadOcCentralAesData::run()
@@ -67,7 +67,7 @@ void ThreadOcCentralAesData::run()
   {
     QMutexLocker l(&m_accessMutex);
     QMutexLocker m(&s_ddsAccesMutex);
-    DEBUG_LOG() << "Instance new OC-Thread for O/C-Laptop-Id: " << m_equipmentId;
+    DEBUG_LOG(m_logger) << "Instance new OC-Thread for O/C-Laptop-Id: " << m_equipmentId;
 
     m_handler = new HandlerOcCentralAesData(m_mainHandler->dds(),
                                             m_baseCoordinate,
@@ -77,7 +77,7 @@ void ThreadOcCentralAesData::run()
     m_handler->setRequestCentralAesData(m_centerType, m_centerEquipmentId, m_position, m_radius, true);
   }
 
-  INFO_LOG() << "OC-Thread started for O/C-Laptop-Id: " << m_equipmentId;
+  INFO_LOG(m_logger) << "OC-Thread started for O/C-Laptop-Id: " << m_equipmentId;
   exec();
 
   {
@@ -104,7 +104,7 @@ HandlerOcCentralAesData::HandlerOcCentralAesData(const std::shared_ptr<DdsHandle
   , m_dataQueue(new CentralAesDataQueue(this))
   , m_logger(getLogger(QStringLiteral("HandlerOcCentralAesData.") + QString::number(equipmentId)))
 {
-  INFO_LOG() << "Create O/C-CentralAesHandler for O/C-Laptop-Id: " << equipmentId
+  INFO_LOG(m_logger) << "Create O/C-CentralAesHandler for O/C-Laptop-Id: " << equipmentId
                      << " aliveTimeout: " << Settings::aliveTimeout() << " sec"
                      << " txCyleTime: " << Settings::txCycleTime() << " sec"
                      << " maxTransferBytes: " << Settings::maxNumOfBytePerTxCycle();
@@ -153,70 +153,70 @@ HandlerOcCentralAesData::HandlerOcCentralAesData(const std::shared_ptr<DdsHandle
     if (data.isCentral())
       m_allCentralEffectClusters.insert(data.id(), data);
   });
-  TRACE_LOG() << "Got " << m_allCentralEffectClusters.size() << " central EffectClusters on startup.";
+  TRACE_LOG(m_logger) << "Got " << m_allCentralEffectClusters.size() << " central EffectClusters on startup.";
 
   m_aesDtc->nContaminations([this](const AreaEffectSimulation::NContamination & data)
   {
     if (data.isCentral())
       m_allCentralNContaminations.insert(data.id(), data);
   });
-  TRACE_LOG() << "Got " << m_allCentralNContaminations.size() << " central NContaminations on startup.";
+  TRACE_LOG(m_logger) << "Got " << m_allCentralNContaminations.size() << " central NContaminations on startup.";
 
   m_aesDtc->bCContaminations([this](const AreaEffectSimulation::BCContamination & data)
   {
     if (data.isCentral())
       m_allCentralBCContaminations.insert(data.id(), data);
   });
-  TRACE_LOG() << "Got " << m_allCentralBCContaminations.size() << " central BCContaminations on startup.";
+  TRACE_LOG(m_logger) << "Got " << m_allCentralBCContaminations.size() << " central BCContaminations on startup.";
 
   m_aesDtc->explosionAreas([this](const AreaEffectSimulation::ExplosionArea & data)
   {
     if (data.isCentral())
       m_allCentralExplosionsArea.insert(data.id(), data);
   });
-  TRACE_LOG() << "Got " << m_allCentralExplosionsArea.size() << " central ExplosionsAreas on startup.";
+  TRACE_LOG(m_logger) << "Got " << m_allCentralExplosionsArea.size() << " central ExplosionsAreas on startup.";
 
   m_aesDtc->explosionSingles([this](const AreaEffectSimulation::ExplosionSingle & data)
   {
     if (data.isCentral())
       m_allCentralExplosionsSingle.insert(data.id(), data);
   });
-  TRACE_LOG() << "Got " << m_allCentralExplosionsSingle.size() << " central ExplosionsSingles on startup.";
+  TRACE_LOG(m_logger) << "Got " << m_allCentralExplosionsSingle.size() << " central ExplosionsSingles on startup.";
 
   m_aesDtc->mineAreas([this](const AreaEffectSimulation::MineArea & data)
   {
     if (data.isCentral())
       m_allCentralMineAreas.insert(data.id(), data);
   });
-  TRACE_LOG() << "Got " << m_allCentralMineAreas.size() << " central MineAreas on startup.";
+  TRACE_LOG(m_logger) << "Got " << m_allCentralMineAreas.size() << " central MineAreas on startup.";
 
   m_aesDtc->functionalAreas([this](const AreaEffectSimulation::FunctionalArea & data)
   {
     if (data.isCentral())
       m_allCentralFunctionalAreas.insert(data.id(), data);
   });
-  TRACE_LOG() << "Got " << m_allCentralFunctionalAreas.size() << " central FunctionalAreas on startup.";
+  TRACE_LOG(m_logger) << "Got " << m_allCentralFunctionalAreas.size() << " central FunctionalAreas on startup.";
 
   m_aesDtc->boobyTraps([this](const AreaEffectSimulation::BoobyTrap & data)
   {
     if (data.isCentral())
       m_allCentralBoobyTraps.insert(data.id(), data);
   });
-  TRACE_LOG() << "Got " << m_allCentralBoobyTraps.size() << " central BoobyTraps on startup.";
+  TRACE_LOG(m_logger) << "Got " << m_allCentralBoobyTraps.size() << " central BoobyTraps on startup.";
 
   m_aesDtc->offRouteMines([this](const AreaEffectSimulation::OffRouteMine & data)
   {
     if (data.isCentral())
       m_allCentralOffRouteMines.insert(data.id(), data);
   });
-  TRACE_LOG() << "Got " << m_allCentralOffRouteMines.size() << " central OffRouteMines on startup.";
+  TRACE_LOG(m_logger) << "Got " << m_allCentralOffRouteMines.size() << " central OffRouteMines on startup.";
 
   m_aesDtc->explosionClusters([this](const AreaEffectSimulation::ExplosionCluster &data)
   {
     if (data.isCentral())
       m_allCentralExplosionClusters.insert(data.id(), data);
   });
-  TRACE_LOG() << "Got " << m_allCentralExplosionClusters.size() << " central ExplosionClusters on startup.";
+  TRACE_LOG(m_logger) << "Got " << m_allCentralExplosionClusters.size() << " central ExplosionClusters on startup.";
 
   //fetch aes itemviews
   QList<qint32> aesItemIds = allInternalAesItemIds();
@@ -225,7 +225,7 @@ HandlerOcCentralAesData::HandlerOcCentralAesData(const std::shared_ptr<DdsHandle
     if (aesItemIds.contains(data.aesItemId()))
       m_allCentralAesItemViews.insert(data.aesItemId(), data);
   });
-  TRACE_LOG() << "Got " << allInternalAesItemIds().size() << " central AesItems in total on startup. And " << m_allCentralAesItemViews.size() << " AesItemViews.";
+  TRACE_LOG(m_logger) << "Got " << allInternalAesItemIds().size() << " central AesItems in total on startup. And " << m_allCentralAesItemViews.size() << " AesItemViews.";
 
   m_aesDtc->enableEffectCluster();
   m_aesDtc->enableNContamination();
@@ -248,10 +248,10 @@ void HandlerOcCentralAesData::setRequestCentralAesData(OcSituation::SituationCen
                                                        int radius,
                                                        bool initial)
 {
-  TRACE_LOG() << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
+  TRACE_LOG(m_logger) << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
 
   QMutexLocker l(&m_accessMutex);
-  DEBUG_LOG() << "Requested CenterEquipmentId: " << centerEquipmentId << " radius: " << radius;
+  DEBUG_LOG(m_logger) << "Requested CenterEquipmentId: " << centerEquipmentId << " radius: " << radius;
 
   bool endThread = false;
 
@@ -272,7 +272,7 @@ void HandlerOcCentralAesData::setRequestCentralAesData(OcSituation::SituationCen
 
       if (centerParticipant.id() <= 0)
       {
-        ERROR_LOG() << "Participant with EqId " << m_centerEquipmentId
+        ERROR_LOG(m_logger) << "Participant with EqId " << m_centerEquipmentId
                             << " as center of the oc situation request does not exist!";
         endThread = true;
       }
@@ -282,7 +282,7 @@ void HandlerOcCentralAesData::setRequestCentralAesData(OcSituation::SituationCen
 
         if (partPosition.participantId() == 0)
         {
-          ERROR_LOG() << "Participant with EqId " << m_centerEquipmentId
+          ERROR_LOG(m_logger) << "Participant with EqId " << m_centerEquipmentId
                               << " as center of the oc situation request has no position!";
           endThread = true;
         }
@@ -294,7 +294,7 @@ void HandlerOcCentralAesData::setRequestCentralAesData(OcSituation::SituationCen
       }
       if (endThread && ++m_retryCount < 5)
       {
-        INFO_LOG() << "Retry setting data - maybe participant is not yet available... " << m_retryCount;
+        INFO_LOG(m_logger) << "Retry setting data - maybe participant is not yet available... " << m_retryCount;
         QTimer::singleShot(1000 * m_retryCount, this, [this]()
         {
           // must be initial here
@@ -305,7 +305,7 @@ void HandlerOcCentralAesData::setRequestCentralAesData(OcSituation::SituationCen
     }
     else
     {
-      INFO_LOG() << "Situation is not requested anymore -> end thread";
+      INFO_LOG(m_logger) << "Situation is not requested anymore -> end thread";
       endThread = true;
     }
   }
@@ -316,13 +316,13 @@ void HandlerOcCentralAesData::setRequestCentralAesData(OcSituation::SituationCen
     {
       if (m_centerParticipantId == 0)
       {
-        DEBUG_LOG() << "m_centerParticipantId == 0";
+        DEBUG_LOG(m_logger) << "m_centerParticipantId == 0";
         endThread = true;
       }
     }
     else if ((centerPosition.lon() == std::nan("")) || (centerPosition.lat() == std::nan("")))
     {
-      DEBUG_LOG() << "m_centerParticipantId == 0";
+      DEBUG_LOG(m_logger) << "m_centerParticipantId == 0";
       endThread = true;
     }
   }
@@ -337,7 +337,7 @@ void HandlerOcCentralAesData::setRequestCentralAesData(OcSituation::SituationCen
   QTimer::singleShot(0, this, &HandlerOcCentralAesData::resetAliveTimer);
   if (endThread && !initial)
   {
-    DEBUG_LOG() << "Ending Thread --> stopping txTimer and resetting internal data.";
+    DEBUG_LOG(m_logger) << "Ending Thread --> stopping txTimer and resetting internal data.";
 
     QTimer::singleShot(0, this, &HandlerOcCentralAesData::handleSituation);
 
@@ -448,13 +448,13 @@ void HandlerOcCentralAesData::onAesItemViewChanged(const AreaEffectSimulation::A
 
 void HandlerOcCentralAesData::handleSituation()
 {
-  TRACE_LOG() << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
+  TRACE_LOG(m_logger) << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
 
   QMutexLocker l(&m_accessMutex);
 
   if (m_radius == 0)
   {
-    INFO_LOG() << "Do not send Situation as radius is 0, centerEquipmentId " << m_centerEquipmentId
+    INFO_LOG(m_logger) << "Do not send Situation as radius is 0, centerEquipmentId " << m_centerEquipmentId
                        << ", m_position " << m_centerPosition;
     QTimer::singleShot(0, this, &HandlerOcCentralAesData::aliveTimeout); // ending thread
     return;
@@ -469,7 +469,7 @@ void HandlerOcCentralAesData::handleSituation()
   bool hasOverload = m_aesItemsInRange.size() > 50;
   if (hasOverload)
   {
-    DEBUG_LOG() << "Got more than 50 AesItems in range. " << m_aesItemsInRange.size() << " in total --> Sorting out.";
+    DEBUG_LOG(m_logger) << "Got more than 50 AesItems in range. " << m_aesItemsInRange.size() << " in total --> Sorting out.";
 
     QMultiMap<qreal, qint32> distances;
 
@@ -481,7 +481,7 @@ void HandlerOcCentralAesData::handleSituation()
         distances.insert(distance, currentAesItemId);
     }
 
-    DEBUG_LOG() << "We have " << distances.size() << " valid distances.";
+    DEBUG_LOG(m_logger) << "We have " << distances.size() << " valid distances.";
 
     m_aesItemsInRange.clear();
 
@@ -490,12 +490,12 @@ void HandlerOcCentralAesData::handleSituation()
     for (auto it = distances.constBegin(); (it != distances.constEnd()) && (counter < 50); ++it, ++counter)
       m_aesItemsInRange.insert(it.value());
 
-    DEBUG_LOG() << "We now have " << m_aesItemsInRange.size() << " AES Items to send.";
+    DEBUG_LOG(m_logger) << "We now have " << m_aesItemsInRange.size() << " AES Items to send.";
   }
 
   QSet<qint32> validIds = m_aesItemsInRange - oldAesItemsInRange;
 
-  DEBUG_LOG() << "After sorting out old items, we have " << validIds.size() << " items left.";
+  DEBUG_LOG(m_logger) << "After sorting out old items, we have " << validIds.size() << " items left.";
 
   removeKickedOutAesItems(oldAesItemsInRange);
 
@@ -525,12 +525,12 @@ void HandlerOcCentralAesData::handleSituation()
     req.equipmentNumber(m_equipmentId);
     req.payload(LtsUtils::convert<std::vector<uint8_t>>(payload));
 
-    DEBUG_LOG() << "Sending " << req.payload().size() << " Bytes payload.";
+    DEBUG_LOG(m_logger) << "Sending " << req.payload().size() << " Bytes payload.";
 
     emit sendOcData(req);
   }
   else
-    DEBUG_LOG() << "Sending timeout, but nothing to send.";
+    DEBUG_LOG(m_logger) << "Sending timeout, but nothing to send.";
 }
 
 void HandlerOcCentralAesData::resetAliveTimer()
@@ -540,7 +540,7 @@ void HandlerOcCentralAesData::resetAliveTimer()
 
 void HandlerOcCentralAesData::aliveTimeout()
 {
-  INFO_LOG() << "O/C-Thread keep alive timeout for O/C-Laptop-Id: " << m_equipmentId
+  INFO_LOG(m_logger) << "O/C-Thread keep alive timeout for O/C-Laptop-Id: " << m_equipmentId
                      << " - Thread will be finished id: " << QThread::currentThreadId();
 
   QThread::currentThread()->quit();
@@ -548,8 +548,8 @@ void HandlerOcCentralAesData::aliveTimeout()
 
 void HandlerOcCentralAesData::onResetInternalData()
 {
-  TRACE_LOG() << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
-  DEBUG_LOG() << "Resetting internal data!";
+  TRACE_LOG(m_logger) << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "Resetting internal data!";
 
   m_aesItemsInRange.clear();
   m_dataQueue->clear();
@@ -559,7 +559,7 @@ void HandlerOcCentralAesData::onResetInternalData()
 
 void HandlerOcCentralAesData::fetchAesItemsInRange()
 {
-  TRACE_LOG() << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
+  TRACE_LOG(m_logger) << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
 
   if (m_radius == 0)
     return;
@@ -567,11 +567,11 @@ void HandlerOcCentralAesData::fetchAesItemsInRange()
   const QPointF relCenterPos = PositionConverter::relativeFromGeographic(m_centerPosition, m_baseCoordinate);
 
   if (m_centerType == OcSituation::SituationCenterType::Equipment)
-    INFO_LOG() << "Fetching AesItems in radius around equipment " << m_centerEquipmentId
+    INFO_LOG(m_logger) << "Fetching AesItems in radius around equipment " << m_centerEquipmentId
                        << " with position " << relCenterPos.x() << "/" << relCenterPos.y() << " and radius: " << m_radius << ", " << m_baseCoordinate.mgrs()
                        << ", " << m_centerPosition.lon() << ", " << m_centerPosition.lat();
   else
-    INFO_LOG() << "Fetching AesItems in radius of position " << relCenterPos.x() << "/" << relCenterPos.y() << " radius: " << m_radius;
+    INFO_LOG(m_logger) << "Fetching AesItems in radius of position " << relCenterPos.x() << "/" << relCenterPos.y() << " radius: " << m_radius;
 
   m_aesItemsInRange.clear();
 
@@ -586,16 +586,16 @@ void HandlerOcCentralAesData::fetchAesItemsInRange()
   qint32 offRouteMinesInRange = fetchAesItemsInCircle(m_allCentralOffRouteMines);
   qint32 explosionClustersInRage = fetchAesItemsInCircle(m_allCentralExplosionClusters);
 
-  TRACE_LOG() << "Got " << effectClustersInRange << " EffectClusters in range.";
-  TRACE_LOG() << "Got " << nContaminationsInRange << " NContaminations in range.";
-  TRACE_LOG() << "Got " << bCContaminationsInRange << " BCContaminations in range.";
-  TRACE_LOG() << "Got " << explosionsAreaInRange << " ExplosionsArea in range.";
-  TRACE_LOG() << "Got " << explosionsSingleInRange << " ExplosionsSingle in range.";
-  TRACE_LOG() << "Got " << mineAreasInRange << " MineAreas in range.";
-  TRACE_LOG() << "Got " << functionalAreasInRange << " FunctionalAreas in range.";
-  TRACE_LOG() << "Got " << boobyTrapsInRange << " BoobyTraps in range.";
-  TRACE_LOG() << "Got " << offRouteMinesInRange << " OffRouteMines in range.";
-  TRACE_LOG() << "Got " << explosionClustersInRage << " ExplosionClusters in range.";
+  TRACE_LOG(m_logger) << "Got " << effectClustersInRange << " EffectClusters in range.";
+  TRACE_LOG(m_logger) << "Got " << nContaminationsInRange << " NContaminations in range.";
+  TRACE_LOG(m_logger) << "Got " << bCContaminationsInRange << " BCContaminations in range.";
+  TRACE_LOG(m_logger) << "Got " << explosionsAreaInRange << " ExplosionsArea in range.";
+  TRACE_LOG(m_logger) << "Got " << explosionsSingleInRange << " ExplosionsSingle in range.";
+  TRACE_LOG(m_logger) << "Got " << mineAreasInRange << " MineAreas in range.";
+  TRACE_LOG(m_logger) << "Got " << functionalAreasInRange << " FunctionalAreas in range.";
+  TRACE_LOG(m_logger) << "Got " << boobyTrapsInRange << " BoobyTraps in range.";
+  TRACE_LOG(m_logger) << "Got " << offRouteMinesInRange << " OffRouteMines in range.";
+  TRACE_LOG(m_logger) << "Got " << explosionClustersInRage << " ExplosionClusters in range.";
 }
 
 template<typename T>
@@ -607,7 +607,7 @@ qint32 HandlerOcCentralAesData::fetchAesItemsInCircle(const QHash<qint32, T> &ae
   {
     if (!m_allCentralAesItemViews.contains(it.key()))
     {
-      WARNING_LOG() << "Got AesItem::id " << it.key() << " but there is no corresponding AesItemView.";
+      WARNING_LOG(m_logger) << "Got AesItem::id " << it.key() << " but there is no corresponding AesItemView.";
       continue;
     }
 
@@ -616,7 +616,7 @@ qint32 HandlerOcCentralAesData::fetchAesItemsInCircle(const QHash<qint32, T> &ae
     if (it.value().effectStateId() == AreaEffectSimulation::AesEffectState::inner_enum::EsExpired ||
         it.value().effectStateId() == AreaEffectSimulation::AesEffectState::inner_enum::EsRemoved)
     {
-      TRACE_LOG() << "AesItem of type " << aesItemView.aesTypeId() << ", with id " << it.key() << " is removed or expired --> skipping.";
+      TRACE_LOG(m_logger) << "AesItem of type " << aesItemView.aesTypeId() << ", with id " << it.key() << " is removed or expired --> skipping.";
       continue;
     }
 
@@ -697,7 +697,7 @@ void HandlerOcCentralAesData::removeKickedOutAesItems(const QSet<qint32> &aesIte
 {
   QSet<qint32> kickedOutAesItems = aesItemsSentBefore - m_aesItemsInRange;
 
-  DEBUG_LOG() << "Found " << kickedOutAesItems.size() << " AesItems to kick out.";
+  DEBUG_LOG(m_logger) << "Found " << kickedOutAesItems.size() << " AesItems to kick out.";
 
   AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::inner_enum::AtUnknown;
 
@@ -727,7 +727,7 @@ void HandlerOcCentralAesData::removeKickedOutAesItems(const QSet<qint32> &aesIte
       aesType = AreaEffectSimulation::AesType::inner_enum::AtExplosionCluster;
     else
     {
-      WARNING_LOG() << "Could not remove AesItem with id " << currentAesItemId << ". There is no way to find out its AesType";
+      WARNING_LOG(m_logger) << "Could not remove AesItem with id " << currentAesItemId << ". There is no way to find out its AesType";
       continue;
     }
 
@@ -737,7 +737,7 @@ void HandlerOcCentralAesData::removeKickedOutAesItems(const QSet<qint32> &aesIte
 
 void HandlerOcCentralAesData::buildSituationCircle()
 {
-  TRACE_LOG() << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
+  TRACE_LOG(m_logger) << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
 
   // building the situation "circle" --> we use a regular polygon with 8 edges
   m_situationCircle.clear();
@@ -763,7 +763,7 @@ qreal HandlerOcCentralAesData::calculateDistanceToCircleCenter(qint32 aesItemId)
 {
   if (!m_allCentralAesItemViews.contains(aesItemId))
   {
-    WARNING_LOG() << "Could not calculate distance to circle center, because there is no AesItemView for AesItem::id " << aesItemId;
+    WARNING_LOG(m_logger) << "Could not calculate distance to circle center, because there is no AesItemView for AesItem::id " << aesItemId;
     return -1.0;
   }
 
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 d19135049..1e2162472 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
@@ -53,7 +53,7 @@ bool HandlerOcData::init()
   // EVL DTC enable
   if (!m_evlDtc->enableEvaluationSchema())
   {
-    ERROR_LOG() << "Enabling EVL Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling EVL Data-Topics failed.";
     return false;
   }
   connect(m_evlDtc.get(), &Evaluations::Interface::Dtc::evaluationSchemaChanged, this, &HandlerOcData::onEvaluationSchemaChanged);
@@ -66,40 +66,40 @@ bool HandlerOcData::init()
   // EVL FTC enable
   if (!m_evlFtc->enableEvlCommentModify())
   {
-    ERROR_LOG() << "Enabling EVL Function-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling EVL Function-Topics failed.";
     return false;
   }
 
   // Msg FTC enable
   if (!m_msgFtc->enableCreateOperatorMessage())
   {
-    ERROR_LOG() << "Enabling MSG Function-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling MSG Function-Topics failed.";
     return false;
   }
 
   if (!m_ppmDtc->enableParticipant())
   {
-    ERROR_LOG() << "Enabling PPM Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling PPM Data-Topics failed.";
     return false;
   }
 
   if (!m_ppmFtc->enableRegisterParticipant())
   {
-    ERROR_LOG() << "Enabling PPM FTC-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling PPM FTC-Topics failed.";
     return false;
   }
 
   // TAB DTC enable
   if (!m_tabDtc->enableOcData())
   {
-    ERROR_LOG() << "Enabling TAB Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling TAB Data-Topics failed.";
     return false;
   }
 
   // TAB DTC enable
   if (!m_tabDtc->enableConnections())
   {
-    ERROR_LOG() << "Enabling TAB Data-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling TAB Data-Topics failed.";
     return false;
   }
 
@@ -108,56 +108,56 @@ bool HandlerOcData::init()
   // TAB FTC enable
   if (!m_tabFtc->enableSendOcData())
   {
-    ERROR_LOG() << "Enabling TAB Function-Topics failed.";
+    ERROR_LOG(m_logger) << "Enabling TAB Function-Topics failed.";
     return false;
   }
 
   // Handler aes data
   if (!m_handlerOcAesData->init())
   {
-    ERROR_LOG() << "Could not initialise HandlerOcAesData.";
+    ERROR_LOG(m_logger) << "Could not initialise HandlerOcAesData.";
     return false;
   }
 
   connect(m_stateInformationTimer, &QTimer::timeout, this, &HandlerOcData::sendStateInformation);
   m_stateInformationTimer->setInterval(Settings::stateInformationCycleTime());
-  INFO_LOG() << "Starting StateInformation timer with interval: " << m_stateInformationTimer->interval();
+  INFO_LOG(m_logger) << "Starting StateInformation timer with interval: " << m_stateInformationTimer->interval();
   m_stateInformationTimer->start();
 
-  INFO_LOG() << "Initialisation HandlerOcData succesful.";
+  INFO_LOG(m_logger) << "Initialisation HandlerOcData succesful.";
   return true;
 }
 
 void HandlerOcData::onEvlCommentModifyReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "Evaluation could not be transmitted to EVL: " << reply.translated();
+    ERROR_LOG(m_logger) << "Evaluation could not be transmitted to EVL: " << reply.translated();
   else
-    DEBUG_LOG() << "Evaluation successfully transmitted to EVL!";
+    DEBUG_LOG(m_logger) << "Evaluation successfully transmitted to EVL!";
 }
 
 void HandlerOcData::onCreateOperatorMessageReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "Message could not be created by MSG: " << reply.translated();
+    ERROR_LOG(m_logger) << "Message could not be created by MSG: " << reply.translated();
   else
-    DEBUG_LOG() << "Message created successfully by MSG!";
+    DEBUG_LOG(m_logger) << "Message created successfully by MSG!";
 }
 
 void HandlerOcData::onSendOcDataReply(const Core::FunctionReplyObject &reply)
 {
   if (reply.error())
-    ERROR_LOG() << "Oc data could not be send: " << reply.translated();
+    ERROR_LOG(m_logger) << "Oc data could not be send: " << reply.translated();
   else
-    DEBUG_LOG() << "Oc data send successfully to TAB!";
+    DEBUG_LOG(m_logger) << "Oc data send successfully to TAB!";
 }
 
 void HandlerOcData::onRegisterParticipantReply(const ParticipantManagement::RegisterReply &reply)
 {
   if (reply.errorString().size())
-    ERROR_LOG() << "Modify Participant data could not be send: " << reply.errorString();
+    ERROR_LOG(m_logger) << "Modify Participant data could not be send: " << reply.errorString();
   else
-    DEBUG_LOG() << "Modify Participant data send successfully to ppm!";
+    DEBUG_LOG(m_logger) << "Modify Participant data send successfully to ppm!";
 }
 
 void HandlerOcData::onEvaluationSchemaChanged(const Evaluations::EvaluationSchema &data, DataModification modType)
@@ -183,7 +183,7 @@ void HandlerOcData::onOcDataChanged(const TrainingAreaBase::OcData &data, DataMo
   LtsUtils::get1Byte(payload, telegramId);
 
 
-  DEBUG_LOG() << "New OcData telegramId: " << telegramId;
+  DEBUG_LOG(m_logger) << "New OcData telegramId: " << telegramId;
 
   switch (telegramId)
   {
@@ -227,7 +227,7 @@ void HandlerOcData::onOcDataChanged(const TrainingAreaBase::OcData &data, DataMo
   }
   default:
   {
-    INFO_LOG() << "OC-data with telegram ID: " << telegramId << " is not by HandlerOcData OSS!";
+    INFO_LOG(m_logger) << "OC-data with telegram ID: " << telegramId << " is not by HandlerOcData OSS!";
     break;
   }
   }
@@ -269,7 +269,7 @@ void HandlerOcData::onSituationThreadExit()
 {
   ThreadOcSituationData *t = qobject_cast<ThreadOcSituationData *>(sender());
 
-  INFO_LOG() << "Exit O/C-Thread for O/C-Laptop-Id: " << m_situationThreads.key(t);
+  INFO_LOG(m_logger) << "Exit O/C-Thread for O/C-Laptop-Id: " << m_situationThreads.key(t);
   QMutexLocker l(&m_accessMutex);
 
   m_situationThreads.remove(m_situationThreads.key(t));
@@ -281,7 +281,7 @@ void HandlerOcData::onCentralAesThreadExit()
 {
   ThreadOcCentralAesData *t = qobject_cast<ThreadOcCentralAesData *>(sender());
 
-  INFO_LOG() << "Exit CentralAesData-Thread for O/C-Laptop-Id: " << m_centralAesDataThreads.key(t);
+  INFO_LOG(m_logger) << "Exit CentralAesData-Thread for O/C-Laptop-Id: " << m_centralAesDataThreads.key(t);
   QMutexLocker l(&m_accessMutex);
 
   m_centralAesDataThreads.remove(m_centralAesDataThreads.key(t));
@@ -320,7 +320,7 @@ void HandlerOcData::onSendEquipmentMessageOcRequest(const rti::core::SampleIdent
 
 void HandlerOcData::onEquipmentErrorRequest(const rti::core::SampleIdentity &cookie, const EquipmentErrorRequest &request)
 {
-  ERROR_LOG() << "onEquipmentErrorRequest" << request.equipmentNumber();
+  ERROR_LOG(m_logger) << "onEquipmentErrorRequest" << request.equipmentNumber();
   EquipmentErrorRegistration out;
   //  out.id(request.requestId());
   out.sampleTime(QDateTime::currentMSecsSinceEpoch());
@@ -347,7 +347,7 @@ void HandlerOcData::handleDemandSituation(const QByteArray &data, int equipmentI
     LtsUtils::get2Byte(data, pos, centerEquipmentId);
     LtsUtils::get2Byte(data, pos, radius);
 
-    DEBUG_LOG() << "Request from O/C-Laptop-Id: " << equipmentId
+    DEBUG_LOG(m_logger) << "Request from O/C-Laptop-Id: " << equipmentId
                         << " centerEquipmentId: " << centerEquipmentId << " radius: " << radius;
   }
   else
@@ -359,7 +359,7 @@ void HandlerOcData::handleDemandSituation(const QByteArray &data, int equipmentI
     position.lat(tmp);
     LtsUtils::get2Byte(data, pos, radius);
 
-    DEBUG_LOG() << "Request from O/C-Laptop-Id: " << equipmentId
+    DEBUG_LOG(m_logger) << "Request from O/C-Laptop-Id: " << equipmentId
                         << " center: " << position << " radius: " << radius;
   }
   bool filterActive  = false;
@@ -440,7 +440,7 @@ void HandlerOcData::handleDemandEvaluationSchema(const QByteArray &data, int equ
   // ignoring requested schema ID, as we only have one active schema to be send to TA
   Evaluations::EvaluationSchema schema = m_evlDtc->evaluationSchema(m_currentActiveEvaluationSchemaId);
 
-  DEBUG_LOG() << "Sending to equipmentnumber: " << equipmentNumber << " evaluation schmema: " << m_currentActiveEvaluationSchemaId;
+  DEBUG_LOG(m_logger) << "Sending to equipmentnumber: " << equipmentNumber << " evaluation schmema: " << m_currentActiveEvaluationSchemaId;
 
   TrainingAreaBase::SendOcDataRequest out;
   out.equipmentNumber(equipmentNumber);
@@ -485,7 +485,7 @@ void HandlerOcData::handleEvaluation(const QByteArray &data)
   LtsUtils::get2Byte(data, pos, textLength);
   out.text(QByteArray(data.mid(pos, textLength)).toStdString());
 
-  DEBUG_LOG() << "Got new evl comment: " << out;
+  DEBUG_LOG(m_logger) << "Got new evl comment: " << out;
 
   m_evlFtc->evlCommentModifyRequest(out, this);
 }
@@ -512,7 +512,7 @@ void HandlerOcData::handleMessage(const QByteArray &data)
       recipientIds[0] = participantId;
     else
     {
-      ERROR_LOG() << "Recipient equipment number: " << tmp << " is unknown. Aborting creating message.";
+      ERROR_LOG(m_logger) << "Recipient equipment number: " << tmp << " is unknown. Aborting creating message.";
       return;
     }
   }
@@ -530,7 +530,7 @@ void HandlerOcData::handleMessage(const QByteArray &data)
       out.senderId(participantId);
     else
     {
-      WARNING_LOG() << "Sender equipment number: " << tmp << " is unknown. Setting senderId to 0.";
+      WARNING_LOG(m_logger) << "Sender equipment number: " << tmp << " is unknown. Setting senderId to 0.";
       out.senderId(0);
       out.senderType(Messaging::AddressType::ObserverController);
     }
@@ -544,7 +544,7 @@ void HandlerOcData::handleMessage(const QByteArray &data)
   // get exerciseId
   LtsUtils::get2Byte(data, pos, tmp);
   if (tmp == 0)
-    WARNING_LOG() << "Could'n set ExerciseId" << " " << tmp << " set to 0";
+    WARNING_LOG(m_logger) << "Could'n set ExerciseId" << " " << tmp << " set to 0";
   out.exerciseId(tmp);
   // get address type
   const QByteArray msg(data.right(data.size() - pos));
@@ -560,7 +560,7 @@ void HandlerOcData::handleMessage(const QByteArray &data)
     out.message(msg.mid(idx + 1).constData());
   }
 
-  DEBUG_LOG() << "Got new message: " << out;
+  DEBUG_LOG(m_logger) << "Got new message: " << out;
   m_msgFtc->createOperatorMessageRequest(out, this);
 }
 
@@ -586,7 +586,7 @@ void HandlerOcData::handleEquipmentErrorRegistration(const QByteArray &data)
 
   out.sampleTime(QDateTime::currentMSecsSinceEpoch());
 
-  DEBUG_LOG() << "Got new error registration: " << out;
+  DEBUG_LOG(m_logger) << "Got new error registration: " << out;
   m_dts->publish(out);
 }
 
@@ -625,7 +625,7 @@ void HandlerOcData::handleEquipmentRegistration(const QByteArray &data)
   req.participantId(participantId);
   req.info(part.info());
   req.identification(part.identification());
-  DEBUG_LOG() << "Try to register part with id: " << req.participantId() << " and eqNumeber " << req.equipmentNumber();
+  DEBUG_LOG(m_logger) << "Try to register part with id: " << req.participantId() << " and eqNumeber " << req.equipmentNumber();
   m_ppmFtc->registerParticipantRequest(req, this);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_data.h
index a2cb03d8d..3e8e28e7a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_data.h
@@ -37,6 +37,7 @@ public:
   bool init();
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onEvlCommentModifyReply(const Core::FunctionReplyObject &reply) override final;
   void onCreateOperatorMessageReply(const Core::FunctionReplyObject &reply) override final;
   void onSendOcDataReply(const Core::FunctionReplyObject &reply) override final;
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 ce152c065..72d87865c 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
@@ -49,7 +49,7 @@ void ThreadOcSituationData::requestOcSituationData(OcSituation::SituationCenterT
                                                    QSet<ParticipantManagement::TypeClass::type> typeClassList,
                                                    bool initial)
 {
-  INFO_LOG() << "OC-Situation Request for centerEquipmentId: " << centerEquipmentId
+  INFO_LOG(m_logger) << "OC-Situation Request for centerEquipmentId: " << centerEquipmentId
                      << " from O/C-laptop-Id: " << m_equipmentId
                      << " with radius of " << radius
                      << "m, initial: " << initial;
@@ -67,7 +67,7 @@ void ThreadOcSituationData::requestOcSituationData(OcSituation::SituationCenterT
   if (m_handler)
     m_handler->setRequestOcSituationData(centerType, centerEquipmentId, position, radius, filterActive, partyList, typeClassList, initial);
   else
-    DEBUG_LOG() << "Thread doesn't exist up to now! Do nothing.";
+    DEBUG_LOG(m_logger) << "Thread doesn't exist up to now! Do nothing.";
 }
 
 void ThreadOcSituationData::run()
@@ -76,7 +76,7 @@ void ThreadOcSituationData::run()
   {
     QMutexLocker l(&m_accessMutex);
     QMutexLocker m(&s_ddsAccesMutex);
-    DEBUG_LOG() << "Instance new OC-Thread for O/C-Laptop-Id: " << m_equipmentId;
+    DEBUG_LOG(m_logger) << "Instance new OC-Thread for O/C-Laptop-Id: " << m_equipmentId;
 
     m_handler = new HandlerOcSituationData(m_mainHandler->dds(),
                                            m_baseCoordinate,
@@ -86,7 +86,7 @@ void ThreadOcSituationData::run()
     m_handler->setRequestOcSituationData(m_centerType, m_centerEquipmentId, m_position, m_radius, m_filterActive, m_partyList, m_typeClassList, true);
   }
 
-  INFO_LOG() << "OC-Thread started for O/C-Laptop-Id: " << m_equipmentId;
+  INFO_LOG(m_logger) << "OC-Thread started for O/C-Laptop-Id: " << m_equipmentId;
   exec();
 
   {
@@ -113,7 +113,7 @@ HandlerOcSituationData::HandlerOcSituationData(const std::shared_ptr<DdsHandler>
   , m_txTimer(new QTimer(this))
   , m_logger(getLogger(QStringLiteral("HandlerOcSituationData.") + QString::number(equipmentId)))
 {
-  INFO_LOG() << "Create O/C-Handler for O/C-Laptop-Id: " << equipmentId
+  INFO_LOG(m_logger) << "Create O/C-Handler for O/C-Laptop-Id: " << equipmentId
                      << " aliveTimeout: " << Settings::aliveTimeout() << " sec"
                      << " txCyleTime: " << Settings::txCycleTime() << " sec"
                      << " maxTransferBytes: " << Settings::maxNumOfBytePerTxCycle();
@@ -161,10 +161,10 @@ void HandlerOcSituationData::setRequestOcSituationData(OcSituation::SituationCen
                                                        QSet<ParticipantManagement::TypeClass::type> typeClasses,
                                                        bool initial)
 {
-  TRACE_LOG() << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
+  TRACE_LOG(m_logger) << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
 
   QMutexLocker l(&m_accessMutex);
-  DEBUG_LOG() << "Requested CenterEquipmentId: " << centerEquipmentId << " radius: " << radius;
+  DEBUG_LOG(m_logger) << "Requested CenterEquipmentId: " << centerEquipmentId << " radius: " << radius;
 
   bool endThread = false;
 
@@ -195,7 +195,7 @@ void HandlerOcSituationData::setRequestOcSituationData(OcSituation::SituationCen
 
       if (centerParticipant.id() <= 0)
       {
-        ERROR_LOG() << "Participant with EqId " << m_centerEquipmentId
+        ERROR_LOG(m_logger) << "Participant with EqId " << m_centerEquipmentId
                             << " as center of the oc situation request does not exist!";
         endThread = true;
       }
@@ -204,7 +204,7 @@ void HandlerOcSituationData::setRequestOcSituationData(OcSituation::SituationCen
         const ParticipantManagement::ParticipantPosition &partPosition = m_allParticipantPositions.value(centerParticipant.id());
         if (partPosition.participantId() == 0)
         {
-          ERROR_LOG() << "Participant with EqId " << m_centerEquipmentId
+          ERROR_LOG(m_logger) << "Participant with EqId " << m_centerEquipmentId
                               << " as center of the oc situation request has no position!";
           endThread = true;
         }
@@ -216,7 +216,7 @@ void HandlerOcSituationData::setRequestOcSituationData(OcSituation::SituationCen
       }
       if (endThread && ++m_retryCount < 5)
       {
-        INFO_LOG() << "Retry setting data - maybe participant is not yet available... " << m_retryCount;
+        INFO_LOG(m_logger) << "Retry setting data - maybe participant is not yet available... " << m_retryCount;
         QTimer::singleShot(1000 * m_retryCount, this, [this]()
         {
           // must be initial here
@@ -227,7 +227,7 @@ void HandlerOcSituationData::setRequestOcSituationData(OcSituation::SituationCen
     }
     else
     {
-      INFO_LOG() << "Situation is not requested anymore -> end thread";
+      INFO_LOG(m_logger) << "Situation is not requested anymore -> end thread";
       endThread = true;
     }
   }
@@ -259,7 +259,7 @@ void HandlerOcSituationData::setRequestOcSituationData(OcSituation::SituationCen
 
 void HandlerOcSituationData::onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType)
 {
-  TRACE_LOG() << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
+  TRACE_LOG(m_logger) << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
 
   if (modType == DataModification::eRemoved)
     return;
@@ -269,7 +269,7 @@ void HandlerOcSituationData::onParticipantChanged(const ParticipantManagement::P
 
   if (!m_participants.contains(participantId))
   {
-    DEBUG_LOG() << "m_participants does not contain participant id: " << participantId;
+    DEBUG_LOG(m_logger) << "m_participants does not contain participant id: " << participantId;
     return; // participant is not of interest (now)
   }
 
@@ -290,11 +290,11 @@ void HandlerOcSituationData::onParticipantChanged(const ParticipantManagement::P
     setModified(participantId, OcSituation::ModificationFlag::eDesignator);
 
   m_participants[participantId] = data;
-  DEBUG_LOG() << "updated data in m_participants" << data;
+  DEBUG_LOG(m_logger) << "updated data in m_participants" << data;
 
   if (m_modifiedFlags.contains(participantId))
   {
-    INFO_LOG() << "setModified for: " << m_participantId2EqId[participantId]
+    INFO_LOG(m_logger) << "setModified for: " << m_participantId2EqId[participantId]
                        << " / " << participantId
                        << " bits: 0x" << QString::number(m_modifiedFlags[participantId], 16);
   }
@@ -313,7 +313,7 @@ static inline int getEquipmentStateBits(const ParticipantManagement::DynamicPart
 
 void HandlerOcSituationData::onDynamicParticipantDataChanged(const ParticipantManagement::DynamicParticipantData &data, DataModification modType)
 {
-  TRACE_LOG() << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
+  TRACE_LOG(m_logger) << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
   if (modType == DataModification::eRemoved)
     return;
 
@@ -322,7 +322,7 @@ void HandlerOcSituationData::onDynamicParticipantDataChanged(const ParticipantMa
 
   if (!m_participants.contains(participantId))
   {
-    DEBUG_LOG() << "m_participants does not contain participant id: " << participantId;
+    DEBUG_LOG(m_logger) << "m_participants does not contain participant id: " << participantId;
     return; // participant does not interest us yet;
   }
 
@@ -343,11 +343,11 @@ void HandlerOcSituationData::onDynamicParticipantDataChanged(const ParticipantMa
     setModified(participantId, OcSituation::ModificationFlag::eState);
 
   m_dynamicParticpantData[participantId] = data;
-  DEBUG_LOG() << "updated data in m_dynamicParticpantData" << data;
+  DEBUG_LOG(m_logger) << "updated data in m_dynamicParticpantData" << data;
 
   if (m_modifiedFlags.contains(participantId))
   {
-    INFO_LOG() << "setModified for: " << m_participantId2EqId[participantId]
+    INFO_LOG(m_logger) << "setModified for: " << m_participantId2EqId[participantId]
                        << " / " << participantId
                        << " bits: 0x" << QString::number(m_modifiedFlags[participantId], 16);
   }
@@ -355,7 +355,7 @@ void HandlerOcSituationData::onDynamicParticipantDataChanged(const ParticipantMa
 
 void HandlerOcSituationData::onParticipantPositionChanged(const ParticipantManagement::ParticipantPosition &data, DataModification modType)
 {
-  TRACE_LOG() << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
+  TRACE_LOG(m_logger) << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
   if (modType == DataModification::eRemoved)
     return;
   const int participantId = data.participantId();
@@ -368,7 +368,7 @@ void HandlerOcSituationData::onParticipantPositionChanged(const ParticipantManag
 
   if (!m_participants.contains(participantId))
   {
-    DEBUG_LOG() << "m_participants does not contain participant id: " << participantId;
+    DEBUG_LOG(m_logger) << "m_participants does not contain participant id: " << participantId;
     return; // participant does not interest us yet;
   }
 
@@ -404,11 +404,11 @@ void HandlerOcSituationData::onParticipantPositionChanged(const ParticipantManag
   }
 
   m_participantPositions[participantId] = data;
-  DEBUG_LOG() << "updated data in m_participantPositions" << data;
+  DEBUG_LOG(m_logger) << "updated data in m_participantPositions" << data;
 
   if (m_modifiedFlags.contains(participantId))
   {
-    INFO_LOG() << "setModified for: " << m_participantId2EqId[participantId]
+    INFO_LOG(m_logger) << "setModified for: " << m_participantId2EqId[participantId]
                        << " / " << participantId
                        << " bits: 0x" << QString::number(m_modifiedFlags[participantId], 16);
   }
@@ -444,13 +444,13 @@ void HandlerOcSituationData::onDusMineStateChanged(const AreaEffectSimulation::D
 
 void HandlerOcSituationData::handleSituation()
 {
-  TRACE_LOG() << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
+  TRACE_LOG(m_logger) << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
 
   QMutexLocker l(&m_accessMutex);
 
   if (m_radius == 0)
   {
-    INFO_LOG() << "Do not send Situation as radius is 0, centerEquipmentId " << m_centerEquipmentId
+    INFO_LOG(m_logger) << "Do not send Situation as radius is 0, centerEquipmentId " << m_centerEquipmentId
                        << ", m_position " << m_centerPosition;
     QTimer::singleShot(0, this, &HandlerOcSituationData::aliveTimeout); // ending thread
     return;
@@ -462,7 +462,7 @@ void HandlerOcSituationData::handleSituation()
   const QByteArray data = createDataStream(Settings::maxNumOfBytePerTxCycle(), prioQueue);
   if (data.isEmpty())
   {
-    DEBUG_LOG() << "Don't send empty data to TAB.";
+    DEBUG_LOG(m_logger) << "Don't send empty data to TAB.";
     return;
   }
 
@@ -487,7 +487,7 @@ void HandlerOcSituationData::resetAliveTimer()
 
 void HandlerOcSituationData::aliveTimeout()
 {
-  INFO_LOG() << "O/C-Thread keep alive timeout for O/C-Laptop-Id: " << m_equipmentId
+  INFO_LOG(m_logger) << "O/C-Thread keep alive timeout for O/C-Laptop-Id: " << m_equipmentId
                      << " - Thread will be finished id: " << QThread::currentThreadId();
 
   QThread::currentThread()->quit();
@@ -495,9 +495,9 @@ void HandlerOcSituationData::aliveTimeout()
 
 void HandlerOcSituationData::onResetInternalData()
 {
-  TRACE_LOG() << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
+  TRACE_LOG(m_logger) << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
 
-  INFO_LOG() << "Resetting internal data!";
+  INFO_LOG(m_logger) << "Resetting internal data!";
   m_participants.clear();
   m_dynamicParticpantData.clear();
   m_participantPositions.clear();
@@ -514,15 +514,15 @@ void HandlerOcSituationData::onResetInternalData()
 
 void HandlerOcSituationData::fetchParticipantsInRange()
 {
-  TRACE_LOG() << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
+  TRACE_LOG(m_logger) << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
   const QPointF relCenterPos = PositionConverter::relativeFromGeographic(m_centerPosition, m_baseCoordinate);
 
   if (m_centerType == OcSituation::SituationCenterType::Equipment)
-    INFO_LOG() << "Fetching participants in radius around equipment " << m_centerEquipmentId
+    INFO_LOG(m_logger) << "Fetching participants in radius around equipment " << m_centerEquipmentId
                        << " with position " << relCenterPos.x() << "/" << relCenterPos.y() << " and radius: " << m_radius << ", " << m_baseCoordinate.mgrs()
                        << ", " << m_centerPosition.lon() << ", " << m_centerPosition.lat();
   else
-    INFO_LOG() << "Fetching participants in radius of position " << relCenterPos.x() << "/" << relCenterPos.y() << " radius: " << m_radius;
+    INFO_LOG(m_logger) << "Fetching participants in radius of position " << relCenterPos.x() << "/" << relCenterPos.y() << " radius: " << m_radius;
 
   const double rangeSqr = m_radius * m_radius;
   QMultiMap<double, int> curParticipantsInRange;
@@ -542,7 +542,7 @@ void HandlerOcSituationData::fetchParticipantsInRange()
         if ((m_partyList.count() > 0 && m_partyList.contains(participant.partyId()) == false) ||
             (m_typeClassList.count() > 0 && m_typeClassList.contains(typeClass.underlying()) == false))
         {
-          DEBUG_LOG() << participant.id() << " filtered out";
+          DEBUG_LOG(m_logger) << participant.id() << " filtered out";
           continue;
         }
       }
@@ -554,13 +554,13 @@ void HandlerOcSituationData::fetchParticipantsInRange()
 
       if (distanceSqr > rangeSqr)
       {
-        DEBUG_LOG() << "Participant NOT in range equipment number: " << participant.equipmentNumber().get()
+        DEBUG_LOG(m_logger) << "Participant NOT in range equipment number: " << participant.equipmentNumber().get()
                             << " pos: " << relPartPos.x() << "/" << relPartPos.y()
                             << " distance: " << std::sqrt(distanceSqr) << " distanceSqr: " << distanceSqr;
         continue;
       }
 
-      DEBUG_LOG() << "Participant in range equipment number: " << participant.equipmentNumber().get()
+      DEBUG_LOG(m_logger) << "Participant in range equipment number: " << participant.equipmentNumber().get()
                           << " pos: " << relPartPos.x() << "/" << relPartPos.y()
                           << " distance: " << std::sqrt(distanceSqr) << " distanceSqr: " << distanceSqr;
       curParticipantsInRange.insertMulti(distanceSqr, participant.id());
@@ -574,7 +574,7 @@ void HandlerOcSituationData::fetchParticipantsInRange()
   {
     handleParticipant(m_allParticipants.value(id));
     curParticipants.insert(id);
-    DEBUG_LOG() << "Added participant to hundred nearest: " << m_participantId2EqId[id]
+    DEBUG_LOG(m_logger) << "Added participant to hundred nearest: " << m_participantId2EqId[id]
                         << " / " << id;
     ++cnt;
     if (cnt >= Settings::maxParticipantsInSituation())
@@ -591,7 +591,7 @@ void HandlerOcSituationData::fetchParticipantsInRange()
       {
         m_newlyOutdatedParticipants.insert(id);
         m_outdatedParticipants.insert(id);
-        DEBUG_LOG() << "Participant outdated: " << m_participantId2EqId[id]
+        DEBUG_LOG(m_logger) << "Participant outdated: " << m_participantId2EqId[id]
                             << " / " << id;
       }
     }
@@ -600,7 +600,7 @@ void HandlerOcSituationData::fetchParticipantsInRange()
 
 void HandlerOcSituationData::handleParticipant(const ParticipantManagement::Participant &participant)
 {
-  TRACE_LOG() << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
+  TRACE_LOG(m_logger) << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
 
   int participantId = participant.id();
   if (participant.equipmentNumber().is_set())
@@ -611,7 +611,7 @@ void HandlerOcSituationData::handleParticipant(const ParticipantManagement::Part
   // now check if is a new participant
   if (!m_participants.contains(participantId))
   {
-    DEBUG_LOG() << "Adding previously unknown participant to m_participants: " << m_participantId2EqId.value(participantId)
+    DEBUG_LOG(m_logger) << "Adding previously unknown participant to m_participants: " << m_participantId2EqId.value(participantId)
                         << " / " << participantId;
     // new participant -> all modified
     setModified(participantId, OcSituation::ModificationFlag::eAll);
@@ -625,7 +625,7 @@ void HandlerOcSituationData::handleParticipant(const ParticipantManagement::Part
     // old participant, check if was outdated
     if (m_outdatedParticipants.remove(participantId))
     {
-      DEBUG_LOG() << "Adding old player that is inside the radius again: " << m_participantId2EqId.value(participantId)
+      DEBUG_LOG(m_logger) << "Adding old player that is inside the radius again: " << m_participantId2EqId.value(participantId)
                           << " / " << participantId;
       if (m_modifiedFlags[participantId] == OcSituation::ModificationFlag::eNone)
         setModified(participantId, OcSituation::ModificationFlag::ePosition2D);
@@ -641,7 +641,7 @@ static inline bool sortParticipantsForRange(const QPair<int, float> &p1,
 
 QVector<QPair<int, float>> HandlerOcSituationData::createPrioQueue() const
 {
-  TRACE_LOG() << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
+  TRACE_LOG(m_logger) << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
 
   QVector<QPair<int, float>> participantsPrioQueue;
   participantsPrioQueue.reserve(m_participantsToSend.size());
@@ -665,12 +665,12 @@ QVector<QPair<int, float>> HandlerOcSituationData::createPrioQueue() const
       cntNotSendDbg = participantIt.value();
       // Je nicht gesendeten -> 5 % abziehen, aber nie alles
       const int cntNotSend = participantIt.value() > 20 ? 19 : participantIt.value();
-      DEBUG_LOG() << "prio: " << prio << ", prio / 20 * cntNotSend: " << prio / 20 * cntNotSend;
+      DEBUG_LOG(m_logger) << "prio: " << prio << ", prio / 20 * cntNotSend: " << prio / 20 * cntNotSend;
       prio -= (prio / 20 * cntNotSend);
     }
     participantsPrioQueue.push_back(qMakePair(participantId, prio));
 
-    DEBUG_LOG() << "Radius from center for: " << m_participantId2EqId[participantId]
+    DEBUG_LOG(m_logger) << "Radius from center for: " << m_participantId2EqId[participantId]
                         << " / " << participantId << " = " << sqrt(r2) << "m, prio: " << prio
                         << ", not sent: " << cntNotSendDbg << " time(s)";
   }
@@ -681,7 +681,7 @@ QVector<QPair<int, float>> HandlerOcSituationData::createPrioQueue() const
 QByteArray HandlerOcSituationData::createDataStream(int maxSize,
                                                     const QVector<QPair<int, float>> &participantsPrioQueue)
 {
-  TRACE_LOG() << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
+  TRACE_LOG(m_logger) << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
 
   QByteArray ret;
 
@@ -690,7 +690,7 @@ QByteArray HandlerOcSituationData::createDataStream(int maxSize,
     maxSize -= 5;
 
   // first: participants that are not in range any more
-  DEBUG_LOG() << "m_newlyOutdatedParticipants: " << m_newlyOutdatedParticipants.size();
+  DEBUG_LOG(m_logger) << "m_newlyOutdatedParticipants: " << m_newlyOutdatedParticipants.size();
   QSet<int> copyOfOutdated = m_newlyOutdatedParticipants;
   for (const auto participantId : std::as_const(m_newlyOutdatedParticipants))
   {
@@ -701,21 +701,21 @@ QByteArray HandlerOcSituationData::createDataStream(int maxSize,
       continue;
 
     QByteArray ba = m_bWithCompression ? qCompress(ret) : ret;
-    DEBUG_LOG() << "Added info about oudated player " << m_participantId2EqId[participantId]
+    DEBUG_LOG(m_logger) << "Added info about oudated player " << m_participantId2EqId[participantId]
                         << " / " << participantId
                         << " data size: " << ret.size()
                         << " compressed size: " << ba.size();
     if (ba.size() > maxSize)
     {
       m_newlyOutdatedParticipants = copyOfOutdated;
-      TRACE_LOG() << "Uncompressed Data: " << ret.toHex(' ');
+      TRACE_LOG(m_logger) << "Uncompressed Data: " << ret.toHex(' ');
       return ba;
     }
   }
   m_newlyOutdatedParticipants = copyOfOutdated;
 
   // Data updates
-  DEBUG_LOG() << "participantsPrioQueue: " << participantsPrioQueue.size();
+  DEBUG_LOG(m_logger) << "participantsPrioQueue: " << participantsPrioQueue.size();
   for (auto prioPair : participantsPrioQueue)
   {
     int participantId = prioPair.first;
@@ -734,7 +734,7 @@ QByteArray HandlerOcSituationData::createDataStream(int maxSize,
     // default DynamicParticipantData crashes the tablet software. we skip it ... for now
     if (dynamicParticipantData == ParticipantManagement::DynamicParticipantData())
     {
-      INFO_LOG() << "There is only default DynamicParticipantData for participant with id " << participantId << " --> skipping";
+      INFO_LOG(m_logger) << "There is only default DynamicParticipantData for participant with id " << participantId << " --> skipping";
       continue;
     }
 
@@ -753,21 +753,21 @@ QByteArray HandlerOcSituationData::createDataStream(int maxSize,
       continue;
 
     QByteArray ba = m_bWithCompression ? qCompress(ret) : ret;
-    DEBUG_LOG() << "Added info about changed player " << m_participantId2EqId[participantId]
+    DEBUG_LOG(m_logger) << "Added info about changed player " << m_participantId2EqId[participantId]
                         << " / " << participantId
                         << " bits: 0x" << QString::number(modifiedFlags, 16)
                         << " data size: " << ret.size()
                         << " compressed: " << ba.size();
     if (ba.size() > maxSize)
     {
-      DEBUG_LOG() << "Uncompressed Data: " << ret.toHex(' ');
+      DEBUG_LOG(m_logger) << "Uncompressed Data: " << ret.toHex(' ');
       return ba;
     }
   }
 
   if (!ret.isEmpty())
   {
-    DEBUG_LOG() << "Uncompressed Data: " << ret.toHex(' ');
+    DEBUG_LOG(m_logger) << "Uncompressed Data: " << ret.toHex(' ');
     return m_bWithCompression ? qCompress(ret) : ret;
   }
   else
@@ -776,7 +776,7 @@ QByteArray HandlerOcSituationData::createDataStream(int maxSize,
 
 void HandlerOcSituationData::updatePrioOfNotSendParticipants()
 {
-  TRACE_LOG() << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
+  TRACE_LOG(m_logger) << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
   // add a prio bonus to all participants not send this cycle
   QMap<int, OcSituation::ModificationBits>::const_iterator it = m_modifiedFlags.constBegin();
   for (; it != m_modifiedFlags.constEnd(); ++it)
@@ -794,15 +794,15 @@ void HandlerOcSituationData::updatePrioOfNotSendParticipants()
       participantIt.value()++;
       notSentSince = participantIt.value();
     }
-    DEBUG_LOG() << "Player " << m_participantId2EqId[participantId]
+    DEBUG_LOG(m_logger) << "Player " << m_participantId2EqId[participantId]
                         << " / " << participantId << " not sent for " << notSentSince << " time(s)";
   }
 }
 
 void HandlerOcSituationData::setModified(int participantId, OcSituation::ModificationBits bits)
 {
-  TRACE_LOG() << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
-  DEBUG_LOG() << "setModified " << bits << " for: " << m_participantId2EqId[participantId]
+  TRACE_LOG(m_logger) << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "setModified " << bits << " for: " << m_participantId2EqId[participantId]
                       << " / " << participantId;
   m_participantsToSend.insert(participantId);
 
@@ -817,8 +817,8 @@ void HandlerOcSituationData::setModified(int participantId, OcSituation::Modific
 
 void HandlerOcSituationData::clearModified(int participantId)
 {
-  TRACE_LOG() << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
-  DEBUG_LOG() << "clearModified for: " << m_participantId2EqId[participantId]
+  TRACE_LOG(m_logger) << "Thread " << QThread::currentThreadId() << " function: " << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << "clearModified for: " << m_participantId2EqId[participantId]
                       << " / " << participantId;
   m_modifiedFlags.remove(participantId);
   m_participantsNotSend.remove(participantId);
@@ -921,7 +921,7 @@ void HandlerOcSituationData::addVBG(QByteArray &buf, const ParticipantManagement
   uint8_t vitRes = (youngestStateInformation.vitality() / 10);
   if (vitRes > 10)
   {
-    WARNING_LOG() << "Vitality of Participant " << data.participantId() << " is not between 0 and 100%. Putting to 100%";
+    WARNING_LOG(m_logger) << "Vitality of Participant " << data.participantId() << " is not between 0 and 100%. Putting to 100%";
     vitRes = 10;
   }
   vitRes += ((int)youngestStateInformation.sanitationResult().underlying() << 4);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/main_handler.cpp
index 4cd44a0e5..99f91fce2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/main_handler.cpp
@@ -17,8 +17,7 @@
 namespace OcSituationServer
 {
 
-MainHandler::MainHandler(QObject *parent)
-  : QObject(parent)
+MainHandler::MainHandler(QObject *parent) : QObject(parent)
   , m_exerciseId(0)
   , m_ddsHandler(nullptr)
   , m_dbHandler(nullptr)
@@ -32,8 +31,8 @@ MainHandler::MainHandler(QObject *parent)
   , m_ppmDtc(nullptr)
   , m_ppmFtc(nullptr)
   , m_tabDtc(nullptr)
-  , m_tabFtc(nullptr)
-{}
+  , m_tabFtc(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 MainHandler::~MainHandler()
 {
@@ -69,55 +68,55 @@ bool MainHandler::init(int domainId, int exerciseId)
 
   if (!m_dbHandler->init(exerciseId, Settings::settings()))
   {
-    ERROR_LOG() << "Initialisation dbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation dbHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation dbHandler succesful.";
 
   // initialize DDS
   m_ddsHandler = std::make_shared<DdsHandler>(domainId, exerciseId);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation ddsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation ddsHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation ddsHandler succesful.";
 
   // create AES Dtc
   m_aesDtc = AreaEffectSimulation::Interface::Dtc::create(m_ddsHandler->dds());
-  DEBUG_LOG() << "Created AES Dtc";
+  DEBUG_LOG(m_logger) << "Created AES Dtc";
 
   // create EVL Dtc
   m_evlDtc = Evaluations::Interface::Dtc::create(m_ddsHandler->dds());
-  DEBUG_LOG() << "Created EVL Dtc";
+  DEBUG_LOG(m_logger) << "Created EVL Dtc";
 
   // create EVL Ftc
   m_evlFtc = Evaluations::Interface::Ftc::create(m_ddsHandler->dds());
-  DEBUG_LOG() << "Created EVL Ftc";
+  DEBUG_LOG(m_logger) << "Created EVL Ftc";
 
   // create GIM Dtc
   m_gimDtc = GuezIedManagement::Interface::Dtc::create(m_ddsHandler->dds());
-  DEBUG_LOG() << "Created GIM Dtc";
+  DEBUG_LOG(m_logger) << "Created GIM Dtc";
 
   // create MSG Ftc
   m_msgFtc = Messaging::Interface::Ftc::create(m_ddsHandler->dds());
-  DEBUG_LOG() << "Created Msg Ftc";
+  DEBUG_LOG(m_logger) << "Created Msg Ftc";
 
   // create PPM Dtc
   m_ppmDtc = ParticipantManagement::Interface::Dtc::create(m_ddsHandler->dds());
-  DEBUG_LOG() << "Created PPM Dtc";
+  DEBUG_LOG(m_logger) << "Created PPM Dtc";
 
   // create PPM Ftc
   m_ppmFtc = ParticipantManagement::Interface::Ftc::create(m_ddsHandler->dds());
-  DEBUG_LOG() << "Created PPM Dtc";
+  DEBUG_LOG(m_logger) << "Created PPM Dtc";
 
   // create TAB Dtc
   m_tabDtc = TrainingAreaBase::Interface::Dtc::create(m_ddsHandler->dds());
-  DEBUG_LOG() << "Created TAB Dtc";
+  DEBUG_LOG(m_logger) << "Created TAB Dtc";
 
   // create TAB Ftc
   m_tabFtc = TrainingAreaBase::Interface::Ftc::create(m_ddsHandler->dds());
-  DEBUG_LOG() << "Created TAB Ftc";
+  DEBUG_LOG(m_logger) << "Created TAB Ftc";
 
   // create position converter
   m_positionConverter = std::make_shared<PositionConverter>(this);
@@ -126,7 +125,7 @@ bool MainHandler::init(int domainId, int exerciseId)
   m_handlerOcData = std::make_shared<HandlerOcData>(this, this);
   if (!m_handlerOcData->init())
   {
-    ERROR_LOG() << "Initialisation HandlerOcData failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerOcData failed.";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/main_handler.h
index 85d405fe8..50a763945 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/main_handler.h
@@ -63,6 +63,7 @@ public:
   int exerciseId() const { return m_exerciseId; }
 
 private:
+  NGL::INGLLogger &m_logger;
   int m_exerciseId;
 
   std::shared_ptr<DdsHandler>        m_ddsHandler;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/position_converter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/position_converter.cpp
index fa6a926e8..7e279a0a7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/position_converter.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/position_converter.cpp
@@ -15,12 +15,11 @@
 namespace OcSituationServer
 {
 
-PositionConverter::PositionConverter(MainHandler *m_mainHandler)
-  : m_mainHandler(m_mainHandler)
+PositionConverter::PositionConverter(MainHandler *m_mainHandler) : m_mainHandler(m_mainHandler)
   , m_baseCoord(LtsCoordTrans::UtmCoordinate())
   , m_asmDtc(AssetManagement::Interface::Dtc::create(m_mainHandler->dds()->dds()))
-  , m_exmDtc(ExerciseManagement::Interface::Dtc::create(m_mainHandler->dds()->dds()))
-{
+  , m_exmDtc(ExerciseManagement::Interface::Dtc::create(m_mainHandler->dds()->dds())),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_exmDtc->enableExercise();
   m_asmDtc->enableTrainingArea();
 }
@@ -41,24 +40,24 @@ bool PositionConverter::initCoordConversion()
 
   if (!m_exmDtc->waitForHistoricalDataExercise(15000))
   {
-    ERROR_LOG() << "Error initializing ExerciseManagement DTC";
+    ERROR_LOG(m_logger) << "Error initializing ExerciseManagement DTC";
     return false;
   }
   const auto ex = m_exmDtc->exercise(m_mainHandler->exerciseId());
   if (ex.id() <= 0)
   {
-    ERROR_LOG() << "Can not retrieve exercise information for id " << m_mainHandler->exerciseId();
+    ERROR_LOG(m_logger) << "Can not retrieve exercise information for id " << m_mainHandler->exerciseId();
     return false;
   }
   if (!m_asmDtc->waitForHistoricalDataTrainingArea(10000))
   {
-    ERROR_LOG() << "Error initializing AssetManagement DTC";
+    ERROR_LOG(m_logger) << "Error initializing AssetManagement DTC";
     return false;
   }
   const auto ta = m_asmDtc->trainingArea(ex.trainingAreaId());
   if (ta.id() <= 0)
   {
-    ERROR_LOG() << "Can not retrieve training are information for id " << ex.trainingAreaId();
+    ERROR_LOG(m_logger) << "Can not retrieve training are information for id " << ex.trainingAreaId();
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/ModuleTests/opm_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/ModuleTests/opm_tests.cpp
index f4d89396d..622d8583b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/ModuleTests/opm_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/ModuleTests/opm_tests.cpp
@@ -42,7 +42,7 @@ OpmTests::~OpmTests()
 //-----------------------------------------------------------------------------
 bool OpmTests::init(int domainId, int exerciseId, int testId, int operatorId, int createdId)
 {
-  INFO_LOG() << "OpmTests::init() "
+  INFO_LOG(m_logger) << "OpmTests::init() "
                      << " domainId:" << domainId
                      << " exerciseId:" << exerciseId
                      << " testId: " << testId
@@ -61,18 +61,18 @@ bool OpmTests::init(int domainId, int exerciseId, int testId, int operatorId, in
   m_ddsConnector->initPublisherSubscriber();
 
   // Access to FTC
-  DEBUG_LOG() << "create ftc";
+  DEBUG_LOG(m_logger) << "create ftc";
   m_ftc = OperatorManagement::Interface::Ftc::create(m_ddsConnector);
-  DEBUG_LOG() << "init ftc";
+  DEBUG_LOG(m_logger) << "init ftc";
   bool bRet = m_ftc->enableAll();
-  DEBUG_LOG() << "init end - bRet = " << bRet;
+  DEBUG_LOG(m_logger) << "init end - bRet = " << bRet;
 
   // Access to DTC
-  DEBUG_LOG() << "create dtc";
+  DEBUG_LOG(m_logger) << "create dtc";
   m_dtc = OperatorManagement::Interface::Dtc::create(m_ddsConnector);
-  DEBUG_LOG() << "init dtc";
+  DEBUG_LOG(m_logger) << "init dtc";
   bRet = m_dtc->enableAll();
-  DEBUG_LOG() << "init end - bRet = " << bRet;
+  DEBUG_LOG(m_logger) << "init end - bRet = " << bRet;
 
   connect(m_dtc.get(), &Interface::Dtc::userChanged,
           this,        &OpmTests::onReceiveOperatorChanged);
@@ -86,7 +86,7 @@ bool OpmTests::init(int domainId, int exerciseId, int testId, int operatorId, in
 //-----------------------------------------------------------------------------
 void OpmTests::startTest()
 {
-  INFO_LOG() << "startTest() exerciseId:" << m_exerciseId
+  INFO_LOG(m_logger) << "startTest() exerciseId:" << m_exerciseId
                      << " testId:" << m_testId
                      << " operatorId:" << m_operatorId
                         ;
@@ -121,10 +121,10 @@ void OpmTests::tryCreate()
   OperatorCreateModifyRequest data;
   getOperatorCreateRequestData( data);
 
-  INFO_LOG() << "trying to send OperatorCreateRequest";
+  INFO_LOG(m_logger) << "trying to send OperatorCreateRequest";
   if (!m_ftc->operatorCreateModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
   QTest::qWait(1000);
@@ -137,10 +137,10 @@ void OpmTests::tryModify()
   OperatorCreateModifyRequest data;
   getOperatorModifyRequestData(data);
 
-  INFO_LOG() << "trying to send OperatorCreateModifyRequest";
+  INFO_LOG(m_logger) << "trying to send OperatorCreateModifyRequest";
   if (!m_ftc->operatorCreateModifyRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting modify data";
+    ERROR_LOG(m_logger) << "Error requesting modify data";
     failExit();
   }
   QTest::qWait(1000);
@@ -154,10 +154,10 @@ void OpmTests::tryRemove()
 
   data.id(m_operatorId);
 
-  INFO_LOG() << "trying to send remove request";
+  INFO_LOG(m_logger) << "trying to send remove request";
   if (!m_ftc->operatorRemoveRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting remove data";
+    ERROR_LOG(m_logger) << "Error requesting remove data";
     failExit();
   }
   QTest::qWait(1000);
@@ -190,7 +190,7 @@ void OpmTests::tryLogin()
                        << ", force:" << data.force();
   if (!m_ftc->operatorLoginRequest(data, this))
   {
-    ERROR_LOG() << "Error login operator id " << m_operatorId << " on workstation 1";
+    ERROR_LOG(m_logger) << "Error login operator id " << m_operatorId << " on workstation 1";
     failExit();
   }
   QTest::qWait(1000);
@@ -213,10 +213,10 @@ void OpmTests::tryLoginForce()
   data.workstationId(4);
   data.force(true);
 
-  INFO_LOG() << "trying to send OperatorLoginRequest";
+  INFO_LOG(m_logger) << "trying to send OperatorLoginRequest";
   if (!m_ftc->operatorLoginRequest(data, this))
   {
-    ERROR_LOG() << "Error login operator id " << m_operatorId << " on workstation 1";
+    ERROR_LOG(m_logger) << "Error login operator id " << m_operatorId << " on workstation 1";
     failExit();
   }
   QTest::qWait(1000);
@@ -230,10 +230,10 @@ void OpmTests::tryLogout()
 
   data.id(m_operatorId);
 
-  INFO_LOG() << "trying to send OperatorLogoutRequest";
+  INFO_LOG(m_logger) << "trying to send OperatorLogoutRequest";
   if (!m_ftc->operatorLogoutRequest(data, this))
   {
-    ERROR_LOG() << "Error logout operator id " << m_operatorId;
+    ERROR_LOG(m_logger) << "Error logout operator id " << m_operatorId;
     failExit();
   }
   QTest::qWait(1000);
@@ -246,18 +246,18 @@ void OpmTests::tryGetOperatorsByOperatorRight()
   int operatorRight = OperatorRights::CContaminationsEdit;
 
   m_dtc->waitForHistoricalDataUser();
-  INFO_LOG() << "trying to send get operators by operatorRight";
+  INFO_LOG(m_logger) << "trying to send get operators by operatorRight";
   QVector<int> operators = m_dtc->getOperatorsByOperatorRight(operatorRight);
   if (operators.empty())
   {
-    ERROR_LOG() << "Error no operators for operatorRight:  " << operatorRight;
+    ERROR_LOG(m_logger) << "Error no operators for operatorRight:  " << operatorRight;
     failExit();
   }
   else
   {
     for (int operatorId : operators)
     {
-      INFO_LOG() << "Operator " << operatorId << " found.";
+      INFO_LOG(m_logger) << "Operator " << operatorId << " found.";
     }
   }
   QTest::qWait(1000);
@@ -266,22 +266,22 @@ void OpmTests::tryGetOperatorsByOperatorRight()
 void OpmTests::tryGetAllOperators()
 {
   m_eTestStep = eGetAllOperators;
-  DEBUG_LOG() << "trying to get all operators";
+  DEBUG_LOG(m_logger) << "trying to get all operators";
 
   m_dtc->waitForHistoricalDataUser();
   const QMap<qint32, OperatorManagement::User> opMap = m_dtc->users();
   if(opMap.isEmpty())
   {
-    ERROR_LOG() << "Error requesting all operator data";
+    ERROR_LOG(m_logger) << "Error requesting all operator data";
     failExit();
   }
   else
   {
-    INFO_LOG() << "Amout of existing operators = " << opMap.size();
+    INFO_LOG(m_logger) << "Amout of existing operators = " << opMap.size();
     m_operatorId = opMap.firstKey();
     for(auto it = opMap.begin(); it != opMap.end(); ++it)
     {
-      INFO_LOG() << "opm(" << it.key() << ") :"
+      INFO_LOG(m_logger) << "opm(" << it.key() << ") :"
                          << " name:"            << it.value().name()
                             //                         << " password:"        << it.value().password()
                             //                         << " effectiveACLs:"   << it.value().effectiveAcls()
@@ -294,7 +294,7 @@ void OpmTests::tryGetAllOperators()
 //-----------------------------------------------------------------------------
 void OpmTests::tryGetOperator()
 {
-  DEBUG_LOG() << "trying to get operator with id:" << m_operatorId;
+  DEBUG_LOG(m_logger) << "trying to get operator with id:" << m_operatorId;
 
   if(m_testId > 1)
   {
@@ -303,7 +303,7 @@ void OpmTests::tryGetOperator()
 
   if(m_operatorId <= 0)
   {
-    ERROR_LOG() << "invalid operatorId - test aborted.";
+    ERROR_LOG(m_logger) << "invalid operatorId - test aborted.";
     failExit();
   }
 
@@ -312,12 +312,12 @@ void OpmTests::tryGetOperator()
 
   if(op.id() <= 0)
   {
-    ERROR_LOG() << "Error receiving data for operatorId " << m_operatorId << " returnVal:" << op.id();
+    ERROR_LOG(m_logger) << "Error receiving data for operatorId " << m_operatorId << " returnVal:" << op.id();
     failExit();
   }
   else
   {
-    INFO_LOG() << "opm(" << op.id() << ") :"
+    INFO_LOG(m_logger) << "opm(" << op.id() << ") :"
                        << " name: "            << op.name()
                           //                       << " password: "        << data.password()
                           //                         << " effectiveACLs:"   << it.value().effectiveAcls()
@@ -330,7 +330,7 @@ void OpmTests::tryGetOperator()
     {
       if(! onCompareCreatedData(op))
       {
-        ERROR_LOG() << "Compare created data failed!";
+        ERROR_LOG(m_logger) << "Compare created data failed!";
         failExit();
       }
       else
@@ -343,7 +343,7 @@ void OpmTests::tryGetOperator()
     {
       if(! onCompareModifiedData(op))
       {
-        ERROR_LOG() << "Compare modified data failed!";
+        ERROR_LOG(m_logger) << "Compare modified data failed!";
         failExit();
       }
       else
@@ -363,20 +363,20 @@ void OpmTests::tryGetOperator()
 //-----------------------------------------------------------------------------
 void OpmTests::onOperatorCreateModifyReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got create/modifyReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got create/modifyReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   m_operatorId = replyObject.id();
 
   if(replyObject.error())
   {
-    ERROR_LOG() << "Error requesting create/modify data";
+    ERROR_LOG(m_logger) << "Error requesting create/modify data";
     failExit();
     return;
   }
   else
   {
-    DEBUG_LOG() << "Requesting create/modify data ok. Got id:" << replyObject.id() << " ... ok.";
+    DEBUG_LOG(m_logger) << "Requesting create/modify data ok. Got id:" << replyObject.id() << " ... ok.";
   }
 
   if(m_testId == 0)
@@ -394,23 +394,23 @@ void OpmTests::onOperatorCreateModifyReply(const Core::FunctionReplyObject &repl
 //-----------------------------------------------------------------------------
 void OpmTests::onOperatorRemoveReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got removeReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   if(replyObject.error())
   {
-    ERROR_LOG() << "Error requesting remove data for id:" << replyObject.id();
+    ERROR_LOG(m_logger) << "Error requesting remove data for id:" << replyObject.id();
     failExit();
     return;
   }
   else
   {
-    DEBUG_LOG() << "Requesting remove data for id:" << replyObject.id() << " ... ok.";
+    DEBUG_LOG(m_logger) << "Requesting remove data for id:" << replyObject.id() << " ... ok.";
   }
 
   if(m_testId == 0)
   {
-    INFO_LOG() << "***** FTC/DTC test successfully finished. (used id:" << replyObject.id() << ") *****";
+    INFO_LOG(m_logger) << "***** FTC/DTC test successfully finished. (used id:" << replyObject.id() << ") *****";
     // ansonsten verheriger Ausstieg mit Errorlog.
   }
 
@@ -421,12 +421,12 @@ void OpmTests::onOperatorRemoveReply(const Core::FunctionReplyObject &replyObjec
 //-----------------------------------------------------------------------------
 void OpmTests::onOperatorLoginReply(const Core::FunctionReplyObject &replyObject)
 {
-  DEBUG_LOG() << "Got loginReply with id " << replyObject.id()
+  DEBUG_LOG(m_logger) << "Got loginReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   if(replyObject.error())
   {
-    ERROR_LOG() << "Error requesting login for id:" << replyObject.id();
+    ERROR_LOG(m_logger) << "Error requesting login for id:" << replyObject.id();
     failExit();
     return;
   }
@@ -437,12 +437,12 @@ void OpmTests::onOperatorLoginReply(const Core::FunctionReplyObject &replyObject
 //-----------------------------------------------------------------------------
 void OpmTests::onOperatorLogoutReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got logoutReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got logoutReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   if(replyObject.error())
   {
-    ERROR_LOG() << "Error requesting logout for id:" << replyObject.id();
+    ERROR_LOG(m_logger) << "Error requesting logout for id:" << replyObject.id();
     failExit();
     return;
   }
@@ -456,8 +456,8 @@ void OpmTests::onReceiveOperatorChanged(const User &data, DataModification modTy
   // Check signal/slot connection
   if (m_operatorId == data.id())
   {
-    TRACE_LOG() << "Check signal/slot connection for DTC.  Data for id = " << data.id() << " received";
-    TRACE_LOG() << "ModificationType: = " << (int)modType << " received";
+    TRACE_LOG(m_logger) << "Check signal/slot connection for DTC.  Data for id = " << data.id() << " received";
+    TRACE_LOG(m_logger) << "ModificationType: = " << (int)modType << " received";
   }
 } // end of onReceiveOperatorData()
 
@@ -467,8 +467,8 @@ void OpmTests::onReceiveGroupChanged(const Group &data, DataModification modType
   // Check signal/slot connection
   //  if (m_operatorId == data.id())
   //  {
-  TRACE_LOG() << "Check signal/slot connection for DTC.  Data for id = " << data.id() << " received";
-  TRACE_LOG() << "ModificationType: = " << (int)modType << " received";
+  TRACE_LOG(m_logger) << "Check signal/slot connection for DTC.  Data for id = " << data.id() << " received";
+  TRACE_LOG(m_logger) << "ModificationType: = " << (int)modType << " received";
   //  }
 } // end of onReceiveOperatorData()
 
@@ -513,7 +513,7 @@ void OpmTests::getOperatorModifyRequestData(OperatorCreateModifyRequest &data) c
 //-----------------------------------------------------------------------------
 bool OpmTests::onCompareCreatedData(User &data)
 {
-  DEBUG_LOG() << "start onCompareCreatedData() for id :" << data.id();
+  DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id();
 
   OperatorCreateModifyRequest createData;
 
@@ -528,7 +528,7 @@ bool OpmTests::onCompareCreatedData(User &data)
   if (data.description() != createData.description())
     return false;
 
-  DEBUG_LOG() << "successfull finished onCompareCreatedData() for id :" << data.id();
+  DEBUG_LOG(m_logger) << "successfull finished onCompareCreatedData() for id :" << data.id();
 
   return true;
 } // end of onCompareCreatedData()
@@ -536,7 +536,7 @@ bool OpmTests::onCompareCreatedData(User &data)
 //-----------------------------------------------------------------------------
 bool OpmTests::onCompareModifiedData(User &data)
 {
-  DEBUG_LOG() << "start onCompareModifiedData() for id :" << data.id();
+  DEBUG_LOG(m_logger) << "start onCompareModifiedData() for id :" << data.id();
 
   OperatorCreateModifyRequest modifyData;
 
@@ -551,7 +551,7 @@ bool OpmTests::onCompareModifiedData(User &data)
   if (data.description() != modifyData.description())
     return false;
 
-  DEBUG_LOG() << "successfully finished onCompareModifiedData() for id :" << data.id();
+  DEBUG_LOG(m_logger) << "successfully finished onCompareModifiedData() for id :" << data.id();
 
   return true;
 } // end of onCompareModifiedData()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/ModuleTests/opm_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/ModuleTests/opm_tests.h
index ec6bb91c5..93f04a4cb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/ModuleTests/opm_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/ModuleTests/opm_tests.h
@@ -67,6 +67,7 @@ protected Q_SLOTS:
   void onReceiveGroupChanged(const Group &data, DataModification modType);
 
 protected:
+  NGL::INGLLogger &m_logger;
   // Callbackfunctions for FTC
   void onOperatorCreateModifyReply(const Core::FunctionReplyObject &replyObject) override final;
   void onOperatorRemoveReply(const Core::FunctionReplyObject &replyObject) override final;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/WebSocketInterface/Messages/client_message.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/WebSocketInterface/Messages/client_message.cpp
index dd604dcd0..e6a98c8fb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/WebSocketInterface/Messages/client_message.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/WebSocketInterface/Messages/client_message.cpp
@@ -51,9 +51,8 @@ ClientMessage::ClientMessage(DataManager *dataManager, LtsWebSocket::ReplyHandle
 // ####### ClientMessage end #######
 
 // ####### BaseDlRequest begin #######
-BaseDlRequest::BaseDlRequest(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const int typeId, const QString &uuid)
-  : ClientMessage(dataManager, client, type, typeId, uuid)
-{}
+BaseDlRequest::BaseDlRequest(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const int typeId, const QString &uuid) : ClientMessage(dataManager, client, type, typeId, uuid),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 void BaseDlRequest::process()
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/WebSocketInterface/websocket_interface_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/WebSocketInterface/websocket_interface_handler.cpp
index ca8193858..824b8318b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/WebSocketInterface/websocket_interface_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/WebSocketInterface/websocket_interface_handler.cpp
@@ -36,7 +36,7 @@ bool WebSocketInterfaceHandler::init()
 {
   cleanup();
 
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "... ok";
 
   m_dataManager = new DataManager(m_mainHandler);
 
@@ -44,16 +44,16 @@ bool WebSocketInterfaceHandler::init()
 
   m_webSocketServer = new LtsWebSocket::LtsWebSocketServer(m_messageFactory, this);
 
-  DEBUG_LOG() << "Initialising LtsWebSocketServer";
+  DEBUG_LOG(m_logger) << "Initialising LtsWebSocketServer";
   if (!m_webSocketServer->init(QStringLiteral("ASM"), Settings::getWebSocketServerPortRange(1)))
   {
-    ERROR_LOG() << "Failed to initialise LtsWebSocketServer";
+    ERROR_LOG(m_logger) << "Failed to initialise LtsWebSocketServer";
     return false;
   }
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "... ok";
 
-  DEBUG_LOG() << "Connection signals and slots";
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "Connection signals and slots";
+  DEBUG_LOG(m_logger) << "... ok";
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/dds_handler.cpp
index d59ae2aae..11882ecb3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/dds_handler.cpp
@@ -16,14 +16,14 @@ namespace OperatorManagement
 DdsHandler::DdsHandler(int domainId)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Any, 0))
 {
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
   if(!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -46,10 +46,10 @@ bool DdsHandler::init(const QStringList &qosFileList)
       !m_ddsDts->enableActiveApp() ||
       !m_dtcAsm->enableAsset())
     bRet = false;
-  INFO_LOG() << "Dts initialised: " << bRet;;
+  INFO_LOG(m_logger) << "Dts initialised: " << bRet;;
 
   bRet &= m_ddsFts->enableAll();
-  INFO_LOG() << "Fts initialised" << bRet;
+  INFO_LOG(m_logger) << "Fts initialised" << bRet;
 
   return bRet;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/dds_handler.h
index c8892919e..93e3f81c5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/dds_handler.h
@@ -41,6 +41,7 @@ public:
   std::shared_ptr<DDSConnector::DdsConnector> ddsConnector() const { return m_ddsConnector; }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector>         m_ddsConnector;
   std::shared_ptr<Core::Pacemaker>                    m_pacemaker;
   std::shared_ptr<Core::TopicLockMaster>              m_topicLockMaster;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_access_control_level.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_access_control_level.cpp
index 1b6430bad..c39e6fb2a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_access_control_level.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_access_control_level.cpp
@@ -33,7 +33,7 @@ bool HandlerAccessControlLevel::init()
     if(ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       bRet = false;
       return;
     }
@@ -42,11 +42,11 @@ bool HandlerAccessControlLevel::init()
 
   if (!m_mainHandler->db()->select(cb) || !bRet)
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
 
-  DEBUG_LOG() << "m_exeObjMap.size() = " << m_accesscontrollevelObjMap.size();
+  DEBUG_LOG(m_logger) << "m_exeObjMap.size() = " << m_accesscontrollevelObjMap.size();
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_access_control_level.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_access_control_level.h
index d856667bc..a219c5104 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_access_control_level.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_access_control_level.h
@@ -25,6 +25,7 @@ public:
   bool init();
 
 private:
+  NGL::INGLLogger &m_logger;
   QMap<int, ObjectAccessControlLevel*> m_accesscontrollevelObjMap;
   MainHandler                         *m_mainHandler;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_active_apps.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_active_apps.cpp
index 64736e19f..57505d4ed 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_active_apps.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_active_apps.cpp
@@ -43,7 +43,7 @@ bool HandlerActiveApps::init()
 
 void HandlerActiveApps::cleanupOperator(int operatorId)
 {
-  INFO_LOG() << "cleanupOperator operatorId: " << operatorId
+  INFO_LOG(m_logger) << "cleanupOperator operatorId: " << operatorId
                      << ", m_activeApps.size = " << m_activeApps.size();
 
   // Operator has logged in or out or WS is not alive anymore:
@@ -55,7 +55,7 @@ void HandlerActiveApps::cleanupOperator(int operatorId)
     const ActiveApp &item = it.value();
     if (item.operatorId() == operatorId)
     {
-      INFO_LOG() << "cleanupOperator operatorId: " << operatorId << " ActiveApp=" << item;
+      INFO_LOG(m_logger) << "cleanupOperator operatorId: " << operatorId << " ActiveApp=" << item;
       dtsPtr->removeActiveAppByKey(item.id());
       it = m_activeApps.erase(it);
     }
@@ -92,11 +92,11 @@ void HandlerActiveApps::removeZombieEntry(const ActiveApp &request)
 void HandlerActiveApps::onActiveAppUpdateRequest(const rti::core::SampleIdentity &cookie,
                                                  const ActiveApp &request)
 {
-  DEBUG_LOG() << "onActiveAppUpdateRequest: " << request;
+  DEBUG_LOG(m_logger) << "onActiveAppUpdateRequest: " << request;
   auto ret = activeAppUpdateRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
-  DEBUG_LOG() << "onActiveAppUpdateRequest - returned id: " << ret.id();
+    WARNING_LOG(m_logger) << ret();
+  DEBUG_LOG(m_logger) << "onActiveAppUpdateRequest - returned id: " << ret.id();
   fts()->activeAppUpdateReply(cookie, ret);
 }
 
@@ -135,7 +135,7 @@ Core::FunctionReplyObject HandlerActiveApps::activeAppUpdateRequest(const Active
     // copy data
     it.value() = request;
   }
-  DEBUG_LOG() << "onActiveAppUpdateRequest - publish new data: " << it.value();
+  DEBUG_LOG(m_logger) << "onActiveAppUpdateRequest - publish new data: " << it.value();
   dts()->publish(it.value());
   return Core::FunctionReplyObject(it.value().id());
 }
@@ -143,10 +143,10 @@ Core::FunctionReplyObject HandlerActiveApps::activeAppUpdateRequest(const Active
 void HandlerActiveApps::onActiveAppRemoveRequest(const rti::core::SampleIdentity &cookie,
                                                  const Core::RemoveElementRequest &request)
 {
-  DEBUG_LOG() << "onActiveAppRemoveRequest: " << request;
+  DEBUG_LOG(m_logger) << "onActiveAppRemoveRequest: " << request;
   auto ret = activeAppRemoveRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   fts()->activeAppRemoveReply(cookie, ret);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_active_apps.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_active_apps.h
index e564f8db8..e9c947550 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_active_apps.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_active_apps.h
@@ -31,6 +31,7 @@ public:
   void cleanupOperator(int operatorId);
 
 private:
+  NGL::INGLLogger &m_logger;
   void cleanup();
   void removeZombieEntry(const ActiveApp &request);
   void onActiveAppUpdateRequest(const rti::core::SampleIdentity &cookie,
@@ -44,6 +45,7 @@ private:
   std::shared_ptr<Interface::Fts> fts() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   QHash<int /*id*/, ActiveApp> m_activeApps;
   MainHandler *m_mainHandler;
 };
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 b960cb91d..9c17c5809 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
@@ -53,7 +53,7 @@ bool HandlerGroup::init()
   };
   if (!m_mainHandler->db()->select(cbGroupGroup))
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return true;
   }
 
@@ -64,7 +64,7 @@ bool HandlerGroup::init()
   };
   if (!m_mainHandler->db()->select(cbAclAllow))
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return true;
   }
 
@@ -75,7 +75,7 @@ bool HandlerGroup::init()
   };
   if (!m_mainHandler->db()->select(cbAclDeny))
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return true;
   }
 
@@ -92,7 +92,7 @@ bool HandlerGroup::init()
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       bRet = false;
       return;
     }
@@ -100,19 +100,19 @@ bool HandlerGroup::init()
   };
   if (!m_mainHandler->db()->select(cbGroup) || !bRet)
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
 
-  DEBUG_LOG() << "m_exeObjMap.size() = " << m_groupObjMap.size();
-  INFO_LOG() << "Handler Group initialized";
+  DEBUG_LOG(m_logger) << "m_exeObjMap.size() = " << m_groupObjMap.size();
+  INFO_LOG(m_logger) << "Handler Group initialized";
 
   return true;
 }
 
 void HandlerGroup::updateRolePresetId(const int operatorId, const int rolePresetId)
 {
-  DEBUG_LOG() << "updateRolePresetId "
+  DEBUG_LOG(m_logger) << "updateRolePresetId "
                       << " operatorId=" << operatorId
                       << " rolePresetId=" << rolePresetId;
   m_mainHandler->getHandlerOperator()->operatorModifyRolePresetId( operatorId, rolePresetId);
@@ -139,12 +139,12 @@ Core::FunctionReplyObject HandlerGroup::changeMembership(const OperatorManagemen
 void HandlerGroup::onGroupChangeMembershipsRequest(const rti::core::SampleIdentity &cookie,
                                                    const GroupChangeMembersRequest &request)
 {
-  DEBUG_LOG() << "onGroupChangeMembershipsRequest " << request;
+  DEBUG_LOG(m_logger) << "onGroupChangeMembershipsRequest " << request;
   Core::FunctionReplyObject ret = changeMembership(request);
   if (request.operatorId().is_set() && request.rolePresetId().is_set())
     updateRolePresetId(request.operatorId().get(), request.rolePresetId().get());
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_mainHandler->fts()->groupChangeMembershipsReply(cookie, ret);
 }
 
@@ -176,10 +176,10 @@ Core::FunctionReplyObject HandlerGroup::create(const GroupCreateRequest &request
 void HandlerGroup::onGroupCreateRequest(const rti::core::SampleIdentity &cookie,
                                         const GroupCreateRequest &request)
 {
-  DEBUG_LOG() << "onGroupCreateRequest" << request;
+  DEBUG_LOG(m_logger) << "onGroupCreateRequest" << request;
   Core::FunctionReplyObject ret = create(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_mainHandler->fts()->groupCreateReply(cookie, ret);
 }
 
@@ -207,7 +207,7 @@ Core::FunctionReplyObject HandlerGroup::changeName(const OperatorManagement::Gro
 void HandlerGroup::onGroupChangeNameRequest(const rti::core::SampleIdentity &cookie,
                                             const GroupChangeNameRequest &request)
 {
-  DEBUG_LOG() << "onGroupChangeNameRequest" << request;
+  DEBUG_LOG(m_logger) << "onGroupChangeNameRequest" << request;
 
   Core::FunctionReplyObject ret;
   ObjectGroup *ifs = m_groupObjMap.value(request.id());
@@ -259,10 +259,10 @@ Core::FunctionReplyObject HandlerGroup::remove(const Core::RemoveElementRequest
 void HandlerGroup::onGroupRemoveRequest(const rti::core::SampleIdentity &cookie,
                                         const Core::RemoveElementRequest &request)
 {
-  DEBUG_LOG() << "onGroupRemoveRequest" << request;
+  DEBUG_LOG(m_logger) << "onGroupRemoveRequest" << request;
   Core::FunctionReplyObject ret = remove(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_mainHandler->fts()->groupRemoveReply(cookie, ret);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_group.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_group.h
index 9d287ce7f..2886d733f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_group.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_group.h
@@ -34,6 +34,7 @@ public:
   Core::FunctionReplyObject remove(const Core::RemoveElementRequest &request);
 
 private:
+  NGL::INGLLogger &m_logger;
   void onGroupChangeMembershipsRequest(const rti::core::SampleIdentity &cookie,
                                        const GroupChangeMembersRequest &request) override;
   void onGroupCreateRequest(const rti::core::SampleIdentity &cookie,
@@ -46,6 +47,7 @@ private:
   void updateRolePresetId( const int operatorId, const int rolePresetId);
 
 private:
+  NGL::INGLLogger &m_logger;
   QMap<int, ObjectGroup*>  m_groupObjMap;
   QMultiMap<int, int>      m_groupGroupMap;
   QMultiMap<int, int>      m_aclAllowMap;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_locked_topics.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_locked_topics.cpp
index f6dce336d..63d2810a2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_locked_topics.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_locked_topics.cpp
@@ -53,7 +53,7 @@ bool HandlerLockedTopics::init()
 
   auto cbDatabase = [this](const Database::OpmLockedTopics & data)
   {
-    DEBUG_LOG() << "Locked topic from db: " << data.exerciseId.toInt() << ", " << data.workstationId
+    DEBUG_LOG(m_logger) << "Locked topic from db: " << data.exerciseId.toInt() << ", " << data.workstationId
                         << ", " << data.operatorId << data.entityTypeName;
     m_lockedTopics.insert(Core::key(data.entityId, data.exerciseId.isNull() ? 0 : data.exerciseId.toInt(), data.entityTypeName), data);
   };
@@ -89,7 +89,7 @@ void HandlerLockedTopics::operatorLoggedInOut(int operatorId, int workstationId)
 {
   // check if there are stale locks (e.g. by crashing client) - then remove all of them - if there are any
 
-  DEBUG_LOG() << "operatorLoggedInOut: " << workstationId << ", " << operatorId;
+  DEBUG_LOG(m_logger) << "operatorLoggedInOut: " << workstationId << ", " << operatorId;
 
   // Ueberall wurden - ohne erase wohlgemerkt - mutable Iteratoren verwendet. Nur hier - wo erase verwendet wurde - nicht! :')
   QMutableHashIterator<Core::key, Database::OpmLockedTopics> it(m_lockedTopics);
@@ -98,7 +98,7 @@ void HandlerLockedTopics::operatorLoggedInOut(int operatorId, int workstationId)
   {
     const auto lockedTopic = it.next().value();
 
-    DEBUG_LOG() << "check if unlock: id=" << lockedTopic.id
+    DEBUG_LOG(m_logger) << "check if unlock: id=" << lockedTopic.id
                         << ", exId=" << lockedTopic.exerciseId.toInt()
                         << ", wsId=" << lockedTopic.workstationId
                         << ", opId=" << lockedTopic.operatorId;
@@ -107,7 +107,7 @@ void HandlerLockedTopics::operatorLoggedInOut(int operatorId, int workstationId)
       continue;
     }
 
-    DEBUG_LOG() << "Unlocking topic: id=" << lockedTopic.id
+    DEBUG_LOG(m_logger) << "Unlocking topic: id=" << lockedTopic.id
                         << ", exId=" << lockedTopic.exerciseId.toInt()
                         << ", wsId=" << lockedTopic.workstationId
                         << ", opId=" << lockedTopic.operatorId;
@@ -126,11 +126,11 @@ void HandlerLockedTopics::onTryLockEntityRequest(const rti::core::SampleIdentity
   auto ret = tryLock(request);
   if (!ret.errorString().empty())
   {
-    WARNING_LOG() << Core::FunctionReplyObject(ret.FunctionReply::id(), ret.errorString(), ret.errorParams()).translated() << " - " << request;
+    WARNING_LOG(m_logger) << Core::FunctionReplyObject(ret.FunctionReply::id(), ret.errorString(), ret.errorParams()).translated() << " - " << request;
   }
   else if (ret.alreadyLocked())
   {
-    WARNING_LOG() << "onTryLockEntityRequest failed because the topic was already locked by ws " << ret.alreadyLocked().get().workstationName() << " and op " << ret.alreadyLocked().get().operatorName() <<  " - " << request;
+    WARNING_LOG(m_logger) << "onTryLockEntityRequest failed because the topic was already locked by ws " << ret.alreadyLocked().get().workstationName() << " and op " << ret.alreadyLocked().get().operatorName() <<  " - " << request;
   }
   m_ftsTryLockEntity->sendReply(cookie, ret);
 
@@ -155,7 +155,7 @@ Core::TryLockEntityReply lockSuccessReply(const Database::OpmLockedTopics &dbStr
 
 Core::TryLockEntityReply HandlerLockedTopics::tryLock(const Core::TryLockEntityRequest &request)
 {
-  DEBUG_LOG() << "tryLock : " << request;
+  DEBUG_LOG(m_logger) << "tryLock : " << request;
 
   const auto topicId = request.entityId();
 
@@ -191,7 +191,7 @@ Core::TryLockEntityReply HandlerLockedTopics::tryLock(const Core::TryLockEntityR
 
 //Core::TryLockEntityReply HandlerLockedTopics::tryLockModify(const Core::TryLockEntityRequest &request)
 //{
-//  DEBUG_LOG() << "tryLockModify: " << request;
+//  DEBUG_LOG(m_logger) << "tryLockModify: " << request;
 
 //  const auto lockEntityId = request.id();
 
@@ -260,7 +260,7 @@ Core::TryLockEntityReply HandlerLockedTopics::tryLock(const Core::TryLockEntityR
 //    }
 
 //    const Database::OpmLockedTopics &lockedTopic = *lockedTopicIt;
-//    DEBUG_LOG() << Q_FUNC_INFO << ": locked topic id " << lockedTopic.id;
+//    DEBUG_LOG(m_logger) << Q_FUNC_INFO << ": locked topic id " << lockedTopic.id;
 //    // ... and then reinserting the updated lock entity (as the id has now changed) - while the key (op, ws, exc, topic id) stays the same!
 //    m_lockedTopics[requestedKey] = dbStruct;
 //  }
@@ -270,7 +270,7 @@ Core::TryLockEntityReply HandlerLockedTopics::tryLock(const Core::TryLockEntityR
 
 //bool HandlerLockedTopics::removeReleaseOutdatedLock(const int lockEntityId)
 //{
-//  DEBUG_LOG() << "removeReleaseOutdatedLock: lockEntityId = " << lockEntityId;
+//  DEBUG_LOG(m_logger) << "removeReleaseOutdatedLock: lockEntityId = " << lockEntityId;
 
 //  auto lockedTopicIt = std::find_if(m_lockedTopics.constBegin(), m_lockedTopics.constEnd(),
 //                                    [&lockEntityId](const Database::OpmLockedTopics &lockedTopic)
@@ -280,13 +280,13 @@ Core::TryLockEntityReply HandlerLockedTopics::tryLock(const Core::TryLockEntityR
 
 //  if (lockedTopicIt == m_lockedTopics.constEnd())
 //  {
-//    ERROR_LOG() << Q_FUNC_INFO << ": Failed to release outdated lock as lock entity id ("<<lockedTopicIt<<") was not found!";
+//    ERROR_LOG(m_logger) << Q_FUNC_INFO << ": Failed to release outdated lock as lock entity id ("<<lockedTopicIt<<") was not found!";
 //    Q_ASSERT(false);
 //    return false;
 //  }
 
 //  const Database::OpmLockedTopics &lockedTopic = *lockedTopicIt;
-//  DEBUG_LOG() << Q_FUNC_INFO << ": found lock entity " << lockEntityId;
+//  DEBUG_LOG(m_logger) << Q_FUNC_INFO << ": found lock entity " << lockEntityId;
 
 //  unlockInDb(lockedTopic);
 //  removeLockedEntity(lockEntityId);
@@ -305,7 +305,7 @@ void HandlerLockedTopics::onTryUnlockEntityRequest(const rti::core::SampleIdenti
   auto ret = tryUnlock(request);
   if (!ret.errorString().empty())
   {
-    WARNING_LOG() << Core::FunctionReplyObject(ret.FunctionReply::id(), ret.errorString(), ret.errorParams()).translated() << " - " << request;
+    WARNING_LOG(m_logger) << Core::FunctionReplyObject(ret.FunctionReply::id(), ret.errorString(), ret.errorParams()).translated() << " - " << request;
   }
   m_ftsTryUnlockEntity->sendReply(cookie, ret);
 
@@ -315,7 +315,7 @@ void HandlerLockedTopics::onTryUnlockEntityRequest(const rti::core::SampleIdenti
 
 Core::FunctionReply HandlerLockedTopics::tryUnlock(const Core::TryUnlockEntityRequest &request)
 {
-  DEBUG_LOG() << "tryUnlock: " << request;
+  DEBUG_LOG(m_logger) << "tryUnlock: " << request;
 
   const auto lockEntityId = request.id();
 
@@ -366,7 +366,7 @@ bool HandlerLockedTopics::publishLockedEntity(const Core::LockedEntity &entity)
     m_dtsLockedEntity->write(entity);
     return true;
   }
-  ERROR_LOG() << "Publishing LockedEntity " << entity.id() << " failed: DTS not available!";
+  ERROR_LOG(m_logger) << "Publishing LockedEntity " << entity.id() << " failed: DTS not available!";
   return false;
 }
 
@@ -379,7 +379,7 @@ bool HandlerLockedTopics::removeLockedEntity(int64_t id)
     m_dtsLockedEntity->remove(entity);
     return true;
   }
-  ERROR_LOG() << "Removing LockedEntity " << entity.id() << " failed: DTS not available!";
+  ERROR_LOG(m_logger) << "Removing LockedEntity " << entity.id() << " failed: DTS not available!";
   return false;
 }
 
@@ -404,14 +404,14 @@ void HandlerLockedTopics::dumpLockedTopics(int line)
 {
   QHashIterator<Core::key, Database::OpmLockedTopics> it (m_lockedTopics);
 
-  INFO_LOG()  << " dump m_lockedTopics, START size= " << m_lockedTopics.size()
+  INFO_LOG(m_logger)  << " dump m_lockedTopics, START size= " << m_lockedTopics.size()
                         << " (callerline=" << line << ")";
   while (it.hasNext())
   {
     it.next();
     const Core::key &keyRef = it.key();
     const Database::OpmLockedTopics &valRef = it.value();
-    INFO_LOG() << " entityTypeName=" << keyRef.entityTypeName << "'"
+    INFO_LOG(m_logger) << " entityTypeName=" << keyRef.entityTypeName << "'"
                        << ", entityId=" << keyRef.entityId
                        << ", exerciseId=" << keyRef.exerciseId
                        << " - eTN=" << valRef.entityTypeName
@@ -419,7 +419,7 @@ void HandlerLockedTopics::dumpLockedTopics(int line)
                        << ", exId=" << valRef.exerciseId.toInt()
                        << ", opId=" << valRef.operatorId;
   }
-  INFO_LOG()  << " dump m_lockedTopics, END   size= " << m_lockedTopics.size();
+  INFO_LOG(m_logger)  << " dump m_lockedTopics, END   size= " << m_lockedTopics.size();
 }
 
 } // namespace
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 263d6766b..aa82a3eb1 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
@@ -53,7 +53,7 @@ bool HandlerOperator::init()
   // read all Operators from database
   if (!m_mainHandler->db()->select(dataVec))
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return true;
   }
 
@@ -61,17 +61,17 @@ bool HandlerOperator::init()
   // read all Operators from database
   if (!m_mainHandler->db()->select(partyExerciseVec))
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return true;
   }
   QMap<int, QVector<Database::OpmOperatorExercise> > opMap;
   for (const auto &elem : partyExerciseVec)
   {
-    INFO_LOG() << "---------- elem.operatorId:" << elem.operatorId
+    INFO_LOG(m_logger) << "---------- elem.operatorId:" << elem.operatorId
                        << ", elem size " << elem.visibleParties().size();
     opMap[elem.operatorId] << elem;
   }
-  INFO_LOG() << "------- opMap size" << opMap.size();
+  INFO_LOG(m_logger) << "------- opMap size" << opMap.size();
 
   OperatorManagement::OperatorWorkstationAlive alive;
   alive.lastAlive(QDateTime::currentMSecsSinceEpoch());
@@ -82,7 +82,7 @@ bool HandlerOperator::init()
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       return false;
     }
     if (m_logger.isDebugEnabled())
@@ -92,7 +92,7 @@ bool HandlerOperator::init()
       stringList.reserve(acls.size());
       for (int acl : acls)
         stringList << QString::number(acl);
-      DEBUG_LOG() << "Effective ACLs for Operator " << op.name << "(id: " << op.id << "): "
+      DEBUG_LOG(m_logger) << "Effective ACLs for Operator " << op.name << "(id: " << op.id << "): "
                           <<  stringList.join(QLatin1String(", "));
     }
     ifs->updateExercises(getExercisesForOperator(exMappingVec, op.id), true);
@@ -110,7 +110,7 @@ bool HandlerOperator::init()
           this, &HandlerOperator::onOperatorWorkstationAliveChanged);
   dtc->enableOperatorWorkstationAlive();
 
-  DEBUG_LOG() << "m_exeObjMap.size() = " << m_operatorObjMap.size();
+  DEBUG_LOG(m_logger) << "m_exeObjMap.size() = " << m_operatorObjMap.size();
 
   return true;
 }
@@ -138,7 +138,7 @@ std::vector<int> HandlerOperator::getExercisesForOperator(const QVector<Database
 void HandlerOperator::onOperatorChangePasswordRequest(const rti::core::SampleIdentity &cookie,
                                                       const OperatorChangePasswordRequest &request)
 {
-  DEBUG_LOG() << "onOperatorChangePasswordRequest()";
+  DEBUG_LOG(m_logger) << "onOperatorChangePasswordRequest()";
   ObjectOperator *ifs = m_operatorObjMap.value(request.id());
   if (!ifs)
   {
@@ -184,14 +184,14 @@ void HandlerOperator::onOperatorCreateModifyRequest(const rti::core::SampleIdent
                                                     const OperatorCreateModifyRequest &request)
 {
   Core::FunctionReplyObject ret;
-  DEBUG_LOG() << "onOperatorCreateModifyRequest()";
+  DEBUG_LOG(m_logger) << "onOperatorCreateModifyRequest()";
   if (!request.id().is_set())
     ret = operatorCreateRequest(request);
   else
     ret = operatorModifyRequest(request);
 
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_mainHandler->fts()->operatorCreateModifyReply(cookie, ret);
 }
 
@@ -268,13 +268,13 @@ Core::FunctionReplyObject HandlerOperator::operatorCreateRequest(const OperatorC
 
 void HandlerOperator::operatorModifyRolePresetId( int operatorId, int rolePresetId)
 {
-  DEBUG_LOG()<< "HandlerOperator::operatorModifyRolePresetId"
+  DEBUG_LOG(m_logger)<< "HandlerOperator::operatorModifyRolePresetId"
                      << " operatorId=" << operatorId
                      << " rolePresetId=" << rolePresetId;
   ObjectOperator *ifs = m_operatorObjMap.value(operatorId);
   if (!ifs)
   {
-    ERROR_LOG()<< "No valid operator id given: "<< operatorId;
+    ERROR_LOG(m_logger)<< "No valid operator id given: "<< operatorId;
     return;
   }
 
@@ -341,7 +341,7 @@ Core::FunctionReplyObject HandlerOperator::operatorModifyRequest(const OperatorC
 void HandlerOperator::onOperatorRemoveRequest(const rti::core::SampleIdentity &cookie,
                                               const Core::RemoveElementRequest &request)
 {
-  DEBUG_LOG() << "onOperatorRemoveRequest()" << request;
+  DEBUG_LOG(m_logger) << "onOperatorRemoveRequest()" << request;
 
   ObjectOperator *ifs = m_operatorObjMap.value(request.id());
   if (!ifs)
@@ -372,7 +372,7 @@ void HandlerOperator::onOperatorRemoveRequest(const rti::core::SampleIdentity &c
   Core::FunctionReplyObject ret = m_mainHandler->getHandlerGroup()->remove(groupRemoveRequest);
   if (ret.error())
   {
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
   }
   else
   {
@@ -389,7 +389,7 @@ void HandlerOperator::onOperatorRemoveRequest(const rti::core::SampleIdentity &c
 void HandlerOperator::onOperatorLoginRequest(const rti::core::SampleIdentity &cookie,
                                              const OperatorLoginRequest &request)
 {
-  DEBUG_LOG() << "OperatorLoginRequest: " << request;
+  DEBUG_LOG(m_logger) << "OperatorLoginRequest: " << request;
 
   ObjectOperator *ifs = m_operatorObjMap.value(request.id());
   if (!ifs)
@@ -460,7 +460,7 @@ void HandlerOperator::onOperatorLoginRequest(const rti::core::SampleIdentity &co
         OperatorLogoutRequest req;
         req.id(otherOperatorId);
         onOperatorLogoutRequest(cookie, req);
-        WARNING_LOG() << "Logged out operator " << otherOperatorId << " on workstation id " << request.workstationId();
+        WARNING_LOG(m_logger) << "Logged out operator " << otherOperatorId << " on workstation id " << request.workstationId();
       }
     }
     // Claim WS:
@@ -471,7 +471,7 @@ void HandlerOperator::onOperatorLoginRequest(const rti::core::SampleIdentity &co
   }
 
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   else
   {
     m_mainHandler->getHandlerLockedTopics()->operatorLoggedIn(request.id(), request.workstationId());
@@ -491,7 +491,7 @@ int HandlerOperator::getLoggedOperatorId(int workstationId) const
 void HandlerOperator::onOperatorLogoutRequest(const rti::core::SampleIdentity &cookie,
                                               const OperatorLogoutRequest &request)
 {
-  DEBUG_LOG() << "OperatorLogoutRequest: " << request;
+  DEBUG_LOG(m_logger) << "OperatorLogoutRequest: " << request;
 
   ObjectOperator *ifs = m_operatorObjMap.value(request.id());
   if (!ifs)
@@ -566,10 +566,10 @@ void HandlerOperator::onOperatorGetSetSettingsRequest(const rti::core::SampleIde
 
 void HandlerOperator::onOperatorApplyForeignAclsRequest(const rti::core::SampleIdentity &cookie, const OperatorApplyForeignAclsRequest &request)
 {
-  DEBUG_LOG() << "peratorApplyForeignAclsRequest: " << request;
+  DEBUG_LOG(m_logger) << "peratorApplyForeignAclsRequest: " << request;
   auto reply = operatorApplyForeignAclsRequest(request);
   if (reply.error())
-    WARNING_LOG() << reply();
+    WARNING_LOG(m_logger) << reply();
   m_mainHandler->fts()->operatorApplyForeignAclsReply(cookie, reply);
 }
 
@@ -589,11 +589,11 @@ Core::FunctionReplyObject HandlerOperator::operatorApplyForeignAclsRequest(const
 void HandlerOperator::onOperatorUpdateVisiblePartiesByExerciseRequest(const rti::core::SampleIdentity &cookie,
                                                                       const OperatorUpdateVisiblePartiesByExerciseRequest &request)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << request;
-  // DEBUG_LOG() << "onOperatorUpdateVisiblePartiesByExerciseRequest: " << request;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << request;
+  // DEBUG_LOG(m_logger) << "onOperatorUpdateVisiblePartiesByExerciseRequest: " << request;
   Core::FunctionReplyObject reply = operatorUpdateVisiblePartiesByExerciseRequest(request);
   if (reply.error())
-    WARNING_LOG() << reply();
+    WARNING_LOG(m_logger) << reply();
   m_mainHandler->fts()->operatorUpdateVisiblePartiesByExerciseReply(cookie, reply);
 }
 
@@ -625,7 +625,7 @@ void HandlerOperator::reloadAcls()
 
 void HandlerOperator::onOperatorWorkstationAliveChanged(const OperatorManagement::OperatorWorkstationAlive &data, DataModification modType)
 {
-  INFO_LOG() << "onOperatorWorkstationAliveChanged: " << data << ", " << modType;
+  INFO_LOG(m_logger) << "onOperatorWorkstationAliveChanged: " << data << ", " << modType;
   if (data.operatorId() < 0)
   {
     m_aliveData.remove(data.workstationId());
@@ -645,11 +645,11 @@ void HandlerOperator::onCheckAliveTimeout()
     return;
 
   const qint64 tTimeoutTime = QDateTime::currentMSecsSinceEpoch() - 90 * 1000;  // 90s
-  DEBUG_LOG() << "onCheckAliveTimeout, timeoutTime: " << tTimeoutTime;
+  DEBUG_LOG(m_logger) << "onCheckAliveTimeout, timeoutTime: " << tTimeoutTime;
   auto it = m_aliveData.begin();
   while (it != m_aliveData.end())
   {
-    DEBUG_LOG() << "Checking alive for workstation " << it.key();
+    DEBUG_LOG(m_logger) << "Checking alive for workstation " << it.key();
     auto &events = it.value();
     if (events.isEmpty() || events.last().lastAlive() >= tTimeoutTime)
     {
@@ -659,12 +659,12 @@ void HandlerOperator::onCheckAliveTimeout()
     // no reference, will be a dangling one after m_aliveData.erase(it) !
     const OperatorWorkstationAlive owa = events.last();
 
-    WARNING_LOG() << "Timeout for workstation " << owa.workstationId()
+    WARNING_LOG(m_logger) << "Timeout for workstation " << owa.workstationId()
                           << " and operator " << owa.operatorId() << " - logging out";
     if (m_logger.isDebugEnabled())
     {
       for (const auto &event : events)
-        DEBUG_LOG() << "Alive history: " << event;
+        DEBUG_LOG(m_logger) << "Alive history: " << event;
     }
     ObjectOperator *ifs = m_operatorObjMap.value(owa.operatorId());
     it = m_aliveData.erase(it);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_operator.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_operator.h
index bceef812a..3e24d1500 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_operator.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_operator.h
@@ -42,6 +42,7 @@ public:
   QString operatorNameById(int operatorId) const;
 
 private:
+  NGL::INGLLogger &m_logger;
   void onOperatorChangePasswordRequest(const rti::core::SampleIdentity &cookie,
                                        const OperatorChangePasswordRequest &request) override;
   void onOperatorCreateModifyRequest(const rti::core::SampleIdentity &cookie,
@@ -75,6 +76,7 @@ private:
 private Q_SLOTS:
   void onCheckAliveTimeout();
 private:
+  NGL::INGLLogger &m_logger;
   QHash<int, QVector<OperatorWorkstationAlive>> m_aliveData;
   QHash<int, ObjectOperator*>  m_operatorObjMap;
   QTimer                *m_aliveCheckTimer;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/main_handler.cpp
index d0536e8b2..9d145270b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/main_handler.cpp
@@ -48,7 +48,7 @@ bool MainHandler::init(int domainId)
 
   if (!m_dbHandler->init(0, Settings::settings()))
   {
-    ERROR_LOG() << "Initialisation dbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
     return false;
   }
 
@@ -117,14 +117,14 @@ bool MainHandler::initWebSocketHandler()
 {
   // WebSocketServer
   m_handlerWebSocket =  std::make_shared<WebSocketInterface::WebSocketInterfaceHandler>(this);
-  DEBUG_LOG() << "Reset WebSocketInterfaceHandler succesful.";
+  DEBUG_LOG(m_logger) << "Reset WebSocketInterfaceHandler succesful.";
   if (!m_handlerWebSocket->init())
   {
-    ERROR_LOG() << "Initialisation WebSocketInterfaceHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler failed.";
     return false;
   }
   m_ddsHandler->pacemaker()->addPort(m_handlerWebSocket->serverWebSocketPort(), Core::PortType::WebSocketServer);
-  DEBUG_LOG() << "Initialisation WebSocketInterfaceHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler succesful.";
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/main_handler.h
index dc9beced4..b2b40c954 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/main_handler.h
@@ -48,6 +48,7 @@ public:
   std::shared_ptr<HandlerActiveApps>         getHandlerActiveApps()   const { return m_handlerActiveApps;     }
 
 private:
+  NGL::INGLLogger &m_logger;
   bool initAclHandler();
   bool initOperatorHandler();
   bool initGroupHandler();
@@ -56,6 +57,7 @@ private:
   bool initActiveApps();
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<HandlerAccessControlLevel> m_handlerAcl;
   std::shared_ptr<HandlerOperator>           m_handlerOperator;
   std::shared_ptr<HandlerGroup>              m_handlerGroup;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_access_control_level.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_access_control_level.cpp
index b5a5a881a..2396aeccf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_access_control_level.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_access_control_level.cpp
@@ -55,11 +55,11 @@ void ObjectAccessControlLevel::onPublishData()
   ddsData.description(m_data.description.toStdString());
 
   // Todo: Copy as above
-  INFO_LOG() << "Publish OpmAccessControlLevel-data to dds (" << m_data.id << ") ...";
+  INFO_LOG(m_logger) << "Publish OpmAccessControlLevel-data to dds (" << m_data.id << ") ...";
 
   if (!m_mainHandler->dts()->publish(ddsData))
   {
-    ERROR_LOG() << "Error publishing OpmAccessControlLevel-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing OpmAccessControlLevel-data to dds";
   }
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_access_control_level.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_access_control_level.h
index 69e8e9863..477d12309 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_access_control_level.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_access_control_level.h
@@ -28,6 +28,7 @@ public:
   qint64 getId() const { return m_data.id; }
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onPublishData();
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_group.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_group.cpp
index a2262280d..2031109ea 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_group.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_group.cpp
@@ -228,11 +228,11 @@ void ObjectGroup::onPublishData()
   ddsData.type(m_data.typeId);
   ddsData.isMemberOf(m_isMemberOf);
 
-  INFO_LOG() << "Publish OpmGroup-data to dds (" << m_data.id << ") ...";
+  INFO_LOG(m_logger) << "Publish OpmGroup-data to dds (" << m_data.id << ") ...";
 
   if (!m_mainHandler->dts()->publish(ddsData))
   {
-    ERROR_LOG() << "Error publishing OpmGroup-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing OpmGroup-data to dds";
   }
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_group.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_group.h
index 14d996d80..8978878be 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_group.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_group.h
@@ -41,6 +41,7 @@ public:
   QString name() const { return m_data.name; }
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onPublishData();
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.cpp
index 88f6d16e9..79f93cb23 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.cpp
@@ -92,13 +92,13 @@ Core::FunctionReplyObject ObjectOperator::updateExercises(const std::vector<int>
     }
     if (mapping.visibleParties().empty())
     {
-      DEBUG_LOG()<< "Update Operator visible Parties for Execise: No parties found for " << exerciseId << " use default (ex0)";
+      DEBUG_LOG(m_logger)<< "Update Operator visible Parties for Execise: No parties found for " << exerciseId << " use default (ex0)";
       // Add default visibleParties from ex0
       mapping.visibleParties = m_data.visibleParties;
     }
 
     if (!m_mainHandler->db()->insert(mapping))
-      INFO_LOG() << "Can not add operator " << mapping.operatorId << " to exercise " << exerciseId << " - exercise does no longer exist";
+      INFO_LOG(m_logger) << "Can not add operator " << mapping.operatorId << " to exercise " << exerciseId << " - exercise does no longer exist";
     else
     {
       if (std::find(m_exercises.begin(), m_exercises.end(), exerciseId) == m_exercises.end())
@@ -116,7 +116,7 @@ Core::FunctionReplyObject ObjectOperator::updateExercises(const std::vector<int>
 Core::FunctionReplyObject ObjectOperator::updateObject(const Database::OpmOperator &data)
 {
   m_data.name = data.name;
-  DEBUG_LOG() << "ObjectOperator::updateObject"
+  DEBUG_LOG(m_logger) << "ObjectOperator::updateObject"
                       << " data.id = " << data.id
                       << " data.rolePresetId = " << data.rolePresetId;
   m_data.description = data.description;
@@ -133,7 +133,7 @@ Core::FunctionReplyObject ObjectOperator::updateObject(const Database::OpmOperat
 
   if (!m_mainHandler->db()->update(m_data))
   {
-    ERROR_LOG()<< "Error updating Operator in database: " << m_mainHandler->db()->getLastError().text();
+    ERROR_LOG(m_logger)<< "Error updating Operator in database: " << m_mainHandler->db()->getLastError().text();
     return Core::FunctionReplyObject(0, tr_lts("dds", "Error updating operator in database."));
   }
   m_data.primaryGroupId = data.primaryGroupId;
@@ -144,13 +144,13 @@ Core::FunctionReplyObject ObjectOperator::updateObject(const Database::OpmOperat
 
 Core::FunctionReplyObject ObjectOperator::updateOperatorExercise(const Database::OpmOperatorExercise &data)
 {
-  DEBUG_LOG() << Q_FUNC_INFO  << data.operatorId << " " << data.exerciseId;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO  << data.operatorId << " " << data.exerciseId;
 
   // insert can fail due to (deleted) exerciseId
   m_mainHandler->db()->setEmitMessageOnError(false);
   for (int i=0; i < m_dataExercise.size(); ++i)
   {
-    DEBUG_LOG() << "** m_dataExercise.at(" << i << "): "  << m_dataExercise.at(i).exerciseId << "==" << data.exerciseId;
+    DEBUG_LOG(m_logger) << "** m_dataExercise.at(" << i << "): "  << m_dataExercise.at(i).exerciseId << "==" << data.exerciseId;
     if (m_dataExercise.at(i).exerciseId != data.exerciseId)
       continue;
     Database::OpmOperatorExercise mapping = m_dataExercise.at(i);
@@ -159,16 +159,16 @@ Core::FunctionReplyObject ObjectOperator::updateOperatorExercise(const Database:
     mapping.properties = data.properties;
     m_dataExercise.replace(i, mapping);
 
-    DEBUG_LOG() << "** m_dataExercise.at(" << i << "): "  << m_dataExercise.at(i).operatorId << ", "
+    DEBUG_LOG(m_logger) << "** m_dataExercise.at(" << i << "): "  << m_dataExercise.at(i).operatorId << ", "
                         << m_dataExercise.at(i).exerciseId << ", "
                         << m_dataExercise.at(i).visibleParties.toPgString() << ", "
                         << m_dataExercise.at(i).hiddenParties.toPgString();
-    DEBUG_LOG() << "** mapping: "  << mapping.operatorId << ", "
+    DEBUG_LOG(m_logger) << "** mapping: "  << mapping.operatorId << ", "
                         << mapping.exerciseId << ", "
                         << mapping.visibleParties.toPgString() << ", "
                         << mapping.hiddenParties.toPgString();
     if (!m_mainHandler->db()->update(mapping))
-      ERROR_LOG()<< "Error updating OperatorExecise in database: " << m_mainHandler->db()->getLastError().text();
+      ERROR_LOG(m_logger)<< "Error updating OperatorExecise in database: " << m_mainHandler->db()->getLastError().text();
   }
   m_mainHandler->db()->setEmitMessageOnError(true);
 
@@ -236,7 +236,7 @@ void ObjectOperator::reloadAcls(bool force)
 //  QStringList stringList;
 //  for (int acl : calculatedAcls)
 //    stringList << QString::number(acl);
-//  DEBUG_LOG() << "Effective ACLs for Operator " << m_data.name << "(id: " << m_data.id << "): " <<  stringList.join(QLatin1String(", "));
+//  DEBUG_LOG(m_logger) << "Effective ACLs for Operator " << m_data.name << "(id: " << m_data.id << "): " <<  stringList.join(QLatin1String(", "));
 
   if (force || m_effectiveAcls != calculatedAcls)
     updateEffectiveAcls(calculatedAcls);
@@ -336,12 +336,12 @@ void ObjectOperator::onPublishData()
   op.rolePresetId(m_data.rolePresetId);
   op.properties(m_data.properties.toStdString());
 
-  INFO_LOG() << "Publish OpmOperator-data to dds (" << m_data.id
+  INFO_LOG(m_logger) << "Publish OpmOperator-data to dds (" << m_data.id
                      << " rolePresetId =" << m_data.rolePresetId
                      << ") ...";
 
   if (!m_mainHandler->dts()->publish(op))
-    ERROR_LOG() << "Error publishing OpmOperator-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing OpmOperator-data to dds";
 }
 
 std::vector<OperatorManagement::PartiesByExercise> ObjectOperator::toDdsData(const QVector<Database::OpmOperatorExercise> &dbData)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.h
index 1a750012b..2faaf052e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.h
@@ -41,6 +41,7 @@ public:
   QSet<int>                    effectiveAcls() const { return m_effectiveAcls; }
   void reloadAcls(bool force = false);
 protected:
+  NGL::INGLLogger &m_logger;
   void onPublishData();
 
 private:
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 678eb9b48..118f83af7 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
@@ -32,7 +32,7 @@ bool BiteHandler::init()
 void BiteHandler::onDemandBiteReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    WARNING_LOG() << "Got an demandBiteError: " << replyObject();
+    WARNING_LOG(m_logger) << "Got an demandBiteError: " << replyObject();
 
   auto it = m_demandedBiteParticipantRequests.find(replyObject.id());
   if (it != m_demandedBiteParticipantRequests.end())
@@ -45,17 +45,17 @@ void BiteHandler::onDemandBiteReply(const Core::FunctionReplyObject &replyObject
     m_demandedBiteParticipantRequests.erase(it);
   }
   else
-    WARNING_LOG() << "Bite request with request id " << replyObject.id() << " was not replied to by the proxy";
+    WARNING_LOG(m_logger) << "Bite request with request id " << replyObject.id() << " was not replied to by the proxy";
 }
 
 void BiteHandler::onCallBiteRequest(const rti::core::SampleIdentity &cookie,
                                     const CallBiteRequest &request)
 {
-  DEBUG_LOG() << "onCallBiteRequest: " << request;
+  DEBUG_LOG(m_logger) << "onCallBiteRequest: " << request;
   auto ret = callBiteRequest(cookie, request);
   if (ret.error() || ret.id())
   {
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
     m_mainHandler->fts()->callBiteReply(cookie, ret);
   }
   // delayed answer in non-error case
@@ -75,7 +75,7 @@ Core::FunctionReplyObject BiteHandler::callBiteRequest(const rti::core::SampleId
   {
     if (m_demandedBiteParticipants.contains(participantId))
     {
-      DEBUG_LOG() << "demandBiteRequest for participant Id "
+      DEBUG_LOG(m_logger) << "demandBiteRequest for participant Id "
                           << participantId
                           << " already triggered - reply is still to be done";
       bAlreadyDemandedFound = true;
@@ -85,12 +85,12 @@ Core::FunctionReplyObject BiteHandler::callBiteRequest(const rti::core::SampleId
     const ParticipantHandling::Participant *participant = m_mainHandler->participantHandler()->participantById(participantId);
     if (participant == nullptr)
     {
-      WARNING_LOG() << "Got BITE request for non existing participant id " << participantId;
+      WARNING_LOG(m_logger) << "Got BITE request for non existing participant id " << participantId;
       continue;
     }
     if (participant->equipmentNumber() == 0)
     {
-      WARNING_LOG() << "Got BITE request participant id " << participantId << " but has no equipment number set";
+      WARNING_LOG(m_logger) << "Got BITE request participant id " << participantId << " but has no equipment number set";
       continue;
     }
     bOneFound = true;
@@ -134,7 +134,7 @@ Core::FunctionReplyObject BiteHandler::callBiteRequest(const rti::core::SampleId
 
 void BiteHandler::onBiteRequestTimeout(int requestId)
 {
-  INFO_LOG() << "onBiteRequestTimeout for " << requestId;
+  INFO_LOG(m_logger) << "onBiteRequestTimeout for " << requestId;
 
   onDemandBiteReply(Core::FunctionReplyObject(requestId, tr_lts("dds", "Timeout while waiting for the proxy")));
 }
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 b0569ca86..581b4add3 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
@@ -26,13 +26,13 @@ bool ParticipantManagement::EquipmentEventHandling::EquipmentEventHandler::init(
 {
   if (!m_mainHandler->tabDtc()->enableEquipmentEvent())
   {
-    ERROR_LOG() << " TAB Dtc enableEquipmentEvent() failed !";
+    ERROR_LOG(m_logger) << " TAB Dtc enableEquipmentEvent() failed !";
     return false;
   }
 
   if (!m_mainHandler->dts()->enableEquipmentSystemEventFtcReply())
   {
-    ERROR_LOG() << " Dts enableEquipmentSystemEventDataFtcReply() failed !";
+    ERROR_LOG(m_logger) << " Dts enableEquipmentSystemEventDataFtcReply() failed !";
     return false;
   }
   connect(m_mainHandler->tabDtc().get(), &TrainingAreaBase::Interface::Dtc::equipmentEventChanged, this, &EquipmentEventHandler::onEquipmentEventChanged);
@@ -43,7 +43,7 @@ bool ParticipantManagement::EquipmentEventHandling::EquipmentEventHandler::init(
 void ParticipantManagement::EquipmentEventHandling::EquipmentEventHandler::onEquipmentSystemEventDataRequest(const rti::core::SampleIdentity &cookie,
                                                                                                              const ParticipantManagement::EquipmentSystemEventDataRequest &request)
 {
-  INFO_LOG() << "IN onEquipmentSystemEventDataRequest";
+  INFO_LOG(m_logger) << "IN onEquipmentSystemEventDataRequest";
 
   Core::FunctionReplyObject ret;
 
@@ -58,13 +58,13 @@ void ParticipantManagement::EquipmentEventHandling::EquipmentEventHandler::onEqu
   if (request.deviceSpecificEventCode() > -1)
     stmt += QStringLiteral(" AND device_specific_event_code=") + QString::number(request.deviceSpecificEventCode());
 
-  INFO_LOG() << "stmt: " << stmt;
+  INFO_LOG(m_logger) << "stmt: " << stmt;
 
   NSqlQuery q(m_mainHandler->db()->database());
   if (!q.exec(stmt))
   {
-    ERROR_LOG() << "Error while selecting event-data ";
-    ERROR_LOG() << "stmt : " << stmt;
+    ERROR_LOG(m_logger) << "Error while selecting event-data ";
+    ERROR_LOG(m_logger) << "stmt : " << stmt;
     ret.setStr("Error while selecting data");
     m_mainHandler->fts()->equipmentSystemEventDataReply(cookie, ret);
     return;
@@ -132,7 +132,7 @@ void ParticipantManagement::EquipmentEventHandling::EquipmentEventHandler::onEqu
 
   if (!m_mainHandler->dts()->publish(event))
   {
-    ERROR_LOG() << "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/ModuleTests/ppm_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ModuleTests/ppm_tests.cpp
index 8a57fd9fb..7eacc5195 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ModuleTests/ppm_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ModuleTests/ppm_tests.cpp
@@ -37,7 +37,7 @@ ParticipantManagement::PpmTests::~PpmTests()
 //--------------------------------------------------------------------------------
 void ParticipantManagement::PpmTests::startTest()
 {
-  INFO_LOG() << "********* startTest **************";
+  INFO_LOG(m_logger) << "********* startTest **************";
   switch (m_testId)
   {
   case 1:
@@ -83,14 +83,14 @@ void ParticipantManagement::PpmTests::startTest()
     failExit();
     break;
   }
-  INFO_LOG() << "*********  endTest  **************";
+  INFO_LOG(m_logger) << "*********  endTest  **************";
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
 
 //--------------------------------------------------------------------------------
 bool ParticipantManagement::PpmTests::init(int domainId, int exerciseId, int testId, int partyId, int typeId, int equipmentId, int participantId)
 {
-  INFO_LOG() << "init begin";
+  INFO_LOG(m_logger) << "init begin";
 
   m_testId = testId;
   m_partyId = partyId;
@@ -107,22 +107,22 @@ bool ParticipantManagement::PpmTests::init(int domainId, int exerciseId, int tes
     return false;
   m_ddsConnector->initPublisherSubscriber();
 
-  DEBUG_LOG() << "create DTC PPM";
+  DEBUG_LOG(m_logger) << "create DTC PPM";
   m_dtc = ParticipantManagement::Interface::Dtc::create(m_ddsConnector);
-  DEBUG_LOG() << "init DTC PPM";
+  DEBUG_LOG(m_logger) << "init DTC PPM";
   bool bRet = m_dtc->enableAll();
 
-  DEBUG_LOG() << "create FTC PPM";
+  DEBUG_LOG(m_logger) << "create FTC PPM";
   m_ftc = ParticipantManagement::Interface::Ftc::create(m_ddsConnector);
-  DEBUG_LOG() << "init FTC PPM";
+  DEBUG_LOG(m_logger) << "init FTC PPM";
   bRet &= m_ftc->enableAll();
-  DEBUG_LOG() << "init end PPM - bRet = " << bRet;
+  DEBUG_LOG(m_logger) << "init end PPM - bRet = " << bRet;
 
-  DEBUG_LOG() << "Domain Id = " << domainId;
-  DEBUG_LOG() << "Test Id = " << testId;
-  DEBUG_LOG() << "Party Id = " << partyId;
-  DEBUG_LOG() << "Type Id = " << typeId;
-  DEBUG_LOG() << "Equipment Id = " << equipmentId;
+  DEBUG_LOG(m_logger) << "Domain Id = " << domainId;
+  DEBUG_LOG(m_logger) << "Test Id = " << testId;
+  DEBUG_LOG(m_logger) << "Party Id = " << partyId;
+  DEBUG_LOG(m_logger) << "Type Id = " << typeId;
+  DEBUG_LOG(m_logger) << "Equipment Id = " << equipmentId;
 
   return bRet;
 }
@@ -130,7 +130,7 @@ bool ParticipantManagement::PpmTests::init(int domainId, int exerciseId, int tes
 //--------------------------------------------------------------------------------
 void ParticipantManagement::PpmTests::tryCreateTemplate()
 {
-  INFO_LOG() << "Trying to send Create Template";
+  INFO_LOG(m_logger) << "Trying to send Create Template";
 
   std::vector<ParticipantManagement::TemplateData> data;
 
@@ -148,13 +148,13 @@ void ParticipantManagement::PpmTests::tryCreateTemplate()
   m_dtc->waitForHistoricalDataTemplateParticipant();
   ParticipantManagement::TemplateParticipant tp = m_dtc->templateParticipant(1);
   const ParticipantManagement::TemplateData tdSup(m_dtc->convertFromParticipantTemplateToTemplateData(tp));
-  DEBUG_LOG() << "SuperiorModId: " << tdSup.modId();
+  DEBUG_LOG(m_logger) << "SuperiorModId: " << tdSup.modId();
 
   data.push_back(tdSup);
 
   if (!m_ftc->modifyTemplateDataRequest(ModifyTemplateDataRequest(data),this))
   {
-    ERROR_LOG() << "Error creating template data";
+    ERROR_LOG(m_logger) << "Error creating template data";
     failExit();
   }
   QTest::qWait(1000);
@@ -164,7 +164,7 @@ void ParticipantManagement::PpmTests::tryCreateTemplate()
 //--------------------------------------------------------------------------------
 void ParticipantManagement::PpmTests::tryCreateParticipant()
 {
-  INFO_LOG() << "Trying to send Create ParticipantData per ModifyParticipantData";
+  INFO_LOG(m_logger) << "Trying to send Create ParticipantData per ModifyParticipantData";
 
   ParticipantManagement::ParticipantData ptd;
   ptd.modId(1);
@@ -182,7 +182,7 @@ void ParticipantManagement::PpmTests::tryCreateParticipant()
 
   if (!m_ftc->modifyParticipantDataRequest(req,this))
   {
-    ERROR_LOG() << "Error creating participant data";
+    ERROR_LOG(m_logger) << "Error creating participant data";
     failExit();
   }
   QTest::qWait(1000);
@@ -192,7 +192,7 @@ void ParticipantManagement::PpmTests::tryCreateParticipant()
 //--------------------------------------------------------------------------------
 void ParticipantManagement::PpmTests::tryUpdateInfoParticipant()
 {
-  INFO_LOG() << "Trying to send update info per registerForParticantRequest";
+  INFO_LOG(m_logger) << "Trying to send update info per registerForParticantRequest";
 
   ParticipantManagement::RegisterParticipantRequest rpr;
   rpr.participantId(m_participantId);
@@ -203,7 +203,7 @@ void ParticipantManagement::PpmTests::tryUpdateInfoParticipant()
 
   if (!m_ftc->registerParticipantRequest(rpr,this))
   {
-    ERROR_LOG() << "Error updating info/identification for participant";
+    ERROR_LOG(m_logger) << "Error updating info/identification for participant";
     failExit();
   }
   QTest::qWait(1000);
@@ -212,7 +212,7 @@ void ParticipantManagement::PpmTests::tryUpdateInfoParticipant()
 //--------------------------------------------------------------------------------
 void ParticipantManagement::PpmTests::tryRegisterParticipant()
 {
-  INFO_LOG() << "Trying to send registerForParticantRequest";
+  INFO_LOG(m_logger) << "Trying to send registerForParticantRequest";
 
   ParticipantManagement::RegisterParticipantRequest rpr;
   rpr.participantId(m_participantId);
@@ -223,7 +223,7 @@ void ParticipantManagement::PpmTests::tryRegisterParticipant()
 
   if (!m_ftc->registerParticipantRequest(rpr,this))
   {
-    ERROR_LOG() << "Error updating info/identification for participant";
+    ERROR_LOG(m_logger) << "Error updating info/identification for participant";
     failExit();
   }
   QTest::qWait(1000);
@@ -232,7 +232,7 @@ void ParticipantManagement::PpmTests::tryRegisterParticipant()
 //--------------------------------------------------------------------------------
 void ParticipantManagement::PpmTests::tryCreateParty()
 {
-  INFO_LOG() << "Trying to Create Party per ModifyPartyData";
+  INFO_LOG(m_logger) << "Trying to Create Party per ModifyPartyData";
 
   ParticipantManagement::Party party;
 
@@ -251,7 +251,7 @@ void ParticipantManagement::PpmTests::tryCreateParty()
 
   if (!m_ftc->modifyPartyDataRequest(req, this))
   {
-    ERROR_LOG() << "Error creating party data";
+    ERROR_LOG(m_logger) << "Error creating party data";
     failExit();
   }
 
@@ -269,7 +269,7 @@ void ParticipantManagement::PpmTests::tryCreateParty()
 
   if (!m_ftc->modifyPartyDataRequest(req, this))
   {
-    ERROR_LOG() << "Error creating party data";
+    ERROR_LOG(m_logger) << "Error creating party data";
     failExit();
   }
 
@@ -287,7 +287,7 @@ void ParticipantManagement::PpmTests::tryCreateParty()
 
   if (!m_ftc->modifyPartyDataRequest(req, this))
   {
-    ERROR_LOG() << "Error creating party data";
+    ERROR_LOG(m_logger) << "Error creating party data";
     failExit();
   }
 
@@ -305,7 +305,7 @@ void ParticipantManagement::PpmTests::tryCreateParty()
 
   if (!m_ftc->modifyPartyDataRequest(req, this))
   {
-    ERROR_LOG() << "Error creating party data";
+    ERROR_LOG(m_logger) << "Error creating party data";
     failExit();
   }
 
@@ -316,7 +316,7 @@ void ParticipantManagement::PpmTests::tryCreateParty()
 //--------------------------------------------------------------------------------
 void ParticipantManagement::PpmTests::tryModifyParty()
 {
-  INFO_LOG() << "Trying to send Modify PartyData per ModifyPartyData";
+  INFO_LOG(m_logger) << "Trying to send Modify PartyData per ModifyPartyData";
 
   ParticipantManagement::Party party;
 
@@ -324,7 +324,7 @@ void ParticipantManagement::PpmTests::tryModifyParty()
   party = m_dtc->party(m_partyId);
   if (party.id() < 0)
   {
-    ERROR_LOG() << "Party not found: id = " << m_partyId;
+    ERROR_LOG(m_logger) << "Party not found: id = " << m_partyId;
     failExit();
   }
 
@@ -338,7 +338,7 @@ void ParticipantManagement::PpmTests::tryModifyParty()
 
   if (!m_ftc->modifyPartyDataRequest(req, this))
   {
-    ERROR_LOG() << "Error modifying party data";
+    ERROR_LOG(m_logger) << "Error modifying party data";
     failExit();
   }
 
@@ -348,7 +348,7 @@ void ParticipantManagement::PpmTests::tryModifyParty()
 //--------------------------------------------------------------------------------
 void ParticipantManagement::PpmTests::tryRemoveParty()
 {
-  INFO_LOG() << "Trying to send RemoveParty";
+  INFO_LOG(m_logger) << "Trying to send RemoveParty";
 
   ParticipantManagement::Party party;
 
@@ -356,7 +356,7 @@ void ParticipantManagement::PpmTests::tryRemoveParty()
   party = m_dtc->party(m_partyId);
   if (party.id() < 0)
   {
-    ERROR_LOG() << "Party not found: id = " << m_partyId;
+    ERROR_LOG(m_logger) << "Party not found: id = " << m_partyId;
     failExit();
   }
 
@@ -367,12 +367,12 @@ void ParticipantManagement::PpmTests::tryRemoveParty()
   {
     if (party.isUsedBy())
     {
-      INFO_LOG() << "Not possible to delete used party!" ;
+      INFO_LOG(m_logger) << "Not possible to delete used party!" ;
       successExit();
     }
     else
     {
-      ERROR_LOG() << "Failed to delete not used party with id " << m_partyId;
+      ERROR_LOG(m_logger) << "Failed to delete not used party with id " << m_partyId;
       failExit();
     }
   }
@@ -383,14 +383,14 @@ void ParticipantManagement::PpmTests::tryRemoveParty()
 //--------------------------------------------------------------------------------
 void ParticipantManagement::PpmTests::trySyncParties()
 {
-  INFO_LOG() << "Trying to sync parties with Ex 0";
+  INFO_LOG(m_logger) << "Trying to sync parties with Ex 0";
 
   SyncPartiesRequest req;
   req.exerciseId(42);
 
   if (!m_ftc->syncPartiesRequest(req, this))
   {
-    ERROR_LOG() << "Error sync parties";
+    ERROR_LOG(m_logger) << "Error sync parties";
     failExit();
   }
 
@@ -400,7 +400,7 @@ void ParticipantManagement::PpmTests::trySyncParties()
 //--------------------------------------------------------------------------------
 void ParticipantManagement::PpmTests::tryChangeUsed()
 {
-  INFO_LOG() << "Trying to send change used";
+  INFO_LOG(m_logger) << "Trying to send change used";
 
   ParticipantManagement::Party party;
 
@@ -408,7 +408,7 @@ void ParticipantManagement::PpmTests::tryChangeUsed()
   party = m_dtc->party(m_partyId);
   if (party.id() < 0)
   {
-    ERROR_LOG() << "Party not found: id = " << m_partyId;
+    ERROR_LOG(m_logger) << "Party not found: id = " << m_partyId;
     failExit();
   }
 
@@ -418,7 +418,7 @@ void ParticipantManagement::PpmTests::tryChangeUsed()
 
   if (!m_ftc->changePartyUsedStateRequest(req, this))
   {
-    ERROR_LOG() << "Error modifying used party";
+    ERROR_LOG(m_logger) << "Error modifying used party";
     failExit();
   }
 
@@ -429,7 +429,7 @@ void ParticipantManagement::PpmTests::tryChangeUsed()
 //--------------------------------------------------------------------------------
 void ParticipantManagement::PpmTests::tryCreateEquipmentType()
 {
-  INFO_LOG() << "Trying to send Create EquipmentType per ModifyEquipmentTypeDataRequest";
+  INFO_LOG(m_logger) << "Trying to send Create EquipmentType per ModifyEquipmentTypeDataRequest";
 
   ParticipantManagement::EquipmentType etd;
   etd.id(1);
@@ -446,7 +446,7 @@ void ParticipantManagement::PpmTests::tryCreateEquipmentType()
 
   if (!m_ftc->modifyEquipmentTypeDataRequest(ModifyEquipmentTypeDataRequest(data, false),this))
   {
-    ERROR_LOG() << "Error creating equipment type data";
+    ERROR_LOG(m_logger) << "Error creating equipment type data";
     failExit();
   }
   QTest::qWait(1000);
@@ -456,7 +456,7 @@ void ParticipantManagement::PpmTests::tryCreateEquipmentType()
 //--------------------------------------------------------------------------------
 void ParticipantManagement::PpmTests::tryCreateType()
 {
-  INFO_LOG() << "Trying to send CreateTypeRequest";
+  INFO_LOG(m_logger) << "Trying to send CreateTypeRequest";
 
   if (!m_ftc->modifyTypeRequest(Type(0,
                                      ParticipantManagement::TypeClass::SupportEntity,
@@ -469,7 +469,7 @@ void ParticipantManagement::PpmTests::tryCreateType()
   {}, std::string()),
                                 this))
   {
-    ERROR_LOG() << "Error creating type data";
+    ERROR_LOG(m_logger) << "Error creating type data";
     failExit();
   }
 
@@ -479,7 +479,7 @@ void ParticipantManagement::PpmTests::tryCreateType()
 //--------------------------------------------------------------------------------
 void ParticipantManagement::PpmTests::tryModifyType()
 {
-  INFO_LOG() << "Trying to send ModifyTypeRequest";
+  INFO_LOG(m_logger) << "Trying to send ModifyTypeRequest";
 
   if (!m_ftc->modifyTypeRequest(Type(m_typeId,
                                      ParticipantManagement::TypeClass::SupportEntity,
@@ -492,7 +492,7 @@ void ParticipantManagement::PpmTests::tryModifyType()
                                      {}, std::string()),
                                 this))
   {
-    ERROR_LOG() << "Error modifying type data";
+    ERROR_LOG(m_logger) << "Error modifying type data";
     failExit();
   }
   QTest::qWait(1000);
@@ -501,11 +501,11 @@ void ParticipantManagement::PpmTests::tryModifyType()
 //--------------------------------------------------------------------------------
 void ParticipantManagement::PpmTests::tryRemoveType()
 {
-  INFO_LOG() << "Trying to send RemoveTypeRequest";
+  INFO_LOG(m_logger) << "Trying to send RemoveTypeRequest";
 
   if (!m_ftc->removeTypeRequest(RemoveTypeRequest(m_typeId), this))
   {
-    ERROR_LOG() << "Error modifying type data";
+    ERROR_LOG(m_logger) << "Error modifying type data";
     failExit();
   }
   QTest::qWait(1000);
@@ -515,7 +515,7 @@ void ParticipantManagement::PpmTests::tryRemoveType()
 // ------------------------------------------------------------------------------
 void ParticipantManagement::PpmTests::onError(const QString &reason)
 {
-  ERROR_LOG() << "Got Reply error: " << reason;
+  ERROR_LOG(m_logger) << "Got Reply error: " << reason;
   failExit();
 }
 
@@ -527,7 +527,7 @@ void ParticipantManagement::PpmTests::onCreateReply(const Core::FunctionReplyObj
     onError(replyObject.translated());
     return;
   }
-  INFO_LOG() << "Got createReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got createReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
@@ -540,7 +540,7 @@ void ParticipantManagement::PpmTests::onModifyReply(const Core::FunctionReplyObj
     onError(replyObject.translated());
     return;
   }
-  INFO_LOG() << "Got modifyRequest with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got modifyRequest with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
@@ -553,7 +553,7 @@ void ParticipantManagement::PpmTests::onRemoveReply(const Core::FunctionReplyObj
     onError(replyObject.translated());
     return;
   }
-  INFO_LOG() << "Got removeReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
@@ -566,7 +566,7 @@ void ParticipantManagement::PpmTests::onSyncPartiesReply(const Core::FunctionRep
     onError(replyObject.translated());
     return;
   }
-  INFO_LOG() << "Got syncParties with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got syncParties with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
@@ -585,22 +585,22 @@ void ParticipantManagement::PpmTests::onRemovePartyReply(const Core::FunctionRep
     onError(replyObject.translated());
     return;
   }
-  INFO_LOG() << "Got removeReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
 
 void ParticipantManagement::PpmTests::onRegisterParticipantReply(const RegisterReply &reply)
 {
-  ERROR_LOG() << "onRegisterParticipantReply " << reply.errorString() << "exerciseId: " << reply.exerciseId();
+  ERROR_LOG(m_logger) << "onRegisterParticipantReply " << reply.errorString() << "exerciseId: " << reply.exerciseId();
   for ( std::string str : reply.errorParams())
-     ERROR_LOG() << "error params: " << str;
+     ERROR_LOG(m_logger) << "error params: " << str;
 }
 
 // ------------------------------------------------------------------------------
 void ParticipantManagement::PpmTests::failExit()
 {
-  ERROR_LOG() << "FAIL EXIT !";
+  ERROR_LOG(m_logger) << "FAIL EXIT !";
   m_bTestsSuccessful = false;
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
@@ -608,7 +608,7 @@ void ParticipantManagement::PpmTests::failExit()
 // ------------------------------------------------------------------------------
 void ParticipantManagement::PpmTests::successExit()
 {
-  INFO_LOG() << "SUCCESS EXIT !";
+  INFO_LOG(m_logger) << "SUCCESS EXIT !";
   m_bTestsSuccessful = true;
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
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 1fb6b7afb..d6510b968 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
@@ -29,7 +29,7 @@ GetParticipants::~GetParticipants()
 void GetParticipants::onGetParticipantsRequest(const rti::core::SampleIdentity &cookie,
                                                const GetParticipantsRequest &request)
 {
-  DEBUG_LOG() << "onGetParticipantsRequest" << request;
+  DEBUG_LOG(m_logger) << "onGetParticipantsRequest" << request;
 
 
   // Initialize RecordReplay to get initial participants
@@ -54,7 +54,7 @@ void GetParticipants::onGetParticipantsRequest(const rti::core::SampleIdentity &
       participants[p.id()] = std::move(p);
   }
 
-  DEBUG_LOG() << "Starting to read participant from record replay. Size: "
+  DEBUG_LOG(m_logger) << "Starting to read participant from record replay. Size: "
                       << participants.size();
 
   GetParticipantsReply reply;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/get_participants.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/get_participants.h
index 1c5f2961d..0c1d627aa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/get_participants.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/get_participants.h
@@ -21,10 +21,12 @@ public:
   ~GetParticipants();
 
 private:
+  NGL::INGLLogger &m_logger;
   void onGetParticipantsRequest(const rti::core::SampleIdentity &cookie,
                                 const GetParticipantsRequest &request) override;
 
 private:
+  NGL::INGLLogger &m_logger;
   MainHandler     *m_mainHandler;
 };
 }
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 2b95448ba..b11c3dde2 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
@@ -124,7 +124,7 @@ bool Participant::setPosition(const TrainingAreaBase::EquipmentPosition &newPosi
 
       if (!mountedParticipant)
       {
-        WARNING_LOG() << "Mounted Participant with equipNo " << mountedEqId << " not found - ignoring";
+        WARNING_LOG(m_logger) << "Mounted Participant with equipNo " << mountedEqId << " not found - ignoring";
         continue;
       }
 
@@ -133,7 +133,7 @@ bool Participant::setPosition(const TrainingAreaBase::EquipmentPosition &newPosi
       mountedParticipant->publishPosition();
 
       newMountedParticipantIds.push_back(mountedParticipant->id());
-      INFO_LOG() << "Mounting Participant with id: " << mountedParticipant->id() << " to id: " << id();
+      INFO_LOG(m_logger) << "Mounting Participant with id: " << mountedParticipant->id() << " to id: " << id();
     }
 
     // unmount current mounted participants that are not in the list anymore
@@ -164,7 +164,7 @@ bool Participant::setPosition(const ParticipantPosition &newPosition, bool bForc
 {
   if (!bForce && !isValidPosition(newPosition.sampleTime(), newPosition.pos(), newPosition.reportingSource()))
   {
-    WARNING_LOG() << "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();
     return false;
@@ -188,7 +188,7 @@ bool Participant::setPosition(const TrainingAreaBase::EquipmentPosition &newPosi
 {
   if (mountedToId == id())
   {
-    WARNING_LOG() << "Trying to mount to ourself: " << id();
+    WARNING_LOG(m_logger) << "Trying to mount to ourself: " << id();
     return false;
   }
   TrainingAreaBase::EquipmentPosition mountedPosition = newPosition;
@@ -213,7 +213,7 @@ void Participant::unmountParticipantById(const TrainingAreaBase::EquipmentPositi
   Participant *unmountedParticipant = particpantHandler()->participantById(id);
   unmountedParticipant->setPosition(newPosition, 0);
   unmountedParticipant->publishPosition();
-  INFO_LOG() << "Unmounting Participant with ID: " << unmountedParticipant->id() << "from ID: " << this->id();
+  INFO_LOG(m_logger) << "Unmounting Participant with ID: " << unmountedParticipant->id() << "from ID: " << this->id();
 
 }
 
@@ -259,7 +259,7 @@ bool Participant::setState(const TrainingAreaBase::EquipmentState &newState, int
       if (bits.test(i))
       {
         mainVulState = static_cast<ProjectDataManagement::VulnerabilityState_def::type>(i);
-        //WARNING_LOG() << "mainVulState was manipulated into: " << i;
+        //WARNING_LOG(m_logger) << "mainVulState was manipulated into: " << i;
         break;
       }
     }
@@ -267,9 +267,9 @@ bool Participant::setState(const TrainingAreaBase::EquipmentState &newState, int
 
   // if mainVulnState *still* is BC (VBG12), something went wrong on the sender side (TNE?)
   if (mainVulState == ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged)
-    WARNING_LOG() << "Sending a BC (VBG12) if the last vuln is CR (VBG0) is not allowed! Something went wrong on the sender side (TNE?)";
+    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() << "setState for eqid: " << newState.equipmentNumber()
+  DEBUG_LOG(m_logger) << "setState for eqid: " << newState.equipmentNumber()
                       << "\nvuln was: " << (int)newState.vulnerabilityState().underlying()
                       << "\nvuln now: " << (int)mainVulState.underlying()
                       << "\nbits (DEC): " << newState.vulnerabilityBits()
@@ -283,7 +283,7 @@ bool Participant::setState(const TrainingAreaBase::EquipmentState &newState, int
   {
     const int idx = static_cast<int>(mainVulState.underlying());
     vulnerabilityBits = (1 << idx);
-    WARNING_LOG() << "Missing vulnerabilityBits! bailing by supplementing by adding this vuln state to the bits";
+    WARNING_LOG(m_logger) << "Missing vulnerabilityBits! bailing by supplementing by adding this vuln state to the bits";
   }
 
   // check if it is a (younger) CombatReady state - remove older
@@ -318,7 +318,7 @@ bool Participant::setState(const TrainingAreaBase::EquipmentState &newState, int
     if (newState.originatorId() > 255)
     {
 
-      WARNING_LOG() << "Participant with EqNo "
+      WARNING_LOG(m_logger) << "Participant with EqNo "
                             << m_participantData.equipmentNumber()
                             << " sent wrong Enum Values (Sanitation Eval / ~ Result): "
                             << newState.originatorId()
@@ -330,12 +330,12 @@ bool Participant::setState(const TrainingAreaBase::EquipmentState &newState, int
 
     if (sanEvaluationVal > 2) // Todo: Check against valid enum values in a better way!
     {
-      WARNING_LOG() << "Cannot cast upper 2 Bits to SanEvaluation! Defaulting to Okay";
+      WARNING_LOG(m_logger) << "Cannot cast upper 2 Bits to SanEvaluation! Defaulting to Okay";
       sanEvaluationVal = 0;
     }
     if (sanResultVal > 4) // Todo: Check against valid enum values in a better way!
     {
-      WARNING_LOG() << "Cannot cast lower 6 Bits to SanResult! Defaulting to Unhandled";
+      WARNING_LOG(m_logger) << "Cannot cast lower 6 Bits to SanResult! Defaulting to Unhandled";
       sanResultVal = 1;
     }
     sanEvaluation = static_cast<SanitationEvaluation::inner_enum>(sanEvaluationVal);
@@ -408,7 +408,7 @@ bool Participant::setSpecialSensorData(const TrainingAreaBase::SpecialSensorData
 
 bool Participant::setGear(const TrainingAreaBase::EquipmentGearAssignment &gearAssignment)
 {
-  DEBUG_LOG() << "Gear Assignment";
+  DEBUG_LOG(m_logger) << "Gear Assignment";
   // outdated?
   if (m_lastGearUsage > gearAssignment.sampleTime())
     return false;
@@ -426,7 +426,7 @@ bool Participant::setGear(const TrainingAreaBase::EquipmentGearAssignment &gearA
   {
     if (gear.gearId() == 0)
     {
-      WARNING_LOG() << "Got a gear assignment but gear id is 0 - old Saab AGDUS? - ignoring";
+      WARNING_LOG(m_logger) << "Got a gear assignment but gear id is 0 - old Saab AGDUS? - ignoring";
       continue;
     }
     newGearIds += gear.gearId();
@@ -444,7 +444,7 @@ bool Participant::setGear(const TrainingAreaBase::EquipmentGearAssignment &gearA
       ++it;
     else
     {
-      DEBUG_LOG() << "Gear Assignment: Removing Designation with gearId: " << it->gearId();
+      DEBUG_LOG(m_logger) << "Gear Assignment: Removing Designation with gearId: " << it->gearId();
       it = m_dynamicData.designations().erase(it);
     }
   }
@@ -649,10 +649,10 @@ bool Participant::setGearCharge(const GearInformation &gearInfo)
       if (bAdjustTurretInfo)
       {
         int substr = m_dynamicData.gear()[index_wanne].remain();
-        INFO_LOG() << "Adjust Turret - substracting index wanne " << substr;
+        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() << "Turret remain " << gi.remain();
+        INFO_LOG(m_logger) << "Turret remain " << gi.remain();
         gi.gearId(2);
       }
       if (gearInfo.chargeCounting())
@@ -705,7 +705,7 @@ bool Participant::isNewAssignStateValid(const ParticipantAssignState &newAssignS
   case ParticipantAssignState::NotAssigned:
     if (equipmentNumber)
     {
-      WARNING_LOG() << "Not assigned, but equipmentnumber is set";
+      WARNING_LOG(m_logger) << "Not assigned, but equipmentnumber is set";
       return false;
     }
     break;
@@ -715,7 +715,7 @@ bool Participant::isNewAssignStateValid(const ParticipantAssignState &newAssignS
       // equipment number changed -> allow
       if (oldAssignState == ParticipantAssignState::AssignedWms && equipmentNumber != 0)
         return true;
-      WARNING_LOG() << "Now assigned from WMS, but no equipmentnumber or old assign state != NotAssigned: "
+      WARNING_LOG(m_logger) << "Now assigned from WMS, but no equipmentnumber or old assign state != NotAssigned: "
                             << equipmentNumber << ", " << newAssignState << ", " << oldAssignState;
       return false;
     }
@@ -730,7 +730,7 @@ bool Participant::isNewAssignStateValid(const ParticipantAssignState &newAssignS
       // equipment number changed -> allow
       if (oldAssignState == ParticipantAssignState::HandoutWms && equipmentNumber != 0)
         return true;
-      WARNING_LOG() << "Now assigned from WMS (handout), but no equipmentnumber or old assign state != NotAssigned/AssignedWms: "
+      WARNING_LOG(m_logger) << "Now assigned from WMS (handout), but no equipmentnumber or old assign state != NotAssigned/AssignedWms: "
                             << equipmentNumber << ", " << newAssignState << ", " << oldAssignState;
       return false;
     }
@@ -747,7 +747,7 @@ bool Participant::isNewAssignStateValid(const ParticipantAssignState &newAssignS
       // Assign state HandoutExcon + equipmentNumber = 0 -> reserved participant for EXCON in WH (WH must not touch it)
       if (equipmentNumber == 0)
         return true;
-      WARNING_LOG() << "Now assigned from EXCON, but no equipmentnumber or old assign state != NotAssigned: "
+      WARNING_LOG(m_logger) << "Now assigned from EXCON, but no equipmentnumber or old assign state != NotAssigned: "
                             << equipmentNumber << ", " << newAssignState << ", " << oldAssignState;
       return false;
     }
@@ -762,7 +762,7 @@ bool Participant::isNewAssignStateValid(const ParticipantAssignState &newAssignS
         oldAssignState != ParticipantAssignState::HandoutWms &&
         equipmentNumber != 0)
     {
-      WARNING_LOG() << "Now assigned from ExconWmsOverruled, old assign state != AssignedWms or != HandoutWms or equipment number is set: "
+      WARNING_LOG(m_logger) << "Now assigned from ExconWmsOverruled, old assign state != AssignedWms or != HandoutWms or equipment number is set: "
                             << equipmentNumber << ", " << newAssignState << ", " << oldAssignState;
       return false;
     }
@@ -789,7 +789,7 @@ bool Participant::hasToBeChanged(const ParticipantManagement::Participant &data)
 
 bool Participant::hasToBeChanged(const ParticipantManagement::ParticipantBase &data)
 {
-  DEBUG_LOG() << "hasToBeChanged: " << data;
+  DEBUG_LOG(m_logger) << "hasToBeChanged: " << data;
   ParticipantManagement::ParticipantBase &curData = m_participantData;
   bool hasChanges = (curData != data);
 
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 86c33ab41..51213c651 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
@@ -62,7 +62,7 @@ bool ParticipantHandler::init()
 
   if (!m_webSocketHandler->init(Settings::getWebSocketServerPortRange(2)))
   {
-    ERROR_LOG() << "could not init websockethandler";
+    ERROR_LOG(m_logger) << "could not init websockethandler";
     return false;
   }
 
@@ -71,14 +71,14 @@ bool ParticipantHandler::init()
 
 void ParticipantHandler::setEquipmentNumberForParticipant(int oldEqNo, int newEqNo, int participantId)
 {
-  DEBUG_LOG() << "setEquipmentNumberForParticipant, old: " << oldEqNo << ", new: " << newEqNo << ", participant: " << participantId;
+  DEBUG_LOG(m_logger) << "setEquipmentNumberForParticipant, old: " << oldEqNo << ", new: " << newEqNo << ", participant: " << participantId;
   if (oldEqNo > 0)
     m_equipNumber2ParticipantId.remove(oldEqNo);
   if (newEqNo > 0)
   {
     int &val = m_equipNumber2ParticipantId[newEqNo];
     if (val != 0 && val != participantId)
-      WARNING_LOG() << "Another participant (" << val << ") already has the equipment number " << newEqNo << " - overriding it with participant "
+      WARNING_LOG(m_logger) << "Another participant (" << val << ") already has the equipment number " << newEqNo << " - overriding it with participant "
                             << participantId;
     val = participantId;
   }
@@ -89,7 +89,7 @@ Participant *ParticipantHandler::participantById(int32_t participantId) const {
 Participant *ParticipantHandler::participantByEquipmentNumber(int32_t equipmentNumber)
 {
   const int participantId = m_equipNumber2ParticipantId.value(equipmentNumber);
-  DEBUG_LOG() << " >>>>>> [ParticipantHandler] participantByEquipmentNumber  participantId: " << participantId << " | equipNumb: " << equipmentNumber;
+  DEBUG_LOG(m_logger) << " >>>>>> [ParticipantHandler] participantByEquipmentNumber  participantId: " << participantId << " | equipNumb: " << equipmentNumber;
   return participantById(participantId);
 }
 
@@ -97,7 +97,7 @@ void ParticipantHandler::onNewGearEvent(const TrainingAreaBase::EquipmentGearEve
 {
   if (isTelegramInFuture(gearEvent))
   {
-    WARNING_LOG() << "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;
   }
 
@@ -106,7 +106,7 @@ void ParticipantHandler::onNewGearEvent(const TrainingAreaBase::EquipmentGearEve
   Participant *participantToBeChanged = participantByEquipmentNumber(gearEvent.equipmentNumber());
   if (!participantToBeChanged)
   {
-    WARNING_LOG() << "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;
   }
 
@@ -125,7 +125,7 @@ void ParticipantHandler::onNewGearChargeStateFromProxy(const TrainingAreaBase::E
 {
   if (isTelegramInFuture(chargeState))
   {
-    WARNING_LOG() << "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;
   }
 
@@ -134,7 +134,7 @@ void ParticipantHandler::onNewGearChargeStateFromProxy(const TrainingAreaBase::E
 
   if (!participantToBeChanged)
   {
-    WARNING_LOG() << "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;
   }
 
@@ -149,13 +149,13 @@ void ParticipantHandler::onNewGearAssignmentFromProxy(const TrainingAreaBase::Eq
 {
   if (isTelegramInFuture(gearAssignment))
   {
-    WARNING_LOG() << "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());
   if (!participantToBeChanged)
   {
-    WARNING_LOG() << "Got gear assignment for unknown equipment number " << gearAssignment.equipmentNumber();
+    WARNING_LOG(m_logger) << "Got gear assignment for unknown equipment number " << gearAssignment.equipmentNumber();
     return;
   }
 
@@ -167,7 +167,7 @@ void ParticipantHandler::onNewStateFromProxy(const TrainingAreaBase::EquipmentSt
 {
   if (isTelegramInFuture(data))
   {
-    WARNING_LOG() << "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;
   }
 
@@ -185,7 +185,7 @@ void ParticipantHandler::onNewStateFromProxy(const TrainingAreaBase::EquipmentSt
   Participant *participantToBeChanged = participantByEquipmentNumber(data.equipmentNumber());
   if (!participantToBeChanged)
   {
-    WARNING_LOG() << "Got equipment state for unknown equipment number " << data.equipmentNumber();
+    WARNING_LOG(m_logger) << "Got equipment state for unknown equipment number " << data.equipmentNumber();
     return;
   }
 
@@ -242,15 +242,15 @@ void ParticipantHandler::onNewPositionFromProxy(const TrainingAreaBase::Equipmen
 {
   if (isTelegramInFuture(position))
   {
-    WARNING_LOG() << "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)
   {
-    INFO_LOG() << "position is outdated: " << position;
+    INFO_LOG(m_logger) << "position is outdated: " << position;
     return;
   }
-  DEBUG_LOG() << "Got new position from proxy: " << position;
+  DEBUG_LOG(m_logger) << "Got new position from proxy: " << position;
 
   const int equipNo = position.equipmentNumber();
   // negative - treat as participantId
@@ -258,7 +258,7 @@ void ParticipantHandler::onNewPositionFromProxy(const TrainingAreaBase::Equipmen
 
   if (!participantWithNewPosition)
   {
-    WARNING_LOG() << "Got EquipmentPosition " << position << " for unknown equipment number: " << equipNo;
+    WARNING_LOG(m_logger) << "Got EquipmentPosition " << position << " for unknown equipment number: " << equipNo;
     return;
   }
 
@@ -270,14 +270,14 @@ void ParticipantHandler::onNewEquipmentOperationalStateFromProxy(const TrainingA
 {
   if (isTelegramInFuture(operationalState))
   {
-    WARNING_LOG() << "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());
   if (!participantToUpdate)
   {
-    WARNING_LOG() << "Got EquipmentOperationalState for unknown equipment number: " << operationalState;
+    WARNING_LOG(m_logger) << "Got EquipmentOperationalState for unknown equipment number: " << operationalState;
     return;
   }
 
@@ -289,12 +289,12 @@ void ParticipantHandler::onNewBiteFromProxy(const TrainingAreaBase::EquipmentBit
 {
   if (isTelegramInFuture(bite))
   {
-    WARNING_LOG() << "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() << "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;
   }
 
@@ -334,19 +334,19 @@ void ParticipantHandler::onNewParticipantModeReport(const TrainingAreaBase::Part
 {
   if (isTelegramInFuture(report))
   {
-    WARNING_LOG() << "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() << "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());
   if (!participant)
   {
-    ERROR_LOG() << Q_FUNC_INFO << "Could not find participant with equipment number " << report.equipmentNumber();
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << "Could not find participant with equipment number " << report.equipmentNumber();
     return;
   }
 
@@ -375,12 +375,12 @@ void ParticipantHandler::onNewSpecialSensorData(const TrainingAreaBase::SpecialS
 {
   if (isTelegramInFuture(data))
   {
-    WARNING_LOG() << "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() << "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;
   }
 
@@ -388,7 +388,7 @@ void ParticipantHandler::onNewSpecialSensorData(const TrainingAreaBase::SpecialS
 
   if (!participant)
   {
-    ERROR_LOG() << Q_FUNC_INFO << "Could not find participant with equipment number " << data.equipmentNumber();
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << "Could not find participant with equipment number " << data.equipmentNumber();
     return;
   }
 
@@ -409,54 +409,54 @@ void ParticipantHandler::onNewSpecialSensorData(const TrainingAreaBase::SpecialS
 
 void ParticipantHandler::onNewLaserDesignation(const TrainingAreaBase::LaserDesignation &data)
 {
-  DEBUG_LOG() << "New Laser Designation: "
+  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());
 
   if (!participant)
   {
-    ERROR_LOG() << Q_FUNC_INFO << "Could not find participant with equipment number " << data.equipmentNumber();
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << "Could not find participant with equipment number " << data.equipmentNumber();
     return;
   }
 
   DynamicParticipantData dpd = participant->dynamicParticipantData();
 
-  DEBUG_LOG() << "Begin Update Laser Designation: ";
+  DEBUG_LOG(m_logger) << "Begin Update Laser Designation: ";
   updateLaserDesignation(dpd, data);
 
-  DEBUG_LOG() << "End Update Laser Designation: ";
+  DEBUG_LOG(m_logger) << "End Update Laser Designation: ";
 
-  DEBUG_LOG() << "Set DPD and publish ";
+  DEBUG_LOG(m_logger) << "Set DPD and publish ";
   participant->setDynamicData(dpd);
   participant->publishDynamicData();
 }
 
 void ParticipantHandler::onLaserDesignationRemoved(int equipmentNumber, int gearId)
 {
-  DEBUG_LOG() << "On Remove Laser Designation: ";
+  DEBUG_LOG(m_logger) << "On Remove Laser Designation: ";
 
   Participant *participant = participantByEquipmentNumber(equipmentNumber);
 
   if (!participant)
   {
-    ERROR_LOG() << Q_FUNC_INFO << "Could not find participant with equipment number " << equipmentNumber;
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << "Could not find participant with equipment number " << equipmentNumber;
     return;
   }
   DynamicParticipantData dpd = participant->dynamicParticipantData();
 
-  DEBUG_LOG() << "Begin Remove Laser Designation: ";
+  DEBUG_LOG(m_logger) << "Begin Remove Laser Designation: ";
   removeLaserDesignation(dpd, gearId);
-  DEBUG_LOG() << "End Remove Laser Designation: ";
+  DEBUG_LOG(m_logger) << "End Remove Laser Designation: ";
 
-  DEBUG_LOG() << "Set DPD and publish ";
+  DEBUG_LOG(m_logger) << "Set DPD and publish ";
   participant->setDynamicData(dpd);
   participant->publishDynamicData();
 }
 
 void ParticipantHandler::onBuildingHitLineInfo(const Buildings::BuildingHitLineInfo &data)
 {
-  DEBUG_LOG() << "onBuildingHitLineInfo "
+  DEBUG_LOG(m_logger) << "onBuildingHitLineInfo "
                       << "BuildingId=" << data.buildingId() << " originatorParticipantId=" << data.originatorParticipantId();
   auto dtcPdm = m_bdp->pdmDtc();
   // NOTE: igniterTypeId/IgniterFunction = 0 as long as BuildingHitLineInfo does not contain values
@@ -467,36 +467,36 @@ void ParticipantHandler::onBuildingHitLineInfo(const Buildings::BuildingHitLineI
 
   if (!participant)
   {
-    ERROR_LOG() << Q_FUNC_INFO << "Could not find participant with participantId: " << data.originatorParticipantId();
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << "Could not find participant with participantId: " << data.originatorParticipantId();
     return;
   }
 
   DynamicParticipantData dpd = participant->dynamicParticipantData();
 
-  DEBUG_LOG() << "Begin Update Laser Designation: ";
+  DEBUG_LOG(m_logger) << "Begin Update Laser Designation: ";
   updateLaserDesignation(dpd, data);
-  DEBUG_LOG() << "End Update Laser Designation: ";
+  DEBUG_LOG(m_logger) << "End Update Laser Designation: ";
 
-  DEBUG_LOG() << "setDynamicData";
+  DEBUG_LOG(m_logger) << "setDynamicData";
   participant->setDynamicData(dpd);
-  DEBUG_LOG() << "publishDynamicData"
+  DEBUG_LOG(m_logger) << "publishDynamicData"
                       << " dpd.designations().size()=" << dpd.designations().size();
   participant->publishDynamicData();
 }
 
 void ParticipantHandler::onSanitaryMaterialStockReport(const TrainingAreaBase::ParticipantSanitaryMaterialStockReport &data)
 {
-  DEBUG_LOG() << "onSanitaryMaterialStockReport";
+  DEBUG_LOG(m_logger) << "onSanitaryMaterialStockReport";
   Participant *participant = participantByEquipmentNumber(data.equipmentNumber());
   if (!participant)
   {
-    ERROR_LOG() << Q_FUNC_INFO << "Could not find participant with equipment number " << data.equipmentNumber();
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << "Could not find participant with equipment number " << data.equipmentNumber();
     return;
   }
   if (data.qualification() == TrainingAreaBase::Qualification::NotDefined)
   {
-    DEBUG_LOG() << "!!! Clear Materials : equipment number " << data.equipmentNumber();
-    DEBUG_LOG() << "!!! 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(),
@@ -506,8 +506,8 @@ void ParticipantHandler::onSanitaryMaterialStockReport(const TrainingAreaBase::P
   }
   else
   {
-    DEBUG_LOG() << "!!! Set Materials : equipment number " << data.equipmentNumber();
-    DEBUG_LOG() << "!!! Set Materials : sample time " << data.sampleTime();
+    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(),
@@ -524,7 +524,7 @@ void ParticipantHandler::onParticipantSanitation(const TrainingAreaBase::Partici
   Participant *participantOrig = participantByEquipmentNumber(data.originatorEquipmentNumber());
   if (!participant)
   {
-    ERROR_LOG() << Q_FUNC_INFO << "Could not find participant with equipment number " << data.equipmentNumber();
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << "Could not find participant with equipment number " << data.equipmentNumber();
     return;
   }
   int participantOrigId = data.originatorEquipmentNumber();
@@ -533,14 +533,14 @@ void ParticipantHandler::onParticipantSanitation(const TrainingAreaBase::Partici
 
   if (data.qualification() == TrainingAreaBase::Qualification::NotDefined && data.proceduresTaken() == 0)
   {
-    DEBUG_LOG() << "!!! Clear Sanitation = " << data.sampleTime();
-    DEBUG_LOG() << "!!! Clear Sanitation: equipNo = " << data.equipmentNumber();
+    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() << "!!! SetSanitation: sample time = " << data.sampleTime();
-    DEBUG_LOG() << "!!! SetSanitation: equipNo = " << data.equipmentNumber();
+    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();
@@ -555,7 +555,7 @@ void ParticipantHandler::onOperatorAction(const TrainingAreaBase::OperatorAction
   Participant *participant = participantByEquipmentNumber(data.equipmentNumber());
   if (!participant)
   {
-    ERROR_LOG() << Q_FUNC_INFO << "Could not find participant with equipment number " << data.equipmentNumber();
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << "Could not find participant with equipment number " << data.equipmentNumber();
     return;
   }
 
@@ -586,7 +586,7 @@ void ParticipantHandler::onNewFunctionalAreaEntryChanged(const TrainingAreaBase:
 
   if (!participant)
   {
-    ERROR_LOG() << Q_FUNC_INFO << "Could not find participant with equipment number " << data.equipmentNumber();
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << "Could not find participant with equipment number " << data.equipmentNumber();
     return;
   }
 
@@ -640,7 +640,7 @@ void ParticipantHandler::setPosition(const ParticipantManagement::ParticipantPos
 
   if (!participant)
   {
-    ERROR_LOG() << Q_FUNC_INFO << "Could not find participant with id " << data.participantId();
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << "Could not find participant with id " << data.participantId();
     return;
   }
 
@@ -685,14 +685,14 @@ quint16 ParticipantHandler::getWebSocketPort() const { return m_webSocketHandler
 void ParticipantHandler::updateLaserDesignation(DynamicParticipantData &data, const TrainingAreaBase::LaserDesignation &newLaserDesignation)
 {
   LOGGER_T m_logger = getLogger("ParticipantHandler.Laser");
-  DEBUG_LOG() << "-Update Laser Designation - Start ";
+  DEBUG_LOG(m_logger) << "-Update Laser Designation - Start ";
 
   for (LaserDesignation &laserDesignation : data.designations())
   {
     if (laserDesignation.gearId() != newLaserDesignation.gearId())
       continue;
 
-    DEBUG_LOG() << "-Update Laser Designation - Gear with id " << laserDesignation.gearId() << " found in designations";
+    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())
@@ -704,22 +704,22 @@ void ParticipantHandler::updateLaserDesignation(DynamicParticipantData &data, co
       laserDesignation.spotLocation(Core::GeoPosition(0.0, 0.0, 0.0));
 
     laserDesignation.outputPower(newLaserDesignation.outputPower());
-    DEBUG_LOG() << "-Update Laser Designation - Data updated, returning";
+    DEBUG_LOG(m_logger) << "-Update Laser Designation - Data updated, returning";
     return;
   }
 
-  DEBUG_LOG() << "-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...
   {
-    DEBUG_LOG() << "-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() << "-Update Laser Designation - Gear with id " << newLaserDesignation.gearId() << " found in Gears";
-  DEBUG_LOG() << "-Update Laser Designation - Adding new designation";
+  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(),
@@ -731,11 +731,11 @@ void ParticipantHandler::updateLaserDesignation(DynamicParticipantData &dataInOu
   LOGGER_T m_logger = getLogger("ParticipantHandler.Laser");
   // Todo: Die erste vorhandene LaserDesignation wird angepasst. Ein Laser On muss vorher gekommen sein, damit das Element da ist.
   // Mehrere Designatoren pro Teilnehmer werden nicht unterstützt.
-  DEBUG_LOG() << "-Update Laser Designation by Building Hitline Info";
+  DEBUG_LOG(m_logger) << "-Update Laser Designation by Building Hitline Info";
 
   for (LaserDesignation &laserDesignation : dataInOut.designations())
   {
-    DEBUG_LOG() << "-Update Laser Designation by Building Hitline Info - Updating (first) Designation with GearId " << laserDesignation.gearId();
+    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;
@@ -751,9 +751,9 @@ void ParticipantHandler::updateLaserDesignation(DynamicParticipantData &dataInOu
     ld.spotLocation() = newLaserDesignation.buildingPos();
     ld.outputPower(1.0);
     dataInOut.designations().emplace_back(ld);
-    ERROR_LOG() << "-Update Laser Designation by Building Hitline Info - Added Designation";
+    ERROR_LOG(m_logger) << "-Update Laser Designation by Building Hitline Info - Added Designation";
   }
-  ERROR_LOG() << "-Update Laser Designation by Building Hitline Info - No laserDesignation available participantId="
+  ERROR_LOG(m_logger) << "-Update Laser Designation by Building Hitline Info - No laserDesignation available participantId="
                       << newLaserDesignation.originatorParticipantId();
 }
 
@@ -761,17 +761,17 @@ void ParticipantHandler::removeLaserDesignation(DynamicParticipantData &data, qi
 {
   LOGGER_T m_logger = getLogger("ParticipantHandler.Laser");
 
-  DEBUG_LOG() << "-Remove Laser Designation: Start";
+  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);
 
   if (eraseIterator == data.designations().end())
   {
-    DEBUG_LOG() << "-Remove Laser Designation: GearId NOT found";
+    DEBUG_LOG(m_logger) << "-Remove Laser Designation: GearId NOT found";
     return;
   }
 
-  DEBUG_LOG() << "-Remove Laser Designation: Removing Designation";
+  DEBUG_LOG(m_logger) << "-Remove Laser Designation: Removing Designation";
   data.designations().erase(eraseIterator);
 }
 
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 bd8b34fc4..4c0561563 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
@@ -135,6 +135,7 @@ class ParticipantHandler
   quint16 getWebSocketPort() const;
 
   protected:
+  NGL::INGLLogger &m_logger;
   static void updateLaserDesignation(DynamicParticipantData &data, const TrainingAreaBase::LaserDesignation &newLaserDesignation);
   void updateLaserDesignation(DynamicParticipantData &dataInOut, const Buildings::BuildingHitLineInfo &newLaserDesignation);
   static void removeLaserDesignation(DynamicParticipantData &data, qint32 gearId);
@@ -158,6 +159,7 @@ class ParticipantHandler
   virtual bool isSampleTimeInFuture(qint64 sampleTime) const;
 
   protected:
+  NGL::INGLLogger &m_logger;
   std::unique_ptr<UnitPositionCalculator> m_unitPositionCalculator;
   QHash<int, int> m_equipNumber2ParticipantId;
   QHash<int, Participant *> m_participants;
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 c1c43beec..1117e293b 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
@@ -29,7 +29,7 @@ bool ProxyListener::init()
           this, &ProxyListener::onProxyEquipmentBiteChanged);
   if (!m_tabDtc->enableEquipmentBite())
   {
-    ERROR_LOG() << "Could not initialize TraininAreaBase data topic client";
+    ERROR_LOG(m_logger) << "Could not initialize TraininAreaBase data topic client";
     return false;
   }
 
@@ -91,7 +91,7 @@ bool ProxyListener::init()
         !m_tabDtc->enableUASMissionStatus() ||
         !m_bldDtc->enableBuildingHitLineInfo())
     {
-      ERROR_LOG() << "Could not initialize TraininAreaBase data topic client";
+      ERROR_LOG(m_logger) << "Could not initialize TraininAreaBase data topic client";
       return false;
     }
   }
@@ -104,7 +104,7 @@ void ProxyListener::onProxyEquipmentPositionChanged(const TrainingAreaBase::Equi
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG() << "Got new position data from proxy " << data;
+  DEBUG_LOG(m_logger) << "Got new position data from proxy " << data;
 
   emit newPosition(data);
 }
@@ -114,7 +114,7 @@ void ProxyListener::onProxyEquipmentGearAssignmentChanged(const TrainingAreaBase
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG() << "Got new gear assignment from proxy " << data;
+  DEBUG_LOG(m_logger) << "Got new gear assignment from proxy " << data;
 
   emit newGearAssignment(data);
 }
@@ -124,7 +124,7 @@ void ProxyListener::onProxyEquipmentGearEventChanged(const TrainingAreaBase::Equ
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG() << "Got new gear event " << data;
+  DEBUG_LOG(m_logger) << "Got new gear event " << data;
 
   emit newGearEvent(data);
 }
@@ -134,19 +134,19 @@ void ProxyListener::onProxyEquipmentGearChargeStateChanged(const TrainingAreaBas
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG() << "Got new gear charge state " << data;
+  DEBUG_LOG(m_logger) << "Got new gear charge state " << data;
 
   emit newGearChargeState(data);
 }
 
 void ProxyListener::onProxyParticipantSanitaryMaterialStockReportChanged(const TrainingAreaBase::ParticipantSanitaryMaterialStockReport &data, DataModification modType)
 {
-  DEBUG_LOG() << "FUCKING FUCK FUCK" << data;
+  DEBUG_LOG(m_logger) << "FUCKING FUCK FUCK" << data;
 
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG() << "Got new material stock report" << data;
+  DEBUG_LOG(m_logger) << "Got new material stock report" << data;
 
   emit newSanitaryMaterialStockReport(data);
 }
@@ -156,7 +156,7 @@ void ProxyListener::onProxyEquipmentStateChanged(const TrainingAreaBase::Equipme
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG() << "Got new equipment state " << data;
+  DEBUG_LOG(m_logger) << "Got new equipment state " << data;
 
   emit newState(data);
 }
@@ -166,7 +166,7 @@ void ProxyListener::onProxyEquipmentOperationalStateChanged(const TrainingAreaBa
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG() << "Got new equipment operational state " << data;
+  DEBUG_LOG(m_logger) << "Got new equipment operational state " << data;
 
   emit newEquipmentOperationalState(data);
 }
@@ -176,7 +176,7 @@ void ProxyListener::onProxyEquipmentBiteChanged(const TrainingAreaBase::Equipmen
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG() << "Got new equipment bite " << data;
+  DEBUG_LOG(m_logger) << "Got new equipment bite " << data;
 
   emit newEquipmentBite(data);
 }
@@ -186,7 +186,7 @@ void ProxyListener::onProxyCtaDataErrorChanged(const TrainingAreaBase::CtaDataEr
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG() << "Got new Combat Training Area Data error: " << data;
+  DEBUG_LOG(m_logger) << "Got new Combat Training Area Data error: " << data;
 
   emit newCtaDataError(data);
 }
@@ -196,7 +196,7 @@ void ProxyListener::onSpecialSensorDataChanged(const TrainingAreaBase::SpecialSe
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG() << "Got new Special Sensor data: " << data;
+  DEBUG_LOG(m_logger) << "Got new Special Sensor data: " << data;
 
   emit newSpecialSensorData(data);
 }
@@ -206,7 +206,7 @@ void ProxyListener::onFunctionalAreaEntryChanged(const TrainingAreaBase::Functio
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG() << "Got functional area entry: " << data;
+  DEBUG_LOG(m_logger) << "Got functional area entry: " << data;
 
   emit newFunctionalAreaEntryChanged(data);
 }
@@ -215,12 +215,12 @@ void ProxyListener::onLaserDesignationChanged(const TrainingAreaBase::LaserDesig
 {
   if (modType == DataModification::eRemoved)
   {
-    DEBUG_LOG() << "Got no laser designation data: " << data;
+    DEBUG_LOG(m_logger) << "Got no laser designation data: " << data;
     emit laserDesignationRemoved(data.equipmentNumber(), data.gearId());
     return;
   }
 
-  DEBUG_LOG() << "Got laser designation data: " << data;
+  DEBUG_LOG(m_logger) << "Got laser designation data: " << data;
 
   emit newLaserDesignationData(data);
 }
@@ -230,7 +230,7 @@ void ProxyListener::onProxyParticipantSanitationChanged(const TrainingAreaBase::
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG() << "Got new Participant Sanitation" << data;
+  DEBUG_LOG(m_logger) << "Got new Participant Sanitation" << data;
 
   emit newParticipantSanitation(data);
 }
@@ -240,7 +240,7 @@ void ProxyListener::onOperatorActionChanged(const TrainingAreaBase::OperatorActi
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG() << "Got new Operator Action" << data;
+  DEBUG_LOG(m_logger) << "Got new Operator Action" << data;
 
   emit newOperatorAction(data);
 }
@@ -250,7 +250,7 @@ void ProxyListener::onEquipmentEventChanged(const TrainingAreaBase::EquipmentEve
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG() << "Got new Operator Action" << data;
+  DEBUG_LOG(m_logger) << "Got new Operator Action" << data;
 
   emit newEquipmentEvent(data);
 
@@ -275,13 +275,13 @@ void ProxyListener::onUASStatusChanged(const TrainingAreaBase::UASStatus &data,
   UASRadioLinkConnectionStatus newState;
   newState.id(uas.id());
   newState.uasState(data.uasState());
-  DEBUG_LOG() << "Publish new UAS State " << newState;
+  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() << "currentTask = " << (int)data.currentTask().underlying() << ", currentMissionName = " << data.currentMissionName() << ", name of ended mission: " << data.missionEnded();
+  DEBUG_LOG(m_logger) << "currentTask = " << (int)data.currentTask().underlying() << ", 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
@@ -290,14 +290,14 @@ void ProxyListener::onUASMissionStatusChanged(const TrainingAreaBase::UASMission
   */
   if (modType == DataModification::eRemoved)
   {
-    DEBUG_LOG() << "removed - stop";
+    DEBUG_LOG(m_logger) << "removed - stop";
     return;
   }
 
   if (!data.currentMissionName().empty() || data.currentTask().underlying() != ProjectDataManagement::UasActionTask::Loiter || data.missionEnded().empty())
   {
     //DEBUG As this will happen a lot
-    DEBUG_LOG() << "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().underlying()<<") is not Loiter or mission not ended ("<< data.missionEnded() << (data.missionEnded().empty() ? " [NOT ENDED]" : " [  ENDED  ]")<<")";
     return;
   }
 
@@ -305,7 +305,7 @@ void ProxyListener::onUASMissionStatusChanged(const TrainingAreaBase::UASMission
   const int participantId = m_mainHandler->ddsHandler()->dtc()->participantIdByEquipmentNumber(data.equipmentNumber());
   if (participantId <= 0)
   {
-    ERROR_LOG() << "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;
   }
 
@@ -314,11 +314,11 @@ void ProxyListener::onUASMissionStatusChanged(const TrainingAreaBase::UASMission
     // 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())))
     {
-      ERROR_LOG() << "setCurrentMissionActionFulfilled didn't work out";
+      ERROR_LOG(m_logger) << "setCurrentMissionActionFulfilled didn't work out";
       return;
     }
 
-    DEBUG_LOG() << "setCurrentMissionActionFulfilled done !";
+    DEBUG_LOG(m_logger) << "setCurrentMissionActionFulfilled done !";
   });
 }
 
@@ -327,7 +327,7 @@ void ProxyListener::onBuildingHitLineInfoChanged(const Buildings::BuildingHitLin
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG() << "Got new Building Hitline Info" << data;
+  DEBUG_LOG(m_logger) << "Got new Building Hitline Info" << data;
 
   emit newBuildingHitLineInfo(data);
 
@@ -338,7 +338,7 @@ void ProxyListener::onProxyParticipantModeReportChanged(const TrainingAreaBase::
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG() << "Got new Participant Mode Report Training Area Data error " << data;
+  DEBUG_LOG(m_logger) << "Got new Participant Mode Report Training Area Data error " << data;
 
   emit newParticipantModeReport(data);
 }
@@ -353,7 +353,7 @@ Core::FunctionReplyObject ProxyListener::demandVulnerabilityStateChange(const rt
   const int requestId = req.requestId();
   auto cb = [this, requestId]()
   {
-    INFO_LOG() << "VulnerabilityStateChange timeout for " << 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);
@@ -373,14 +373,14 @@ void ProxyListener::onDemandVulnerabilityStateChangeReply(const Core::FunctionRe
 Core::FunctionReplyObject ProxyListener::sendModifyUasStateRequest(const rti::core::SampleIdentity &cookie,
                                                                    const TrainingAreaBase::SendModifyUasStateRequest &req)
 {
-  DEBUG_LOG() << " -- [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();
   auto cb = [this, requestId]()
   {
-    INFO_LOG() << "ModifyUasState timeout for " << 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);
@@ -406,7 +406,7 @@ Core::FunctionReplyObject ProxyListener::demandInitRequest(const rti::core::Samp
   const int requestId = req.requestId();
   auto cb = [this, requestId]()
   {
-    INFO_LOG() << "DemandInit timeout for " << 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);
@@ -433,7 +433,7 @@ Core::FunctionReplyObject ProxyListener::sendEquipmentMessage(const rti::core::S
   const int requestId = req.requestId();
   auto cb = [this, requestId]()
   {
-    INFO_LOG() << "SendMessage timeout for " << 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);
@@ -460,7 +460,7 @@ Core::FunctionReplyObject ProxyListener::sendParticipantModeRequest(const rti::c
   const int requestId = req.requestId();
   auto cb = [this, requestId]()
   {
-    INFO_LOG() << "SendParticipantMode timeout for " << 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);
@@ -484,7 +484,7 @@ Core::FunctionReplyObject ProxyListener::sendSetSanitationRequest(const rti::cor
   const int requestId = req.requestId();
   auto cb = [this, requestId]()
   {
-    INFO_LOG() << "sendSetSanitationRequest timeout for " << 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);
@@ -507,7 +507,7 @@ Core::FunctionReplyObject ProxyListener::selectiveReammunitionRequest(const rti:
   const int requestId = req.requestId();
   auto cb = [this, requestId]()
   {
-    INFO_LOG() << "selectiveReammunitionRequest timeout for " << 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);
@@ -533,7 +533,7 @@ Core::FunctionReplyObject ProxyListener::sendOcCommandRequest(const rti::core::S
   const int requestId = req.requestId();
   auto cb = [this, requestId]()
   {
-    INFO_LOG() << "SendOcCommand timeout for " << 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);
@@ -567,7 +567,7 @@ void ProxyListener::handleReply(const std::function<void(const rti::core::Sample
                                 const char *requestType)
 {
   if (replyObject.error())
-    WARNING_LOG() << requestType << ": " << replyObject();
+    WARNING_LOG(m_logger) << requestType << ": " << replyObject();
 
   auto it = m_trainingAreaRequests.find(replyObject.id());
   if (it != m_trainingAreaRequests.end())
@@ -580,7 +580,7 @@ void ProxyListener::handleReply(const std::function<void(const rti::core::Sample
     m_trainingAreaRequests.erase(it);
   }
   else
-    WARNING_LOG() << requestType << " with request id " << replyObject.id() << " was not replied to by the proxy";
+    WARNING_LOG(m_logger) << requestType << " with request id " << replyObject.id() << " was not replied to by the proxy";
 }
 
 
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 72af593f8..24c088806 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
@@ -21,13 +21,12 @@ namespace ParticipantManagement
 {
 namespace ParticipantHandling
 {
-UnitPositionCalculator::UnitPositionCalculator(ParticipantHandler *participantHandler, QObject *parent)
-  : QObject(parent)
+UnitPositionCalculator::UnitPositionCalculator(ParticipantHandler *participantHandler, QObject *parent) : QObject(parent)
   , m_participantHandler(participantHandler)
   , m_bSomethingChangedSinceLastCalculation(false)
   , m_timer(new QTimer(this))
-  , m_bRunning(true)
-{
+  , m_bRunning(true),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   connect(m_timer, &QTimer::timeout, this, &UnitPositionCalculator::calculate);
   m_timer->setSingleShot(true);
 
@@ -45,7 +44,7 @@ UnitPositionCalculator::~UnitPositionCalculator()
 
 void UnitPositionCalculator::startCalculation()
 {
-  DEBUG_LOG() << "Starting calculation timer";
+  DEBUG_LOG(m_logger) << "Starting calculation timer";
   m_timer->start();
   m_bRunning = true;
 }
@@ -67,7 +66,7 @@ void UnitPositionCalculator::waitForCalculationFinished()
 
 void UnitPositionCalculator::onParticipantDeleted(int participantId)
 {
-  DEBUG_LOG() << "Participant " << participantId << " deleted";
+  DEBUG_LOG(m_logger) << "Participant " << participantId << " deleted";
   auto it = m_participantData.find(participantId);
   if (it == m_participantData.end())
     return;
@@ -76,7 +75,7 @@ void UnitPositionCalculator::onParticipantDeleted(int participantId)
 
 void UnitPositionCalculator::onPositionChanged(int participantId, int64_t positionTime, const Core::GeoPosition &pos)
 {
-  DEBUG_LOG() << "Position for participant " << participantId << " changed to "
+  DEBUG_LOG(m_logger) << "Position for participant " << participantId << " changed to "
                       << pos << " (" << positionTime / 1000 << "s)";
   CalculatedUnitPosition &data = getParticipant(participantId);
   if (data.sampleTimeLeader() >= positionTime)
@@ -91,7 +90,7 @@ void UnitPositionCalculator::onPositionChanged(int participantId, int64_t positi
 
 void UnitPositionCalculator::onSuperiorChanged(int participantId, int superiorId)
 {
-  DEBUG_LOG() << "Superior for participant " << participantId << " changed to " << superiorId;
+  DEBUG_LOG(m_logger) << "Superior for participant " << participantId << " changed to " << superiorId;
   CalculatedUnitPosition &data = getParticipant(participantId);
   data.superiorId = superiorId;
   m_bSomethingChangedSinceLastCalculation = true;
@@ -105,7 +104,7 @@ void UnitPositionCalculator::onInferiorChanged(int participantId, const std::vec
     slIds.reserve(inferiorIds.size());
     for (int id : inferiorIds)
       slIds += QString::number(id);
-    DEBUG_LOG() << "Inferior for participant " << participantId << " changed, size: " << slIds.join(QLatin1Char(' '));
+    DEBUG_LOG(m_logger) << "Inferior for participant " << participantId << " changed, size: " << slIds.join(QLatin1Char(' '));
   }
 
   CalculatedUnitPosition &data = getParticipant(participantId);
@@ -118,7 +117,7 @@ UnitPositionCalculator::CalculatedUnitPosition &UnitPositionCalculator::getParti
   auto it = m_participantData.find(participantId);
   if (it == m_participantData.end())
   {
-    DEBUG_LOG() << "No information for participant " << participantId << " - creating dummy data";
+    DEBUG_LOG(m_logger) << "No information for participant " << participantId << " - creating dummy data";
 
     CalculatedUnitPosition data;
     data.participantId(participantId);
@@ -138,7 +137,7 @@ void UnitPositionCalculator::calculate()
   if (!m_bSomethingChangedSinceLastCalculation)
   {
     if (!s_bDebugOnce)
-      DEBUG_LOG() << "Nothing changed - no calculation needed -> waiting for new data";
+      DEBUG_LOG(m_logger) << "Nothing changed - no calculation needed -> waiting for new data";
     s_bDebugOnce = true;
     m_timer->start(1000);
     return;
@@ -310,7 +309,7 @@ void UnitPositionCalculator::onCalculationDone()
     if (it != m_publishedPositionData.end())
     {
       ParticipantManagement::UnitPosition &up = it->second;
-      DEBUG_LOG() << "old: " << up << ", new: " << pos << ", equal: " << (up == pos);
+      DEBUG_LOG(m_logger) << "old: " << up << ", new: " << pos << ", equal: " << (up == pos);
       if (up == pos)
         continue;
       // nan == nan is always false, have to check it on our own
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/unit_position_calculator.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/unit_position_calculator.h
index e6e6a07aa..9882ae1f7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/unit_position_calculator.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/unit_position_calculator.h
@@ -36,6 +36,7 @@ public:
   void onInferiorChanged(int participantId, const std::vector<int> &inferiorIds);
 
 private:
+  NGL::INGLLogger &m_logger;
   struct CalculatedUnitPosition : public ParticipantManagement::UnitPosition
   {
     int superiorId = 0;
@@ -43,6 +44,7 @@ private:
   };
 
 private:
+  NGL::INGLLogger &m_logger;
   CalculatedUnitPosition &getParticipant(int participantId);
   void calculate();
   // no const ref - must be a copy since this is running in a different thread
@@ -61,6 +63,7 @@ private Q_SLOTS:
   void onCalculationDone();
 
 private:
+  NGL::INGLLogger &m_logger;
   std::unordered_map<int, CalculatedUnitPosition> m_participantData;
   std::unordered_map<int, CalculatedUnitPosition> m_publishedPositionData;
 
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 bd879353b..0c08643e0 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
@@ -48,7 +48,7 @@ bool PartyHandling::PartyHandler::init()
   // read parties from db
   if (!m_mainHandler->db()->select(partyVec))
   {
-    ERROR_LOG() << "Error while reading party data from database";
+    ERROR_LOG(m_logger) << "Error while reading party data from database";
     return false;
   }
 
@@ -59,7 +59,7 @@ bool PartyHandling::PartyHandler::init()
 
   if (partyVec.isEmpty())
   {
-    ERROR_LOG() << "Error while reading party data from database";
+    ERROR_LOG(m_logger) << "Error while reading party data from database";
     return false;
   }
 
@@ -77,7 +77,7 @@ bool PartyHandling::PartyHandler::init()
 //------------------------------------------------------------------------------------------
 void PartyHandling::PartyHandler::resetAdlerProperties( QString &properties, const int partyId)
 {
-  DEBUG_LOG() << "properties: " << properties;
+  DEBUG_LOG(m_logger) << "properties: " << properties;
   QJsonObject obj = QJsonDocument::fromJson(properties.toUtf8()).object();
 
   if (!obj.contains(QStringLiteral("Adler")))
@@ -87,7 +87,7 @@ void PartyHandling::PartyHandler::resetAdlerProperties( QString &properties, con
   if (connectState == ParticipantManagement::ConnectState::Undefined)
     return;
 
- DEBUG_LOG() << "connectState: " << connectState;
+ DEBUG_LOG(m_logger) << "connectState: " << connectState;
 
  if (connectState != ParticipantManagement::ConnectState::Disconnected)
    {
@@ -97,7 +97,7 @@ void PartyHandling::PartyHandler::resetAdlerProperties( QString &properties, con
      const QByteArray propertiesStr = QJsonDocument(obj).toJson(QJsonDocument::Compact);
      properties = QString::fromStdString(propertiesStr.data());
 
-     INFO_LOG() << "isSaaConnected set to false";
+     INFO_LOG(m_logger) << "isSaaConnected set to false";
    }
 }
 
@@ -110,7 +110,7 @@ QVector<Database::PpmParty> PartyHandling::PartyHandler::loadDefaultParties(bool
   QVector<Database::PpmParty> partyVec;
 
   if (!m_mainHandler->dbEx0()->select(partyVec))
-    ERROR_LOG() << "Error while reading party data from database (ex_0)";
+    ERROR_LOG(m_logger) << "Error while reading party data from database (ex_0)";
 
   auto cb = [](const Database::PpmParty &p1,const Database::PpmParty &p2) -> bool
   {
@@ -139,7 +139,7 @@ void PartyHandling::PartyHandler::onModifyPartyDataRequest(const rti::core::Samp
 {
   auto ret = modifyPartyDataRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
 
   m_mainHandler->fts()->modifyPartyDataReply(cookie, ret);
 }
@@ -147,7 +147,7 @@ void PartyHandling::PartyHandler::onModifyPartyDataRequest(const rti::core::Samp
 //------------------------------------------------------------------------------------------
 Core::FunctionReplyObject PartyHandling::PartyHandler::modifyPartyDataRequest(const ParticipantManagement::Party &request)
 {
-  DEBUG_LOG() << "onModifyPartyDataRequest: " << request;
+  DEBUG_LOG(m_logger) << "onModifyPartyDataRequest: " << request;
   Party *partyToPublish = m_parties.value(request.id());
 
   if (!partyToPublish && request.id() >= 0)
@@ -156,7 +156,7 @@ Core::FunctionReplyObject PartyHandling::PartyHandler::modifyPartyDataRequest(co
 
   if (!partyToPublish) // create new party
   {
-    DEBUG_LOG() << "Creating new party";
+    DEBUG_LOG(m_logger) << "Creating new party";
 
     // insert into database
     Database::PpmParty newDbParty;
@@ -172,7 +172,7 @@ Core::FunctionReplyObject PartyHandling::PartyHandler::modifyPartyDataRequest(co
     if (!m_mainHandler->db()->insert(newDbParty))
     {
       QString errText = m_mainHandler->db()->getLastError().databaseText();
-      ERROR_LOG() << "Error inserting Party into database: " << errText;
+      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);
     }
 
@@ -181,7 +181,7 @@ Core::FunctionReplyObject PartyHandling::PartyHandler::modifyPartyDataRequest(co
   }
   else // modify existing party
   {
-    DEBUG_LOG() << "Modifying party with id " << partyToPublish->id();
+    DEBUG_LOG(m_logger) << "Modifying party with id " << partyToPublish->id();
 
     if (!partyToPublish->hasChanges(request, true))
       partyToPublish = nullptr; // so it will not be published at the end of this method ...
@@ -203,10 +203,10 @@ Core::FunctionReplyObject PartyHandling::PartyHandler::modifyPartyDataRequest(co
 void PartyHandling::PartyHandler::onRemovePartyRequest(const rti::core::SampleIdentity &cookie,
                                                        const ParticipantManagement::RemovePartyRequest &request)
 {
-  DEBUG_LOG() << "onRemovePartyRequest: " << request;
+  DEBUG_LOG(m_logger) << "onRemovePartyRequest: " << request;
   auto ret = removePartyRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
 
   m_mainHandler->fts()->removePartyReply(cookie, ret);
 }
@@ -214,7 +214,7 @@ void PartyHandling::PartyHandler::onRemovePartyRequest(const rti::core::SampleId
 //------------------------------------------------------------------------------------------
 Core::FunctionReplyObject PartyHandling::PartyHandler::removePartyRequest(const ParticipantManagement::RemovePartyRequest &request)
 {
-  DEBUG_LOG() << "onRemovePartyRequest " << request;
+  DEBUG_LOG(m_logger) << "onRemovePartyRequest " << request;
 
   if (request.partyId() < 0)
     return Core::FunctionReplyObject(tr_lts("dds", "Got request to delete a party, but no valid party id to delete"));
@@ -227,7 +227,7 @@ Core::FunctionReplyObject PartyHandling::PartyHandler::removePartyRequest(const
   if (partyToDelete->isUsedBy() == true)
     return Core::FunctionReplyObject(tr_lts("dds", "Not possible to delete a party in use"));
 
-  DEBUG_LOG() << "Removing party with ID " << request.partyId();
+  DEBUG_LOG(m_logger) << "Removing party with ID " << request.partyId();
 
   return removeParty(partyToDelete);
 }
@@ -253,7 +253,7 @@ Core::FunctionReplyObject PartyHandling::PartyHandler::removeParty(Party *partyT
 void PartyHandling::PartyHandler::onSyncPartiesRequest(const rti::core::SampleIdentity &cookie,
                                                        const ParticipantManagement::SyncPartiesRequest &request)
 {
-  DEBUG_LOG() << "onSyncPartiesRequest: " << request;
+  DEBUG_LOG(m_logger) << "onSyncPartiesRequest: " << request;
 
   Core::FunctionReplyObject rep;
   QVector<Database::PpmParty> partyVec = loadDefaultParties(false);
@@ -261,7 +261,7 @@ void PartyHandling::PartyHandler::onSyncPartiesRequest(const rti::core::SampleId
   for (auto it = partyVec.begin(); it != partyVec.end(); ++it)
   {
     int partyId = (*it).id;
-    DEBUG_LOG() << "Checking Party Id: " << partyId;
+    DEBUG_LOG(m_logger) << "Checking Party Id: " << partyId;
 
     Database::PpmParty partyEx0 = (*it);
 
@@ -272,12 +272,12 @@ void PartyHandling::PartyHandler::onSyncPartiesRequest(const rti::core::SampleId
       if (!m_mainHandler->db()->insert(partyEx0))
       {
         QString errText = m_mainHandler->db()->getLastError().databaseText();
-        WARNING_LOG() << "Error inserting new party with id " << partyId << " to database: " << errText;
+        WARNING_LOG(m_logger) << "Error inserting new party with id " << partyId << " to database: " << errText;
         continue;
       }
       else
       {
-        DEBUG_LOG() << "Inserting Party Id: " << partyId;
+        DEBUG_LOG(m_logger) << "Inserting Party Id: " << partyId;
         PartyHandling::Party *newParty = new PartyHandling::Party(partyEx0);
         m_parties.insert(partyEx0.id, newParty);
         m_mainHandler->dts()->publish(newParty->toDdsParty());
@@ -293,7 +293,7 @@ void PartyHandling::PartyHandler::onSyncPartiesRequest(const rti::core::SampleId
                      || partyEx0.hlaForceIdentifier != partyEx->toDbParty().hlaForceIdentifier
                      || partyEx0.roleId      != partyEx->toDbParty().roleId;
 
-      DEBUG_LOG() << "Has changes = " << hasChanges;
+      DEBUG_LOG(m_logger) << "Has changes = " << hasChanges;
 
       if (hasChanges)
       {
@@ -312,7 +312,7 @@ void PartyHandling::PartyHandler::onSyncPartiesRequest(const rti::core::SampleId
 
         auto ret = modifyPartyDataRequest(req);
         if (ret.error())
-          WARNING_LOG() << ret();
+          WARNING_LOG(m_logger) << ret();
       }
     }
   }
@@ -332,14 +332,14 @@ void PartyHandling::PartyHandler::onSyncPartiesRequest(const rti::core::SampleId
     }
     if (!found)
     {
-      DEBUG_LOG() << "Party id to be deleted = " << curParty->id();
+      DEBUG_LOG(m_logger) << "Party id to be deleted = " << curParty->id();
       if (curParty->isUsedBy())
-        INFO_LOG() << "Party with id " << curParty->id() << " cannot be deleted, is in use";
+        INFO_LOG(m_logger) << "Party with id " << curParty->id() << " cannot be deleted, is in use";
       else
       {
         auto ret = removeParty(curParty);  // removed from map etc
         if (ret.error())
-          WARNING_LOG() << ret();
+          WARNING_LOG(m_logger) << ret();
       }
     }
   }
@@ -352,10 +352,10 @@ void PartyHandling::PartyHandler::onSyncPartiesRequest(const rti::core::SampleId
 void PartyHandling::PartyHandler::onChangePartyUsedStateRequest(const rti::core::SampleIdentity &cookie,
                                                                 const ParticipantManagement::ChangePartyUsedStateRequest &request)
 {
-  DEBUG_LOG() << "onChangePartyUsedStateRequest: " << request;
+  DEBUG_LOG(m_logger) << "onChangePartyUsedStateRequest: " << request;
   auto ret = changePartyUsedStateRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_mainHandler->fts()->changePartyUsedStateReply(cookie, ret);
 }
 
@@ -374,7 +374,7 @@ Core::FunctionReplyObject PartyHandling::PartyHandler::changePartyUsedStateReque
     if (!m_mainHandler->db()->update(party->toDbParty()))
       return Core::FunctionReplyObject(request.partyId(), tr_lts("dds", "Error updating party used state in database"));
 
-    DEBUG_LOG() << "Change used state for party " << party->id() << " to " << party->isUsedBy();
+    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());
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 2fba5a273..ad8c24ec3 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
@@ -18,33 +18,33 @@ HandlerTargetInformation::HandlerTargetInformation(MainHandler *mainHandler)
   , RemoveTargetInformationRequestHandler(mainHandler->fts())
   , m_mainHandler(mainHandler)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 //--------------------------------------------------------------------------
 HandlerTargetInformation::~HandlerTargetInformation()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 //--------------------------------------------------------------------------
 bool HandlerTargetInformation::init()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   bool bRet = true;
   //  create objects
   auto cb = [this, &bRet](const Database::PpmTargetInformation & data)
   {
-    DEBUG_LOG() << "Reading from DB PpmTargetInformation with id = " << data.id;
+    DEBUG_LOG(m_logger) << "Reading from DB PpmTargetInformation with id = " << data.id;
     ObjectTargetInformation *ifs(new ObjectTargetInformation(m_mainHandler));
     Core::FunctionReplyObject ret = ifs->createObject(ObjectTargetInformation::toDdsData(data));
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       bRet = false;
       return;
     }
@@ -52,11 +52,11 @@ bool HandlerTargetInformation::init()
   };
   if (!m_mainHandler->db()->select(cb) || !bRet)
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
-  DEBUG_LOG() << "m_objectMap.size() = " << m_objectMap.size();
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  DEBUG_LOG(m_logger) << "m_objectMap.size() = " << m_objectMap.size();
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
@@ -66,19 +66,19 @@ bool HandlerTargetInformation::init()
 void HandlerTargetInformation::onModifyTargetInformationRequest(const rti::core::SampleIdentity &cookie,
                                                                 const ModifyTargetInformationRequest &request)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   const auto ret = targetInformationModifyRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
 
   m_mainHandler->fts()->modifyTargetInformationReply(cookie, ret);
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 //--------------------------------------------------------------------------
 Core::FunctionReplyObject HandlerTargetInformation::targetInformationModifyRequest(const ModifyTargetInformationRequest &request)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   const int requestId = request.targetInfo().id();
   // modify
   if (requestId > 0)
@@ -100,7 +100,7 @@ Core::FunctionReplyObject HandlerTargetInformation::targetInformationModifyReque
   }
   else
     m_objectMap.insert(ifs->getId(), ifs);
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return ret;
 }
 
@@ -108,7 +108,7 @@ Core::FunctionReplyObject HandlerTargetInformation::targetInformationModifyReque
 void HandlerTargetInformation::onRemoveTargetInformationRequest(const rti::core::SampleIdentity &cookie,
                                                             const RemoveTargetInformationRequest &request)
 {
-  TRACE_LOG()  << Q_FUNC_INFO << " request=" << request;
+  TRACE_LOG(m_logger)  << Q_FUNC_INFO << " request=" << request;
 
   Core::FunctionReplyObject ret;
   ObjectTargetInformation *ifs = m_objectMap.value(request.id());
@@ -122,7 +122,7 @@ void HandlerTargetInformation::onRemoveTargetInformationRequest(const rti::core:
 
   ret = ifs->removeObject();
   if (ret.error())
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
   else
   {
     // delete Object
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/handler_target_information.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/handler_target_information.h
index 98b5106d3..202d47527 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/handler_target_information.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/handler_target_information.h
@@ -44,6 +44,8 @@ public:
   }
 
 private: // methods
+
+NGL::INGLLogger &m_logger;
   void onModifyTargetInformationRequest(const rti::core::SampleIdentity &cookie,
                                         const ModifyTargetInformationRequest &request) override;
   Core::FunctionReplyObject targetInformationModifyRequest(const ModifyTargetInformationRequest &request);
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 f4237343a..822443d59 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
@@ -108,20 +108,19 @@ std::vector<ShootbackArea> vecfromJson(const QJsonValue &val)
 }
 
 
-ObjectTargetInformation::ObjectTargetInformation(MainHandler *mainHandler)
-  : m_mainHandler(mainHandler)
-{
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+ObjectTargetInformation::ObjectTargetInformation(MainHandler *mainHandler) : m_mainHandler(mainHandler),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 //------------------------------------------------------------------------------
 ObjectTargetInformation::~ObjectTargetInformation()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (isValid())
     m_mainHandler->dts()->removeTargetInformationByKey(m_data.id());
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 //------------------------------------------------------------------------------
@@ -133,7 +132,7 @@ bool ObjectTargetInformation::isValid() const
 //------------------------------------------------------------------------------
 Core::FunctionReplyObject ObjectTargetInformation::createObject(const TargetInformation &data)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_data = data;
 
   if (m_data.id() <= 0)
@@ -144,20 +143,20 @@ Core::FunctionReplyObject ObjectTargetInformation::createObject(const TargetInfo
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting TargetInformation-data into database"));
 
     m_data.id(dbData.id);
-    DEBUG_LOG() << "New PpmTargetInformation: " /*<< m_data.id()*/;
+    DEBUG_LOG(m_logger) << "New PpmTargetInformation: " /*<< m_data.id()*/;
   }
 
   // Publish Data via DTS
   onPublishData();
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return Core::FunctionReplyObject(m_data.id());
 }
 
 //------------------------------------------------------------------------------
 Core::FunctionReplyObject ObjectTargetInformation::updateObject(const TargetInformation &data)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, participantId=" << data.participantId()
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, participantId=" << data.participantId()
                       << " size =" << data.shootbackAreas().size();
   Database::PpmTargetInformation dbData;
   dbData = toDbData(data);
@@ -166,12 +165,12 @@ Core::FunctionReplyObject ObjectTargetInformation::updateObject(const TargetInfo
     return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating TargetInformation-data into database"));
 
   m_data = data;
-  DEBUG_LOG() << "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() << Q_FUNC_INFO << " END, id=" << data.id()
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, id=" << data.id()
                       << " size =" << data.shootbackAreas().size();
   return Core::FunctionReplyObject(m_data.id());
 }
@@ -179,7 +178,7 @@ Core::FunctionReplyObject ObjectTargetInformation::updateObject(const TargetInfo
 //------------------------------------------------------------------------------
 Core::FunctionReplyObject ObjectTargetInformation::removeObject()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " 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());
@@ -187,7 +186,7 @@ Core::FunctionReplyObject ObjectTargetInformation::removeObject()
   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() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return Core::FunctionReplyObject(m_data.id());
 }
 
@@ -195,10 +194,10 @@ Core::FunctionReplyObject ObjectTargetInformation::removeObject()
 //------------------------------------------------------------------------------
 void ObjectTargetInformation::onPublishData()
 {
-  TRACE_LOG() << "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() << "Error publishing TargetInformation-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing TargetInformation-data to dds";
 }
 
 // -------------------------------------------------------------------------------------------------------
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 f8bfdab65..1651c0b96 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
@@ -46,6 +46,7 @@ public:
   static TargetInformation toDdsData(const Database::PpmTargetInformation &dbData);  // db -> dds
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onPublishData();
 
 private:
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 1d3dfb0ec..06dce072f 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
@@ -40,7 +40,7 @@ bool TemplateHandler::init()
   };
   if (!m_mainHandler->db()->select(cb))
   {
-    ERROR_LOG() << "Error while reading template data from database";
+    ERROR_LOG(m_logger) << "Error while reading template data from database";
     return false;
   }
 
@@ -58,10 +58,10 @@ bool TemplateHandler::init()
 void TemplateHandler::onModifyTemplateDataRequest(const rti::core::SampleIdentity &cookie,
                                                   const ParticipantManagement::ModifyTemplateDataRequest &request)
 {
-  DEBUG_LOG() << "onModifyTemplateDataRequest: " << request;
+  DEBUG_LOG(m_logger) << "onModifyTemplateDataRequest: " << request;
   const auto ret = modifyTemplateDataRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_mainHandler->fts()->modifyTemplateDataReply(cookie, ret);
 }
 
@@ -92,7 +92,7 @@ Core::FunctionReplyObject TemplateHandler::modifyTemplateDataRequest(const Parti
   }
   removeTransaction.commit();
 
-  DEBUG_LOG() << "Starting validating ModifyTemplateDataRequest";
+  DEBUG_LOG(m_logger) << "Starting validating ModifyTemplateDataRequest";
   if (templatesToBeCreatedOrModified.size() >= 1000) // concurrent validation for big requests
   {
     QVector<QFuture<Core::FunctionReplyObject>> futureVec;
@@ -125,7 +125,7 @@ Core::FunctionReplyObject TemplateHandler::modifyTemplateDataRequest(const Parti
   {
     for (const ParticipantManagement::TemplateData &currentTemplate : std::as_const(templatesToBeCreatedOrModified))
     {
-      DEBUG_LOG() << "Validating template: " << currentTemplate;
+      DEBUG_LOG(m_logger) << "Validating template: " << currentTemplate;
       auto ret = validateTemplateData(templatesToBeCreatedOrModified, modIdToTemplateId, currentTemplate);
       if (ret.error())
         return ret;
@@ -134,17 +134,17 @@ Core::FunctionReplyObject TemplateHandler::modifyTemplateDataRequest(const Parti
 
   DBTransaction trans(m_mainHandler->db()->database());
   // only continue if there was no error detected
-  DEBUG_LOG() << "ModifyTemplateDataRequest has valid data";
+  DEBUG_LOG(m_logger) << "ModifyTemplateDataRequest has valid data";
 
   // create new and update existing templates
-  DEBUG_LOG() << "Creating new and updating existing templates ...";
+  DEBUG_LOG(m_logger) << "Creating new and updating existing templates ...";
 
   for (const TemplateData &currentData : std::as_const(templatesToBeCreatedOrModified))
   {
     Template *templateToUpdate = m_templates.value(modIdToTemplateId.value(currentData.modId()));
     if (!templateToUpdate)
     {
-      DEBUG_LOG() << "Creating new template: " << currentData;
+      DEBUG_LOG(m_logger) << "Creating new template: " << currentData;
       const auto ret = createNewTemplate(currentData, modIdToTemplateId, templatesWithChanges);
       if (ret.error())
         return ret;
@@ -155,13 +155,13 @@ Core::FunctionReplyObject TemplateHandler::modifyTemplateDataRequest(const Parti
       if (templateToUpdate->hasToBeChanged(currentData) &&
           !templatesWithChanges.contains(templateToUpdate))
       {
-        DEBUG_LOG() << "Template changed: " << templateToUpdate->toDdsTemplateParticipant();
+        DEBUG_LOG(m_logger) << "Template changed: " << templateToUpdate->toDdsTemplateParticipant();
         templatesWithChanges.append(templateToUpdate);
       }
     }
   }
 
-  DEBUG_LOG() << "New templates created and existing templates updated";
+  DEBUG_LOG(m_logger) << "New templates created and existing templates updated";
 
   // build hierarchy
   for (const TemplateData &currentData : std::as_const(templatesToBeCreatedOrModified)) // first set superiorIds
@@ -179,7 +179,7 @@ Core::FunctionReplyObject TemplateHandler::modifyTemplateDataRequest(const Parti
     if (!currentTemplate->hasNewInferiorStructure(inferiorIdsForTemplate(currentTemplate->id())) ||
         templatesWithChanges.contains(currentTemplate))
       continue;
-    DEBUG_LOG() << "Template got new inferiors: " << currentTemplate->toDdsTemplateParticipant();
+    DEBUG_LOG(m_logger) << "Template got new inferiors: " << currentTemplate->toDdsTemplateParticipant();
     templatesWithChanges.append(currentTemplate);
   }
 
@@ -207,7 +207,7 @@ std::vector<int32_t> TemplateHandler::inferiorIdsForTemplate(int32_t superiorTem
   {
     if (currentTemplate->superiorId() == superiorTemplateId)
     {
-      DEBUG_LOG() << "Building hierarchy, parentId: " << superiorTemplateId << " has child " << currentTemplate->id();
+      DEBUG_LOG(m_logger) << "Building hierarchy, parentId: " << superiorTemplateId << " has child " << currentTemplate->id();
       result.push_back(currentTemplate->id());
     }
   }
@@ -254,14 +254,14 @@ Core::FunctionReplyObject TemplateHandler::validateTemplateData(const QVector<Te
 {
   if (templateToValidate.templateId() != 0)
   {
-    DEBUG_LOG() << "Checking template id";
+    DEBUG_LOG(m_logger) << "Checking template id";
     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());
 
-    DEBUG_LOG() << "... ok";
+    DEBUG_LOG(m_logger) << "... ok";
     {
       QMutexLocker l(&m_mutex);
       modIdToTemplateId.insert(templateToValidate.modId(), existingTemplate->id()); /* register template to indicate that this template
@@ -272,7 +272,7 @@ Core::FunctionReplyObject TemplateHandler::validateTemplateData(const QVector<Te
   // superior ids valid?
   if (templateToValidate.superiorModId() > 0)
   {
-    DEBUG_LOG() << "checking superiorIds";
+    DEBUG_LOG(m_logger) << "checking superiorIds";
     // superior exists?
     bool isExistingSuperiorId = false;
     for (const TemplateData &dat : dataVec)
@@ -289,14 +289,14 @@ Core::FunctionReplyObject TemplateHandler::validateTemplateData(const QVector<Te
           .arg(templateToValidate.modId())
           .arg(templateToValidate.superiorModId());
 
-    DEBUG_LOG() << "... ok";
+    DEBUG_LOG(m_logger) << "... ok";
 
     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"));
 
     // all hierarchy numbers with same superior unique?
-    DEBUG_LOG() << "Checking hierarchyNumbers";
+    DEBUG_LOG(m_logger) << "Checking hierarchyNumbers";
     for (const TemplateData &dat : dataVec)
     {
       // operator==() on optionals returns false if not set ...
@@ -308,18 +308,18 @@ Core::FunctionReplyObject TemplateHandler::validateTemplateData(const QVector<Te
             .arg(dat.superiorModId())
             .arg(dat.hierarchyNumber());
     }
-    DEBUG_LOG() << "... ok";
+    DEBUG_LOG(m_logger) << "... ok";
   }
 
   // typeId valid?
-  DEBUG_LOG() << "Checking typeId";
+  DEBUG_LOG(m_logger) << "Checking typeId";
   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());
 
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "... ok";
 
   return Core::FunctionReplyObject();
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler.h
index f824476aa..7f1d6a55c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler.h
@@ -39,6 +39,8 @@ public:
   static std::shared_ptr<TypeHandler> createInstance(MainHandler *mainHandler, NGL::INGLLogger &logger);
 
 protected:
+
+NGL::INGLLogger &m_logger;
   bool isArtilleryType(int typeId) const;
   explicit TypeHandler(MainHandler *mainHandler, LOGGER_T logger);
 protected:
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 d8dd5c4e9..f2d29d8b4 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
@@ -35,7 +35,7 @@ ParticipantManagement::UasHandling::MissionPlanHandler::~MissionPlanHandler()
 
 bool MissionPlanHandler::init()
 {
-  DEBUG_LOG()<<" -- MissionPlanHandler init...";
+  DEBUG_LOG(m_logger)<<" -- MissionPlanHandler init...";
   qDeleteAll(m_objMissionPlans);
   m_objMissionPlans.clear();
   if (!loadMissionPlansFromDb())
@@ -59,7 +59,7 @@ void MissionPlanHandler::onRemoveMissionPlanRequest(const rti::core::SampleIdent
 
 void MissionPlanHandler::onSetMissionActionFulfilledRequest(const rti::core::SampleIdentity &cookie, const SetMissionActionFulfilledRequest &request)
 {
-  //DEBUG_LOG()<<">> -- onSetMissionActionFulfilledRequest -- ";
+  //DEBUG_LOG(m_logger)<<">> -- onSetMissionActionFulfilledRequest -- ";
   Core::FunctionReplyObject reply = setMissionActionFulfilledRequest(request);
   m_mainHandler->ddsHandler()->fts()->setMissionActionFulfilledReply(cookie, reply);
 }
@@ -71,22 +71,22 @@ bool MissionPlanHandler::loadMissionPlansFromDb()
   QVector<ParticipantManagement::Database::PpmMissionAction> missionActionVec;
   if (!m_mainHandler->db()->select(missionActionVec))
   {
-    ERROR_LOG()<<"Error reading data from database >> PpmMissionAction: "<<missionActionVec.size();
+    ERROR_LOG(m_logger)<<"Error reading data from database >> PpmMissionAction: "<<missionActionVec.size();
     return false;
   }
 
   if (!m_mainHandler->db()->select(missionItemVec))
   {
-    ERROR_LOG()<<"Error reading data from database >> missionItemVec"<<missionItemVec.size();
+    ERROR_LOG(m_logger)<<"Error reading data from database >> missionItemVec"<<missionItemVec.size();
     return false;
   }
 
   if (!m_mainHandler->db()->select(missionPlanVec))
   {
-    ERROR_LOG()<<"Error reading data from database >> missionPlanVec"<<missionPlanVec.size();
+    ERROR_LOG(m_logger)<<"Error reading data from database >> missionPlanVec"<<missionPlanVec.size();
     return false;
   }
-  DEBUG_LOG() << "load MissionPlans From Db  Plans size = " << missionPlanVec.size()
+  DEBUG_LOG(m_logger) << "load MissionPlans From Db  Plans size = " << missionPlanVec.size()
                       <<" Items size = "<<missionItemVec.size()
                       <<" Actions size = "<<missionActionVec.size();
   // add to internal buffer
@@ -169,7 +169,7 @@ bool MissionPlanHandler::loadMissionPlansFromDb()
     m_mainHandler->ddsHandler()->dts()->publish(missionPlan);
 
   }
-  DEBUG_LOG()<<" -- END load mission plan From Db -- ";
+  DEBUG_LOG(m_logger)<<" -- END load mission plan From Db -- ";
   return true;
 }
 
@@ -180,11 +180,11 @@ bool MissionPlanHandler::isUasInAutoMode(int participantId)
 
   if (uas.id() < 1)
   {
-    ERROR_LOG() << "no uas for pid " << participantId;
+    ERROR_LOG(m_logger) << "no uas for pid " << participantId;
     return false;
   }
 
-  DEBUG_LOG() << "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().underlying();
 
   return (uas.uasState() == ProjectDataManagement::UasState::Auto);
 }
@@ -215,7 +215,7 @@ bool MissionPlanHandler::isUasCombatReady(int participantId)
   youngestState.stateTime(0);
   for (const auto &si : history)
   {
-    DEBUG_LOG() << "StateInformation "
+    DEBUG_LOG(m_logger) << "StateInformation "
                          << " time=" << si.stateTime()
                          << " vulnerabilityBits=" << si.vulnerabilityBits()
                          << " vulnerabilityKindId=" << si.vulnerabilityKindId();
@@ -228,7 +228,7 @@ bool MissionPlanHandler::isUasCombatReady(int participantId)
 
 Core::FunctionReplyObject MissionPlanHandler::createMissionPlanRequest(const ModifyMissionPlanRequest &request)
 {
-  DEBUG_LOG() <<" >> -- createMissionPlanRequest -- ";
+  DEBUG_LOG(m_logger) <<" >> -- createMissionPlanRequest -- ";
   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());
@@ -267,7 +267,7 @@ Core::FunctionReplyObject MissionPlanHandler::createMissionPlanRequest(const Mod
 
 Core::FunctionReplyObject MissionPlanHandler::modifyMissionPlanRequest(const ModifyMissionPlanRequest &request)
 {
-  DEBUG_LOG()<<" >> -- modifyMissionPlanRequest -- ";
+  DEBUG_LOG(m_logger)<<" >> -- modifyMissionPlanRequest -- ";
   /// 1- update Mission plan Table
   /// 2- remove first all mission items and their actions
   /// 3- add New mission items
@@ -285,7 +285,7 @@ Core::FunctionReplyObject MissionPlanHandler::modifyMissionPlanRequest(const Mod
 
 Core::FunctionReplyObject MissionPlanHandler::removeMissionPlanRequest(int id)
 {
-  DEBUG_LOG()<<" >> -- removeMissionPlanRequest -- ";
+  DEBUG_LOG(m_logger)<<" >> -- removeMissionPlanRequest -- ";
   Core::FunctionReplyObject ret;
   ObjectMissionPlan *obj = m_objMissionPlans.value(id, nullptr);
   if (!obj)
@@ -317,7 +317,7 @@ bool MissionPlanHandler::setCurrentMissionActionFulfilled(int participantId, con
         {
           const QString thisMissionName(QStringLiteral("%1_%2_%3").arg(missionPlan->missionPlan().id()).arg(QString::fromStdString(missionPlan->missionPlan().name()), QString::fromStdString(item.name())));
 
-          INFO_LOG() << ">> 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)
           {
@@ -329,7 +329,7 @@ bool MissionPlanHandler::setCurrentMissionActionFulfilled(int participantId, con
             continue;
           }
 
-          DEBUG_LOG() << ">> ######### 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);
@@ -338,7 +338,7 @@ bool MissionPlanHandler::setCurrentMissionActionFulfilled(int participantId, con
           const auto res = setMissionActionFulfilledRequest(req);
           if (res.error())
           {
-            ERROR_LOG() << "failed to set current mission action as fulfilled: " << res.str();
+            ERROR_LOG(m_logger) << "failed to set current mission action as fulfilled: " << res.str();
           }
 
           found = true;
@@ -364,13 +364,13 @@ bool MissionPlanHandler::setCurrentMissionActionFulfilled(int participantId, con
   }
 
   // maybe okay? last mission action was already fulfilled? is this even possible at this point?
-  DEBUG_LOG() << "failed to set current mission action as fulfilled: no action found for pId " << participantId;
+  DEBUG_LOG(m_logger) << "failed to set current mission action as fulfilled: no action found for pId " << participantId;
   return false;
 }
 
 Core::FunctionReplyObject MissionPlanHandler::setMissionActionFulfilledRequest(const SetMissionActionFulfilledRequest &request)
 {
-  DEBUG_LOG()<<" -- [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);
   if (!obj)
@@ -391,7 +391,7 @@ bool MissionPlanHandler::isUasParticipant(int participantId) const
 
   if (PARTICIPANT == nullptr)
   {
-    WARNING_LOG() << "Got invalid participantId " << participantId;
+    WARNING_LOG(m_logger) << "Got invalid participantId " << participantId;
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/mission_plan_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/mission_plan_handler.h
index da471873d..4a498274d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/mission_plan_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/mission_plan_handler.h
@@ -42,6 +42,7 @@ public:
   bool setCurrentMissionActionFulfilled(int participantId, const QString &nameOfTheMissionThatEnded);
 
 private:
+  NGL::INGLLogger &m_logger;
   bool isUasCombatReady(int participantId);
   bool isUasInAutoMode(int participantId);
   Core::FunctionReplyObject createMissionPlanRequest(const ModifyMissionPlanRequest &request);
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 40dd5b738..d31c4b316 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
@@ -18,13 +18,12 @@ namespace UasHandling
 ObjectMissionPlan::ObjectMissionPlan(const std::shared_ptr<DdsHandler> &ddsHandler,
                                      const std::shared_ptr<DatabaseInterface> &db,
                                      const ParticipantManagement::MissionPlan & missionPlan,
-                                     QObject *parent)
-  : QObject(parent)
+                                     QObject *parent) : QObject(parent)
   , m_ddsHandler(ddsHandler)
   , m_db(db)
-  , m_missionplan(missionPlan)
-{
-  DEBUG_LOG()<<" - ctor ObjectMissionPlan: planId: "<<m_missionplan.id();
+  , m_missionplan(missionPlan),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  DEBUG_LOG(m_logger)<<" - ctor ObjectMissionPlan: planId: "<<m_missionplan.id();
 
 }
 
@@ -125,7 +124,7 @@ Core::FunctionReplyObject ObjectMissionPlan::createMissionPlan(Database::PpmMiss
   if (!m_db->insert(newMissionPlan))
   {
     QString error = QStringLiteral("Could not insert mission plan into database");
-    ERROR_LOG()<< error;
+    ERROR_LOG(m_logger)<< error;
     return Core::FunctionReplyObject(error.toStdString().c_str());
   }
 
@@ -181,11 +180,11 @@ Core::FunctionReplyObject ObjectMissionPlan::createMissionPlan(Database::PpmMiss
   for (auto &item : m_missionplan.items())
   {
     for (auto &action : item.actions())
-      DEBUG_LOG()<<"[CREATE] itemIdx: "<<item.itemNumber()
+      DEBUG_LOG(m_logger)<<"[CREATE] itemIdx: "<<item.itemNumber()
                          <<" act.Num: "<<action.actionNumber()<<" act.ItemNum: "<<action.itemNumber()<<" itemFul:"<<action.fulfilled();
   }
   trans.commit();
-  DEBUG_LOG()<< ">> [NEW] mission plan with id( "<<newMissionPlan.id<<" ) inserted !!";
+  DEBUG_LOG(m_logger)<< ">> [NEW] mission plan with id( "<<newMissionPlan.id<<" ) inserted !!";
   return Core::FunctionReplyObject(newMissionPlan.id);
 }
 
@@ -205,7 +204,7 @@ Core::FunctionReplyObject ObjectMissionPlan::updateMissionPlan(Database::PpmMiss
   if (!m_db->update(newMissionPlan))
   {
     QString error = QStringLiteral("Could not update mission plan! ");
-    ERROR_LOG()<< error;
+    ERROR_LOG(m_logger)<< error;
     return Core::FunctionReplyObject(error.toStdString().c_str());
   }
 
@@ -215,7 +214,7 @@ Core::FunctionReplyObject ObjectMissionPlan::updateMissionPlan(Database::PpmMiss
     if (!m_db->removePpmMissionItem(itemId))
     {
       QString error = QStringLiteral("Could not remove mission plan from database");
-      ERROR_LOG()<< error;
+      ERROR_LOG(m_logger)<< error;
       return Core::FunctionReplyObject(0, tr_lts("dds", "Could not update mission plan into!"));
     }
   }
@@ -269,7 +268,7 @@ Core::FunctionReplyObject ObjectMissionPlan::updateMissionPlan(Database::PpmMiss
   m_missionplan.itemsFulfilled(0); // on update items and action entries will be cleared
   m_missionplan.fulfilled(0);
 
-  DEBUG_LOG()<< ">> [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());
 }
@@ -280,13 +279,13 @@ Core::FunctionReplyObject ObjectMissionPlan::removeMissionPlan(int id)
   if (!m_db->removePpmMissionPlan(id))
   {
     QString error = QStringLiteral("Could not remove mission plan ! ");
-    ERROR_LOG()<< error;
+    ERROR_LOG(m_logger)<< error;
     return Core::FunctionReplyObject(error.toStdString().c_str());
   }
   trans.commit();
   m_dbMissionActions.clear();
   m_mapMissionItems.clear();
-  DEBUG_LOG()<< ">> [REMOVE] mission Action with id( "<<id<<" ) deleted !!";
+  DEBUG_LOG(m_logger)<< ">> [REMOVE] mission Action with id( "<<id<<" ) deleted !!";
   return Core::FunctionReplyObject();
 }
 
@@ -300,14 +299,14 @@ Core::FunctionReplyObject ObjectMissionPlan::setMissionActionFulfilled(SetMissio
 
   if (!m_db)
   {
-    ERROR_LOG() << "no init yet....";
+    ERROR_LOG(m_logger) << "no init yet....";
     return Core::FunctionReplyObject("");
   }
 
   if (req.missionId() != m_missionplan.id())
   {
     QString error = QStringLiteral("Wrong missionPlan Object caught Request: %1 / currPlanId: %2").arg(req.missionId()).arg(m_missionplan.id());
-    ERROR_LOG()<< error;
+    ERROR_LOG(m_logger)<< error;
     return Core::FunctionReplyObject(error.toStdString().c_str());
   }
 
@@ -326,7 +325,7 @@ Core::FunctionReplyObject ObjectMissionPlan::setMissionActionFulfilled(SetMissio
       || req.itemNumber()   < 0) // actionNumber start by 0
   {
     QString error = QStringLiteral("Could not set mission action with id: %1 ! ").arg(req.actionNumber());
-    ERROR_LOG()<< error;
+    ERROR_LOG(m_logger)<< error;
     return Core::FunctionReplyObject(error.toStdString().c_str());
   }
 
@@ -336,7 +335,7 @@ Core::FunctionReplyObject ObjectMissionPlan::setMissionActionFulfilled(SetMissio
   if (!m_db->update(dbAction))
   {
     QString error = QStringLiteral("Could not update mission action! ");
-    ERROR_LOG()<< error;
+    ERROR_LOG(m_logger)<< error;
     return Core::FunctionReplyObject(error.toStdString().c_str());
   }
 
@@ -371,7 +370,7 @@ Core::FunctionReplyObject ObjectMissionPlan::setMissionActionFulfilled(SetMissio
 
 Core::FunctionReplyObject ObjectMissionPlan::setMissionPlanAborted(bool state)
 {
-  DEBUG_LOG()<<" -- [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());
@@ -387,7 +386,7 @@ Core::FunctionReplyObject ObjectMissionPlan::setMissionPlanAborted(bool state)
   if (!m_db->update(dbMissionPlan))
   {
     QString error = QStringLiteral("Could not update mission plan! ");
-    ERROR_LOG()<< error;
+    ERROR_LOG(m_logger)<< error;
     return Core::FunctionReplyObject(error.toStdString().c_str());
   }
 
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 e626d86aa..fe9c55ecd 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
@@ -45,6 +45,7 @@ public:
   Core::FunctionReplyObject setMissionActionFulfilled(SetMissionActionFulfilledRequest req, qint64 currentTimeMSec);
   Core::FunctionReplyObject setMissionPlanAborted(bool state);
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<ParticipantManagement::DdsHandler>          m_ddsHandler;
   std::shared_ptr<ParticipantManagement::DatabaseInterface>   m_db;
   ParticipantManagement::MissionPlan m_missionplan;
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 5f9775887..c0fbe0d79 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
@@ -49,7 +49,7 @@ bool UasHandler::init()
   // read parties from db
   if (!m_mainHandler->db()->select(uasVec))
   {
-    ERROR_LOG() << "Error while reading Uas data from database";
+    ERROR_LOG(m_logger) << "Error while reading Uas data from database";
     return false;
   }
 
@@ -69,7 +69,7 @@ bool UasHandler::init()
           this, &UasHandler::onExerciseChanged);
   if (!m_exmDtc->enableExercise())
   {
-    ERROR_LOG() << "Could not enable Topic 'Exercise' of EXM DTC";
+    ERROR_LOG(m_logger) << "Could not enable Topic 'Exercise' of EXM DTC";
     return false;
   }
 
@@ -89,16 +89,16 @@ void UasHandler::onCreateModifyUasRequest(const rti::core::SampleIdentity &cooki
 
 void UasHandler::onRemoveUasRequest(const rti::core::SampleIdentity &cookie, const RemoveUasRequest &request)
 {
-  DEBUG_LOG() << "onRemoveUasRequest: " << request;
+  DEBUG_LOG(m_logger) << "onRemoveUasRequest: " << request;
   auto ret = removeUas(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_mainHandler->exAnyFts()->removeUasReply(cookie, ret);
 }
 
 Core::FunctionReplyObject UasHandler::removeUas(const RemoveUasRequest &request)
 {
-  DEBUG_LOG() << "onRemoveUasRequest " << request;
+  DEBUG_LOG(m_logger) << "onRemoveUasRequest " << request;
 
   if (request.id() < 0)
     return Core::FunctionReplyObject(tr_lts("dds", "Got request to delete an UAS, but no valid UAS id to delete"));
@@ -111,7 +111,7 @@ Core::FunctionReplyObject UasHandler::removeUas(const RemoveUasRequest &request)
   if (uasToDelete->participantId() > 0)
     return Core::FunctionReplyObject(tr_lts("dds", "Not possible to delete a UAS in use"));
 
-  DEBUG_LOG() << "Removing UAS with ID " << request.id();
+  DEBUG_LOG(m_logger) << "Removing UAS with ID " << request.id();
 
   return removeUas(uasToDelete);
 }
@@ -137,7 +137,7 @@ Core::FunctionReplyObject UasHandler::removeUas(UasHandling::Uas *uasToDelete)
 //------------------------------------------------------------------------------------------
 Core::FunctionReplyObject UasHandler::createUas(const CreateModifyUasRequest &request)
 {
-  DEBUG_LOG() << Q_FUNC_INFO;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
   // cant check here as we dont have access to all party participants
   /*
@@ -145,7 +145,7 @@ Core::FunctionReplyObject UasHandler::createUas(const CreateModifyUasRequest &re
   {
     QString error = QStringLiteral("Participant with id %1 is no Uas participant.").arg(request.participantId());
 
-    ERROR_LOG() << error;
+    ERROR_LOG(m_logger) << error;
 
     return Core::FunctionReplyObject(error.toStdString().c_str());
   }*/
@@ -168,7 +168,7 @@ Core::FunctionReplyObject UasHandler::createUas(const CreateModifyUasRequest &re
   {
     QString error = QStringLiteral("Could not insert Uas into database");
 
-    ERROR_LOG() << error;
+    ERROR_LOG(m_logger) << error;
 
     return Core::FunctionReplyObject(error.toStdString().c_str());
   }
@@ -188,7 +188,7 @@ Core::FunctionReplyObject UasHandler::modifyUas(const CreateModifyUasRequest &re
   {
     QString error = QStringLiteral("Uas topic with id %1 not present. Not possible to modify it.").arg(request.id());
 
-    ERROR_LOG() << error;
+    ERROR_LOG(m_logger) << error;
 
     return Core::FunctionReplyObject(error.toStdString().c_str());
   }
@@ -204,7 +204,7 @@ Core::FunctionReplyObject UasHandler::modifyUas(const CreateModifyUasRequest &re
   {
     QString error = QStringLiteral("There are no changes in modify request.");
 
-    ERROR_LOG() << error;
+    ERROR_LOG(m_logger) << error;
 
     return Core::FunctionReplyObject(error.toStdString().c_str());
   }
@@ -215,7 +215,7 @@ Core::FunctionReplyObject UasHandler::modifyUas(const CreateModifyUasRequest &re
   {
     QString error = QStringLiteral("Participant with id %1 is no Uas participant.").arg(request.participantId());
 
-    ERROR_LOG() << error;
+    ERROR_LOG(m_logger) << error;
 
     return Core::FunctionReplyObject(error.toStdString().c_str());
   }
@@ -233,7 +233,7 @@ bool UasHandler::isUasParticipant(int participantId) const
 
   if (PARTICIPANT == nullptr)
   {
-    WARNING_LOG() << "Got invalid participantId " << participantId;
+    WARNING_LOG(m_logger) << "Got invalid participantId " << participantId;
 
     return false;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/uas_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/uas_handler.h
index e50da48c3..d0a0b0622 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/uas_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/uas_handler.h
@@ -42,6 +42,7 @@ private slots:
     void onExerciseChanged(const ExerciseManagement::Exercise &data, DataModification mod);
     void onUASRadioLinkConnectionStatusChanged(const UASRadioLinkConnectionStatus &data, DataModification mod);
 private:
+  NGL::INGLLogger &m_logger;
   Core::FunctionReplyObject removeUas(const RemoveUasRequest &request);
   Core::FunctionReplyObject removeUas(UasHandling::Uas *uasToDelete);
   Core::FunctionReplyObject createUas(const CreateModifyUasRequest &request);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/WebSocketInterface/websocket_interface_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/WebSocketInterface/websocket_interface_handler.cpp
index dc70e4518..58ac2538f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/WebSocketInterface/websocket_interface_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/WebSocketInterface/websocket_interface_handler.cpp
@@ -36,7 +36,7 @@ bool WebSocketInterfaceHandler::init()
 {
   cleanup();
 
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "... ok";
 
   m_dataManager = new DataManager(m_mainHandler->exerciseId(), m_mainHandler->db(), m_mainHandler->ddsHandler()->dtc());
 
@@ -44,15 +44,15 @@ bool WebSocketInterfaceHandler::init()
 
   m_webSocketServer = new LtsWebSocket::LtsWebSocketServer(m_messageFactory, this);
 
-  DEBUG_LOG() << "Initialising LtsWebSocketServer";
+  DEBUG_LOG(m_logger) << "Initialising LtsWebSocketServer";
   if (!m_webSocketServer->init(QStringLiteral("PPM"), Settings::getWebSocketServerPortRange(1)))
   {
-    ERROR_LOG() << "Failed to initialise LtsWebSocketServer";
+    ERROR_LOG(m_logger) << "Failed to initialise LtsWebSocketServer";
     return false;
   }
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "... ok";
 
-  DEBUG_LOG() << "Connection signals and slots";
+  DEBUG_LOG(m_logger) << "Connection signals and slots";
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/dds_handler.cpp
index a652cd787..2d3356be8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/dds_handler.cpp
@@ -17,10 +17,9 @@
 namespace ParticipantManagement
 {
 
-DdsHandler::DdsHandler(int domainId, int exerciseId)
-  : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, exerciseId <= 0 ? IDL::PartitionType::Global : IDL::PartitionType::Exercise, exerciseId))
-{
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+DdsHandler::DdsHandler(int domainId, int exerciseId) : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, exerciseId <= 0 ? IDL::PartitionType::Global : IDL::PartitionType::Exercise, exerciseId)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 DdsHandler::~DdsHandler()
@@ -40,7 +39,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -56,7 +55,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
   std::shared_ptr<DTS::PartitionTime> dtsPartitionTime;
   dtsPartitionTime.reset(m_ddsConnector->createDTS<DTS::PartitionTimeImpl>());
   m_exerciseTime = std::make_shared<ExerciseTime>(dtsPartitionTime);
-  ERROR_LOG() << "OKKKKK THIS THE NEW MAIN HANDLER DDS " <<  this->thread();
+  ERROR_LOG(m_logger) << "OKKKKK THIS THE NEW MAIN HANDLER DDS " <<  this->thread();
   m_ddsDts = ParticipantManagement::Interface::Dts::create(m_ddsConnector);
   m_ddsFts = ParticipantManagement::Interface::Fts::create(m_ddsConnector);
   m_ddsDtc = ParticipantManagement::Interface::Dtc::create(m_ddsConnector);
@@ -68,7 +67,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
   m_exAnyConnector = std::make_shared<DDSConnector::DdsConnector>(m_ddsConnector->getDomainParticipant(), IDL::PartitionType::Any);
   if (!m_exAnyConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Could not init Dds Connector with IDL::PartitionType::Any";
+    ERROR_LOG(m_logger) << "Could not init Dds Connector with IDL::PartitionType::Any";
     return false;
   }
   m_exAnyConnector->initPublisherSubscriber();
@@ -77,7 +76,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
   m_ddsAnyExDts->enableUASRadioLinkConnectionStatus(true);
   if (exerciseId <= 0)
   {
-    DEBUG_LOG() << "Creating * FTS: " << m_exAnyConnector->getDefaultPartition();
+    DEBUG_LOG(m_logger) << "Creating * FTS: " << m_exAnyConnector->getDefaultPartition();
     m_ddsAnyExFts = ParticipantManagement::Interface::Fts::create(m_exAnyConnector);
     // do not enable anything here - enable where it is used (inside type handling) to make sure
     // no other service get a subscription matched information without actually having data
@@ -107,7 +106,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
       !m_ddsDts->enableMissionPlan(bExe)
       )
   {
-    ERROR_LOG() << "Error initializing DTS";
+    ERROR_LOG(m_logger) << "Error initializing DTS";
     return false;
   }
 
@@ -144,7 +143,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
 
       )
   {
-    ERROR_LOG() << "Error initializing FTS";
+    ERROR_LOG(m_logger) << "Error initializing FTS";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/dds_handler.h
index 60f7188fd..b554513d8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/dds_handler.h
@@ -50,6 +50,7 @@ public:
   void longActionBreak();
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector>       m_ddsConnector;
   std::shared_ptr<DDSConnector::DdsConnector>       m_exAnyConnector;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/main_handler.cpp
index b3a5be844..207d331fe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/main_handler.cpp
@@ -45,16 +45,16 @@ bool MainHandler::init(int domainId, int exerciseId)
   m_ddsHandler = std::make_shared<DdsHandler>(domainId, exerciseId);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Could not init DdsHandler";
+    ERROR_LOG(m_logger) << "Could not init DdsHandler";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError, QStringLiteral("Could not init DdsHandler"));
     return false;
   }
-  DEBUG_LOG() << "DdsHandler initialized";
+  DEBUG_LOG(m_logger) << "DdsHandler initialized";
 
   m_dbHandler = std::make_shared<DbHandler>();
   if (!m_dbHandler->init(exerciseId, Settings::settings()))
   {
-    ERROR_LOG() << "Could not init DbHandler";
+    ERROR_LOG(m_logger) << "Could not init DbHandler";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError, QStringLiteral("Could not init DbHandler"));
     return false;
   }
@@ -63,7 +63,7 @@ bool MainHandler::init(int domainId, int exerciseId)
     m_dbHandlerEx0 = std::make_shared<DbHandler>();
     if (!m_dbHandlerEx0->init(0, Settings::settings())) // need a second db connection due to username/password
     {
-      ERROR_LOG() << "Could not init DbHandler";
+      ERROR_LOG(m_logger) << "Could not init DbHandler";
       m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError, QStringLiteral("Could not init DbHandler"));
       return false;
     }
@@ -72,55 +72,55 @@ bool MainHandler::init(int domainId, int exerciseId)
   {
     m_dbHandlerEx0 = m_dbHandler;
   }
-  DEBUG_LOG() << "DbHandler initialized";
+  DEBUG_LOG(m_logger) << "DbHandler initialized";
 
   m_typeHandler = TypeHandling::TypeHandler::createInstance(this, m_logger);
   if (!m_typeHandler->init())
   {
-    ERROR_LOG() << "Could not init TypeHandler";
+    ERROR_LOG(m_logger) << "Could not init TypeHandler";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError, QStringLiteral("Could not init TypeHandler"));
     return false;
   }
-  DEBUG_LOG() << "TypeHandler initialized";
+  DEBUG_LOG(m_logger) << "TypeHandler initialized";
 
   m_partyHandler = std::make_shared<PartyHandling::PartyHandler>(this);
   if (!m_partyHandler->init())
   {
-    ERROR_LOG() << "Could not init PartyHandler";
+    ERROR_LOG(m_logger) << "Could not init PartyHandler";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError, QStringLiteral("Could not init PartyHandler"));
     return false;
   }
-  DEBUG_LOG() << "PartyHandler initialized";
+  DEBUG_LOG(m_logger) << "PartyHandler initialized";
 
   m_tabFtc = TrainingAreaBase::Interface::Ftc::create(m_ddsHandler->dds());
   if (!m_tabFtc->enableAll())
   {
-    ERROR_LOG() << "Could not init TrainingAreaBase FTC";
+    ERROR_LOG(m_logger) << "Could not init TrainingAreaBase FTC";
     return false;
   }
-  DEBUG_LOG() << "TrainingAreaBase FTC initialized";
+  DEBUG_LOG(m_logger) << "TrainingAreaBase FTC initialized";
 
   m_aesFtc = AreaEffectSimulation::Interface::Ftc::create(m_ddsHandler->dds());
   if (!m_aesFtc->enableChargeAdministrationModify())
   {
-    ERROR_LOG() << "Could not init AreaEffectSimulation FTC";
+    ERROR_LOG(m_logger) << "Could not init AreaEffectSimulation FTC";
     return false;
   }
 
   m_participantHandler = std::make_shared<ParticipantHandling::ParticipantHandlerForExercise>(this);
   if (!m_participantHandler->init())
   {
-    ERROR_LOG() << "Could not init ParticipantHandler";
+    ERROR_LOG(m_logger) << "Could not init ParticipantHandler";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError, QStringLiteral("Could not init ParticipantHandler"));
     return false;
   }
-  DEBUG_LOG() << "ParticipantHandler initialized";
+  DEBUG_LOG(m_logger) << "ParticipantHandler initialized";
   m_ddsHandler->pacemaker()->addPort(m_participantHandler->getWebSocketPort(), Core::PortType::WebSocketPositionServer);
 
   m_targetInformationHandler = std::make_shared<ParticipantManagement::HandlerTargetInformation>(this);
   if (!m_targetInformationHandler->init())
   {
-    ERROR_LOG() << "Could not init TargetInformationHandler";
+    ERROR_LOG(m_logger) << "Could not init TargetInformationHandler";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError, QStringLiteral("Could not init TargetInformationHandler"));
     return false;
   }
@@ -129,11 +129,11 @@ bool MainHandler::init(int domainId, int exerciseId)
   m_biteHandler = std::make_shared<BiteHandling::BiteHandler>(this);
   if (!m_biteHandler->init())
   {
-    ERROR_LOG() << "Could not init BiteHandler";
+    ERROR_LOG(m_logger) << "Could not init BiteHandler";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError, QStringLiteral("Could not init BiteHandler"));
     return false;
   }
-  DEBUG_LOG() << "BiteHandler initialized";
+  DEBUG_LOG(m_logger) << "BiteHandler initialized";
 
   // template handler is not needed in exercise dependent PPM
   if (m_ddsHandler->dds()->getPartitionId() <= 0)
@@ -141,11 +141,11 @@ bool MainHandler::init(int domainId, int exerciseId)
     m_templateHandler = std::make_shared<TemplateHandling::TemplateHandler>(this);
     if (!m_templateHandler->init())
     {
-      ERROR_LOG() << "Could not init TemplateHandler";
+      ERROR_LOG(m_logger) << "Could not init TemplateHandler";
       m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError, QStringLiteral("Could not init TemplateHandler"));
       return false;
     }
-    DEBUG_LOG() << "TemplateHandler initialized";
+    DEBUG_LOG(m_logger) << "TemplateHandler initialized";
   }
 
   m_getParticipants = std::make_shared<GetParticipants>(this);
@@ -154,20 +154,20 @@ bool MainHandler::init(int domainId, int exerciseId)
   m_equipmentEventHandler = std::make_shared<EquipmentEventHandling::EquipmentEventHandler>(this);
   if (!m_equipmentEventHandler->init())
   {
-    ERROR_LOG() << "Could not init EquipmentEventHandler";
+    ERROR_LOG(m_logger) << "Could not init EquipmentEventHandler";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError, QStringLiteral("Could not init EquipmentEventHandler"));
     return false;
   }
-  DEBUG_LOG() << "EquipmentEventHandler initialized";
+  DEBUG_LOG(m_logger) << "EquipmentEventHandler initialized";
 
   // WebSocketServer
   m_websocketHandler = std::make_shared<WebSocketInterface::WebSocketInterfaceHandler>(this);
   if (!m_websocketHandler->init())
   {
-    ERROR_LOG() << "Could not init WebSocketInterfaceHandler";
+    ERROR_LOG(m_logger) << "Could not init WebSocketInterfaceHandler";
     return false;
   }
-  DEBUG_LOG() << "WebSocketInterfaceHandler initialized";
+  DEBUG_LOG(m_logger) << "WebSocketInterfaceHandler initialized";
   m_ddsHandler->pacemaker()->addPort(m_websocketHandler->webSocketPort(), Core::PortType::WebSocketServer);
   m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
 
@@ -177,11 +177,11 @@ bool MainHandler::init(int domainId, int exerciseId)
     m_uasHandler = std::make_shared<UasHandling::UasHandler>(this);
     if (!m_uasHandler->init())
     {
-      ERROR_LOG() << "Could not init UasHandler";
+      ERROR_LOG(m_logger) << "Could not init UasHandler";
       return false;
     }
 
-    DEBUG_LOG() << "UasHandler initialized";
+    DEBUG_LOG(m_logger) << "UasHandler initialized";
   }
 
   if (exerciseId != 0)
@@ -190,7 +190,7 @@ bool MainHandler::init(int domainId, int exerciseId)
     m_missionPlanHandler = std::make_shared<UasHandling::MissionPlanHandler>(this);
     if (!m_missionPlanHandler->init())
     {
-      ERROR_LOG() << "Couldn't init MissionPlanHandler";
+      ERROR_LOG(m_logger) << "Couldn't init MissionPlanHandler";
       return false;
     }
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/main_handler.h
index 1c91c3fbd..b3d72a87b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/main_handler.h
@@ -82,6 +82,8 @@ class MainHandler final : public ParticipantHandling::BaseDataProvider
   qint64 currentTimeMSec() const override;
 
   private: // attributes
+
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler> m_ddsHandler;
   std::shared_ptr<DbHandler> m_dbHandler;
   std::shared_ptr<DbHandler> m_dbHandlerEx0;
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 8577da74b..f5893e5cd 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
@@ -37,14 +37,14 @@ bool WebSocketHandler::init(quint16 listenPort)
 {
   if (!m_webSocketServer->listen(QHostAddress::Any, listenPort))
   {
-    WARNING_LOG() << "Can not listen on port " << listenPort << " - aborting";
+    WARNING_LOG(m_logger) << "Can not listen on port " << listenPort << " - aborting";
     return false;
   }
 
   connect(m_webSocketServer, &QWebSocketServer::newConnection,
           this, &WebSocketHandler::onNewConnection);
 
-  INFO_LOG() << "Listening on port " << m_webSocketServer->serverPort();
+  INFO_LOG(m_logger) << "Listening on port " << m_webSocketServer->serverPort();
   return true;
 }
 
@@ -90,7 +90,7 @@ void WebSocketHandler::onNewConnection()
 
   m_webSockets += ws;
 
-  INFO_LOG() << "New websocket connected";
+  INFO_LOG(m_logger) << "New websocket connected";
 }
 
 void WebSocketHandler::onWebSocketDisconnected()
@@ -102,7 +102,7 @@ void WebSocketHandler::onWebSocketDisconnected()
   m_webSockets.removeAll(ws);
   ws->deleteLater();
 
-  INFO_LOG() << "A websocket disconnected";
+  INFO_LOG(m_logger) << "A websocket disconnected";
 }
 
 bool WebSocketHandler::sendPosition(const ParticipantPosition &participantPosition, int equipmentNumber) const
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/web_socket_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/web_socket_handler.h
index 1da842c59..804b46738 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/web_socket_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/web_socket_handler.h
@@ -31,6 +31,7 @@ public:
   bool sendPosition(const ParticipantPosition& participantPosition, int equipmentNumber) const;
 
 private:
+  NGL::INGLLogger &m_logger;
   bool sendTelegramInternal(const ParticipantPosition& pos, int eqNo) const;
 
 private Q_SLOTS:
@@ -38,6 +39,7 @@ private Q_SLOTS:
   void onWebSocketDisconnected();
 
 private:
+  NGL::INGLLogger &m_logger;
   QWebSocketServer* m_webSocketServer = nullptr;
   QVector<QWebSocket*> m_webSockets;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/ModuleTests/pre_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/ModuleTests/pre_tests.cpp
index 00f5bc109..17c46b735 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/ModuleTests/pre_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/ModuleTests/pre_tests.cpp
@@ -32,7 +32,7 @@ PreTests::PreTests(QObject *parent)
 //----------------------------------------------------------------------------------
 bool PreTests::init(int domainId, int exerciseId, int testId, int presentationId)
 {
-  INFO_LOG() << "init begin";
+  INFO_LOG(m_logger) << "init begin";
 
   m_testId = testId;
   m_exerciseId = exerciseId;
@@ -42,18 +42,18 @@ bool PreTests::init(int domainId, int exerciseId, int testId, int presentationId
   m_ddsConnector.reset(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, m_exerciseId));
   if (!m_ddsConnector->init())
     return false;
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
   m_ddsConnector->initPublisherSubscriber();
 
-  DEBUG_LOG() << "create ftc PRE";
+  DEBUG_LOG(m_logger) << "create ftc PRE";
   m_ftc = PresentationManagement::Interface::Ftc::create(m_ddsConnector);
-  DEBUG_LOG() << "init ftc PRE";
+  DEBUG_LOG(m_logger) << "init ftc PRE";
   bool bRet = m_ftc->enableAll();
-  DEBUG_LOG() << "init end PRE - bRet = " << bRet;
+  DEBUG_LOG(m_logger) << "init end PRE - bRet = " << bRet;
 
-  DEBUG_LOG() << "Domain Id = " << domainId;
-  DEBUG_LOG() << "Exercise Id = " << exerciseId;
-  DEBUG_LOG() << "Test Id = " << testId;
+  DEBUG_LOG(m_logger) << "Domain Id = " << domainId;
+  DEBUG_LOG(m_logger) << "Exercise Id = " << exerciseId;
+  DEBUG_LOG(m_logger) << "Test Id = " << testId;
 
   //TODO: add connects
 
@@ -63,7 +63,7 @@ bool PreTests::init(int domainId, int exerciseId, int testId, int presentationId
 //----------------------------------------------------------------------------------
 void PreTests::startTest()
 {
-  INFO_LOG() << "startTest";
+  INFO_LOG(m_logger) << "startTest";
   switch (m_testId)
   {
   case 1:
@@ -82,18 +82,18 @@ void PreTests::startTest()
     tryChangeStatus();
     break;
   default:
-    ERROR_LOG() << "Unknown test case !";
+    ERROR_LOG(m_logger) << "Unknown test case !";
     failExit();
     break;
   }
-  INFO_LOG() << "*********  endTest  **************";
+  INFO_LOG(m_logger) << "*********  endTest  **************";
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
 
 //----------------------------------------------------------------------------------
 void PreTests::tryCreate()
 {    
-  INFO_LOG() << "trying to send createRequest Presentation";
+  INFO_LOG(m_logger) << "trying to send createRequest Presentation";
   m_presentationId = -1;
   PresentationModifyRequest request;
 
@@ -119,7 +119,7 @@ void PreTests::tryCreate()
 
   if (!m_ftc->presentationModifyRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
 
@@ -150,10 +150,10 @@ void PreTests::tryModify()
   vectorPc[1].duration(60);
   vectorPc[1].startTime(QDateTime(QDate(2017,2,14), QTime(9,45)).toMSecsSinceEpoch());
 
-  INFO_LOG() << "trying to send modify request for presentation Id = " << m_presentationId;
+  INFO_LOG(m_logger) << "trying to send modify request for presentation Id = " << m_presentationId;
   if (!m_ftc->presentationModifyRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting modify data";
+    ERROR_LOG(m_logger) << "Error requesting modify data";
     failExit();
   }
 
@@ -167,10 +167,10 @@ void PreTests::tryDelete()
 
   request.id(m_presentationId);
 
-  INFO_LOG() << "trying to send delete request for presentation Id = " << m_presentationId;
+  INFO_LOG(m_logger) << "trying to send delete request for presentation Id = " << m_presentationId;
   if (!m_ftc->presentationRemoveRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting delete data";
+    ERROR_LOG(m_logger) << "Error requesting delete data";
     failExit();
   }
 }
@@ -181,11 +181,11 @@ void PreTests::tryGetContent()
   GetPresentationContentRequest request;
 
   request.presentationId(m_presentationId);
-  INFO_LOG() << "trying to send content request for presentation Id = " << m_presentationId;
+  INFO_LOG(m_logger) << "trying to send content request for presentation Id = " << m_presentationId;
 
   if (!m_ftc->getPresentationContentRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting content for presentationId: " << m_presentationId;
+    ERROR_LOG(m_logger) << "Error requesting content for presentationId: " << m_presentationId;
     failExit();
   }
 
@@ -202,10 +202,10 @@ void PreTests::tryChangeStatus()
   request.lastModified(QDateTime::currentMSecsSinceEpoch());
   request.fileStatus(FileStatus::Deleted);
 
-  INFO_LOG() << "trying to send change status request for presentation Id = " << m_presentationId;
+  INFO_LOG(m_logger) << "trying to send change status request for presentation Id = " << m_presentationId;
   if (!m_ftc->presentationChangeStatusRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting change status";
+    ERROR_LOG(m_logger) << "Error requesting change status";
     failExit();
   }
 
@@ -215,7 +215,7 @@ void PreTests::tryChangeStatus()
 //----------------------------------------------------------------------------------
 void PreTests::failExit()
 {
-  ERROR_LOG() << "FAIL EXIT !";
+  ERROR_LOG(m_logger) << "FAIL EXIT !";
   m_bTestsSuccessful = false;
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
@@ -223,14 +223,14 @@ void PreTests::failExit()
 //----------------------------------------------------------------------------------
 void PreTests::onPresentationCreateReply(const Core::FunctionReplyObject &replyObject)
 {
-  DEBUG_LOG() << "END (onPresentationCreateReply)";
+  DEBUG_LOG(m_logger) << "END (onPresentationCreateReply)";
   if (replyObject.error())
   {
-    ERROR_LOG() << "Got onPresentationCreateReply error: " << replyObject();
+    ERROR_LOG(m_logger) << "Got onPresentationCreateReply error: " << replyObject();
     QTimer::singleShot(0, qApp, &QCoreApplication::quit);
     return;
   }
-  INFO_LOG() << "Got createReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got createReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   m_presentationId = replyObject.id();
@@ -245,15 +245,15 @@ void PreTests::onPresentationModifyReply(const Core::FunctionReplyObject &replyO
 {
   if (m_presentationId == -1)
     return onPresentationCreateReply(replyObject);
-  DEBUG_LOG() << "END (onPresentationModifyReply)";
+  DEBUG_LOG(m_logger) << "END (onPresentationModifyReply)";
 
   if (replyObject.error())
   {
-    ERROR_LOG() << "Got onPresentationModifyReply error: " << replyObject();
+    ERROR_LOG(m_logger) << "Got onPresentationModifyReply error: " << replyObject();
     QTimer::singleShot(0, qApp, &QCoreApplication::quit);
     return;
   }
-  INFO_LOG() << "Got createReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got createReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   m_presentationId = replyObject.id();
@@ -267,15 +267,15 @@ void PreTests::onPresentationModifyReply(const Core::FunctionReplyObject &replyO
 //----------------------------------------------------------------------------------
 void PreTests::onPresentationChangeStatusReply(const Core::FunctionReplyObject &replyObject)
 {
-  DEBUG_LOG() << "END (onPresentationChangeStatusReply)";
+  DEBUG_LOG(m_logger) << "END (onPresentationChangeStatusReply)";
 
   if (replyObject.error())
   {
-    ERROR_LOG() << "Got onPresentationChangeStatusReply error: " << replyObject();
+    ERROR_LOG(m_logger) << "Got onPresentationChangeStatusReply error: " << replyObject();
     QTimer::singleShot(0, qApp, &QCoreApplication::quit);
     return;
   }
-  INFO_LOG() << "Got changeStatusReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got changeStatusReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   m_presentationId = replyObject.id();
@@ -289,16 +289,16 @@ void PreTests::onPresentationChangeStatusReply(const Core::FunctionReplyObject &
 //----------------------------------------------------------------------------------
 void PreTests::onPresentationRemoveReply(const Core::FunctionReplyObject &replyObject)
 {
-  DEBUG_LOG() << "END (onPresentationRemoveReply)";
+  DEBUG_LOG(m_logger) << "END (onPresentationRemoveReply)";
 
   if (replyObject.error())
   {
-    ERROR_LOG() << "Got onPresentationRemoveReply error: " << replyObject();
+    ERROR_LOG(m_logger) << "Got onPresentationRemoveReply error: " << replyObject();
     QTimer::singleShot(0, qApp, &QCoreApplication::quit);
     return;
   }
 
-  INFO_LOG() << "Got reply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got reply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -307,16 +307,16 @@ void PreTests::onPresentationRemoveReply(const Core::FunctionReplyObject &replyO
 //----------------------------------------------------------------------------------
 void PreTests::onGetPresentationContentReply(const GetPresentationContentReply &replyObject)
 {
-  DEBUG_LOG() << "END (onGetPresentationContentReply)";
+  DEBUG_LOG(m_logger) << "END (onGetPresentationContentReply)";
 
   if (replyObject.errorString().size() > 0)
   {
-    ERROR_LOG() << "Got onGetPresentationContentReply error: " << replyObject.errorString();
+    ERROR_LOG(m_logger) << "Got onGetPresentationContentReply error: " << replyObject.errorString();
     QTimer::singleShot(0, qApp, &QCoreApplication::quit);
     return;
   }
 
-  INFO_LOG() << "Got reply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got reply with id " << replyObject.id()
                      << " and errorString " << replyObject.errorString()
                      << " and content size " << replyObject.content().size();
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/dds_handler.cpp
index 7d2f52d19..87f412477 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/dds_handler.cpp
@@ -14,14 +14,14 @@ namespace PresentationManagement
 DdsHandler::DdsHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
   : m_ddsConnector(ddsConnector)
 {
-  DEBUG_LOG() << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
   if(!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -35,10 +35,10 @@ bool DdsHandler::init(const QStringList &qosFileList)
   m_ddsFts = PresentationManagement::Interface::Fts::create(m_ddsConnector);
 
   bool bRet = m_ddsDts->enableAll();
-  INFO_LOG() << "Dts initialised";
+  INFO_LOG(m_logger) << "Dts initialised";
 
   bRet &= m_ddsFts->enableAll();
-  INFO_LOG() << "Fts initialised";
+  INFO_LOG(m_logger) << "Fts initialised";
 
   return bRet;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/dds_handler.h
index 831df1ec8..2baf4e18b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/dds_handler.h
@@ -45,6 +45,7 @@ public:
   }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<Core::TopicLockMaster>      m_topicLockMaster;
   std::shared_ptr<PresentationManagement::Interface::Dts>  m_ddsDts;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/handler_presentation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/handler_presentation.cpp
index c37777c08..b62908807 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/handler_presentation.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/handler_presentation.cpp
@@ -46,10 +46,10 @@ bool HandlerPresentation::init()
     };
     if (!m_mainHandler->db()->select(cb))
     {
-      ERROR_LOG() << "Error reading data from database!";
+      ERROR_LOG(m_logger) << "Error reading data from database!";
       return false;
     }
-    DEBUG_LOG() << "m_objectPresentationMap.size() = " << m_objectPresentationMap.size();
+    DEBUG_LOG(m_logger) << "m_objectPresentationMap.size() = " << m_objectPresentationMap.size();
   }
 
   {
@@ -59,7 +59,7 @@ bool HandlerPresentation::init()
       ObjectPresentation *objPre = m_objectPresentationMap.value(data.presentationId);
       if (!objPre || !objPre->isValid())
       {
-        WARNING_LOG() << "Cannot find presentation Id = " << data.presentationId
+        WARNING_LOG(m_logger) << "Cannot find presentation Id = " << data.presentationId
                               << " for presentationContent " << data.id;
         return;
       }
@@ -67,7 +67,7 @@ bool HandlerPresentation::init()
     };
     if (!m_mainHandler->db()->select(cb))
     {
-      ERROR_LOG() << "Error reading data from database!";
+      ERROR_LOG(m_logger) << "Error reading data from database!";
       return false;
     }
   }
@@ -83,10 +83,10 @@ bool HandlerPresentation::init()
 void HandlerPresentation::onPresentationModifyRequest(const rti::core::SampleIdentity &cookie,
                                                       const PresentationModifyRequest &request)
 {
-  DEBUG_LOG() << "onPresentationModifyRequest: " << request;
+  DEBUG_LOG(m_logger) << "onPresentationModifyRequest: " << request;
   auto ret = request.id() > 0 ? presentationModifyRequest(request) : presentationCreateRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_mainHandler->dds()->fts()->presentationModifyReply(cookie, ret);
 }
 
@@ -131,7 +131,7 @@ Core::FunctionReplyObject HandlerPresentation::presentationModifyRequest(const P
 void HandlerPresentation::onPresentationRemoveRequest(const rti::core::SampleIdentity &cookie,
                                                       const Core::RemoveElementRequest &request)
 {
-  DEBUG_LOG() << "onPresentationRemoveRequest: " << request;
+  DEBUG_LOG(m_logger) << "onPresentationRemoveRequest: " << request;
   Core::FunctionReplyObject ret;
   int presentationId = request.id();
 
@@ -151,10 +151,10 @@ void HandlerPresentation::onPresentationRemoveRequest(const rti::core::SampleIde
     return;
   }
 
-  DEBUG_LOG() << "Deleting presentation id = " <<  presentationId;
+  DEBUG_LOG(m_logger) << "Deleting presentation id = " <<  presentationId;
   ret = ifs->removeObject();  // removes all from db due to fk
   if (ret.error())
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
 
   // delete ObjectPresentation (including Map)
   delete ifs;
@@ -211,7 +211,7 @@ void HandlerPresentation::onPresentationChangeStatusRequest(const rti::core::Sam
   }
   Core::FunctionReplyObject ret = ifs->changeStatus(request);
   if (ret.error())
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
 
   m_mainHandler->dds()->fts()->presentationChangeStatusReply(cookie, ret);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/handler_presentation.h b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/handler_presentation.h
index ab1885ebe..e63a7124f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/handler_presentation.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/handler_presentation.h
@@ -44,6 +44,7 @@ public:
   }
 
 private:
+  NGL::INGLLogger &m_logger;
   void onPresentationModifyRequest(const rti::core::SampleIdentity &cookie,
                                    const PresentationModifyRequest &request) override;
   Core::FunctionReplyObject presentationCreateRequest(const PresentationModifyRequest &request);
@@ -56,6 +57,7 @@ private:
                                          const PresentationChangeStatusRequest &request) override;
 
 private:
+  NGL::INGLLogger &m_logger;
   Initialization                 *m_mainHandler;
   QMap<int, ObjectPresentation *>  m_objectPresentationMap;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/initialization.h b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/initialization.h
index ba2b839e0..6d76ac750 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/initialization.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/initialization.h
@@ -42,6 +42,8 @@ public:
   int exerciseId() const;
 
 private:
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>             m_ddsHandler;
   std::shared_ptr<DbHandler>              m_dbHandler;
   std::shared_ptr<HandlerPresentation>    m_handlerPresentation;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/object_presentation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/object_presentation.cpp
index b34788934..617f1a8a5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/object_presentation.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/object_presentation.cpp
@@ -16,9 +16,8 @@
 namespace PresentationManagement
 {
 //----------------------------------------------------------------------------------------------------
-ObjectPresentation::ObjectPresentation(Initialization *mainHandler)
-  : m_mainHandler(mainHandler)
-{
+ObjectPresentation::ObjectPresentation(Initialization *mainHandler) : m_mainHandler(mainHandler),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 ObjectPresentation::ObjectPresentation(const Presentation &data, Initialization *mainHandler)
@@ -79,12 +78,12 @@ Core::FunctionReplyObject ObjectPresentation::createObject(const PresentationMod
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting PresentationContent-data into database"));
     else
     {
-      DEBUG_LOG() << "New presentation content id : " << conDbData.id;
+      DEBUG_LOG(m_logger) << "New presentation content id : " << conDbData.id;
       conData.id(conDbData.id);
     }
   }
 
-  DEBUG_LOG() << "New Id: " << m_data.id();
+  DEBUG_LOG(m_logger) << "New Id: " << m_data.id();
   trans.commit();
 
   onPublishData();
@@ -114,9 +113,9 @@ Core::FunctionReplyObject ObjectPresentation::updateObject(const PresentationMod
   for (const auto &content : std::as_const(m_content))
   {
     if (m_mainHandler->db()->removePrePresentationContent(content.id()))
-      DEBUG_LOG() << "Removed presentation content id " << content.id();
+      DEBUG_LOG(m_logger) << "Removed presentation content id " << content.id();
     else
-      ERROR_LOG() << "Failed to remove presentation content id " << content.id();
+      ERROR_LOG(m_logger) << "Failed to remove presentation content id " << content.id();
   }
 
   m_content = request.content();
@@ -132,7 +131,7 @@ Core::FunctionReplyObject ObjectPresentation::updateObject(const PresentationMod
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting PresentationContent-data into database"));
     else
     {
-      DEBUG_LOG() << "New presentation content id : " << conDbData.id;
+      DEBUG_LOG(m_logger) << "New presentation content id : " << conDbData.id;
       conData.id(conDbData.id);
     }
 
@@ -180,7 +179,7 @@ Core::FunctionReplyObject ObjectPresentation::changeStatus(const PresentationCha
 //------------------------------------------------------------------------------------------------------------
 void ObjectPresentation::onPublishData()
 {
-  INFO_LOG() << "Publish Presentation-data to dds (" << m_data.id() << ") ...";
+  INFO_LOG(m_logger) << "Publish Presentation-data to dds (" << m_data.id() << ") ...";
 
   m_mainHandler->dds()->dts()->publish(m_data);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/object_presentation.h b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/object_presentation.h
index 7a99e63e6..38e94d1e1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/object_presentation.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/object_presentation.h
@@ -54,6 +54,7 @@ public:
   void onPublishData();
 
 private:
+  NGL::INGLLogger &m_logger;
   Initialization                        *m_mainHandler;
   Presentation                           m_data;
   std::vector<PresentationContent>       m_content;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/ModuleTests/pdm_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/ModuleTests/pdm_tests.cpp
index 20951a7c7..ce4175c5c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/ModuleTests/pdm_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/ModuleTests/pdm_tests.cpp
@@ -17,12 +17,11 @@
 //---------------------------------------------------------------------------------
 namespace ProjectDataManagement
 {
-PdmTests::PdmTests(QObject *parent)
-  : QObject(parent)
+PdmTests::PdmTests(QObject *parent) : QObject(parent)
   , m_id(0)
   , m_testId(0)
-  , m_bTestsSuccessful(true)
-{
+  , m_bTestsSuccessful(true),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
  qRegisterMetaType<Core::FunctionReply>("Core::FunctionReply");
 }
 
@@ -33,22 +32,22 @@ PdmTests::~PdmTests()
 //---------------------------------------------------------------------------------
 bool PdmTests::init(int domainId, int testId)
 {
-  DEBUG_LOG() << "init begin";
+  DEBUG_LOG(m_logger) << "init begin";
   m_testId = testId;
 
   // initialize DDS
   m_ddsConnector.reset(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Global, 0));
   if (!m_ddsConnector->init())
     return false;
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
   m_ddsConnector->initPublisherSubscriber();
 
-  DEBUG_LOG() << "create dtc";
+  DEBUG_LOG(m_logger) << "create dtc";
   m_dtc = ProjectDataManagement::Interface::Dtc::create(m_ddsConnector);
-  DEBUG_LOG() << "create ftc";
+  DEBUG_LOG(m_logger) << "create ftc";
   m_ftc = ProjectDataManagement::Interface::Ftc::create(m_ddsConnector);
   bool bRet = m_dtc->enableAll() && m_ftc->enableAll();
-  DEBUG_LOG() << "init end - bRet = " << bRet;
+  DEBUG_LOG(m_logger) << "init end - bRet = " << bRet;
 
   return bRet;
 }
@@ -56,7 +55,7 @@ bool PdmTests::init(int domainId, int testId)
 //---------------------------------------------------------------------------------
 void PdmTests::startTest()
 {
-  INFO_LOG() << "startTest";
+  INFO_LOG(m_logger) << "startTest";
   if (m_testId == 0)
   {
     QTimer::singleShot(1000, this, &PdmTests::tryGetAllVulnerabilityKinds);
@@ -72,7 +71,7 @@ void PdmTests::startTest()
   }
   else
   {
-    ERROR_LOG() << "Unknown test case!";
+    ERROR_LOG(m_logger) << "Unknown test case!";
     failExit();
   }
   QTimer::singleShot(5000, qApp, &QCoreApplication::quit);
@@ -82,21 +81,21 @@ void PdmTests::startTest()
 //---------------------------------------------------------------------------------
 void PdmTests::tryGetAllVulnerabilityKinds()
 {
-  INFO_LOG() << "trying to get all ProjectDataManagements";
+  INFO_LOG(m_logger) << "trying to get all ProjectDataManagements";
   const QMap<qint32, ProjectDataManagement::VulnerabilityKind> map = m_dtc->vulnerabilityKinds();
   if (map.isEmpty())
   {
-    ERROR_LOG() << "Error requesting vulnerability kinds data";
+    ERROR_LOG(m_logger) << "Error requesting vulnerability kinds data";
     failExit();
   }
   else
   {
-    INFO_LOG() << "Amount of vulnerability kinds = " << map.size();
+    INFO_LOG(m_logger) << "Amount of vulnerability kinds = " << map.size();
     m_id = map.firstKey();
     for(auto it = map.begin(); it != map.end(); ++it)
     {
       const ProjectDataManagement::VulnerabilityClass &vc = it.value().vulnerabilityClassId();
-      INFO_LOG() << "VulnerabilityKind(" << it.key() << ") : " << it.value().name()
+      INFO_LOG(m_logger) << "VulnerabilityKind(" << it.key() << ") : " << it.value().name()
                          << ", translation " << m_dtc->trVulnerabilityKindName(it.key(), vc);
     }
   }
@@ -107,18 +106,18 @@ void PdmTests::tryGetAllVulnerabilityKinds()
 //---------------------------------------------------------------------------------
 void PdmTests::tryGetVulnerabilityKind()
 {
-  INFO_LOG() << "trying get itemData for Vulnerability kind " << m_id;
+  INFO_LOG(m_logger) << "trying get itemData for Vulnerability kind " << m_id;
   ProjectDataManagement::VulnerabilityKind data = m_dtc->vulnerabilityKind(m_id);
 
   if (data.taVulnerabilityKind() <= 0)
   {
-    ERROR_LOG() << "Error receiving data for id " << m_id;
+    ERROR_LOG(m_logger) << "Error receiving data for id " << m_id;
     failExit();
   }
   else
   {
     const ProjectDataManagement::VulnerabilityClass &vc = data.vulnerabilityClassId();
-    INFO_LOG() << "## VulnerabilityKind: (" << data.taVulnerabilityKind() << "), name: " << data.name()
+    INFO_LOG(m_logger) << "## VulnerabilityKind: (" << data.taVulnerabilityKind() << "), name: " << data.name()
                        << ", translation " << m_dtc->trVulnerabilityKindName(m_id, vc);
     QTimer::singleShot(0, qApp, &QCoreApplication::quit);
   }
@@ -128,19 +127,19 @@ void PdmTests::tryGetVulnerabilityKind()
 //---------------------------------------------------------------------------------
 void PdmTests::tryGetAllBiteComponentTexts()
 {
-  INFO_LOG() << "trying to get all Bite Component Texts";
+  INFO_LOG(m_logger) << "trying to get all Bite Component Texts";
   const QMap<qint32, ProjectDataManagement::BiteComponentText> map = m_dtc->biteComponentTexts();
   if (map.isEmpty())
   {
-    ERROR_LOG() << "Error requesting bite components text data";
+    ERROR_LOG(m_logger) << "Error requesting bite components text data";
     failExit();
   }
   else
   {
-    INFO_LOG() << "Amount of bite component texts = " << map.size();
+    INFO_LOG(m_logger) << "Amount of bite component texts = " << map.size();
     m_id = map.firstKey();
     for(auto it = map.begin(); it != map.end(); ++it)
-      INFO_LOG() << "BiteComponent(" << it.key() << ") : " << it.value().name()
+      INFO_LOG(m_logger) << "BiteComponent(" << it.key() << ") : " << it.value().name()
                          << ", translation " << m_dtc->trBiteComponentTextName(it.key());
   }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/chargetype_rename.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/chargetype_rename.h
index 2582a9f8d..e4011a429 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/chargetype_rename.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/chargetype_rename.h
@@ -29,6 +29,8 @@ public:
   ~ChargeTypeRename() = default;
 
 private:
+
+NGL::INGLLogger &m_logger;
   void onUpdateChargeNamesRequest(const rti::core::SampleIdentity &cookie,
                                   const UpdateChargeNamesRequest &request) override;
 //  void onSuppressVisibilityRequest(const rti::core::SampleIdentity &cookie,
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/dds_handler.cpp
index 06a28d16e..c253aa330 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/dds_handler.cpp
@@ -16,14 +16,14 @@ namespace ProjectDataManagement
 DdsHandler::DdsHandler(int domainId)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Any))
 {
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -36,11 +36,11 @@ bool DdsHandler::init(const QStringList &qosFileList)
 
   m_ddsDts = ProjectDataManagement::Interface::Dts::create(m_ddsConnector);
   bool bRet = m_ddsDts->enableAll();
-  INFO_LOG() << "Dts initialised";
+  INFO_LOG(m_logger) << "Dts initialised";
 
   m_ddsFts = ProjectDataManagement::Interface::Fts::create(m_ddsConnector);
   bRet &= m_ddsFts->enableAll();
-  INFO_LOG() << "Fts initialised";
+  INFO_LOG(m_logger) << "Fts initialised";
 
   return bRet;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/dds_handler.h
index a400078cd..cb479c905 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/dds_handler.h
@@ -37,6 +37,7 @@ public:
   std::shared_ptr<DDSConnector::DdsConnector>            dds() const { return m_ddsConnector; }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector>            m_ddsConnector;
   std::shared_ptr<Core::Pacemaker>                       m_pacemaker;
   std::shared_ptr<Core::TopicLockMaster>                 m_topicLockMaster;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/main_handler.cpp
index 4fec1c269..29de893b6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/main_handler.cpp
@@ -37,7 +37,7 @@ bool MainHandler::init(int domainId)
   m_dbHandler = std::make_shared<DbHandler>();
   if (!m_dbHandler->init(0, Settings::settings()))
   {
-    ERROR_LOG() << "Initialisation DbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation DbHandler failed.";
     return false;
   }
 
@@ -45,13 +45,13 @@ bool MainHandler::init(int domainId)
   m_ddsHandler =  std::make_shared<DdsHandler>(domainId);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation DdsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
     return false;
   }
 
   if(Settings::settings()->settings()->value(QLatin1String("TrainingAreaBase/UsePvSan"), false).toBool())
   {
-    DEBUG_LOG() << "Has PvSan so do the import";
+    DEBUG_LOG(m_logger) << "Has PvSan so do the import";
     PvSanImport(db(), m_logger);
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/main_handler.h
index 7b5dc35e4..0d8427a53 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/main_handler.h
@@ -32,6 +32,7 @@ public:
   std::shared_ptr<DatabaseInterface> db() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>  m_ddsHandler;
   std::shared_ptr<DbHandler>   m_dbHandler;
   std::shared_ptr<Translation> m_translation;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.cpp
index 08c999700..9d871cb68 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.cpp
@@ -33,7 +33,7 @@ bool PvSanImport::publishDataPvSan()
   //b->removePdmTranslation()
   if (!readFile(procedures, material, injuries, kind, place1, place2))
   {
-    ERROR_LOG() << "Can't read pvsan file";
+    ERROR_LOG(m_logger) << "Can't read pvsan file";
     return false;
   }
 
@@ -99,13 +99,13 @@ bool PvSanImport::readFile(QVector<QString> &procedures, QVector<QString> &mater
 {
   QString vbkFile = NGL::findFile(NGL::FileType::ConfigFile, QStringLiteral("vbk.csv"));
   QFile csvFile(vbkFile);
-  DEBUG_LOG() << "Start reading File " << vbkFile;
+  DEBUG_LOG(m_logger) << "Start reading File " << vbkFile;
 
   if (!csvFile.exists())
     return false;
   if(!csvFile.open(QIODevice::ReadOnly))
     return false;
-  DEBUG_LOG() << "Opened File";
+  DEBUG_LOG(m_logger) << "Opened File";
 
   bool skip = true;
   QTextStream in(&csvFile);
@@ -118,7 +118,7 @@ bool PvSanImport::readFile(QVector<QString> &procedures, QVector<QString> &mater
     if (!line.startsWith(QStringLiteral("Version")))
       continue;
 
-   // ERROR_LOG() << line;
+   // ERROR_LOG(m_logger) << line;
     QStringList versionSplit = line.split(QStringLiteral(";"));
     if (versionSplit.size() > 1)
       m_version = versionSplit.at(1);
@@ -161,7 +161,7 @@ bool PvSanImport::readFile(QVector<QString> &procedures, QVector<QString> &mater
       skip = false;
       continue;
     }
-    //ERROR_LOG() << line;
+    //ERROR_LOG(m_logger) << line;
 
     //now we read all lines until the end
     if (!line.isEmpty())
@@ -265,12 +265,12 @@ bool PvSanImport::readFile(QVector<QString> &procedures, QVector<QString> &mater
 
   csvFile.close();
 
-//  ERROR_LOG() << "read " << procedures.size() << " procedures from file";
-//  ERROR_LOG() << "read " << material.size() << " materials from file";
-//  ERROR_LOG() << "read " << injuries.size() << " injuries from file";
-//  ERROR_LOG() << "read " << kind.size() << " kinds from file";
-//  ERROR_LOG() << "read " << place1.size() << " place1 from file";
-//  ERROR_LOG() << "read " << place2.size() << " place2 from file";
+//  ERROR_LOG(m_logger) << "read " << procedures.size() << " procedures from file";
+//  ERROR_LOG(m_logger) << "read " << material.size() << " materials from file";
+//  ERROR_LOG(m_logger) << "read " << injuries.size() << " injuries from file";
+//  ERROR_LOG(m_logger) << "read " << kind.size() << " kinds from file";
+//  ERROR_LOG(m_logger) << "read " << place1.size() << " place1 from file";
+//  ERROR_LOG(m_logger) << "read " << place2.size() << " place2 from file";
 
 
   return true;
@@ -336,7 +336,7 @@ bool PvSanImport::addProcedures(const QVector<QString> &procedures)
   {
 
    QStringList measure = entry.split(QStringLiteral(";"));
-  // ERROR_LOG() << entry << " size of split: " << measure.size();
+  // ERROR_LOG(m_logger) << entry << " size of split: " << measure.size();
    if (measure.size() < 34 )
      continue;
    Database::PdmSanitationProcedures pros;
@@ -405,11 +405,11 @@ bool PvSanImport::addMaterial(const QVector<QString> &material)
 
   q.prepare(stmt);
 
-  DEBUG_LOG() << "Statement: " << stmt;
+  DEBUG_LOG(m_logger) << "Statement: " << stmt;
 
   if (!q.exec())
   {
-    WARNING_LOG() << "Could not delete sanitation materials";
+    WARNING_LOG(m_logger) << "Could not delete sanitation materials";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.h
index be163bde5..ae9aba06e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.h
@@ -22,6 +22,7 @@ public:
  PvSanImport(const std::shared_ptr<DatabaseInterface> &db,
             NGL::INGLLogger &logger);
 private:
+NGL::INGLLogger &m_logger;
 qint64 getCode(const QString &type, int typeId);
 
 bool publishDataPvSan();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.cpp
index fc2a0681f..788af369a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.cpp
@@ -24,7 +24,7 @@ Translation::Translation(const std::shared_ptr<DdsHandler> &dds, const std::shar
   , m_dds(dds)
   , m_db(db)
 {
-  DEBUG_LOG() << "Translation ctor";
+  DEBUG_LOG(m_logger) << "Translation ctor";
   m_publishTimer.setInterval(1000);
   m_publishTimer.setSingleShot(true);
   m_publishTimer.setTimerType(Qt::VeryCoarseTimer);
@@ -40,7 +40,7 @@ Translation::~Translation()
 
 void Translation::collectAndPublishData()
 {
-  DEBUG_LOG() << "Collecting translation data";
+  DEBUG_LOG(m_logger) << "Collecting translation data";
   m_jsonData.clear();
   const auto cb = [this](const Database::PdmTranslation &data)
   {
@@ -49,13 +49,13 @@ void Translation::collectAndPublishData()
 
   if (!m_db->select(cb))
   {
-    WARNING_LOG() << "Error fetching translations from db";
+    WARNING_LOG(m_logger) << "Error fetching translations from db";
     return;
   }
 
   publishData();
 
-  DEBUG_LOG() << "Collecting translation data - finished";
+  DEBUG_LOG(m_logger) << "Collecting translation data - finished";
 }
 
 void Translation::publishData()
@@ -69,7 +69,7 @@ void Translation::publishData()
   const QByteArray compressed = qCompress(data, 9);
   const QByteArray md5Sum = QCryptographicHash::hash(compressed, QCryptographicHash::Md5).toHex();
 
-  INFO_LOG() << "Created translation blob with " << arr.size() << " elements, size: " << compressed.size()
+  INFO_LOG(m_logger) << "Created translation blob with " << arr.size() << " elements, size: " << compressed.size()
                      << " (uncompressed: " << data.size() << "), md5Sum: " << md5Sum;
   m_dds->dts()->publish(ProjectDataManagement::TranslationBlob(s_translationBlobId,
                                                                LtsUtils::convert<std::vector<uint8_t>>(compressed),
@@ -127,7 +127,7 @@ void Translation::onInsertUpdateTranslationRequest(const rti::core::SampleIdenti
   else
   {
     fro = Core::FunctionReplyObject(te.id, tr_lts("dds", "Can not insert/update translation element"));
-    WARNING_LOG() << fro();
+    WARNING_LOG(m_logger) << fro();
   }
   m_dds->fts()->insertUpdateTranslationReply(cookie, fro);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.h
index 052e4c780..373e50c61 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.h
@@ -30,10 +30,12 @@ protected Q_SLOTS:
   void collectAndPublishData();
   void publishData();
 private:
+  NGL::INGLLogger &m_logger;
   void addToJson(const Database::PdmTranslation &data);
   void onInsertUpdateTranslationRequest(const rti::core::SampleIdentity &cookie,
                                         const InsertUpdateTranslationRequest &request) override;
 private:
+  NGL::INGLLogger &m_logger;
   QHash<int, QJsonObject> m_jsonData;
   std::shared_ptr<DdsHandler> m_dds;
   std::shared_ptr<ProjectDataManagement::DatabaseInterface> m_db;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer.cpp
index 113d03bc4..c422ef4c8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer.cpp
@@ -23,13 +23,12 @@
 namespace RecordingManagement
 {
 
-DbWriter::DbWriter(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
-  : m_query(nullptr)
+DbWriter::DbWriter(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector) : m_query(nullptr)
   , m_recordTimer(new QTimer(this))
   , m_ddsConnector(ddsConnector)
   , m_dbWriterSnapshot(nullptr)
-  , m_dbWriterSnapshotThread(nullptr)
-{}
+  , m_dbWriterSnapshotThread(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 DbWriter::~DbWriter()
 {
@@ -52,18 +51,18 @@ bool DbWriter::loadPlugin(const LtsPluginManager::PluginInstance &pi)
   RecordReplay::RecordReplayPlugin *recPlugin = qobject_cast<RecordReplay::RecordReplayPlugin *>(pi.plugin);
   if (!recPlugin)
   {
-    ERROR_LOG() << "Cannot load RecordReplayPlugin " << pi.fileName;
+    ERROR_LOG(m_logger) << "Cannot load RecordReplayPlugin " << pi.fileName;
     return false;
   }
-  INFO_LOG() << "Loading RecordReplayPlugin " << pi.fileName;
+  INFO_LOG(m_logger) << "Loading RecordReplayPlugin " << pi.fileName;
   // exId == partId da wir hier in IDL::PartitionType::Exercise arbeiten
   if (!recPlugin->initDtc(m_ddsConnector, m_ddsConnector->getPartitionId()))
   {
-    ERROR_LOG() << "Initialisation for RecordReplayPlugin " << pi.fileName << " failed ";
+    ERROR_LOG(m_logger) << "Initialisation for RecordReplayPlugin " << pi.fileName << " failed ";
     return false;
   }
 
-  INFO_LOG() << "Loaded record replay plugin " << recPlugin->pluginName();
+  INFO_LOG(m_logger) << "Loaded record replay plugin " << recPlugin->pluginName();
   m_plugins += recPlugin;
 
   return true;
@@ -81,7 +80,7 @@ bool DbWriter::init(const std::shared_ptr<DatabaseInterface> &db)
 
   // Start recording data
   qint64 msecs = Settings::updateFrequency();
-  INFO_LOG() << "Updating recording tables every " << msecs << " milliseconds.";
+  INFO_LOG(m_logger) << "Updating recording tables every " << msecs << " milliseconds.";
   connect(m_recordTimer, &QTimer::timeout, this, &DbWriter::ddsTopicsToDatabase);
   m_recordTimer->start(msecs);
 
@@ -113,7 +112,7 @@ bool DbWriter::initSnapshot()
 
 void DbWriter::ddsTopicsToDatabase()
 {
-  DEBUG_LOG() << "IN ddsTopicsToDatabase";
+  DEBUG_LOG(m_logger) << "IN ddsTopicsToDatabase";
   DBTransaction trans(m_db->database());
 
   QHash<QString, qint64> minRecordSampleTimes;
@@ -124,7 +123,7 @@ void DbWriter::ddsTopicsToDatabase()
     if (!recPlugin->ddsTopicsToDatabase(*m_query, minRecordSampleTimes))
     {
       // should never happen but who knows
-      ERROR_LOG() << "Error recording dds topics - aborting recording data";
+      ERROR_LOG(m_logger) << "Error recording dds topics - aborting recording data";
       return;
     }
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer.h b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer.h
index 3de98d59a..950c2e607 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer.h
@@ -35,6 +35,7 @@ public:
   bool init(const std::shared_ptr<DatabaseInterface> &db);
 
 protected:
+  NGL::INGLLogger &m_logger;
   bool initSnapshot();
   bool loadPlugin(const LtsPluginManager::PluginInstance &pi);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer_snapshot.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer_snapshot.cpp
index bcc9ea791..28e43d168 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer_snapshot.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer_snapshot.cpp
@@ -36,13 +36,12 @@ void DbWriterSnapshotThread::run()
 
 DbWriterSnapshot::DbWriterSnapshot(const QVector<RecordReplay::RecordReplayPlugin *> &plugins,
                                    int exerciseId,
-                                   NGL::Settings *settings)
-  : QObject()
+                                   NGL::Settings *settings) : QObject()
   , m_plugins(plugins)
   , m_snapshotInterval(1 * 60 * 1000) // TODO: make config variable   // Interval: 1 min in milliseconds
   , m_exerciseId(exerciseId)
-  , m_settings(settings)
-{
+  , m_settings(settings),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 DbWriterSnapshot::~DbWriterSnapshot()
@@ -76,14 +75,14 @@ void DbWriterSnapshot::init()
 
   // Set search path
   const QString stmt = QLatin1String("SET SEARCH_PATH TO ") + m_dbInterface->schemaName() + QLatin1String(", PUBLIC");
-  INFO_LOG() << "SearchPath Stmt: " << stmt;
+  INFO_LOG(m_logger) << "SearchPath Stmt: " << stmt;
   NSqlQuery q(dbConn);
 
   q.exec(stmt);
 
   if (!m_dbInterface->init(dbConn))
   {
-    ERROR_LOG() << "Error initializing database interface - can not initialize DbWriterSnapshot";
+    ERROR_LOG(m_logger) << "Error initializing database interface - can not initialize DbWriterSnapshot";
     m_dbInterface = nullptr;
     return;
   }
@@ -107,7 +106,7 @@ void DbWriterSnapshot::setMinRecordedSampleTimes(const QHash<QString, qint64> &m
     const QString &topicName = it.key();
     if (minRecordedSampleTime == 0)
     {
-      WARNING_LOG() << "Minimum recorded Sample Time for topic " << topicName <<
+      WARNING_LOG(m_logger) << "Minimum recorded Sample Time for topic " << topicName <<
                                " is zero - looks like a service did not properly set the sample time!";
       continue;
     }
@@ -122,7 +121,7 @@ void DbWriterSnapshot::setMinRecordedSampleTimes(const QHash<QString, qint64> &m
       // already a minimum time - make sure to get the minimum from both
       m_minRecordedSampleTimes[topicName] = std::min(minRecordedSampleTime, mrstIt.value());
     }
-    INFO_LOG() << "Current minimum sample time for " << topicName
+    INFO_LOG(m_logger) << "Current minimum sample time for " << topicName
                        << " is " << m_minRecordedSampleTimes.value(topicName)
                        << " = " << QDateTime::fromMSecsSinceEpoch(m_minRecordedSampleTimes.value(topicName)).toString();
   }
@@ -157,7 +156,7 @@ void DbWriterSnapshot::initSnapshot()
   topicRecIdQuery.prepare(QStringLiteral("SELECT MAX(time_stamp) FROM rec_snapshot WHERE svc_name = :svc_name AND topic_name = :topic_name"));
 
   const qint64 tNow(time(nullptr) * 1000 - 60 * 1 * 1000); // jetzt vor einer Minute
-  INFO_LOG() << "tNow (-1min): " << tNow;
+  INFO_LOG(m_logger) << "tNow (-1min): " << tNow;
 
   QHash<QString, qint64> minRecordedSampleTimes;
 
@@ -198,7 +197,7 @@ void DbWriterSnapshot::initSnapshot()
         fromWhere = "snapshot + last sample";
       else if (timeToStartSnapshotCreationFrom == tNow)
         fromWhere = "current time";
-      INFO_LOG() << "last snapshot time for topic '" << topicName
+      INFO_LOG(m_logger) << "last snapshot time for topic '" << topicName
                          << "' is: " << timeToStartSnapshotCreationFrom
                          << " from " << fromWhere;
       minRecordedSampleTimes[topicName] = timeToStartSnapshotCreationFrom;
@@ -218,7 +217,7 @@ void DbWriterSnapshot::writeSnapshotData()
   const QHash<QString, qint64> minRecSampleTimes(getMinRecordedSampleTimes(lastSnapshotTimeToGenerateNow));
   if (minRecSampleTimes.isEmpty())
   {
-    INFO_LOG() << "minRecSampleTimes has no entries with time < " << lastSnapshotTimeToGenerateNow
+    INFO_LOG(m_logger) << "minRecSampleTimes has no entries with time < " << lastSnapshotTimeToGenerateNow
                        << " nothing to do...";
     QTimer::singleShot(m_snapshotInterval, Qt::VeryCoarseTimer,
                        this, &DbWriterSnapshot::writeSnapshotData);
@@ -229,25 +228,25 @@ void DbWriterSnapshot::writeSnapshotData()
   qint64 startTime = std::numeric_limits<qint64>::max();
   for(const qint64 st : std::as_const(minRecSampleTimes))
     startTime = std::min(startTime, st);
-  INFO_LOG() << "writeSnapshotData - lastSnapshotTimeToGenerateNow: " << lastSnapshotTimeToGenerateNow
+  INFO_LOG(m_logger) << "writeSnapshotData - lastSnapshotTimeToGenerateNow: " << lastSnapshotTimeToGenerateNow
                      << ", minRecTime is " << startTime;
   if (startTime <= 0 || startTime > endTime)
   {
-    WARNING_LOG() << "Spurious start time (" << startTime
+    WARNING_LOG(m_logger) << "Spurious start time (" << startTime
                           << ") - using end time for start (" << endTime << ")";
     startTime = endTime - 1;  // -1 -> create at least one interval
   }
 
   if (startTime > lastSnapshotTimeToGenerateNow)
   {
-    INFO_LOG() << "Nothing changed in the last interval until " << lastSnapshotTimeToGenerateNow << " youngest topic is at " << startTime;
+    INFO_LOG(m_logger) << "Nothing changed in the last interval until " << lastSnapshotTimeToGenerateNow << " youngest topic is at " << startTime;
     QTimer::singleShot(m_snapshotInterval, Qt::VeryCoarseTimer,
                        this, &DbWriterSnapshot::writeSnapshotData);
     return;
   }
 
   // we know something changed between startTime and lastSnapshotTimeToGenerateNow - let's do some work
-  INFO_LOG() << "startTime: " << startTime
+  INFO_LOG(m_logger) << "startTime: " << startTime
                      << " lastSnapshotTimeToGenerateNow: " << lastSnapshotTimeToGenerateNow << " - BEGIN";
   DBTransaction trans(QSqlDatabase::database(dbConnectionName()));
   NSqlQuery recSnapshotQuery(QSqlDatabase::database(dbConnectionName()));
@@ -255,7 +254,7 @@ void DbWriterSnapshot::writeSnapshotData()
     writeSnapshotDataPlugin(lastSnapshotTimeToGenerateNow, recSnapshotQuery, recPlugin, minRecSampleTimes);
 
   trans.commit();
-  INFO_LOG() << "startTime: " << startTime
+  INFO_LOG(m_logger) << "startTime: " << startTime
                      << " lastSnapshotTimeToGenerateNow: " << lastSnapshotTimeToGenerateNow << " - FINISHED";
 
 
@@ -288,7 +287,7 @@ void DbWriterSnapshot::writeSnapshotDataPlugin(qint64 endInterval,
 
     for (auto &snapshotData : vec)
     {
-      INFO_LOG() << "svc: " << recSnapshot.svcName
+      INFO_LOG(m_logger) << "svc: " << recSnapshot.svcName
                          << " topic: " << recSnapshot.topicName
                          << " timestamp: " << snapshotData.timeStamp
                          << " #elements: " << snapshotData.recIdArray.size();
@@ -298,7 +297,7 @@ void DbWriterSnapshot::writeSnapshotDataPlugin(qint64 endInterval,
       recSnapshot.recIdArray = LtsUtils::BigintArray2D(std::move(snapshotData.recIdArray));
 
       if (!m_dbInterface->insert(recSnapshot))
-        ERROR_LOG() << "Error while recording snaphshot for topic " << recSnapshot.topicName;
+        ERROR_LOG(m_logger) << "Error while recording snaphshot for topic " << recSnapshot.topicName;
     }
   }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer_snapshot.h b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer_snapshot.h
index 5d9790a52..0e04c062a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer_snapshot.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/db_writer_snapshot.h
@@ -74,6 +74,7 @@ public:
     , m_dbWriterSnapshot(dbWriterSnapshot)
   {}
 protected:
+  NGL::INGLLogger &m_logger;
   void run() override final;
 private:
   DbWriterSnapshot *m_dbWriterSnapshot;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/dds_handler.cpp
index ba56e6ef3..ca401a26a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/dds_handler.cpp
@@ -16,14 +16,14 @@ namespace RecordingManagement
 DdsHandler::DdsHandler(int domainId, int exerciseId)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise, exerciseId))
 {
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/dds_handler.h
index 171797f78..aa4d3a76c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/dds_handler.h
@@ -33,6 +33,7 @@ public:
   std::shared_ptr<DDSConnector::DdsConnector>          dds() const { return m_ddsConnector; }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector>          m_ddsConnector;
   std::shared_ptr<Core::Pacemaker>                     m_pacemaker;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/main_handler.h
index 808c97886..1962736c9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/main_handler.h
@@ -31,6 +31,8 @@ public:
 
 private:
 
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler> m_ddsHandler;
   std::shared_ptr<DbHandler>  m_dbHandler;
   std::shared_ptr<DbWriter>   m_dbWriter;
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 66661cb03..b9cae85ff 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
@@ -18,10 +18,9 @@
 using namespace ReportManagement;
 //-----------------------------------------------------------------------------
 HandlerDynamicParticipantData::HandlerDynamicParticipantData(const std::shared_ptr<DdsHandler> &ddsHandler,
-                                                             const std::shared_ptr<DatabaseInterface> &db)
-  : m_ddsHandler(ddsHandler)
-  , m_db(db)
-{
+                                                             const std::shared_ptr<DatabaseInterface> &db) : m_ddsHandler(ddsHandler)
+  , m_db(db),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 } // end of ctor()
 
 //-----------------------------------------------------------------------------
@@ -32,12 +31,12 @@ HandlerDynamicParticipantData::~HandlerDynamicParticipantData()
 //-----------------------------------------------------------------------------
 bool HandlerDynamicParticipantData::init()
 {
-  DEBUG_LOG() << "Creating and initializing PPM DTC, AES DTC, PDM DTC ...";
+  DEBUG_LOG(m_logger) << "Creating and initializing PPM DTC, AES DTC, PDM DTC ...";
 
   m_ppmDtc = ParticipantManagement::Interface::Dtc::create(m_ddsHandler->ddsConnector());
   if (m_ppmDtc == nullptr)
   {
-    ERROR_LOG() << "Could not create PPM DTC";
+    ERROR_LOG(m_logger) << "Could not create PPM DTC";
     return false;
   }
   m_ppmDtc->enableType();
@@ -45,7 +44,7 @@ bool HandlerDynamicParticipantData::init()
   m_aesDtc = AreaEffectSimulation::Interface::Dtc::create(m_ddsHandler->ddsConnector());
   if (m_aesDtc == nullptr)
   {
-    ERROR_LOG() << "Could not create AES DTC";
+    ERROR_LOG(m_logger) << "Could not create AES DTC";
     return false;
   }
 
@@ -53,7 +52,7 @@ bool HandlerDynamicParticipantData::init()
   m_gimDtc = GuezIedManagement::Interface::Dtc::create(m_ddsHandler->ddsConnector());
   if (m_gimDtc == nullptr)
   {
-    ERROR_LOG() << "Could not create GIM DTC";
+    ERROR_LOG(m_logger) << "Could not create GIM DTC";
     return false;
   }
 #endif
@@ -61,7 +60,7 @@ bool HandlerDynamicParticipantData::init()
   m_pdmDtc = ProjectDataManagement::Interface::Dtc::create(m_ddsHandler->ddsConnector());
   if (m_pdmDtc == nullptr)
   {
-    ERROR_LOG() << "Could not create PDM DTC";
+    ERROR_LOG(m_logger) << "Could not create PDM DTC";
     return false;
   }
   m_pdmDtc->enableChargeType();
@@ -80,7 +79,7 @@ bool HandlerDynamicParticipantData::init()
   m_aesDtc->enableEffects();
   m_aesDtc->waitForHistoricalDataEffects();
   bool ww = m_aesDtc->waitForHistoricalDataAesItemView();
-  DEBUG_LOG() << "waitForHistoricalDataAesItemView = " << ww;
+  DEBUG_LOG(m_logger) << "waitForHistoricalDataAesItemView = " << ww;
   // read all aesItemViewData
   m_aesDtc->aesItemViews([this](const AreaEffectSimulation::AesItemView &aiv) { onAesItemViewChanged(aiv, DataModification::eAdded); });
 
@@ -105,7 +104,7 @@ bool HandlerDynamicParticipantData::init()
           this, &HandlerDynamicParticipantData::onIedChanged);
   m_gimDtc->enableIed();
   bool gg = m_gimDtc->waitForHistoricalDataIed();
-  DEBUG_LOG() << "waitForHistoricalDataIed = " << gg;
+  DEBUG_LOG(m_logger) << "waitForHistoricalDataIed = " << gg;
   // read all aesItemViewData
   m_gimDtc->ieds([this](const GuezIedManagement::Ied &ied) { onIedChanged(ied, DataModification::eAdded); });
 #endif
@@ -114,7 +113,7 @@ bool HandlerDynamicParticipantData::init()
 
   if (!m_bldDtc)
   {
-    ERROR_LOG() << "Could not create DTC Buildings";
+    ERROR_LOG(m_logger) << "Could not create DTC Buildings";
     return false;
   }
 
@@ -129,7 +128,7 @@ bool HandlerDynamicParticipantData::init()
 
   if (!m_ppmDtc->enableDynamicParticipantData())
   {
-    ERROR_LOG() << "init() PPM failed";
+    ERROR_LOG(m_logger) << "init() PPM failed";
     return false;
   }
 
@@ -140,12 +139,12 @@ bool HandlerDynamicParticipantData::init()
 
   if (!m_ppmDtc->enableParticipantGearEvent())
   {
-    ERROR_LOG() << "init() PPM failed";
+    ERROR_LOG(m_logger) << "init() PPM failed";
     return false;
   }
 #endif
 
-  DEBUG_LOG() << "... done";
+  DEBUG_LOG(m_logger) << "... done";
 
   return true;
 } // end of init()
@@ -158,7 +157,7 @@ void HandlerDynamicParticipantData::onParticipantChanged(const ParticipantManage
   case DataModification::eAdded:
   case DataModification::eModified:
     m_partMap[data.id()] = data;
-    DEBUG_LOG() << "added/modified - data.participantId: " << data.id()
+    DEBUG_LOG(m_logger) << "added/modified - data.participantId: " << data.id()
                         << ", data.partyId: " << data.partyId()
                         << ", data.equipmentNumber: " << data.equipmentNumber();
     break;
@@ -177,20 +176,20 @@ void HandlerDynamicParticipantData::onParticipantPositionChanged(const Participa
   case DataModification::eModified:
   {
     m_partPositionMap[data.participantId()] = data;
-    DEBUG_LOG() << "added/modified Participant Position - data.participantId: " << data.participantId()
+    DEBUG_LOG(m_logger) << "added/modified Participant Position - data.participantId: " << data.participantId()
                         << ", data.pos: " << data.pos();
 
     //TransportInitiated (mounted on vehicle)
     if (data.mountedOn().is_set())
     {
-      DEBUG_LOG() << "Mounted on : " << data.mountedOn().get();
+      DEBUG_LOG(m_logger) << "Mounted on : " << data.mountedOn().get();
 
       if (m_isMounted.contains(data.participantId()))
         break;
 
       m_isMounted.append(data.participantId());
 
-      DEBUG_LOG() << "Added mounted participant id " << data.participantId();
+      DEBUG_LOG(m_logger) << "Added mounted participant id " << data.participantId();
 
       qint64 timeMounted = getLastSignificantPositionMountedChanged(data.participantId(), data.sampleTime(), data.pos());
       if (timeMounted <= 0)
@@ -208,13 +207,13 @@ void HandlerDynamicParticipantData::onParticipantPositionChanged(const Participa
       ttData.eventTypeId = ReportManagement::EventType::TransportInitiated;
       ttData.id = 0; // force insert
       if (!m_db->insert(ttData))
-        WARNING_LOG() << "Error while inserting Event TransportInitiated for participantId: " << ttData.participantId;
+        WARNING_LOG(m_logger) << "Error while inserting Event TransportInitiated for participantId: " << ttData.participantId;
     }
     else
     {
       if (m_isMounted.contains(data.participantId()))
       {
-        DEBUG_LOG() << "Removed mounted participant id " << data.participantId();
+        DEBUG_LOG(m_logger) << "Removed mounted participant id " << data.participantId();
         m_isMounted.remove(m_isMounted.indexOf(data.participantId()));
       }
     }
@@ -223,7 +222,7 @@ void HandlerDynamicParticipantData::onParticipantPositionChanged(const Participa
   }
   case DataModification::eRemoved:
   {
-    DEBUG_LOG() << "Removed participant id " << data.participantId();
+    DEBUG_LOG(m_logger) << "Removed participant id " << data.participantId();
     if (m_isMounted.contains(data.participantId()))
       m_isMounted.remove(m_isMounted.indexOf(data.participantId()));
     m_partPositionMap.remove(data.participantId());
@@ -239,7 +238,7 @@ void HandlerDynamicParticipantData::onAesItemViewChanged(const AreaEffectSimulat
   {
   case DataModification::eAdded:
   case DataModification::eModified:
-    DEBUG_LOG() << "added/modified data.aesItemId(): " << data.aesItemId();
+    DEBUG_LOG(m_logger) << "added/modified data.aesItemId(): " << data.aesItemId();
     m_aesItemViewMap[data.aesItemId()] = data;
     break;
   case DataModification::eRemoved:
@@ -258,7 +257,7 @@ void HandlerDynamicParticipantData::onIedChanged(const GuezIedManagement::Ied &d
   {
   case DataModification::eAdded:
   case DataModification::eModified:
-    DEBUG_LOG() << "added/modified data.id(): " << data.id();
+    DEBUG_LOG(m_logger) << "added/modified data.id(): " << data.id();
     m_iedMap[data.id()] = data;
     break;
   case DataModification::eRemoved:
@@ -275,7 +274,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG() << "onDynamicParticipantDataChanged(): "
+  DEBUG_LOG(m_logger) << "onDynamicParticipantDataChanged(): "
                       << " participantId: " << data.participantId()
                       << ", size stateHistory: " << data.stateHistory().size()
                       << ", size sanMatStock: " << data.sanitationMaterialStock().size();
@@ -298,7 +297,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
     itParticipant = m_partMap.constFind(data.participantId());
     if (itParticipant == m_partMap.constEnd())
     {
-      WARNING_LOG() << "Participant does not exist: participantId: " << data.participantId();
+      WARNING_LOG(m_logger) << "Participant does not exist: participantId: " << data.participantId();
       return;
     }
   }
@@ -370,16 +369,16 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
 
   if (data.stateHistory().size() > 0 && data.stateHistory() != lastDynData.stateHistory())
   {
-    INFO_LOG() << "PROCESSING: stateHistory.size() = " << data.stateHistory().size() << " for participant id = " << data.participantId();
+    INFO_LOG(m_logger) << "PROCESSING: stateHistory.size() = " << data.stateHistory().size() << " for participant id = " << data.participantId();
     const ParticipantManagement::StateInformation &stateInfo = data.stateHistory().at(data.stateHistory().size()-1);
     //const ParticipantManagement::StateInformation &stateInfo = m_ppmDtc->youngestStateInformation(data.stateHistory());
     const ProjectDataManagement::VulnerabilityState &vulnState = stateInfo.vulnerabilityState();
 
-    DEBUG_LOG() << "vulnerabilityState: " << vulnState;
+    DEBUG_LOG(m_logger) << "vulnerabilityState: " << vulnState;
     if (stateInfo.originatorChargeTypeId() > 0)
-      DEBUG_LOG() << "originatorChargeTypeId: " << stateInfo.originatorChargeTypeId();
-    DEBUG_LOG() << "originatorType: " << stateInfo.originatorType();
-    DEBUG_LOG() << "vulnerabilityBits: " << stateInfo.vulnerabilityBits();
+      DEBUG_LOG(m_logger) << "originatorChargeTypeId: " << stateInfo.originatorChargeTypeId();
+    DEBUG_LOG(m_logger) << "originatorType: " << stateInfo.originatorType();
+    DEBUG_LOG(m_logger) << "vulnerabilityBits: " << stateInfo.vulnerabilityBits();
 
     //counting NearMiss and HitWithNoEffect as CombatReady, after discussion with Ulli 08.2021
     bool isCombatReady = (vulnState == ProjectDataManagement::VulnerabilityState::CombatReady ||
@@ -401,7 +400,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
     {
       // Save Treatment Data
       if (!m_db->insert(tData))
-        ERROR_LOG() << "Error while inserting treatment data - participantId: " << tData.participantId;
+        ERROR_LOG(m_logger) << "Error while inserting treatment data - participantId: " << tData.participantId;
     }
 
     // Report Firings
@@ -424,7 +423,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
 
     // Save UnitPower Data
     if (!m_db->insert(upData))
-      ERROR_LOG() << "Error while inserting unit power data - participantId: " << upData.participantId;
+      ERROR_LOG(m_logger) << "Error while inserting unit power data - participantId: " << upData.participantId;
 
     // Report Mine Area / Report Firings / Report AirSupport
     if (vulnState != ProjectDataManagement::VulnerabilityState::CombatReady)
@@ -450,7 +449,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
       }
       // Save direct firings data
       if (!m_db->insert(fData))
-        ERROR_LOG() << "Error while inserting direct firings data into db for event_time = " << fData.eventTime;
+        ERROR_LOG(m_logger) << "Error while inserting direct firings data into db for event_time = " << fData.eventTime;
 
       //save TreatmentTimeline events too
       {
@@ -466,7 +465,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
           ttData.eventTypeId = ReportManagement::EventType::VBGChanged;
           ttData.id = 0; // force insert
           if (!m_db->insert(ttData))
-            ERROR_LOG() << "Error while inserting Event VBGChanged for participantId: " << ttData.participantId;
+            ERROR_LOG(m_logger) << "Error while inserting Event VBGChanged for participantId: " << ttData.participantId;
         }
 
         // VitalityChanged
@@ -477,7 +476,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
           ttData.eventTypeId = ReportManagement::EventType::VitalityChanged;
           ttData.id = 0; // force insert
           if (!m_db->insert(ttData))
-            ERROR_LOG() << "Error while inserting Event VitalityChanged for participantId: " << ttData.participantId;
+            ERROR_LOG(m_logger) << "Error while inserting Event VitalityChanged for participantId: " << ttData.participantId;
         }
       }
 
@@ -487,7 +486,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
     if (stateInfo.originatorType() == ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation &&  stateInfo.originatorChargeTypeId() != 0)
     {
       const AreaEffectSimulation::AesItemView aesItemView = getAesItemView(stateInfo.originatorId());
-      DEBUG_LOG() << "Found indirect fire from AES id = " << stateInfo.originatorId() << ", charge type = " << stateInfo.originatorChargeTypeId();
+      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())
@@ -502,11 +501,11 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
       }
       // Save indirect firings data
       if (!m_db->insert(fData))
-        ERROR_LOG() << "Error while inserting indirect firings data into db for event_time = " << fData.eventTime;
+        ERROR_LOG(m_logger) << "Error while inserting indirect firings data into db for event_time = " << fData.eventTime;
 
       // Save indirect firings - Report AirSupport data
       if (!m_db->insert(airSupData))
-        ERROR_LOG() << "Error while inserting indirect firings (for airSupport report) into db for event_time = " << airSupData.eventTime;
+        ERROR_LOG(m_logger) << "Error while inserting indirect firings (for airSupport report) into db for event_time = " << airSupData.eventTime;
 
       //save TreatmentTimeline events too
       {
@@ -522,7 +521,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
           ttData.eventTypeId = ReportManagement::EventType::VBGChanged;
           ttData.id = 0; // force insert
           if (!m_db->insert(ttData))
-            ERROR_LOG() << "Error while inserting Event VBGChanged for participantId: " << ttData.participantId;
+            ERROR_LOG(m_logger) << "Error while inserting Event VBGChanged for participantId: " << ttData.participantId;
         }
 
         // VitalityChanged
@@ -533,7 +532,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
           ttData.eventTypeId = ReportManagement::EventType::VitalityChanged;
           ttData.id = 0; // force insert
           if (!m_db->insert(ttData))
-            ERROR_LOG() << "Error while inserting Event VitalityChanged for participantId: " << ttData.participantId;
+            ERROR_LOG(m_logger) << "Error while inserting Event VitalityChanged for participantId: " << ttData.participantId;
         }
       }
 
@@ -551,7 +550,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
       }
       // Save explosive device data
       if (!m_db->insert(fData))
-        ERROR_LOG() << "Error while inserting explosive device data into db for event_time = " << fData.eventTime;
+        ERROR_LOG(m_logger) << "Error while inserting explosive device data into db for event_time = " << fData.eventTime;
     }
 #endif
 
@@ -569,25 +568,25 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
     else
       nbcData.hit = 0;
 
-    DEBUG_LOG() << "nbcData.hit: "  << nbcData.hit;
+    DEBUG_LOG(m_logger) << "nbcData.hit: "  << nbcData.hit;
 
     // Check, if effectSimulation is mine area or NBC or Functional Area
     if (stateInfo.originatorType() == ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation ||
         stateInfo.originatorType() == ProjectDataManagement::StateChangeOriginator::FunctionalArea)
     {
-      INFO_LOG() << "Originator = AreaEffectSimulation or FunctionalArea";
+      INFO_LOG(m_logger) << "Originator = AreaEffectSimulation or FunctionalArea";
 
       mbData.mineAreaId    = stateInfo.originatorId();
       nbcData.nbcId        = stateInfo.originatorId();
 
-      DEBUG_LOG() << "aesItemViewMap.size(): " << m_aesItemViewMap.size();
+      DEBUG_LOG(m_logger) << "aesItemViewMap.size(): " << m_aesItemViewMap.size();
       const AreaEffectSimulation::AesItemView aesItemView = getAesItemView(nbcData.nbcId);
-      DEBUG_LOG() << "aesItemView.id() = " << aesItemView.id();
+      DEBUG_LOG(m_logger) << "aesItemView.id() = " << aesItemView.id();
 
       if (aesItemView.id() > 0)
       {
         AreaEffectSimulation::AesType aesType = aesItemView.aesTypeId();
-        DEBUG_LOG() << "AesType: " << aesType;
+        DEBUG_LOG(m_logger) << "AesType: " << aesType;
 
         if (aesItemView.partyId().is_set())
           mbData.mineAreaPartyId = aesItemView.partyId().get();
@@ -604,9 +603,9 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
               mbData.mineAreaId = aesItemView.aesItemId();
             if (mbData.mineAreaId > 0)
             {
-              DEBUG_LOG() << "Inserting Mine Area Data";
+              DEBUG_LOG(m_logger) << "Inserting Mine Area Data";
               if (!m_db->insert(mbData))
-                ERROR_LOG() << "Error while inserting mine area data participantId: " << mbData.participantId;
+                ERROR_LOG(m_logger) << "Error while inserting mine area data participantId: " << mbData.participantId;
             }
           }
           if (aesType == AreaEffectSimulation::AesType::AtBCContamination ||
@@ -618,9 +617,9 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
             nbcData.chargeTypeId = aesItemView.chargeStruct().chargeTypeId();
             if (nbcData.nbcId > 0 && nbcData.chargeTypeId > 0)
             {
-              DEBUG_LOG() << "Inserting NBC Data";
+              DEBUG_LOG(m_logger) << "Inserting NBC Data";
               if (!m_db->insert(nbcData))
-                ERROR_LOG() << "Error while inserting nbc data participant: " << nbcData.participantId;
+                ERROR_LOG(m_logger) << "Error while inserting nbc data participant: " << nbcData.participantId;
             }
           }
 
@@ -632,7 +631,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
             vrData.timePositionChanged = getLastSignificantParticipantPositionChanged(vrData.participantId, vrData.timeEvent, getLastPosition(vrData.participantId));
 
             if (!m_db->insert(vrData))
-              ERROR_LOG() << "Error while inserting maintenance data for participantId: " << vrData.participantId;
+              ERROR_LOG(m_logger) << "Error while inserting maintenance data for participantId: " << vrData.participantId;
 
             // treatment timeline event EnterFunctionalArea
             ttData.vulnerabilityState = stateInfo.vulnerabilityState().underlying();
@@ -654,7 +653,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
 
             ttData.id = 0; // force insert
             if (!m_db->insert(ttData))
-              ERROR_LOG() << "Error while inserting Event EnterFunctionalArea for participantId: " << ttData.participantId;
+              ERROR_LOG(m_logger) << "Error while inserting Event EnterFunctionalArea for participantId: " << ttData.participantId;
           }
 
         }
@@ -664,7 +663,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
     // Treatment reports
     if (stateInfo.originatorType() == ProjectDataManagement::StateChangeOriginator::Sanitation)
     {
-      DEBUG_LOG() << "Sanitation";
+      DEBUG_LOG(m_logger) << "Sanitation";
       // Sanitation info only for Human type class
       ParticipantManagement::TypeClass typeClass = m_ppmDtc->type(pData.typeId()).typeClass();
       if (typeClass == ParticipantManagement::TypeClass::Human)
@@ -719,7 +718,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
           toAdd = false;
 
         if (toAdd && !m_db->insert(tData))
-          ERROR_LOG() << "Error while inserting treatment data for participantId: " << tData.participantId;
+          ERROR_LOG(m_logger) << "Error while inserting treatment data for participantId: " << tData.participantId;
 
         // now treatment timeline events
         {
@@ -735,7 +734,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
             ttData.eventTypeId = ReportManagement::EventType::VBGChanged;
             ttData.id = 0; // force insert
             if (!m_db->insert(ttData))
-              ERROR_LOG() << "Error while inserting Event VBGChanged for participantId: " << ttData.participantId;
+              ERROR_LOG(m_logger) << "Error while inserting Event VBGChanged for participantId: " << ttData.participantId;
           }
 
           // VitalityChanged
@@ -746,7 +745,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
             ttData.eventTypeId = ReportManagement::EventType::VitalityChanged;
             ttData.id = 0; // force insert
             if (!m_db->insert(ttData))
-              ERROR_LOG() << "Error while inserting Event VitalityChanged for participantId: " << ttData.participantId;
+              ERROR_LOG(m_logger) << "Error while inserting Event VitalityChanged for participantId: " << ttData.participantId;
           }
 
           // Treatment
@@ -758,7 +757,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
 
           ttData.id = 0; // force insert
           if (!m_db->insert(ttData))
-            ERROR_LOG() << "Error while inserting Event Treatment for participantId: " << ttData.participantId;
+            ERROR_LOG(m_logger) << "Error while inserting Event Treatment for participantId: " << ttData.participantId;
 
 /*
           //TransportInitiated (mounted on vehicle)
@@ -769,7 +768,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
             ttData.eventTypeId = ReportManagement::EventType::TransportInitiated;
             ttData.id = 0; // force insert
             if (!m_db->insert(ttData))
-              ERROR_LOG() << "Error while inserting Event TransportInitiated for participantId: " << ttData.participantId;
+              ERROR_LOG(m_logger) << "Error while inserting Event TransportInitiated for participantId: " << ttData.participantId;
           }
 */
         }
@@ -790,7 +789,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
         ttData.eventTypeId = ReportManagement::EventType::NineLinerSet;
         ttData.id = 0; //force insert
         if (!m_db->insert(ttData))
-          ERROR_LOG() << "Error while inserting Event NineLinerSet for participantId: " << ttData.participantId;
+          ERROR_LOG(m_logger) << "Error while inserting Event NineLinerSet for participantId: " << ttData.participantId;
       }
       else if (stateInfo.originatorChargeTypeId() == 2) // Transport Requested
       {
@@ -799,7 +798,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
         ttData.eventTypeId = ReportManagement::EventType::TransportRequested;
         ttData.id = 0; //force insert
         if (!m_db->insert(ttData))
-          ERROR_LOG() << "Error while inserting Event TransportRequested for participantId: " << ttData.participantId;
+          ERROR_LOG(m_logger) << "Error while inserting Event TransportRequested for participantId: " << ttData.participantId;
       }
     }
 
@@ -816,7 +815,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
         ttData.eventTypeId = ReportManagement::EventType::SetInjury;
       ttData.id = 0; // force insert
       if (!m_db->insert(ttData))
-        ERROR_LOG() << "Error while inserting Event SetInjury for participantId: " << ttData.participantId;
+        ERROR_LOG(m_logger) << "Error while inserting Event SetInjury for participantId: " << ttData.participantId;
     }
 
     // Vitality and Vulnerability reset manually
@@ -830,7 +829,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
       ttData.eventTypeId = ReportManagement::EventType::VitalityReset;
       ttData.id = 0; // force insert
       if (!m_db->insert(ttData))
-        ERROR_LOG() << "Error while inserting Event VitalityReset for participantId: " << ttData.participantId;
+        ERROR_LOG(m_logger) << "Error while inserting Event VitalityReset for participantId: " << ttData.participantId;
     }
 
 #ifdef GUEZ_MODE
@@ -844,7 +843,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
       ttData.eventTypeId = ReportManagement::EventType::VBGSet;
       ttData.id = 0; // force insert
       if (!m_db->insert(ttData))
-        ERROR_LOG() << "Error while inserting Event VBGSet for participantId: " << ttData.participantId;
+        ERROR_LOG(m_logger) << "Error while inserting Event VBGSet for participantId: " << ttData.participantId;
     }
 #endif
 
@@ -853,7 +852,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
 
   }
   else
-    DEBUG_LOG() << "No new state history for participant id = " << data.participantId();
+    DEBUG_LOG(m_logger) << "No new state history for participant id = " << data.participantId();
 
 
   // Report Charge Resupply
@@ -893,7 +892,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
     crData.chargeRemain = gi.remain();
 
     if (crData.chargeTypeId != gi.chargeTypeId())
-      WARNING_LOG() << "OLD charge id " << gi.chargeTypeId() << " changed in NEW id " << crData.chargeTypeId;
+      WARNING_LOG(m_logger) << "OLD charge id " << gi.chargeTypeId() << " changed in NEW id " << crData.chargeTypeId;
 
     QPair<int, int> pair;
     pair.first = gi.gearTypeId();
@@ -907,11 +906,11 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
     }
     gearMap.insert(pair, gi.remain());
 
-    DEBUG_LOG() << "gearTypeId: " << crData.gearTypeId << ", chargeTypeId: " << crData.chargeTypeId;
+    DEBUG_LOG(m_logger) << "gearTypeId: " << crData.gearTypeId << ", chargeTypeId: " << crData.chargeTypeId;
 
     crData.id = 0; // to force insert without id
     if (!m_db->insert(crData))
-      ERROR_LOG() << "Error while inserting charge resupply data for participant: " << data.participantId();
+      ERROR_LOG(m_logger) << "Error while inserting charge resupply data for participant: " << data.participantId();
   }
 
   // Has Turm/Wanne Map been filled?
@@ -929,14 +928,14 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
     }
     gearMap.insert(pair, turmWanneCrData.chargeRemain);
 
-    INFO_LOG() << "Inserting TurmWanne data gearTypeId: " << turmWanneCrData.gearTypeId
+    INFO_LOG(m_logger) << "Inserting TurmWanne data gearTypeId: " << turmWanneCrData.gearTypeId
                        << ", chargeTypeId: " << turmWanneCrData.chargeTypeId
                        << ", remain: " << turmWanneCrData.chargeRemain
                        << ", fired: "  << turmWanneCrData.chargeFired ;
 
     turmWanneCrData.id = 0; // to force insert without id
     if (!m_db->insert(turmWanneCrData))
-      ERROR_LOG() << "Error while inserting (turm/wanne) charge resupply data for participant: " << data.participantId();
+      ERROR_LOG(m_logger) << "Error while inserting (turm/wanne) charge resupply data for participant: " << data.participantId();
 
   }
 
@@ -946,7 +945,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
   for (auto it = gearMap.begin(); it != gearMap.end(); ++it)
   {
     QPair<int, int> pair = it.key();
-    DEBUG_LOG() << "gearTypeId: " << pair.first << ", chargeTypeId: " << pair.second;
+    DEBUG_LOG(m_logger) << "gearTypeId: " << pair.first << ", chargeTypeId: " << pair.second;
     if (!containsGearTypeId(data.gear(), pair.first, pair.second))
     {
       crData.chargeTypeId = -2;
@@ -954,14 +953,14 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
 
       crData.id = 0; // to force insert without id
       if (!m_db->insert(crData))
-        ERROR_LOG() << "Error while inserting charge resupply data for participant: " << data.participantId();
+        ERROR_LOG(m_logger) << "Error while inserting charge resupply data for participant: " << data.participantId();
     }
   }
 
   // Report Sanitation Material
   if (data.sanitationMaterialStock().size() > 0)
   {
-    INFO_LOG() << "sanitationMaterialStock.size() = " << data.sanitationMaterialStock().size() << " for participant id = " << data.participantId();
+    INFO_LOG(m_logger) << "sanitationMaterialStock.size() = " << data.sanitationMaterialStock().size() << " for participant id = " << data.participantId();
 
     Database::RepSanitationMaterialData sanData;
 
@@ -972,7 +971,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
     sanData.sanitationUniqueId = data.sanitationUniqueId();
     sanData.qualification      = data.qualification().underlying();
 
-    DEBUG_LOG() << "Qualification = " << sanData.qualification;
+    DEBUG_LOG(m_logger) << "Qualification = " << sanData.qualification;
 
     for ( ParticipantManagement::SanitationMaterial sanMat : std::as_const(data.sanitationMaterialStock()))
     {
@@ -980,10 +979,10 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
       sanData.materialAmount = sanMat.materialCount();
       sanData.id = 0; // to force insert
 
-      DEBUG_LOG() << "Inserting SanMat data for participant id = " << data.participantId() << " , materialId = " << sanData.materialId << ", stock = " << sanData.materialAmount;
+      DEBUG_LOG(m_logger) << "Inserting SanMat data for participant id = " << data.participantId() << " , materialId = " << sanData.materialId << ", stock = " << sanData.materialAmount;
 
       if (!m_db->insert(sanData))
-        ERROR_LOG() << "Error while inserting sanitation material data for participant: " << data.participantId();
+        ERROR_LOG(m_logger) << "Error while inserting sanitation material data for participant: " << data.participantId();
     }
   }
 
@@ -1011,7 +1010,7 @@ void HandlerDynamicParticipantData::onBuildingStateChanged(const Buildings::Buil
   airSupData.eventTime = data.sampleTime();
 
   if (!m_db->insert(airSupData))
-    ERROR_LOG() << "Error while inserting building state data into db for event_time = " << airSupData.eventTime;
+    ERROR_LOG(m_logger) << "Error while inserting building state data into db for event_time = " << airSupData.eventTime;
 
 } // end of onBuildingStateChanged
 
@@ -1042,7 +1041,7 @@ void HandlerDynamicParticipantData::onAesEffectsChanged(const AreaEffectSimulati
   }
 
   if (!m_db->insert(impData))
-    ERROR_LOG() << "Error while inserting air support impact data into db for event_time = " << impData.eventTime;
+    ERROR_LOG(m_logger) << "Error while inserting air support impact data into db for event_time = " << impData.eventTime;
 
 } // end of onAesEffectsChanged
 
@@ -1070,7 +1069,7 @@ bool HandlerDynamicParticipantData::checkVulnerabilityStateChange(ProjectDataMan
   // No change?
   if (it.value() == vulnState)
   {
-    INFO_LOG() << "Same vulnerabilityState: " << vulnState;
+    INFO_LOG(m_logger) << "Same vulnerabilityState: " << vulnState;
     return false;
   }
 
@@ -1085,10 +1084,10 @@ AreaEffectSimulation::AesItemView HandlerDynamicParticipantData::getAesItemView(
   {
     // make sure we have all data
     bool ww = m_aesDtc->waitForHistoricalDataAesItemView();
-    DEBUG_LOG() << "waitForHistoricalDataAesItemView = " << ww;
+    DEBUG_LOG(m_logger) << "waitForHistoricalDataAesItemView = " << ww;
 
     auto ret = m_aesDtc->aesItemView(effectSimulationId);
-    DEBUG_LOG() << "ret.id() = " << ret.id();
+    DEBUG_LOG(m_logger) << "ret.id() = " << ret.id();
 
     if (ret.id() == effectSimulationId)
     {
@@ -1097,7 +1096,7 @@ AreaEffectSimulation::AesItemView HandlerDynamicParticipantData::getAesItemView(
     }
     else
     {
-      DEBUG_LOG() << "Not found effectSimulationId = " << effectSimulationId;
+      DEBUG_LOG(m_logger) << "Not found effectSimulationId = " << effectSimulationId;
       return AreaEffectSimulation::AesItemView();
     }
 
@@ -1114,21 +1113,21 @@ QString HandlerDynamicParticipantData::getAesName(int effectSimulationId)
   {
     // make sure we have all data
     bool ww = m_aesDtc->waitForHistoricalDataAesItemView();
-    DEBUG_LOG() << "waitForHistoricalDataAesItemView = " << ww;
+    DEBUG_LOG(m_logger) << "waitForHistoricalDataAesItemView = " << ww;
 
     auto aesItemView = getAesItemView(effectSimulationId);
-    ERROR_LOG() << "aesType: " << aesItemView.aesTypeId().underlying();
+    ERROR_LOG(m_logger) << "aesType: " << aesItemView.aesTypeId().underlying();
     if (aesItemView.aesTypeId() == AreaEffectSimulation::AesType_def::AtExplosionCluster)
     {
       QString aesName = QString::fromStdString(m_aesDtc->explosionCluster(effectSimulationId).name());
-      ERROR_LOG() << "ExplosionCluster aesName: " << aesName;
+      ERROR_LOG(m_logger) << "ExplosionCluster aesName: " << aesName;
       m_aesNamesMap.insert(effectSimulationId, aesName);
       return aesName;
     }
     else
     {
       QString aesName = QString::fromStdString(m_aesDtc->airSupportImpact(effectSimulationId).name());
-      ERROR_LOG() << "AirSupport aesName: " << aesName;
+      ERROR_LOG(m_logger) << "AirSupport aesName: " << aesName;
       m_aesNamesMap.insert(effectSimulationId, aesName);
       return aesName;
     }
@@ -1160,9 +1159,9 @@ qint32 HandlerDynamicParticipantData::lastVitality(int participantId, qint64 cur
                                       "WHERE participant_id = :participantId AND (event_time <= :currTime) "
                                       "ORDER BY event_time DESC LIMIT 1");
 
-  DEBUG_LOG() << "Statement: " << stmtSelect;
-  DEBUG_LOG() << "Participant Id = " << participantId;
-  DEBUG_LOG() << "Time = " << currTime;
+  DEBUG_LOG(m_logger) << "Statement: " << stmtSelect;
+  DEBUG_LOG(m_logger) << "Participant Id = " << participantId;
+  DEBUG_LOG(m_logger) << "Time = " << currTime;
 
   qSelect.prepare(stmtSelect);
   qSelect.bindValue(QStringLiteral(":currTime"),      currTime);
@@ -1170,7 +1169,7 @@ qint32 HandlerDynamicParticipantData::lastVitality(int participantId, qint64 cur
 
   if (!qSelect.exec())
   {
-    ERROR_LOG() << "Error selecting data for participant id = " << participantId;
+    ERROR_LOG(m_logger) << "Error selecting data for participant id = " << participantId;
     return vit;
   }
 
@@ -1190,9 +1189,9 @@ qint32 HandlerDynamicParticipantData::lastVulnerabilityKind(int participantId, q
                                       "WHERE participant_id = :participantId AND (event_time <= :currTime) "
                                       "ORDER BY event_time DESC LIMIT 1");
 
-  DEBUG_LOG() << "Statement: " << stmtSelect;
-  DEBUG_LOG() << "Participant Id = " << participantId;
-  DEBUG_LOG() << "Time = " << currTime;
+  DEBUG_LOG(m_logger) << "Statement: " << stmtSelect;
+  DEBUG_LOG(m_logger) << "Participant Id = " << participantId;
+  DEBUG_LOG(m_logger) << "Time = " << currTime;
 
   qSelect.prepare(stmtSelect);
   qSelect.bindValue(QStringLiteral(":currTime"),      currTime);
@@ -1200,7 +1199,7 @@ qint32 HandlerDynamicParticipantData::lastVulnerabilityKind(int participantId, q
 
   if (!qSelect.exec())
   {
-    ERROR_LOG() << "Error selecting data for participant id = " << participantId;
+    ERROR_LOG(m_logger) << "Error selecting data for participant id = " << participantId;
     return vuln;
   }
 
@@ -1222,7 +1221,7 @@ Core::GeoPosition HandlerDynamicParticipantData::getLastPosition(int participant
     m_ppmDtc->waitForHistoricalDataParticipantPosition();
     itParticipant = m_partPositionMap.constFind(participantId);
     if (itParticipant == m_partPositionMap.constEnd())
-      WARNING_LOG() << "Participant position not found for participantId: " << participantId;
+      WARNING_LOG(m_logger) << "Participant position not found for participantId: " << participantId;
   }
   else
     return itParticipant.value().pos();
@@ -1240,9 +1239,9 @@ qint64 HandlerDynamicParticipantData::getLastSignificantParticipantPositionChang
                                       "WHERE participant_id = :participantId AND (sample_time <= :currTime) "
                                       "ORDER by sample_time DESC");
 
-  DEBUG_LOG() << "Statement: " << stmtSelect;
-  DEBUG_LOG() << "Participant Id = " << participantId;
-  DEBUG_LOG() << "Time = " << currTime;
+  DEBUG_LOG(m_logger) << "Statement: " << stmtSelect;
+  DEBUG_LOG(m_logger) << "Participant Id = " << participantId;
+  DEBUG_LOG(m_logger) << "Time = " << currTime;
 
   qSelect.prepare(stmtSelect);
   qSelect.bindValue(QStringLiteral(":currTime"),      currTime);
@@ -1250,7 +1249,7 @@ qint64 HandlerDynamicParticipantData::getLastSignificantParticipantPositionChang
 
   if (!qSelect.exec())
   {
-    ERROR_LOG() << "Error selecting data for participant id = " << participantId;
+    ERROR_LOG(m_logger) << "Error selecting data for participant id = " << participantId;
     return time_changed;
   }
 
@@ -1277,9 +1276,9 @@ qint64 HandlerDynamicParticipantData::getLastSignificantPositionMountedChanged(i
                                       "WHERE participant_id = :participantId AND (sample_time <= :currTime) AND mounted_on > 0 "
                                       "ORDER by sample_time DESC");
 
-  DEBUG_LOG() << "Statement: " << stmtSelect;
-  DEBUG_LOG() << "Participant Id = " << participantId;
-  DEBUG_LOG() << "Time = " << currTime;
+  DEBUG_LOG(m_logger) << "Statement: " << stmtSelect;
+  DEBUG_LOG(m_logger) << "Participant Id = " << participantId;
+  DEBUG_LOG(m_logger) << "Time = " << currTime;
 
   qSelect.prepare(stmtSelect);
   qSelect.bindValue(QStringLiteral(":currTime"),      currTime);
@@ -1287,7 +1286,7 @@ qint64 HandlerDynamicParticipantData::getLastSignificantPositionMountedChanged(i
 
   if (!qSelect.exec())
   {
-    ERROR_LOG() << "Error selecting data for participant id = " << participantId;
+    ERROR_LOG(m_logger) << "Error selecting data for participant id = " << participantId;
     return time_changed;
   }
 
@@ -1310,7 +1309,7 @@ void HandlerDynamicParticipantData::onParticipantGearEventChanged(const Particip
   if (modType == DataModification::eRemoved)
     return;
 
-  DEBUG_LOG() << "onParticipantGearEventChanged(): "
+  DEBUG_LOG(m_logger) << "onParticipantGearEventChanged(): "
                       << " participantId: " << data.participantId();
 
   // Report Firings
@@ -1328,7 +1327,7 @@ void HandlerDynamicParticipantData::onParticipantGearEventChanged(const Particip
     itOParticipant = m_partMap.constFind(fData.participantId);
     if (itOParticipant == m_partMap.constEnd())
     {
-      WARNING_LOG() << "Originator participant does not exist: Id = " << fData.participantId;
+      WARNING_LOG(m_logger) << "Originator participant does not exist: Id = " << fData.participantId;
       return;
     }
   }
@@ -1346,7 +1345,7 @@ void HandlerDynamicParticipantData::onParticipantGearEventChanged(const Particip
 
   // Save firings data
   if (!m_db->insert(fData))
-    ERROR_LOG() << "Error while inserting ParticipantGearEvent firings data into db for event_time = " << fData.eventTime;
+    ERROR_LOG(m_logger) << "Error while inserting ParticipantGearEvent firings data into db for event_time = " << fData.eventTime;
 
 }
 
@@ -1378,11 +1377,11 @@ qint64 HandlerDynamicParticipantData::sinceWhenVitality(int participantId, int v
                                       "WHERE participant_id = :participantId AND (event_time <= :currTime) "
                                       "ORDER BY event_time DESC");
 
-  DEBUG_LOG() << "!!! sinceWhenVitality";
-  DEBUG_LOG() << "Statement: " << stmtSelect;
-  DEBUG_LOG() << "Participant Id = " << participantId;
-  DEBUG_LOG() << "Time = " << currTime;
-  DEBUG_LOG() << "Vitality = " << vitality;
+  DEBUG_LOG(m_logger) << "!!! sinceWhenVitality";
+  DEBUG_LOG(m_logger) << "Statement: " << stmtSelect;
+  DEBUG_LOG(m_logger) << "Participant Id = " << participantId;
+  DEBUG_LOG(m_logger) << "Time = " << currTime;
+  DEBUG_LOG(m_logger) << "Vitality = " << vitality;
 
   qSelect.prepare(stmtSelect);
   qSelect.bindValue(QStringLiteral(":currTime"),      currTime);
@@ -1390,7 +1389,7 @@ qint64 HandlerDynamicParticipantData::sinceWhenVitality(int participantId, int v
 
   if (!qSelect.exec())
   {
-    ERROR_LOG() << "Error selecting data for participant id = " << participantId;
+    ERROR_LOG(m_logger) << "Error selecting data for participant id = " << participantId;
     return time;
   }
 
@@ -1406,7 +1405,7 @@ qint64 HandlerDynamicParticipantData::sinceWhenVitality(int participantId, int v
       break;
   }
 
-  DEBUG_LOG() << "### Recalculated time vitality = " << time;
+  DEBUG_LOG(m_logger) << "### Recalculated time vitality = " << time;
 
   return time;
 }
@@ -1422,11 +1421,11 @@ qint64 HandlerDynamicParticipantData::sinceWhenVulnerability(int participantId,
                                       "WHERE participant_id = :participantId AND (event_time <= :currTime) "
                                       "ORDER BY event_time DESC");
 
-  DEBUG_LOG() << "!!! sinceWhenVulnerability";
-  DEBUG_LOG() << "Statement: " << stmtSelect;
-  DEBUG_LOG() << "Participant Id = " << participantId;
-  DEBUG_LOG() << "Time = " << currTime;
-  DEBUG_LOG() << "Vulnerability = " << vulnerability;
+  DEBUG_LOG(m_logger) << "!!! sinceWhenVulnerability";
+  DEBUG_LOG(m_logger) << "Statement: " << stmtSelect;
+  DEBUG_LOG(m_logger) << "Participant Id = " << participantId;
+  DEBUG_LOG(m_logger) << "Time = " << currTime;
+  DEBUG_LOG(m_logger) << "Vulnerability = " << vulnerability;
 
   qSelect.prepare(stmtSelect);
   qSelect.bindValue(QStringLiteral(":currTime"),      currTime);
@@ -1434,14 +1433,14 @@ qint64 HandlerDynamicParticipantData::sinceWhenVulnerability(int participantId,
 
   if (!qSelect.exec())
   {
-    ERROR_LOG() << "Error selecting data for participant id = " << participantId;
+    ERROR_LOG(m_logger) << "Error selecting data for participant id = " << participantId;
     return time;
   }
 
   while (qSelect.next())
   {
     int vuln = qSelect.value(1).toInt();
-    DEBUG_LOG() << "Checking - time = " << qSelect.value(0).toLongLong() << ", vuln = " << vuln;
+    DEBUG_LOG(m_logger) << "Checking - time = " << qSelect.value(0).toLongLong() << ", vuln = " << vuln;
     if (vuln == vulnerability)
     {
       time = qSelect.value(0).toLongLong();
@@ -1451,7 +1450,7 @@ qint64 HandlerDynamicParticipantData::sinceWhenVulnerability(int participantId,
       break;
   }
 
-  DEBUG_LOG() << "### Recalculated time vulnerability = " << time;
+  DEBUG_LOG(m_logger) << "### Recalculated time vulnerability = " << time;
 
   return time;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/main_handler.cpp
index 9c1515f76..fd1824396 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/main_handler.cpp
@@ -15,12 +15,11 @@
 namespace ReportManagement
 {
 
-MainHandler::MainHandler(QObject *parent)
-  : QObject(parent)
+MainHandler::MainHandler(QObject *parent) : QObject(parent)
   , m_ddsHandler(nullptr)
   , m_dbHandler(nullptr)
-  , m_dynPartData(nullptr)
-{}
+  , m_dynPartData(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 MainHandler::~MainHandler()
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/main_handler.h
index 3bb1200d7..16626cc04 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/main_handler.h
@@ -32,6 +32,8 @@ public:
 
 private:
 
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>                    m_ddsHandler;
   std::shared_ptr<DbHandler>                     m_dbHandler;
   std::shared_ptr<HandlerDynamicParticipantData> m_dynPartData;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_data.cpp
index 40358c3b3..e02349856 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_data.cpp
@@ -38,7 +38,7 @@ HandlerReportData::HandlerReportData(const std::shared_ptr<DdsHandler> &ddsHandl
 //-----------------------------------------------------------------------------
 bool HandlerReportData::init()
 {
-  INFO_LOG() << "start init() DTC HandlerReportData ";
+  INFO_LOG(m_logger) << "start init() DTC HandlerReportData ";
 
   bool bRet = true;
   auto cbReport = [this, &bRet](Database::RepReport dbData)
@@ -49,7 +49,7 @@ bool HandlerReportData::init()
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       bRet = false;
       return;
     }
@@ -62,7 +62,7 @@ bool HandlerReportData::init()
   m_ppmDtc = ParticipantManagement::Interface::Dtc::create(m_ddsHandler->ddsConnector());
   if (m_ppmDtc == nullptr)
   {
-    ERROR_LOG() << "Could not create PPM DTC";
+    ERROR_LOG(m_logger) << "Could not create PPM DTC";
     return false;
   }
   m_ppmDtc->enableParticipant();
@@ -72,7 +72,7 @@ bool HandlerReportData::init()
   m_aesDtc = AreaEffectSimulation::Interface::Dtc::create(m_ddsHandler->ddsConnector());
   if (m_aesDtc == nullptr)
   {
-    ERROR_LOG() << "Could not create AES DTC";
+    ERROR_LOG(m_logger) << "Could not create AES DTC";
     return false;
   }
   m_aesDtc->enableMineArea();
@@ -97,7 +97,7 @@ QString HandlerReportData::intVecToString(const std::vector<int> &intVec)
 void HandlerReportData::onCreateModifyReportRequest(const rti::core::SampleIdentity &cookie,
                                                     const CreateModifyReportRequest &request)
 {
-  DEBUG_LOG() << "onCreateModifyReportRequest" << request;
+  DEBUG_LOG(m_logger) << "onCreateModifyReportRequest" << request;
 
   m_updateReportCookie = cookie;
 
@@ -118,12 +118,12 @@ void HandlerReportData::onCreateModifyReportRequest(const rti::core::SampleIdent
     ReportType repType = request.reportType(); // assuming this cannot be changed by this request
     ok = removeReportData(reportId, repType); // remove old data
     if (!ok)
-      WARNING_LOG() << "Cannot remove old data for report id = " << reportId;
+      WARNING_LOG(m_logger) << "Cannot remove old data for report id = " << reportId;
   }
 
   if (!insertReportData(request, reportId))
   {
-    ERROR_LOG() << "Error while creating report!";
+    ERROR_LOG(m_logger) << "Error while creating report!";
     m_reply.errorString(tr_lts("dds","Error while creating report"));
     m_reply.replyState(Core::FtReplyState::Error);
     m_reply.currentTime(QDateTime::currentMSecsSinceEpoch());
@@ -214,7 +214,7 @@ void HandlerReportData::onCreateModifyReportRequest(const rti::core::SampleIdent
 
   default:
   {
-    WARNING_LOG() << "Report Type unknown, not generating.";
+    WARNING_LOG(m_logger) << "Report Type unknown, not generating.";
     break;
   }
   }
@@ -225,7 +225,7 @@ void HandlerReportData::onCreateModifyReportRequest(const rti::core::SampleIdent
     objRep->removeObject();
     m_objReportMap.remove(reportId);
 
-    ERROR_LOG() << "Error generating report with type " << request.reportType();
+    ERROR_LOG(m_logger) << "Error generating report with type " << request.reportType();
     m_reply.errorString(tr_lts("dds", "Error generating report"));
     m_reply.replyState(Core::FtReplyState::Error);
     m_reply.currentTime(QDateTime::currentMSecsSinceEpoch());
@@ -244,7 +244,7 @@ void HandlerReportData::onCreateModifyReportRequest(const rti::core::SampleIdent
 void HandlerReportData::onRemoveReportRequest(const rti::core::SampleIdentity &cookie,
                                               const Core::RemoveElementRequest &request)
 {
-  DEBUG_LOG() << "onRemoveReportRequest " << request;
+  DEBUG_LOG(m_logger) << "onRemoveReportRequest " << request;
 
   int reportId = request.id();
 
@@ -262,7 +262,7 @@ void HandlerReportData::onRemoveReportRequest(const rti::core::SampleIdentity &c
   ret = ifs->removeObject();
 
   if (ret.error())
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
   else
   {
     // delete ObjectReportInfo
@@ -281,7 +281,7 @@ void HandlerReportData::onRemoveReportRequest(const rti::core::SampleIdentity &c
 //-----------------------------------------------------------------------------
 bool HandlerReportData::removeReportData(int reportId, ReportType repType)
 {
-  INFO_LOG() << "IN removeReportData";
+  INFO_LOG(m_logger) << "IN removeReportData";
 
   bool ok = true;
 
@@ -363,13 +363,13 @@ bool HandlerReportData::removeReportData(int reportId, ReportType repType)
   }
   default:
   {
-    WARNING_LOG() << "Report Type unknown, cannot remove generated data";
+    WARNING_LOG(m_logger) << "Report Type unknown, cannot remove generated data";
     break;
   }
   }
 
   if (!ok)
-    WARNING_LOG() << "Could not remove old generated data for report id = " << reportId;
+    WARNING_LOG(m_logger) << "Could not remove old generated data for report id = " << reportId;
 
   return ok;
 }
@@ -378,7 +378,7 @@ bool HandlerReportData::removeReportData(int reportId, ReportType repType)
 void HandlerReportData::onReportChangeStatusRequest(const rti::core::SampleIdentity &cookie,
                                                     const ReportChangeStatusRequest &request)
 {
-  DEBUG_LOG() << "onReportChangeStatusRequest " << request;
+  DEBUG_LOG(m_logger) << "onReportChangeStatusRequest " << request;
   ObjectReportInfo *ifs = m_objReportMap.value(request.id());
   if (ifs == nullptr)
   {
@@ -388,7 +388,7 @@ void HandlerReportData::onReportChangeStatusRequest(const rti::core::SampleIdent
   }
   Core::FunctionReplyObject ret = ifs->changeStatus(request);
   if (ret.error())
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
 
   m_ddsHandler->fts()->reportChangeStatusReply(cookie, ret);
 }
@@ -496,7 +496,7 @@ bool HandlerReportData::insertReportData(const CreateModifyReportRequest &reques
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       return false;
     }
     m_objReportMap.insert(ifs->getId(), ifs);
@@ -509,14 +509,14 @@ bool HandlerReportData::insertReportData(const CreateModifyReportRequest &reques
     ObjectReportInfo *ifs = m_objReportMap.value(reportId);
     if (!ifs)
     {
-      ERROR_LOG() << "Report not found - report id = " << reportId;
+      ERROR_LOG(m_logger) << "Report not found - report id = " << reportId;
       return false;
     }
     Core::FunctionReplyObject ret = ifs->updateObject(data);
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       return false;
     }
   }
@@ -526,7 +526,7 @@ bool HandlerReportData::insertReportData(const CreateModifyReportRequest &reques
 // -----------------------------------------------------------------------------------
 bool HandlerReportData::removeReportDataResult(int reportId, const QString &tableName)
 {
-  DEBUG_LOG() <<  "Start removeReportDataResult";
+  DEBUG_LOG(m_logger) <<  "Start removeReportDataResult";
 
   DBTransaction trans(m_db->database());
   NSqlQuery q(m_db->database());
@@ -536,17 +536,17 @@ bool HandlerReportData::removeReportDataResult(int reportId, const QString &tabl
   q.prepare(stmt);
   q.bindValue(QStringLiteral(":reportId"), reportId);
 
-  DEBUG_LOG() << "Statement: " << stmt;
+  DEBUG_LOG(m_logger) << "Statement: " << stmt;
 
   if (!q.exec())
   {
-    ERROR_LOG() << "Error removing report data for report id = " << reportId;
+    ERROR_LOG(m_logger) << "Error removing report data for report id = " << reportId;
     return false;
   }
 
   trans.commit();
 
-  DEBUG_LOG() <<  " END removeReportDataResult";
+  DEBUG_LOG(m_logger) <<  " END removeReportDataResult";
   return true;
 }
 
@@ -554,7 +554,7 @@ bool HandlerReportData::removeReportDataResult(int reportId, const QString &tabl
 // -----------------------------------------------------------------------------------
 void HandlerReportData::checkElapsedTimer(QElapsedTimer &t)
 {
-  TRACE_LOG() << "checkElapsedTimer ...";
+  TRACE_LOG(m_logger) << "checkElapsedTimer ...";
   if (t.elapsed() > 5 * 1000)
   {
     t.start();
@@ -565,7 +565,7 @@ void HandlerReportData::checkElapsedTimer(QElapsedTimer &t)
 // -----------------------------------------------------------------------------------
 void HandlerReportData::updateReportReply()
 {
-  DEBUG_LOG() << "updateReportReply: " << m_reply;
+  DEBUG_LOG(m_logger) << "updateReportReply: " << m_reply;
   m_reply.currentTime(QDateTime::currentMSecsSinceEpoch());
   m_ddsHandler->fts()->createModifyReportReply(m_updateReportCookie, m_reply);
   m_ddsHandler->pacemaker()->publishState();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_data.h
index 018238c28..742b3ca3d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_data.h
@@ -192,6 +192,8 @@ class HandlerReportData final
   bool init();
 
   private: // methods
+
+  NGL::INGLLogger &m_logger;
   static QString intVecToString(const std::vector<int> &intVec);
   void onCreateModifyReportRequest(const rti::core::SampleIdentity &cookie, const CreateModifyReportRequest &request) override final;
   void onRemoveReportRequest(const rti::core::SampleIdentity &cookie, const Core::RemoveElementRequest &request) override final;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_get_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_get_data.cpp
index a837d7036..283b7529b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_get_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_get_data.cpp
@@ -42,7 +42,7 @@ void HandlerReportGetData::onGetReportDataRequest(const rti::core::SampleIdentit
   if (ret.errorString().size() != 0)
   {
     Core::FunctionReplyObject fro(ret.id(), ret.errorString(), ret.errorParams());
-    WARNING_LOG() << "error: " << fro();
+    WARNING_LOG(m_logger) << "error: " << fro();
   }
   m_ddsHandler->fts()->getReportDataReply(cookie, ret);
 }
@@ -50,7 +50,7 @@ void HandlerReportGetData::onGetReportDataRequest(const rti::core::SampleIdentit
 //-----------------------------------------------------------------------------
 GetReportDataReply HandlerReportGetData::getReportDataRequest(const GetReportDataRequest &request)
 {
-  INFO_LOG() << "IN onGetReportDataRequest";
+  INFO_LOG(m_logger) << "IN onGetReportDataRequest";
 
   // Get data per reportType
   QByteArray reportData;
@@ -104,7 +104,7 @@ GetReportDataReply HandlerReportGetData::getReportDataRequest(const GetReportDat
       reportData = getTreatmentTimelineResult(request.reportId());
       break;
     default:
-      WARNING_LOG() << "Report Type unknown, no generating.";
+      WARNING_LOG(m_logger) << "Report Type unknown, no generating.";
       break;
   }
 
@@ -445,14 +445,14 @@ QByteArray HandlerReportGetData::getSanitationMaterialResult(int reportId) const
 
   QString stmt = QLatin1String("SELECT id, material_id, sanitation_unique_id, qualification, amount_start, amount_resupplied, amount_end, amount_used, duration FROM "
                                "rep_sanitation_material_result WHERE report_id = :reportId ORDER BY sanitation_unique_id, qualification, material_id");
-  DEBUG_LOG() << " stmt: " << stmt;
+  DEBUG_LOG(m_logger) << " stmt: " << stmt;
 
   qSelect.prepare(stmt);
   qSelect.bindValue(QLatin1String(":reportId"), reportId);
 
   if (!qSelect.exec())
   {
-    ERROR_LOG() << "Couldn't select sanitation material result ";
+    ERROR_LOG(m_logger) << "Couldn't select sanitation material result ";
     return QByteArray();
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_get_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_get_data.h
index 88fb195a2..ee15400d1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_get_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_get_data.h
@@ -32,6 +32,8 @@ public:
   bool init();
 
 private: // methods
+
+NGL::INGLLogger &m_logger;
   void onGetReportDataRequest(const rti::core::SampleIdentity &cookie,
                               const GetReportDataRequest &request) override final;
   GetReportDataReply getReportDataRequest(const GetReportDataRequest &request);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/main_handler.cpp
index c110ae5ab..977dbbc04 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/main_handler.cpp
@@ -18,12 +18,11 @@
 namespace ReportManagement
 {
 
-MainHandler::MainHandler(QObject *parent)
-  : QObject(parent)
+MainHandler::MainHandler(QObject *parent) : QObject(parent)
   , m_ddsHandler(nullptr)
   , m_dbHandler(nullptr)
-  , m_preService(nullptr)
-{}
+  , m_preService(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 MainHandler::~MainHandler()
 {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/main_handler.h
index b570a18d2..3a0d9e3f5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/main_handler.h
@@ -38,6 +38,8 @@ public:
 
 private:
 
+
+NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>                    m_ddsHandler;
   std::shared_ptr<DbHandler>                     m_dbHandler;
   std::shared_ptr<HandlerReportData>             m_reportData;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/object_report_info.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/object_report_info.cpp
index fbb776096..3ffea48fe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/object_report_info.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/object_report_info.cpp
@@ -20,11 +20,10 @@ namespace ReportManagement
 {
 ObjectReportInfo::ObjectReportInfo(const std::shared_ptr<DdsHandler> &ddsHandler,
                                    const std::shared_ptr<DatabaseInterface> &db,
-                                   QObject *parent)
-  : QObject(parent)
+                                   QObject *parent) : QObject(parent)
   , m_ddsHandler(ddsHandler)
-  , m_db(db)
-{
+  , m_db(db),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 //------------------------------------------------------------------------------
@@ -50,7 +49,7 @@ Core::FunctionReplyObject ObjectReportInfo::createObject(Database::RepReport &db
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting RepReport-data into database"));
 
     m_data.id = dbData.id;
-    DEBUG_LOG() << "New reportId: " << m_data.id;
+    DEBUG_LOG(m_logger) << "New reportId: " << m_data.id;
   }
 
   // Publish Data via DTS
@@ -69,7 +68,7 @@ Core::FunctionReplyObject ObjectReportInfo::updateObject(const Database::RepRepo
     return Core::FunctionReplyObject(dbData.id, tr_lts("dds", "Error updating RepReport-data into database"));
 
   m_data = dbData;
-  DEBUG_LOG() << "Data changed for reportId: " << m_data.id;
+  DEBUG_LOG(m_logger) << "Data changed for reportId: " << m_data.id;
 
   // Publish Data via DTS
   onPublishData();
@@ -110,11 +109,11 @@ Core::FunctionReplyObject ObjectReportInfo::changeStatus(const ReportChangeStatu
 //------------------------------------------------------------------------------
 void ObjectReportInfo::onPublishData()
 {
-  INFO_LOG() << "Publish ReportInfo-data to dds (" << m_data.id << ") ...";
+  INFO_LOG(m_logger) << "Publish ReportInfo-data to dds (" << m_data.id << ") ...";
   ReportInfo data = toDdsData(m_data);
 
   if (!m_ddsHandler->dts()->publish(data))
-    ERROR_LOG() << "Error publishing ReportInfo-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing ReportInfo-data to dds";
 }
 
 // TODO: add in LtsUtils ?
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/ModuleTests/rep_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/ModuleTests/rep_tests.cpp
index 1f4bebdec..42a69a734 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/ModuleTests/rep_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/ModuleTests/rep_tests.cpp
@@ -41,7 +41,7 @@ RepTests::~RepTests()
 // ------------------------------------------------------------------
 bool RepTests::init(int domainId, int exerciseId, int testId, int reportId, int operatorId)
 {
-  INFO_LOG() << "init begin";
+  INFO_LOG(m_logger) << "init begin";
 
   m_testId = testId;
   m_exerciseId = exerciseId;
@@ -52,32 +52,32 @@ bool RepTests::init(int domainId, int exerciseId, int testId, int reportId, int
   m_ddsConnector.reset(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, m_exerciseId));
   if (!m_ddsConnector->init())
     return false;
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
   m_ddsConnector->initPublisherSubscriber();
 
   // initialize database
   m_dbHandler = std::make_shared<DbHandler>();
   if(!m_dbHandler->init(m_exerciseId, Settings::settings()))
   {
-    ERROR_LOG() << "Initialisation dbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation dbHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation dbHandler succesful.";
   m_db = m_dbHandler->db();
 
-  DEBUG_LOG() << "create dtc";
+  DEBUG_LOG(m_logger) << "create dtc";
   m_dtc = ReportManagement::Interface::Dtc::create(m_ddsConnector);
-  DEBUG_LOG() << "create ftc";
+  DEBUG_LOG(m_logger) << "create ftc";
   m_ftc = ReportManagement::Interface::Ftc::create(m_ddsConnector);
-  DEBUG_LOG() << "init ftc/dtc";
+  DEBUG_LOG(m_logger) << "init ftc/dtc";
   bool bRet = m_ftc->enableAll() && m_dtc->enableAll();
-  DEBUG_LOG() << "init end - bRet = " << bRet;
+  DEBUG_LOG(m_logger) << "init end - bRet = " << bRet;
 
-  DEBUG_LOG() << "Domain Id   = " << domainId;
-  DEBUG_LOG() << "Exercise Id = " << exerciseId;
-  DEBUG_LOG() << "Test Id     = " << testId;
-  DEBUG_LOG() << "Report Id   = " << reportId;
-  DEBUG_LOG() << "Operator Id   = " << operatorId;
+  DEBUG_LOG(m_logger) << "Domain Id   = " << domainId;
+  DEBUG_LOG(m_logger) << "Exercise Id = " << exerciseId;
+  DEBUG_LOG(m_logger) << "Test Id     = " << testId;
+  DEBUG_LOG(m_logger) << "Report Id   = " << reportId;
+  DEBUG_LOG(m_logger) << "Operator Id   = " << operatorId;
 
   //TODO: add connects
 
@@ -87,7 +87,7 @@ bool RepTests::init(int domainId, int exerciseId, int testId, int reportId, int
 // ------------------------------------------------------------------
 void RepTests::startTest()
 {
-  INFO_LOG() << "startTest";
+  INFO_LOG(m_logger) << "startTest";
   // create reports
   if (m_testId == 11)
     tryCreate(ReportManagement::ReportType::UnitPower);
@@ -144,7 +144,7 @@ void RepTests::startTest()
     tryChangeStatus();
   else
   {
-    ERROR_LOG() << "Unknown test case!";
+    ERROR_LOG(m_logger) << "Unknown test case!";
     failExit();
   }
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -153,7 +153,7 @@ void RepTests::startTest()
 // ------------------------------------------------------------------
 void RepTests::tryCreate(ReportType repType, VisualisationType visType)
 {
-  INFO_LOG() << "trying to send createRequest Report";
+  INFO_LOG(m_logger) << "trying to send createRequest Report";
   CreateModifyReportRequest request;
 
   QString repName = QStringLiteral("Test Report - type ") + QString::number(repType.underlying());
@@ -480,14 +480,14 @@ void RepTests::tryCreate(ReportType repType, VisualisationType visType)
   }
   default:
   {
-    ERROR_LOG() << "Unknown report type!";
+    ERROR_LOG(m_logger) << "Unknown report type!";
     break;
   }
   }
 
   if (!m_ftc->createModifyReportRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
   QTest::qWait(2000);
@@ -496,7 +496,7 @@ void RepTests::tryCreate(ReportType repType, VisualisationType visType)
 // ------------------------------------------------------------------
 void RepTests::tryModify()
 {
-  DEBUG_LOG() << "trying to send modify request for report Id = " << m_reportId;
+  DEBUG_LOG(m_logger) << "trying to send modify request for report Id = " << m_reportId;
 
   m_dtc->waitForHistoricalDataReportInfo(1000);
   ReportInfo rep = m_dtc->reportInfo(m_reportId);
@@ -526,22 +526,22 @@ void RepTests::tryModify()
   request.fileStatus(ReportManagement::FileStatus::Valid);
   request.lastModified(QDateTime::currentMSecsSinceEpoch());
 
-  DEBUG_LOG() << "Start modify";
-  DEBUG_LOG() << "Report type = " << rep.reportType();
+  DEBUG_LOG(m_logger) << "Start modify";
+  DEBUG_LOG(m_logger) << "Report type = " << rep.reportType();
 
   if (!m_ftc->createModifyReportRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting modify data";
+    ERROR_LOG(m_logger) << "Error requesting modify data";
     failExit();
   }
   QTest::qWait(1000);
-  DEBUG_LOG() << "AFTER modify";
+  DEBUG_LOG(m_logger) << "AFTER modify";
 }
 
 // ------------------------------------------------------------------
 void RepTests::tryGetData()
 {
-  DEBUG_LOG() << "trying to send get data request for report Id = " << m_reportId;
+  DEBUG_LOG(m_logger) << "trying to send get data request for report Id = " << m_reportId;
   GetReportDataRequest request;
 
   request.reportId(m_reportId);
@@ -549,7 +549,7 @@ void RepTests::tryGetData()
 
   if (!m_ftc->getReportDataRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting modify data";
+    ERROR_LOG(m_logger) << "Error requesting modify data";
     failExit();
   }
   QTest::qWait(1000);
@@ -559,7 +559,7 @@ void RepTests::tryGetData()
 // ------------------------------------------------------------------
 void RepTests::tryChangeStatus()
 {
-  DEBUG_LOG() << "trying to send change status request for report Id = " << m_reportId;
+  DEBUG_LOG(m_logger) << "trying to send change status request for report Id = " << m_reportId;
   ReportChangeStatusRequest request;
 
   request.id(m_reportId);
@@ -569,7 +569,7 @@ void RepTests::tryChangeStatus()
 
   if (!m_ftc->reportChangeStatusRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting change status";
+    ERROR_LOG(m_logger) << "Error requesting change status";
     failExit();
   }
   QTest::qWait(1000);
@@ -578,10 +578,10 @@ void RepTests::tryChangeStatus()
 // ------------------------------------------------------------------
 void RepTests::tryDelete()
 {
-  INFO_LOG() << "trying to send delete request for report Id = " << m_reportId;
+  INFO_LOG(m_logger) << "trying to send delete request for report Id = " << m_reportId;
   if (!m_ftc->removeReportRequest(RemoveReportRequest(m_reportId), this))
   {
-    ERROR_LOG() << "Error requesting delete data";
+    ERROR_LOG(m_logger) << "Error requesting delete data";
     failExit();
   }
   QTest::qWait(1000);
@@ -590,60 +590,60 @@ void RepTests::tryDelete()
 // ------------------------------------------------------------------
 void RepTests::onCreateModifyReportReply(const CreateModifyReportReply &replyObject)
 {
-  DEBUG_LOG() << "END (onCreateModifyReportReply)";
+  DEBUG_LOG(m_logger) << "END (onCreateModifyReportReply)";
   if (replyObject.errorString().size() > 0)
   {
-    ERROR_LOG() << "Got onCreateModifyReportReply error: " << replyObject.errorString();
+    ERROR_LOG(m_logger) << "Got onCreateModifyReportReply error: " << replyObject.errorString();
     failExit();
     return;
   }
-  INFO_LOG() << "Got createModifyReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got createModifyReply with id " << replyObject.id()
                      << " and errorString " << replyObject.errorString();
 }
 
 // ------------------------------------------------------------------
 void RepTests::onRemoveReportReply(const Core::FunctionReplyObject &replyObject)
 {
-  DEBUG_LOG() << "END (onRemoveReportReply)";
+  DEBUG_LOG(m_logger) << "END (onRemoveReportReply)";
   if (replyObject.error())
   {
-    ERROR_LOG() << "Got onRemoveReportReply error: " << replyObject();
+    ERROR_LOG(m_logger) << "Got onRemoveReportReply error: " << replyObject();
     failExit();
     return;
   }
-  INFO_LOG() << "Got removeReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 }
 
 // ------------------------------------------------------------------
 void RepTests::onGetReportDataReply(const GetReportDataReply &replyObject)
 {
-  DEBUG_LOG() << "END (onGetReportDataReply)";
+  DEBUG_LOG(m_logger) << "END (onGetReportDataReply)";
   if (replyObject.errorString().size() > 0)
   {
-    ERROR_LOG() << "Got onGetReportDataReply error: " << replyObject.errorString();
+    ERROR_LOG(m_logger) << "Got onGetReportDataReply error: " << replyObject.errorString();
     failExit();
     return;
   }
-  INFO_LOG() << "Got createReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got createReply with id " << replyObject.id()
                      << " and errorString " << replyObject.errorString();
 
   QByteArray reportData = LtsUtils::toQByteArray(replyObject.reportData());
 
-  DEBUG_LOG() << "Size reportData: " << reportData.size();
+  DEBUG_LOG(m_logger) << "Size reportData: " << reportData.size();
 }
 
 // ------------------------------------------------------------------
 void RepTests::onReportChangeStatusReply(const Core::FunctionReplyObject &replyObject)
 {
-  DEBUG_LOG() << "END (onReportChangeStatusReply)";
+  DEBUG_LOG(m_logger) << "END (onReportChangeStatusReply)";
   if (replyObject.error())
   {
-    ERROR_LOG() << "Got onReportChangeStatusReply error: " << replyObject();
+    ERROR_LOG(m_logger) << "Got onReportChangeStatusReply error: " << replyObject();
     failExit();
     return;
   }
-  INFO_LOG() << "Got changeStatusReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got changeStatusReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 }
 
@@ -651,7 +651,7 @@ void RepTests::onReportChangeStatusReply(const Core::FunctionReplyObject &replyO
 void RepTests::addTestDataTreatmentTimeline()
 {
   // Report Treatment Timeline
-  ERROR_LOG() << "START addTestDataTreatmentTimeline" ;
+  ERROR_LOG(m_logger) << "START addTestDataTreatmentTimeline" ;
 
   ReportManagement::Database::RepTreatmentTimelineData resData;
   resData.id                    = 10;
@@ -669,7 +669,7 @@ void RepTests::addTestDataTreatmentTimeline()
 
   if (!m_db->insert(resData))
   {
-    ERROR_LOG() << "Error while inserting Event for participantId: " << resData.participantId;
+    ERROR_LOG(m_logger) << "Error while inserting Event for participantId: " << resData.participantId;
     failExit();
   }
 
@@ -680,7 +680,7 @@ void RepTests::addTestDataTreatmentTimeline()
   resData.properties            = QString();
   if (!m_db->insert(resData))
   {
-    ERROR_LOG() << "Error while inserting Event for participantId: " << resData.participantId;
+    ERROR_LOG(m_logger) << "Error while inserting Event for participantId: " << resData.participantId;
     failExit();
   }
 
@@ -693,7 +693,7 @@ void RepTests::addTestDataTreatmentTimeline()
   resData.properties            = QString();
   if (!m_db->insert(resData))
   {
-    ERROR_LOG() << "Error while inserting Event for participantId: " << resData.participantId;
+    ERROR_LOG(m_logger) << "Error while inserting Event for participantId: " << resData.participantId;
     failExit();
   }
 
@@ -704,7 +704,7 @@ void RepTests::addTestDataTreatmentTimeline()
   resData.properties            = QString();
   if (!m_db->insert(resData))
   {
-    ERROR_LOG() << "Error while inserting Event for participantId: " << resData.participantId;
+    ERROR_LOG(m_logger) << "Error while inserting Event for participantId: " << resData.participantId;
     failExit();
   }
 
@@ -715,7 +715,7 @@ void RepTests::addTestDataTreatmentTimeline()
   resData.properties            = QString();
   if (!m_db->insert(resData))
   {
-    ERROR_LOG() << "Error while inserting Event for participantId: " << resData.participantId;
+    ERROR_LOG(m_logger) << "Error while inserting Event for participantId: " << resData.participantId;
     failExit();
   }
 
@@ -727,7 +727,7 @@ void RepTests::addTestDataTreatmentTimeline()
   resData.properties            = QString::fromStdString(json);
   if (!m_db->insert(resData))
   {
-    ERROR_LOG() << "Error while inserting Event for participantId: " << resData.participantId;
+    ERROR_LOG(m_logger) << "Error while inserting Event for participantId: " << resData.participantId;
     failExit();
   }
 
@@ -738,7 +738,7 @@ void RepTests::addTestDataTreatmentTimeline()
   resData.properties            = QString();
   if (!m_db->insert(resData))
   {
-    ERROR_LOG() << "Error while inserting Event for participantId: " << resData.participantId;
+    ERROR_LOG(m_logger) << "Error while inserting Event for participantId: " << resData.participantId;
     failExit();
   }
 
@@ -749,7 +749,7 @@ void RepTests::addTestDataTreatmentTimeline()
   resData.properties            = QString();
   if (!m_db->insert(resData))
   {
-    ERROR_LOG() << "Error while inserting Event for participantId: " << resData.participantId;
+    ERROR_LOG(m_logger) << "Error while inserting Event for participantId: " << resData.participantId;
     failExit();
   }
 
@@ -763,7 +763,7 @@ void RepTests::addTestDataTreatmentTimeline()
   resData.properties            = QString();
   if (!m_db->insert(resData))
   {
-    ERROR_LOG() << "Error while inserting Event for participantId: " << resData.participantId;
+    ERROR_LOG(m_logger) << "Error while inserting Event for participantId: " << resData.participantId;
     failExit();
   }
 
@@ -774,7 +774,7 @@ void RepTests::addTestDataTreatmentTimeline()
   resData.properties            = QString::fromStdString(json);
   if (!m_db->insert(resData))
   {
-    ERROR_LOG() << "Error while inserting Event for participantId: " << resData.participantId;
+    ERROR_LOG(m_logger) << "Error while inserting Event for participantId: " << resData.participantId;
     failExit();
   }
 
@@ -785,7 +785,7 @@ void RepTests::addTestDataTreatmentTimeline()
   resData.properties            = QString::fromStdString(json);
   if (!m_db->insert(resData))
   {
-    ERROR_LOG() << "Error while inserting Event for participantId: " << resData.participantId;
+    ERROR_LOG(m_logger) << "Error while inserting Event for participantId: " << resData.participantId;
     failExit();
   }
 
@@ -794,7 +794,7 @@ void RepTests::addTestDataTreatmentTimeline()
 // ------------------------------------------------------------------------------
 void RepTests::failExit()
 {
-  ERROR_LOG() << "FAIL EXIT !";
+  ERROR_LOG(m_logger) << "FAIL EXIT !";
   m_bTestsSuccessful = false;
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/dds_handler.cpp
index 29c94684d..7284f75ec 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/dds_handler.cpp
@@ -17,14 +17,14 @@ DdsHandler::DdsHandler(int domainId, int exerciseId)
   : QObject()
   , m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise, exerciseId))
 {
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(bool bInitFts, const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -38,11 +38,11 @@ bool DdsHandler::init(bool bInitFts, const QStringList &qosFileList)
   m_ddsFts = ReportManagement::Interface::Fts::create(m_ddsConnector);
 
   bool bRet = m_ddsDts->enableAll();
-  INFO_LOG() << "Dts initialised";
+  INFO_LOG(m_logger) << "Dts initialised";
 
   if (bInitFts)
     bRet &= m_ddsFts->enableAll();  // only needed for Generator, not Analyzer
-  INFO_LOG() << "Fts initialised";
+  INFO_LOG(m_logger) << "Fts initialised";
 
   return bRet;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/dds_handler.h
index 4c107436b..a2a6c0bb8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/dds_handler.h
@@ -57,6 +57,7 @@ public:
   }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<Core::Pacemaker>            m_pacemaker;
   std::shared_ptr<Core::TopicLockMaster>      m_topicLockMaster;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/connection.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/connection.cpp
index 7de32e972..bb0d639e3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/connection.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/connection.cpp
@@ -23,17 +23,16 @@ namespace RoutingService
 Connection::Connection(const dds::domain::DomainParticipant &domainParticipant,
                        const std::string &partition,
                        const std::vector<TopicDispatcherInterface *> &topicsToRoute,
-                       const std::string &desc)
-  : m_output(nullptr)
+                       const std::string &desc) : m_output(nullptr)
   , m_domainParticipant(domainParticipant)
   , m_publisher(new DDSConnector::Publisher(domainParticipant, partition))
   , m_subscriber(new DDSConnector::Subscriber(domainParticipant, partition, false))
   , m_dataWriterTask(nullptr)
   , m_topicsToRoute(topicsToRoute)
   , m_partition(partition)
-  , m_description(desc)
-{
-  INFO_LOG() << "Create connection: " << partition
+  , m_description(desc),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  INFO_LOG(m_logger) << "Create connection: " << partition
                      << ", domain: " << domainParticipant.domain_id()
                      << ", direction: " << m_description
                      << " (" << this << ")";
@@ -50,7 +49,7 @@ Connection::~Connection()
   }
   catch (const dds::core::Exception &ex)
   {
-    ERROR_LOG() << "sub close ex: " << ex.what();
+    ERROR_LOG(m_logger) << "sub close ex: " << ex.what();
   }
   m_subscriber = nullptr;
   try
@@ -60,7 +59,7 @@ Connection::~Connection()
   }
   catch (const dds::core::Exception &ex)
   {
-    ERROR_LOG() << "pub close ex: " << ex.what();
+    ERROR_LOG(m_logger) << "pub close ex: " << ex.what();
   }
   m_publisher = nullptr;
   m_domainParticipant = nullptr;
@@ -76,7 +75,7 @@ void Connection::setOutput(Connection *output)
 
 bool Connection::initialize()
 {
-  DEBUG_LOG() << "initialize new connection for " << m_partition
+  DEBUG_LOG(m_logger) << "initialize new connection for " << m_partition
                       << ", direction: " << m_description
                       << " (" << this << ")";
 
@@ -87,7 +86,7 @@ bool Connection::initialize()
 
   if (!m_output)
   {
-    ERROR_LOG() << "Error initializing connection for " << m_partition
+    ERROR_LOG(m_logger) << "Error initializing connection for " << m_partition
                         << ", direction: " << m_description << " - no output set!";
     return false;
   }
@@ -103,7 +102,7 @@ void Connection::shutdown()
   QElapsedTimer timer;
   timer.start();
 
-  DEBUG_LOG() << "shutting down connection for " << m_partition
+  DEBUG_LOG(m_logger) << "shutting down connection for " << m_partition
                       << ", direction: " << m_description
                       << " (" << this << "), dwt: " << m_dataWriterTask.get();
 
@@ -152,7 +151,7 @@ dds::sub::Subscriber Connection::subscriber() const
 
 bool Connection::initTopics()
 {
-  DEBUG_LOG() << "Init topics for " << m_partition
+  DEBUG_LOG(m_logger) << "Init topics for " << m_partition
                       << ", direction: " << m_description;
 
   if (!m_output)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/connection.h b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/connection.h
index 1dbc73d2f..c45a402eb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/connection.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/connection.h
@@ -38,9 +38,11 @@ public:
   dds::sub::Subscriber subscriber() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   bool initTopics();
 
 private:
+  NGL::INGLLogger &m_logger;
   Connection *m_output;
   dds::domain::DomainParticipant m_domainParticipant;
   std::unique_ptr<DDSConnector::Publisher> m_publisher;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/data_writer_task.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/data_writer_task.cpp
index b1d77c456..195a00cb0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/data_writer_task.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/data_writer_task.cpp
@@ -13,13 +13,13 @@ namespace RoutingService
 DataWriterTask::DataWriterTask()
   : m_doShutdown(false)
 {
-  DEBUG_LOG() << this << ": init ";
+  DEBUG_LOG(m_logger) << this << ": init ";
 }
 
 DataWriterTask::~DataWriterTask()
 {
   std::lock_guard<std::mutex> lock(m_queueLock);
-  DEBUG_LOG() << this << ": Cleaning up remaining writers: " << m_writerQueue.size();
+  DEBUG_LOG(m_logger) << this << ": Cleaning up remaining writers: " << m_writerQueue.size();
   while (!m_writerQueue.empty())
   {
     delete m_writerQueue.front();
@@ -30,7 +30,7 @@ DataWriterTask::~DataWriterTask()
 void DataWriterTask::enqueue(SampleWriterInterface *swi)
 {
   std::lock_guard<std::mutex> lock(m_queueLock);
-  TRACE_LOG() << this << ": enqueue " << swi << " shutdown: " << m_doShutdown;
+  TRACE_LOG(m_logger) << this << ": enqueue " << swi << " shutdown: " << m_doShutdown;
   if (m_doShutdown)
   {
     delete swi;
@@ -44,7 +44,7 @@ void DataWriterTask::shutdown()
 {
   std::lock_guard<std::mutex> l(m_queueLock);
   m_doShutdown = true;
-  DEBUG_LOG() << this << ": Cleaning up remaining writers: " << m_writerQueue.size();
+  DEBUG_LOG(m_logger) << this << ": Cleaning up remaining writers: " << m_writerQueue.size();
   while (!m_writerQueue.empty())
   {
     delete m_writerQueue.front();
@@ -56,7 +56,7 @@ void DataWriterTask::shutdown()
 
 bool DataWriterTask::waitForData()
 {
-  TRACE_LOG() << this << ": waiting for data ";
+  TRACE_LOG(m_logger) << this << ": waiting for data ";
   std::unique_lock<std::mutex> waitCondLock(m_queueLock);
   while (true)
   {
@@ -78,7 +78,7 @@ SampleWriterInterface *DataWriterTask::getNextSampleWriter()
   if (m_writerQueue.empty())
     return nullptr;
 
-  TRACE_LOG() << this << ": getData() queue size: " << m_writerQueue.size();
+  TRACE_LOG(m_logger) << this << ": getData() queue size: " << m_writerQueue.size();
   auto ret = m_writerQueue.front();
   m_writerQueue.pop();
   return ret;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/data_writer_task.h b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/data_writer_task.h
index fc9694657..cee7d838b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/data_writer_task.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/data_writer_task.h
@@ -31,6 +31,7 @@ public:
   void writeSamples();
 
 private:
+  NGL::INGLLogger &m_logger;
   std::queue<SampleWriterInterface *> m_writerQueue;
   std::mutex m_queueLock;
   std::condition_variable m_waitForDataCondition;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/main_handler.cpp
index e759efcf4..c0e7a52df 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/main_handler.cpp
@@ -39,7 +39,7 @@ bool MainHandler::init(int domainIdIn, int domainIdOut, unsigned short tcpPortOu
 
   if (!DDS::QosProfile::setDefault())
   {
-    ERROR_LOG() << "Error setting default QoS from xml-file ";
+    ERROR_LOG(m_logger) << "Error setting default QoS from xml-file ";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/main_handler.h
index 9e53b2104..13c3d1822 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/main_handler.h
@@ -36,6 +36,7 @@ public:
 
 private:
 
+  NGL::INGLLogger &m_logger;
   std::unique_ptr<SessionHandler> m_sessionHandler;
   std::unique_ptr<PartitionHandler> m_partitionHandler;
   std::shared_ptr<Core::Pacemaker> m_pacemaker;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/partition_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/partition_handler.cpp
index 43c8de1c1..93e199d83 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/partition_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/partition_handler.cpp
@@ -11,11 +11,10 @@
 
 namespace RoutingService
 {
-PartitionHandler::PartitionHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector, QObject *parent)
-  : QObject(parent)
+PartitionHandler::PartitionHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector, QObject *parent) : QObject(parent)
   , m_exmDtc(ExerciseManagement::Interface::Dtc::create(ddsConnector))
-  , m_destroyTimer(new QTimer(this))
-{
+  , m_destroyTimer(new QTimer(this)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_exmDtc->enableExercise();
 
   m_destroyTimer->setInterval(1000);
@@ -68,7 +67,7 @@ void PartitionHandler::partitionRemoved(const QString &partitionName)
 void PartitionHandler::onExerciseChanged(const ExerciseManagement::Exercise &data, DataModification modType)
 {
   const QString partitionName(QString::fromStdString(DDSConnector::DdsConnector::getPartitionString(IDL::PartitionType::Exercise, data.id())));
-  DEBUG_LOG() << "onExerciseChanged: " << data << ", modType: " << modType;
+  DEBUG_LOG(m_logger) << "onExerciseChanged: " << data << ", modType: " << modType;
   switch (modType)
   {
   case DataModification::eRemoved:
@@ -92,7 +91,7 @@ void PartitionHandler::onDestroyTimerTimeout()
       ++it;
       continue;
     }
-    DEBUG_LOG() << "onDestroyTimerTimeout for session " << it.key() << " triggered";
+    DEBUG_LOG(m_logger) << "onDestroyTimerTimeout for session " << it.key() << " triggered";
     delete et;
     m_activeSessions.remove(it.key());
     emit destroySession(it.key(), it.key());
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/partition_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/partition_handler.h
index eb7bf5970..1a00c2c08 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/partition_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/partition_handler.h
@@ -28,6 +28,7 @@ public:
   bool init();
 
 private:
+  NGL::INGLLogger &m_logger;
   void partitionModified(const QString &partitionName, const ExerciseManagement::ExerciseState &state);
   void partitionRemoved(const QString &partitionName);
 private Q_SLOTS:
@@ -38,6 +39,7 @@ Q_SIGNALS:
   void destroySession(const QString &partitionNameSv, const QString &partitionNameWs);
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<ExerciseManagement::Interface::Dtc> m_exmDtc;
   QMap<QString, QElapsedTimer *> m_destroyMap;
   QSet<QString> m_activeSessions;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session.cpp
index fc7466047..a59e61d9a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session.cpp
@@ -11,10 +11,9 @@
 
 namespace RoutingService
 {
-Session::Session(const QString &partitionNameSv, const QString &partitionNameWs)
-  : m_partitionNameSv(partitionNameSv.toStdString())
-  , m_partitionNameWs(partitionNameWs.toStdString())
-{}
+Session::Session(const QString &partitionNameSv, const QString &partitionNameWs) : m_partitionNameSv(partitionNameSv.toStdString())
+  , m_partitionNameWs(partitionNameWs.toStdString()),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 Session::~Session()
 {
@@ -26,7 +25,7 @@ bool Session::init(const dds::domain::DomainParticipant &dpIn,
                    const std::vector<TopicDispatcherInterface *> &topicsToRouteToWs,
                    const std::vector<TopicDispatcherInterface *> &topicsToRouteToSv)
 {
-  DEBUG_LOG() << "Creating new session for " << m_partitionNameSv << "-" << m_partitionNameWs;
+  DEBUG_LOG(m_logger) << "Creating new session for " << m_partitionNameSv << "-" << m_partitionNameWs;
 
   m_connectionSvToWs.reset(new Connection(dpIn, m_partitionNameSv, topicsToRouteToWs, "route to WS"));
   m_connectionWsToSv.reset(new Connection(dpOut, m_partitionNameWs, topicsToRouteToSv, "route from WS"));
@@ -40,7 +39,7 @@ bool Session::init(const dds::domain::DomainParticipant &dpIn,
 
 void Session::shutdown()
 {
-  DEBUG_LOG() << "Shutting down session for " << m_partitionNameSv << "-" << m_partitionNameWs;
+  DEBUG_LOG(m_logger) << "Shutting down session for " << m_partitionNameSv << "-" << m_partitionNameWs;
   if (m_connectionSvToWs)
   {
     m_connectionSvToWs->shutdown();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session.h b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session.h
index 0d2fdb3ad..07c8c0920 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session.h
@@ -26,6 +26,7 @@ public:
   void shutdown();
 
 private:
+  NGL::INGLLogger &m_logger;
   std::string m_partitionNameSv;
   std::string m_partitionNameWs;
   std::unique_ptr<Connection> m_connectionSvToWs;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session_handler.cpp
index 2ecbf9660..831e9bf9f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session_handler.cpp
@@ -49,7 +49,7 @@ void SessionHandler::onCreateSession(const QString &partitionNameSv, const QStri
   const QString partitionName = partitionNameSv + QLatin1Char('-') + partitionNameWs;
   if (m_sessionMap.contains(partitionName))
   {
-    WARNING_LOG() << "Got create session for " << partitionName << ", but is already created";
+    WARNING_LOG(m_logger) << "Got create session for " << partitionName << ", but is already created";
     return;
   }
   Session *session = new Session(partitionNameSv, partitionNameWs);
@@ -58,12 +58,12 @@ void SessionHandler::onCreateSession(const QString &partitionNameSv, const QStri
                      topicsToRouteToWs(),
                      topicsToRouteToSv()))
   {
-    WARNING_LOG() << "Can not initialize session for " << partitionName << ", routing will not work...!";
+    WARNING_LOG(m_logger) << "Can not initialize session for " << partitionName << ", routing will not work...!";
     delete session;
     return;
   }
   m_sessionMap[partitionName] = session;
-  INFO_LOG() << "Successfully created session for " << partitionName;
+  INFO_LOG(m_logger) << "Successfully created session for " << partitionName;
 }
 
 void SessionHandler::onDestroySession(const QString &partitionNameSv, const QString &partitionNameWs)
@@ -72,14 +72,14 @@ void SessionHandler::onDestroySession(const QString &partitionNameSv, const QStr
   auto it = m_sessionMap.find(partitionName);
   if (it == m_sessionMap.end())
   {
-    WARNING_LOG() << "Got destroy session for " << partitionName << ", but is not created (already destroyed?)";
+    WARNING_LOG(m_logger) << "Got destroy session for " << partitionName << ", but is not created (already destroyed?)";
     return;
   }
   Session *session = it.value();
   session->shutdown();
   delete session;
   m_sessionMap.erase(it);
-  INFO_LOG() << "Successfully destroyed session for " << partitionName;
+  INFO_LOG(m_logger) << "Successfully destroyed session for " << partitionName;
 }
 
 bool SessionHandler::loadPlugins()
@@ -107,7 +107,7 @@ bool SessionHandler::loadPlugin(const LtsPluginManager::PluginInstance &pi)
                                           QStringLiteral("PDM"),
                                          });
   if (skipList.contains(pi.pluginName.toUpper()))
-      DEBUG_LOG() << "Skipping plugin " << pi.pluginName.toUpper() << " - is global";
+      DEBUG_LOG(m_logger) << "Skipping plugin " << pi.pluginName.toUpper() << " - is global";
 
   m_topicTypePlugins.push_back(typePlugin);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session_handler.h
index 894bdf015..18823c96f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session_handler.h
@@ -44,6 +44,7 @@ public Q_SLOTS:
   void onCreateSession(const QString &partitionNameSv, const QString &partitionNameWs);
   void onDestroySession(const QString &partitionNameSv, const QString &partitionNameWs);
 private:
+  NGL::INGLLogger &m_logger;
   bool loadPlugins();
   bool loadPlugin(const LtsPluginManager::PluginInstance &pi);
 
@@ -51,6 +52,7 @@ private:
   std::vector<TopicDispatcherInterface *> topicsToRouteToSv() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   std::vector<DDSGeneric::TopicTypePlugin *> m_topicTypePlugins;
 
   IDL::PartitionType m_partitionType;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests.cpp
index 585524440..b47ddd84f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests.cpp
@@ -22,8 +22,7 @@
 
 
 
-DataTopicTests::DataTopicTests()
-  : m_domainParticipantPub(nullptr)
+DataTopicTests::DataTopicTests() : m_domainParticipantPub(nullptr)
   , m_domainParticipantSub(nullptr)
   , m_domainId(0)
   , m_ddsPublisher(nullptr)
@@ -35,12 +34,12 @@ DataTopicTests::DataTopicTests()
   , m_dtcServiceInformation(nullptr)
   , m_dtcGroupInformation(nullptr)
   , m_mainThreadId(QThread::currentThreadId())
-  .getNGLLogger("UnitTests.DataTopicTests"))
-{  
+  .getNGLLogger("UnitTests.DataTopicTests")),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {  
   if (!DDS::QosProfile::setDefault())
-    ERROR_LOG() << "Error setting default QoS from xml-file ";
+    ERROR_LOG(m_logger) << "Error setting default QoS from xml-file ";
 
-  DEBUG_LOG() << "Main thread ID is " << m_mainThreadId;
+  DEBUG_LOG(m_logger) << "Main thread ID is " << m_mainThreadId;
 }
 
 DataTopicTests::~DataTopicTests()
@@ -83,7 +82,7 @@ bool DataTopicTests::initPublisher()
   partitionQos.name( { partition } );
   publisherQos << partitionQos;
 
-  DEBUG_LOG() << "Publish on partition " << partition;
+  DEBUG_LOG(m_logger) << "Publish on partition " << partition;
 
   m_ddsPublisher = dds::pub::Publisher(m_domainParticipantPub, publisherQos);
 
@@ -96,9 +95,9 @@ bool DataTopicTests::initPublisher()
 
 bool DataTopicTests::write(const ServiceManagement::ServiceInformation &data)
 {
-  INFO_LOG() << "Publish topic ServiceInformation ";
+  INFO_LOG(m_logger) << "Publish topic ServiceInformation ";
 
-  DEBUG_LOG() << "Id: " << data.id()
+  DEBUG_LOG(m_logger) << "Id: " << data.id()
                       << ", Name: " << data.name()
                       << ", State: " << data.state()
                       << ", Timestamp: " << data.timestamp()
@@ -110,7 +109,7 @@ bool DataTopicTests::write(const ServiceManagement::ServiceInformation &data)
 
 bool DataTopicTests::write(const ServiceManagement::GroupInformation &data)
 {
-  INFO_LOG() << "Publish topic GroupInformation ";
+  INFO_LOG(m_logger) << "Publish topic GroupInformation ";
 
   if(m_logger.isDebugEnabled())
   {
@@ -125,7 +124,7 @@ bool DataTopicTests::write(const ServiceManagement::GroupInformation &data)
     if(services.endsWith(QLatin1Char(',')))
       services.chop(1);
 
-    DEBUG_LOG() << "Type: " << data.type()
+    DEBUG_LOG(m_logger) << "Type: " << data.type()
                         << ", Domain: " << data.domainId()
                         << ", Partition: " << data.exercisePartitionId()
                         << ", Partition: " << data.replayPartitionId()
@@ -149,13 +148,13 @@ ServiceManagement::GroupInformation DataTopicTests::getReceivedGroupInformationD
 void DataTopicTests::processData(const ServiceManagement::ServiceInformation &instance, DataModification modType)
 {
   Q_UNUSED(modType);
-  INFO_LOG() << "process Lts_ServiceInformation";
+  INFO_LOG(m_logger) << "process Lts_ServiceInformation";
 
-  DEBUG_LOG() << "Id: " << instance.id();
-  DEBUG_LOG() << "Name: " << instance.name();
-  DEBUG_LOG() << "State: " << instance.state();
-  DEBUG_LOG() << "Timestamp: " << instance.timestamp();
-  DEBUG_LOG() << "ErrorString: " << instance.errorString();
+  DEBUG_LOG(m_logger) << "Id: " << instance.id();
+  DEBUG_LOG(m_logger) << "Name: " << instance.name();
+  DEBUG_LOG(m_logger) << "State: " << instance.state();
+  DEBUG_LOG(m_logger) << "Timestamp: " << instance.timestamp();
+  DEBUG_LOG(m_logger) << "ErrorString: " << instance.errorString();
 
   m_receivedServiceInformationData = instance;
 
@@ -167,7 +166,7 @@ void DataTopicTests::processData(const ServiceManagement::ServiceInformation &in
 void DataTopicTests::processData(const ServiceManagement::GroupInformation &instance, DataModification modType)
 {
   Q_UNUSED(modType);
-  INFO_LOG() << "process Lts_ServiceInformation";
+  INFO_LOG(m_logger) << "process Lts_ServiceInformation";
 
   if(m_logger.isDebugEnabled())
   {
@@ -182,12 +181,12 @@ void DataTopicTests::processData(const ServiceManagement::GroupInformation &inst
     if(services.endsWith(QLatin1Char(',')))
       services.chop(1);
 
-    DEBUG_LOG() << "Type: " << instance.type();
-    DEBUG_LOG() << "Domain: " << instance.domainId();
-    DEBUG_LOG() << "Partition: " << instance.exercisePartitionId();
-    DEBUG_LOG() << "Replay Partition: " << instance.replayPartitionId();
-    DEBUG_LOG() << "Services: " << services;
-    DEBUG_LOG() << "Timestamp: " << instance.timestamp();
+    DEBUG_LOG(m_logger) << "Type: " << instance.type();
+    DEBUG_LOG(m_logger) << "Domain: " << instance.domainId();
+    DEBUG_LOG(m_logger) << "Partition: " << instance.exercisePartitionId();
+    DEBUG_LOG(m_logger) << "Replay Partition: " << instance.replayPartitionId();
+    DEBUG_LOG(m_logger) << "Services: " << services;
+    DEBUG_LOG(m_logger) << "Timestamp: " << instance.timestamp();
   }
 
   m_receivedGroupInformationData = instance;
@@ -203,7 +202,7 @@ void DataTopicTests::processData(const ServiceManagement::GroupInformation &inst
 
 bool DataTopicTests::initSubscriber()
 {
-  DEBUG_LOG() << "Initialisation DDS (Subscriber/Reader)";
+  DEBUG_LOG(m_logger) << "Initialisation DDS (Subscriber/Reader)";
 
   m_domainParticipantSub =
       dds::domain::DomainParticipant(m_domainId,
@@ -224,7 +223,7 @@ bool DataTopicTests::initSubscriber()
   partitionQos.name( partitions );
   subscriberQos << partitionQos;
 
-  DEBUG_LOG() << "Initialise DTC::SubscriberListener";
+  DEBUG_LOG(m_logger) << "Initialise DTC::SubscriberListener";
   m_subscriberListener = new DDSGeneric::SubscriberListener;
 
   m_ddsSubscriber = dds::sub::Subscriber(m_domainParticipantSub,
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests.h
index 736235813..d5942c762 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests.h
@@ -44,6 +44,7 @@ public:
   ServiceManagement::GroupInformation   getReceivedGroupInformationData() const;
 
 protected:
+  NGL::INGLLogger &m_logger;
   // Subscriber Methods
   void processData(const ServiceManagement::ServiceInformation& instance, DataModification modType);
   void processData(const ServiceManagement::GroupInformation& instance, DataModification modType);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests_main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests_main.cpp
index d5dce6c4c..fc6bfce80 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests_main.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests_main.cpp
@@ -38,7 +38,7 @@ DataTopicTestsMain::DataTopicTestsMain()
 
 void DataTopicTestsMain::initTestCase()
 {
-  DEBUG_LOG() <<"DataTopicTestsMain: initTestCase";
+  DEBUG_LOG(m_logger) <<"DataTopicTestsMain: initTestCase";
 
   m_dtTest = new DataTopicTests();
 
@@ -52,7 +52,7 @@ void DataTopicTestsMain::initTestCase()
 
 void DataTopicTestsMain::publishServiceInformationTestCase()
 {
-  DEBUG_LOG() <<"DataTopicTestsMain: publish ServiceInformation data";
+  DEBUG_LOG(m_logger) <<"DataTopicTestsMain: publish ServiceInformation data";
 
   // Topic ServiceInformation
   m_sentServiceInformationData.id(13);
@@ -66,7 +66,7 @@ void DataTopicTestsMain::publishServiceInformationTestCase()
 
 void DataTopicTestsMain::subscribeServiceInformationTestCase()
 {
-  DEBUG_LOG() << "IN subscribeServiceInformationTestCase";
+  DEBUG_LOG(m_logger) << "IN subscribeServiceInformationTestCase";
 
   QTRY_COMPARE(m_serviceInformationDataArrivedSpy->count(), 1);
 
@@ -81,7 +81,7 @@ void DataTopicTestsMain::subscribeServiceInformationTestCase()
 
 void DataTopicTestsMain::publishGroupInformationTestCase()
 {
-  DEBUG_LOG() << "DataTopicTestsMain: publish GroupInformation data";
+  DEBUG_LOG(m_logger) << "DataTopicTestsMain: publish GroupInformation data";
 
   std::vector<int> services = {1, 3, 5, 7, 11, 13, 17, 19, 23, 42};
 
@@ -97,7 +97,7 @@ void DataTopicTestsMain::publishGroupInformationTestCase()
 
 void DataTopicTestsMain::subscribeGroupInformationTestCase()
 {
-  DEBUG_LOG() << "IN subscribeGroupInformationTestCase";
+  DEBUG_LOG(m_logger) << "IN subscribeGroupInformationTestCase";
 
   QTRY_COMPARE(m_groupInformationDataArrivedSpy->count(), 1);
 
@@ -112,7 +112,7 @@ void DataTopicTestsMain::subscribeGroupInformationTestCase()
 
 void DataTopicTestsMain::cleanupTestCase()
 {
-  DEBUG_LOG() <<"DataTopicTestsMain: cleanupTestCase";
+  DEBUG_LOG(m_logger) <<"DataTopicTestsMain: cleanupTestCase";
   delete m_dtTest; m_dtTest = nullptr;
   delete m_serviceInformationDataArrivedSpy; m_serviceInformationDataArrivedSpy = nullptr;
   delete m_groupInformationDataArrivedSpy; m_groupInformationDataArrivedSpy = nullptr;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests_main.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests_main.h
index 63cb56e7a..1d186e1ff 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests_main.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests_main.h
@@ -35,6 +35,7 @@ private Q_SLOTS:
 
 protected:
 
+  NGL::INGLLogger &m_logger;
 private:
   ServiceManagement::ServiceInformation m_sentServiceInformationData;
   ServiceManagement::GroupInformation   m_sentGroupInformationData;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/WebSocketInterface/websocket_interface_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/WebSocketInterface/websocket_interface_handler.cpp
index d59d545b4..7b9c4b1ad 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/WebSocketInterface/websocket_interface_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/WebSocketInterface/websocket_interface_handler.cpp
@@ -36,31 +36,31 @@ bool WebSocketInterfaceHandler::init()
 {
   cleanup();
 
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "... ok";
 
-  DEBUG_LOG() << "Initialising DataManager";
+  DEBUG_LOG(m_logger) << "Initialising DataManager";
   m_dataManager = new DataManager(m_mainHandler);
   if (!m_dataManager->init())
   {
-    ERROR_LOG() << "Failed to initialise DataManager";
+    ERROR_LOG(m_logger) << "Failed to initialise DataManager";
     return false;
   }
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "... ok";
 
 
   m_messageFactory = new Messages::ClientMessageFactory(m_dataManager);
 
   m_webSocketServer = new LtsWebSocket::LtsWebSocketServer(m_messageFactory, this);
 
-  DEBUG_LOG() << "Initialising LtsWebSocketServer";
+  DEBUG_LOG(m_logger) << "Initialising LtsWebSocketServer";
   if (!m_webSocketServer->init(QStringLiteral("SCM"), NGL::Connections::port(NGL::Connections::eConnection::SCM_WEBSOCKET)))
   {
-    ERROR_LOG() << "Failed to initialise LtsWebSocketServer";
+    ERROR_LOG(m_logger) << "Failed to initialise LtsWebSocketServer";
     return false;
   }
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "... ok";
 
-  DEBUG_LOG() << "Connection signals and slots";
+  DEBUG_LOG(m_logger) << "Connection signals and slots";
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/dds_handler.cpp
index 87f1c2fba..925d4d345 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/dds_handler.cpp
@@ -16,14 +16,14 @@ namespace ServiceManagement
 DdsHandler::DdsHandler(int domainId)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Any))
 {
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -33,11 +33,11 @@ bool DdsHandler::init(const QStringList &qosFileList)
 
   m_ddsDts = ServiceManagement::Interface::Dts::create(m_ddsConnector);
   bool bRet = m_ddsDts->enableAll();
-  INFO_LOG() << "initialized Dts";
+  INFO_LOG(m_logger) << "initialized Dts";
 
   m_ddsFts = ServiceManagement::Interface::Fts::create(m_ddsConnector);
   bRet &= m_ddsFts->enableAll();
-  INFO_LOG() << "initialized Fts";
+  INFO_LOG(m_logger) << "initialized Fts";
 
   return bRet;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/dds_handler.h
index 6e545ec60..018e92b42 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/dds_handler.h
@@ -29,6 +29,7 @@ public:
   std::shared_ptr<ServiceManagement::Interface::Fts> fts() const;
   std::shared_ptr<DDSConnector::DdsConnector> connector() const;
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector>        m_ddsConnector;
   std::shared_ptr<ServiceManagement::Interface::Dts> m_ddsDts;
   std::shared_ptr<ServiceManagement::Interface::Fts> m_ddsFts;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/group.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/group.cpp
index f51194aa2..8a97623cf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/group.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/group.cpp
@@ -41,7 +41,7 @@ Group::Group(const std::shared_ptr<DdsHandler> &ddsHandler,
   , m_groupData(groupData)
   , m_completeCoreTimeout(0)
 {
-  INFO_LOG() << "Group "
+  INFO_LOG(m_logger) << "Group "
                      << m_scheme->groupType
                      << " for partition "
                      << groupData
@@ -77,7 +77,7 @@ void Group::init()
 
 bool Group::setRunningState(Core::RunningState newState)
 {
-  INFO_LOG() << "Setting RunningState of group "
+  INFO_LOG(m_logger) << "Setting RunningState of group "
                      << m_scheme->groupType
                      << " in exercisePartition "
                      << m_groupData.exercisePartitionId()
@@ -109,10 +109,10 @@ void Group::startCore()
 {
   if (m_scheme->groupType != Core::ServiceGroupType::Core)
   {
-    ERROR_LOG() << "startCore() was invoked on a non Core Group object";
+    ERROR_LOG(m_logger) << "startCore() was invoked on a non Core Group object";
     return;
   }
-  DEBUG_LOG() << "Starting Core";
+  DEBUG_LOG(m_logger) << "Starting Core";
 
   // make sure all services are there
   init();
@@ -124,7 +124,7 @@ void Group::startCore()
     {
       if ( proc->prio() == m_actPrio)
       {
-        DEBUG_LOG() << "startCore proc->start() "
+        DEBUG_LOG(m_logger) << "startCore proc->start() "
                              << proc->serviceName()
                              << " prio=" << proc->prio()
                              << " m_actPrio=" <<m_actPrio;
@@ -155,7 +155,7 @@ int Group::getNextPrio(QList <int> &prioList)
 void Group::start()
 {
   QList <int> prioList;
-  DEBUG_LOG() << "Group::start() m_actPrio=" <<  m_actPrio
+  DEBUG_LOG(m_logger) << "Group::start() m_actPrio=" <<  m_actPrio
                        << " groupId=" << m_groupId;
   // make sure all services are there
   init();
@@ -164,7 +164,7 @@ void Group::start()
   {
     if ( !prioList.contains(proc->prio()))
     {
-      DEBUG_LOG() << "prioList.append " << proc->prio()
+      DEBUG_LOG(m_logger) << "prioList.append " << proc->prio()
                            << " m_actPrio=" << m_actPrio
                            << " groupId=" << m_groupId;
       prioList.append(proc->prio());
@@ -180,7 +180,7 @@ void Group::start()
   {
     if ( m_actPrio == proc->prio())
     {
-      DEBUG_LOG() << "Group::start(): proc->start() "
+      DEBUG_LOG(m_logger) << "Group::start(): proc->start() "
                          << proc->serviceName()
                          << " prio=" << proc->prio()
                          << " m_actPrio=" << m_actPrio
@@ -280,7 +280,7 @@ void Group::onNewServiceInfo()
                         m_groupData.replayPartitionId(),
                         serviceIds);
 
-  TRACE_LOG() << "Publishing new GroupInformation: " << info;
+  TRACE_LOG(m_logger) << "Publishing new GroupInformation: " << info;
 
   m_ddsHandler->dts()->publish(info);
 }
@@ -290,7 +290,7 @@ void Group::onCompleteCoreTick()
   QList <int> prioList;
   if (QDateTime::currentMSecsSinceEpoch() > m_completeCoreTimeout)
   {
-    ERROR_LOG() << "Could not start group Core, because no Heartbeat for EXM with RunningState 'Running' was received.";
+    ERROR_LOG(m_logger) << "Could not start group Core, because no Heartbeat for EXM with RunningState 'Running' was received.";
     return;
   }
 
@@ -307,7 +307,7 @@ void Group::onCompleteCoreTick()
   }
   if (exmProc == nullptr)
   {
-    ERROR_LOG() << "Could not find Process for EXM";
+    ERROR_LOG(m_logger) << "Could not find Process for EXM";
     return;
   }
 
@@ -319,7 +319,7 @@ void Group::onCompleteCoreTick()
     {
       if ( !prioList.contains(proc->prio()))
       {
-        DEBUG_LOG() << "prioList.append " << proc->prio()
+        DEBUG_LOG(m_logger) << "prioList.append " << proc->prio()
                              << " m_actPrio=" << m_actPrio
                              << " groupId=" << m_groupId;
         prioList.append(proc->prio());
@@ -331,7 +331,7 @@ void Group::onCompleteCoreTick()
     {
       if (proc->state() != QProcess::Running && proc->prio() == m_actPrio)
       {
-        DEBUG_LOG() << "onCompleteCoreTick proc->start() "
+        DEBUG_LOG(m_logger) << "onCompleteCoreTick proc->start() "
                              << proc->serviceName()
                              << " prio=" << proc->prio();
         proc->start();
@@ -345,7 +345,7 @@ void Group::onCompleteCoreTick()
     return;
   }
   else
-    DEBUG_LOG() << "EXM has runningState " << exmProc->runningState();
+    DEBUG_LOG(m_logger) << "EXM has runningState " << exmProc->runningState();
   // start next completion attemp
   QTimer::singleShot(1000, this, &Group::onCompleteCoreTick);
 }
@@ -357,7 +357,7 @@ ServiceProcess *Group::procFromPid(Q_PID pid)
     if (proc->pid() == pid)
       return proc;
   }
-  DEBUG_LOG() << "Searched for not existing process with PID "
+  DEBUG_LOG(m_logger) << "Searched for not existing process with PID "
                       << pid;
   return nullptr;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/group_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/group_handler.cpp
index b59353cb7..08097c23e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/group_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/group_handler.cpp
@@ -40,15 +40,15 @@ GroupHandler::~GroupHandler()
 
 bool GroupHandler::init(int32_t coreDomain)
 {
-  DEBUG_LOG() << "Initializing GroupHandler ...";
+  DEBUG_LOG(m_logger) << "Initializing GroupHandler ...";
 
   bool bAllPartsInitialized = m_heartbeatListener->init() &&
       startGroupCore(coreDomain);
 
   if (bAllPartsInitialized)
-    DEBUG_LOG() << "GroupHandler successfully initialized.";
+    DEBUG_LOG(m_logger) << "GroupHandler successfully initialized.";
   else
-    ERROR_LOG() << "GroupHandler initialization failed.";
+    ERROR_LOG(m_logger) << "GroupHandler initialization failed.";
 
   return bAllPartsInitialized;
 }
@@ -137,14 +137,14 @@ bool GroupHandler::startGroupCore(int32_t domainId)
 {
   if (domainId != m_ddsHandler->connector()->getDomainId())
   {
-    ERROR_LOG() << "Could not start group Core for domain "
+    ERROR_LOG(m_logger) << "Could not start group Core for domain "
                         << domainId
                         << ", this ServiceManagement instance only supports domain "
                         << m_ddsHandler->connector()->getDomainId();
     return false;
   }
 
-  DEBUG_LOG() << "Starting core group ...";
+  DEBUG_LOG(m_logger) << "Starting core group ...";
 
   GroupRequest groupToSearch;
   groupToSearch.type(Core::ServiceGroupType::Core);
@@ -157,7 +157,7 @@ bool GroupHandler::startGroupCore(int32_t domainId)
 
     if (coreScheme == nullptr)
     {
-      ERROR_LOG() << "Could not start core group because there are no services linked to it";
+      ERROR_LOG(m_logger) << "Could not start core group because there are no services linked to it";
       return false;
     }
 
@@ -174,7 +174,7 @@ void GroupHandler::onStartGroupRequest(const rti::core::SampleIdentity &cookie,
 {
   auto ret = onStartGroup(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_ddsHandler->fts()->startGroupReply(cookie, ret);
 }
 
@@ -182,13 +182,13 @@ void GroupHandler::slotStartGroupRequest(const GroupRequest &request)
 {
   auto ret = onStartGroup(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   emit startGroupReply(ret);
 }
 
 Core::FunctionReplyObject GroupHandler::onStartGroup(const GroupRequest &request)
 {
-  DEBUG_LOG() << "New StartGroupRequest: " << request;
+  DEBUG_LOG(m_logger) << "New StartGroupRequest: " << request;
 
   if (request.domainId() != m_ddsHandler->connector()->getDomainId())
     return Core::FunctionReplyObject(request.requestId(),
@@ -219,7 +219,7 @@ Core::FunctionReplyObject GroupHandler::onStartGroup(const GroupRequest &request
   // if there is a similar group, we should take the services from there (to avoid restarting services on exeuction -> pause or pause -> resume)
   if (similarGroup)
   {
-    DEBUG_LOG() << "Taking existing services from group " << similarGroup->type()
+    DEBUG_LOG(m_logger) << "Taking existing services from group " << similarGroup->type()
                         << " to " << existingGroup->type();
     existingGroup->takeServicesFromGroup(similarGroup);
     similarGroup->stop();
@@ -235,7 +235,7 @@ Core::FunctionReplyObject GroupHandler::onStartGroup(const GroupRequest &request
 
 Core::FunctionReplyObject GroupHandler::onStopAllForExercise(int domainId, int exercisePartitionId)
 {
-  DEBUG_LOG() << "Stopping all proces for domain " << domainId << ", partition " << exercisePartitionId;
+  DEBUG_LOG(m_logger) << "Stopping all proces for domain " << domainId << ", partition " << exercisePartitionId;
   QVector<Group *> stillAliveGroups;
 
   int cntStopped = 0;
@@ -257,7 +257,7 @@ Core::FunctionReplyObject GroupHandler::onStopAllForExercise(int domainId, int e
   }
 
   m_groups = stillAliveGroups;
-  DEBUG_LOG() << "Stopping all proces for domain " << domainId << ", partition " << exercisePartitionId
+  DEBUG_LOG(m_logger) << "Stopping all proces for domain " << domainId << ", partition " << exercisePartitionId
                       << " - done. Stopped " << cntStopped << " groups"
                       << ", still alive: " << cntAlive;
   return Core::FunctionReplyObject(exercisePartitionId);
@@ -267,7 +267,7 @@ void GroupHandler::onStopGroupRequest(const rti::core::SampleIdentity &cookie, c
 {
   auto ret = onStopGroup(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_ddsHandler->fts()->stopGroupReply(cookie, ret);
 }
 
@@ -275,13 +275,13 @@ void GroupHandler::slotStopGroupRequest(const GroupRequest &request)
 {
   auto ret = onStopGroup(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   emit stopGroupReply(ret);
 }
 
 Core::FunctionReplyObject GroupHandler::onStopGroup(const GroupRequest &request)
 {
-  DEBUG_LOG() << "New StopGroupRequest: " << request;
+  DEBUG_LOG(m_logger) << "New StopGroupRequest: " << request;
 
   Group *existingGroup = getGroup(request);
 
@@ -303,13 +303,13 @@ void GroupHandler::onRestartGroupRequest(const rti::core::SampleIdentity &cookie
 {
   auto ret = onRestartGroup(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_ddsHandler->fts()->restartGroupReply(cookie, ret);
 }
 
 Core::FunctionReplyObject GroupHandler::onRestartGroup(const GroupRequest &request)
 {
-  DEBUG_LOG() << "New RestartGroupRequest: " << request;
+  DEBUG_LOG(m_logger) << "New RestartGroupRequest: " << request;
 
   Group *existingGroup = getGroup(request);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/heartbeat_listener.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/heartbeat_listener.cpp
index 8d2e32148..a31f8feef 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/heartbeat_listener.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/heartbeat_listener.cpp
@@ -9,10 +9,9 @@
 #include "heartbeat_listener.h"
 #include "service_donator.h"
 
-ServiceManagement::HeartbeatListener::HeartbeatListener(const std::shared_ptr<DDSConnector::DdsConnector> &connector, const std::shared_ptr<ServiceDonator> &serviceDonator)
-  : m_ddsConnector(connector)
-  , m_serviceDonator(serviceDonator)
-{}
+ServiceManagement::HeartbeatListener::HeartbeatListener(const std::shared_ptr<DDSConnector::DdsConnector> &connector, const std::shared_ptr<ServiceDonator> &serviceDonator) : m_ddsConnector(connector)
+  , m_serviceDonator(serviceDonator),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 ServiceManagement::HeartbeatListener::~HeartbeatListener()
 {}
@@ -25,7 +24,7 @@ bool ServiceManagement::HeartbeatListener::init()
 
   if (!m_coreDtc->enableCurrentRunningState())
   {
-    ERROR_LOG() << "Core DTC for HeartbeatListener in domain " << m_ddsConnector->getDomainId()
+    ERROR_LOG(m_logger) << "Core DTC for HeartbeatListener in domain " << m_ddsConnector->getDomainId()
                         << " could not be initialized.";
     m_coreDtc.reset();
     return false;
@@ -34,7 +33,7 @@ bool ServiceManagement::HeartbeatListener::init()
   QObject::connect(m_coreDtc.get(), &Core::Interface::Dtc::currentRunningStateChanged,
                    m_serviceDonator.get(), &ServiceDonator::onNewServiceInfoFromDds);
 
-  DEBUG_LOG() << "HeartbeatListener for domain " << m_ddsConnector->getDomainId()
+  DEBUG_LOG(m_logger) << "HeartbeatListener for domain " << m_ddsConnector->getDomainId()
                       << " successfully initialized.";
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/licence_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/licence_handler.cpp
index d17af7818..7f1923c97 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/licence_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/licence_handler.cpp
@@ -22,7 +22,7 @@ LicenceHandler::LicenceHandler(const std::shared_ptr<DdsHandler> &ddsHandler, co
   , m_ddsHandler(ddsHandler)
   , m_xmlFileName(licenceFile)
 {
-  INFO_LOG() << "Start ServiceManagement LicenceHandler.  Filename: " << m_xmlFileName;
+  INFO_LOG(m_logger) << "Start ServiceManagement LicenceHandler.  Filename: " << m_xmlFileName;
 } // end of ctor()
 //-----------------------------------------------------------------------------
 
@@ -35,12 +35,12 @@ LicenceHandler::~LicenceHandler()
 
 bool LicenceHandler::init()
 {
-  INFO_LOG() << "init() Start ServiceManagement LicenceHandler.";
+  INFO_LOG(m_logger) << "init() Start ServiceManagement LicenceHandler.";
 
   // read all licences from licencefile
   if (!readLicenceFile())
   {
-    ERROR_LOG() << "Error reading data from licencefile!";
+    ERROR_LOG(m_logger) << "Error reading data from licencefile!";
     return false;
   }
 
@@ -64,7 +64,7 @@ bool LicenceHandler::isServiceLicensed(const QString &licenceName) const
 void LicenceHandler::onGetLicenceRequest(const rti::core::SampleIdentity &cookie,
                                          const LicenceRequest &request)
 {
-  INFO_LOG() << "Try to getLicence (from DDS) for '" << request.name() << "' ...";
+  INFO_LOG(m_logger) << "Try to getLicence (from DDS) for '" << request.name() << "' ...";
 
   Core::FunctionReplyObject ret = getLicenceInternal(QString::fromStdString(request.name()));
   m_ddsHandler->fts()->getLicenceReply(cookie, ret);
@@ -76,7 +76,7 @@ void LicenceHandler::onGetLicenceRequest(const rti::core::SampleIdentity &cookie
 void LicenceHandler::onFreeLicenceRequest(const rti::core::SampleIdentity &cookie,
                                           const LicenceRequest &request)
 {
-  INFO_LOG() << "Try to freeLicence (from DDS) for '" << request.name() << "' ...";
+  INFO_LOG(m_logger) << "Try to freeLicence (from DDS) for '" << request.name() << "' ...";
 
   Core::FunctionReplyObject ret = freeLicenceInternal(QString::fromStdString(request.name()));
   m_ddsHandler->fts()->freeLicenceReply(cookie, ret);
@@ -87,12 +87,12 @@ void LicenceHandler::onFreeLicenceRequest(const rti::core::SampleIdentity &cooki
 
 bool LicenceHandler::getLicence(const QString &licenceName)
 {
-  INFO_LOG() << "Try to getLicence (from SCM) for '" << licenceName << "' ...";
+  INFO_LOG(m_logger) << "Try to getLicence (from SCM) for '" << licenceName << "' ...";
 
   Core::FunctionReplyObject fro = getLicenceInternal(licenceName);
 
   if (fro.error())
-    INFO_LOG() << "getLicence()   errorText: " << fro.translated();
+    INFO_LOG(m_logger) << "getLicence()   errorText: " << fro.translated();
 
   return !fro.error();
 } // end of getLicence()
@@ -100,12 +100,12 @@ bool LicenceHandler::getLicence(const QString &licenceName)
 
 bool LicenceHandler::freeLicence(const QString &licenceName)
 {
-  INFO_LOG() << "Try to freeLicence (from SCM) for '" << licenceName << "' ...";
+  INFO_LOG(m_logger) << "Try to freeLicence (from SCM) for '" << licenceName << "' ...";
 
   Core::FunctionReplyObject fro = freeLicenceInternal(licenceName);
 
   if (fro.error())
-    INFO_LOG() << "freeLicence()   errorText: " << fro.translated();
+    INFO_LOG(m_logger) << "freeLicence()   errorText: " << fro.translated();
 
   return !fro.error();
 } // end of freeLicence()
@@ -116,13 +116,13 @@ bool LicenceHandler::readLicenceFile()
   QFile f(m_xmlFileName);
   if (!f.exists())
   {
-    ERROR_LOG() << "Error loading licencefile ... file not found. '" << m_xmlFileName << "'";
+    ERROR_LOG(m_logger) << "Error loading licencefile ... file not found. '" << m_xmlFileName << "'";
     return false;
   }
 
   if (!f.open(QIODevice::ReadOnly))
   {
-    ERROR_LOG() << "Error loading licencefile ... file open failed.'" << m_xmlFileName << "'";
+    ERROR_LOG(m_logger) << "Error loading licencefile ... file open failed.'" << m_xmlFileName << "'";
     return false;
   }
 
@@ -131,20 +131,20 @@ bool LicenceHandler::readLicenceFile()
   if (m_xmlFileName.endsWith(QLatin1String(".crl")))
   {
     qbaIn = LtsLicence::decryptData(qbaIn);
-    INFO_LOG() << "ReadAll() from encrypted licencefile ... bytesAvailable:" << qbaIn.size();
+    INFO_LOG(m_logger) << "ReadAll() from encrypted licencefile ... bytesAvailable:" << qbaIn.size();
   }
   else if (m_xmlFileName.endsWith(QLatin1String(".lic")))
-    INFO_LOG() << "ReadAll() from unencrypted licencefile ... bytesAvailable:" << qbaIn.size();
+    INFO_LOG(m_logger) << "ReadAll() from unencrypted licencefile ... bytesAvailable:" << qbaIn.size();
 
   f.close();
 
-  INFO_LOG() << "Try to parse xml file '" << m_xmlFileName << "'";
+  INFO_LOG(m_logger) << "Try to parse xml file '" << m_xmlFileName << "'";
 
   m_licenceVec = LtsLicence::readLicences(qbaIn);
 
   if (m_licenceVec.isEmpty())
   {
-    ERROR_LOG() << "Parse error reading xml file '" << m_xmlFileName << "'";
+    ERROR_LOG(m_logger) << "Parse error reading xml file '" << m_xmlFileName << "'";
     return false;
   }
   return true;
@@ -169,7 +169,7 @@ Core::FunctionReplyObject LicenceHandler::getLicenceInternal(const QString &lice
       {
         if (licence.maxCount <= licence.licenceRefCount)
         {
-          WARNING_LOG() << "getLicence() for '" << licence.name << "' failed. - No more licences available.";
+          WARNING_LOG(m_logger) << "getLicence() for '" << licence.name << "' failed. - No more licences available.";
           return Core::FunctionReplyObject(0, "No more licences available.");
         }
         else
@@ -183,14 +183,14 @@ Core::FunctionReplyObject LicenceHandler::getLicenceInternal(const QString &lice
       if (m_logger.isInfoEnabled())
       {
         const QString info = dumpLicenceInformation(licence);
-        INFO_LOG() << "getLicence() for '" << licenceName << "' ok.\n" << info;
+        INFO_LOG(m_logger) << "getLicence() for '" << licenceName << "' ok.\n" << info;
       }
       publishData(licence);
       return Core::FunctionReplyObject(i + 1); // id im FRO >0 ; - m_licenceVec beginnt bei [0]
     }
   }
 
-  ERROR_LOG() << "getLicence() for '" << licenceName << "' failed. - No licence with this name.";
+  ERROR_LOG(m_logger) << "getLicence() for '" << licenceName << "' failed. - No licence with this name.";
   return Core::FunctionReplyObject(0, "No licence with this name.");
 } // end of getLicenceInternal()
 //-----------------------------------------------------------------------------
@@ -213,7 +213,7 @@ Core::FunctionReplyObject LicenceHandler::freeLicenceInternal(const QString &lic
       {
         if (licence.licenceRefCount <= 0)
         {
-          WARNING_LOG() << "freeLicence() for '" << licence.name << "' failed. - Max number of licences are free.";
+          WARNING_LOG(m_logger) << "freeLicence() for '" << licence.name << "' failed. - Max number of licences are free.";
           return Core::FunctionReplyObject(0, "Max number of licences are free.");
         }
         else
@@ -230,14 +230,14 @@ Core::FunctionReplyObject LicenceHandler::freeLicenceInternal(const QString &lic
       if (m_logger.isInfoEnabled())
       {
         const QString info = dumpLicenceInformation(licence);
-        INFO_LOG() << "freeLicence() for '" << licenceName << "' ok.\n" << info;
+        INFO_LOG(m_logger) << "freeLicence() for '" << licenceName << "' ok.\n" << info;
       }
       publishData(licence);
       return Core::FunctionReplyObject(i + 1); // id im FRO >0 ; - m_licenceVec beginnt bei [0]
     }
   }
 
-  ERROR_LOG() << "freeLicence() for '" << licenceName << "' failed. - No licence with this name.";
+  ERROR_LOG(m_logger) << "freeLicence() for '" << licenceName << "' failed. - No licence with this name.";
   return Core::FunctionReplyObject(0, "No licence with this name.");
 }// end of freeLicence()
 //-----------------------------------------------------------------------------
@@ -251,13 +251,13 @@ bool LicenceHandler::isLicenceValid(const LtsLicence::Licence &licence) const
   {
     if (!licence.ignoreExpiration)
     {
-      INFO_LOG() << "Licence '" << licence.name << "' is valid for " << now.daysTo(end) << " days."
+      INFO_LOG(m_logger) << "Licence '" << licence.name << "' is valid for " << now.daysTo(end) << " days."
                          << " Expiration: " << licence.expiration.date().toString()
                          << " " << licence.expiration.time().toString();
     }
     return true;
   }
-  WARNING_LOG() << "Licence '" << licence.name << "' is expired since " << end.daysTo(now) << " days."
+  WARNING_LOG(m_logger) << "Licence '" << licence.name << "' is expired since " << end.daysTo(now) << " days."
                         << " Expiration: " << licence.expiration.date().toString()
                         << " " << licence.expiration.time().toString();
   return false;
@@ -309,10 +309,10 @@ void LicenceHandler::publishAllData()
 
 void LicenceHandler::publishData(const LtsLicence::Licence &data)
 {
-  INFO_LOG() << "Publish '" << data.name << "' Licence-data to dds";
+  INFO_LOG(m_logger) << "Publish '" << data.name << "' Licence-data to dds";
 
   if (!m_ddsHandler->dts()->publish(toDdsData(data)))
-    ERROR_LOG() << "Error publishing '" << data.name << "' Licence-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing '" << data.name << "' Licence-data to dds";
 
 } // end of publishData()
 //-----------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/licence_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/licence_handler.h
index 3a4127d03..c2ce252d6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/licence_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/licence_handler.h
@@ -45,6 +45,8 @@ public:
   bool freeLicence(const QString &licenceName) override;
 
 private: // Methoden
+
+NGL::INGLLogger &m_logger;
   bool readLicenceFile();
 
   Core::FunctionReplyObject getLicenceInternal(const QString &licenceName);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/main_handler.cpp
index 66ae62d23..9d8af1bac 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/main_handler.cpp
@@ -24,14 +24,13 @@
 namespace ServiceManagement
 {
 
-MainHandler::MainHandler(QObject *parent)
-  : QObject(parent)
+MainHandler::MainHandler(QObject *parent) : QObject(parent)
   , m_ddsHandler(nullptr)
   , m_groupHandler(nullptr)
   , m_licenceHandler(nullptr)
   , m_serviceHandler(nullptr)
-  , m_websocketHandler(nullptr)
-{
+  , m_websocketHandler(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   QtSingleCoreApplication *sa = qobject_cast<QtSingleCoreApplication*>(QCoreApplication::instance());
   Q_ASSERT(sa);
   connect(sa, &QtSingleCoreApplication::messageReceived,
@@ -49,18 +48,18 @@ MainHandler::~MainHandler()
 
 bool MainHandler::init(int domainId, const QString &licenceFile)
 {
-  DEBUG_LOG() << "Initializing MainHandler ...";
+  DEBUG_LOG(m_logger) << "Initializing MainHandler ...";
 
   m_ddsHandler = std::make_shared<DdsHandler>(domainId);
   bool bAllPartsInitialized = m_ddsHandler->init();
 
-  ERROR_LOG() << "Searching for licence file: " << licenceFile;
+  ERROR_LOG(m_logger) << "Searching for licence file: " << licenceFile;
   QString licenceFileName = NGL::findFile(NGL::FileType::ConfigFile, licenceFile);
 
   m_licenceHandler = std::make_shared<LicenceHandler>(m_ddsHandler, licenceFileName);
   if (!m_licenceHandler->init())
   {
-    ERROR_LOG() << "Initialisation LicenceHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation LicenceHandler failed.";
     return false;
   }
 
@@ -78,15 +77,15 @@ bool MainHandler::init(int domainId, const QString &licenceFile)
     m_websocketHandler =  std::make_shared<WebSocketInterface::WebSocketInterfaceHandler>(this);
     if (!m_websocketHandler->init())
     {
-      ERROR_LOG() << "Initialisation WebSocketInterfaceHandler failed.";
+      ERROR_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler failed.";
       return false;
     }
 
-    DEBUG_LOG() << "MainHandler successfully initialized :)";
+    DEBUG_LOG(m_logger) << "MainHandler successfully initialized :)";
   }
   else
   {
-    ERROR_LOG() << "MainHandler initialization failed";
+    ERROR_LOG(m_logger) << "MainHandler initialization failed";
   }
 
   return bAllPartsInitialized;
@@ -101,7 +100,7 @@ bool MainHandler::readServices()
 {
   CodeGen::XmlReader xmlReader;
   const QString xmlPath = NGL::directory(NGL::FileType::ConfigFile, QLatin1String("xml"));
-  DEBUG_LOG() << "Using xml path " << xmlPath;
+  DEBUG_LOG(m_logger) << "Using xml path " << xmlPath;
   QDirIterator directoryIterator(xmlPath);
   int serviceCount = 0;
 
@@ -131,7 +130,7 @@ bool MainHandler::readServices()
 
           if (serviceName.isEmpty() || exeName.length() < 4 || groupNames.isEmpty())
           {
-            INFO_LOG() << currentFileName
+            INFO_LOG(m_logger) << currentFileName
                                << " does not include complete service information.";
           }
           else
@@ -144,7 +143,7 @@ bool MainHandler::readServices()
               const int prioService = xmlReader.getPrio();
               if (bDevMode)
               {
-                WARNING_LOG() << "Developer mode for service " << serviceName
+                WARNING_LOG(m_logger) << "Developer mode for service " << serviceName
                                       << " activated - no automatic restart on crash!";
               }
               Service *newService = new Service(serviceName,
@@ -156,7 +155,7 @@ bool MainHandler::readServices()
                                                 prioService);
               m_serviceHandler->addService(newService);
 
-              DEBUG_LOG() << "Added new service \""
+              DEBUG_LOG(m_logger) << "Added new service \""
                                   << serviceName
                                   << "\""
                                   << " prio=" << prioService;
@@ -165,7 +164,7 @@ bool MainHandler::readServices()
               {
                 if (groupNameMapping.contains(groupName))
                 {
-                  DEBUG_LOG() << "  --> Linking to group \""
+                  DEBUG_LOG(m_logger) << "  --> Linking to group \""
                                       << groupName
                                       << "\"";
                   if (serviceName == QStringLiteral("ReportAnalyzer") && (groupName == QStringLiteral("ExercisePaused") || groupName == QStringLiteral("ExerciseAfterActionReview")))
@@ -174,7 +173,7 @@ bool MainHandler::readServices()
                   m_groupHandler->addServiceLink(newService->id(), groupNameMapping.value(groupName));
                 }
                 else
-                  INFO_LOG() << "Found unknown group name: " << groupName;
+                  INFO_LOG(m_logger) << "Found unknown group name: " << groupName;
               }
               ++ serviceCount;
             }
@@ -188,7 +187,7 @@ bool MainHandler::readServices()
 
   if (serviceCount)
     return true;
-  ERROR_LOG() << "Could not find any valid service in directory " << xmlPath;
+  ERROR_LOG(m_logger) << "Could not find any valid service in directory " << xmlPath;
   return false;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service.cpp
index dd19b76f6..9b69e9331 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service.cpp
@@ -115,13 +115,13 @@ void ServiceManagement::Service::waitForStopped()
 
 void ServiceManagement::Service::onServiceProcessDestroyed(QObject *obj)
 {
-  DEBUG_LOG() << "onServiceProcessDestroyed: " << obj;
+  DEBUG_LOG(m_logger) << "onServiceProcessDestroyed: " << obj;
   ServiceProcess *sp = static_cast<ServiceProcess*>(obj);
   for (int i = 0; i < m_procs.size(); ++i)
   {
     if (m_procs.at(i) == sp)
     {
-      DEBUG_LOG() << "Found... - removing";
+      DEBUG_LOG(m_logger) << "Found... - removing";
       m_procs.remove(i);
       break;
     }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_handler.cpp
index a9c0a393c..2c79fbd42 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_handler.cpp
@@ -39,17 +39,17 @@ ServiceManagement::ServiceHandler::~ServiceHandler()
 
 bool ServiceManagement::ServiceHandler::init()
 {
-  DEBUG_LOG() << "Initializing ServiceHandler ...";
+  DEBUG_LOG(m_logger) << "Initializing ServiceHandler ...";
 
   connect(m_heartBeatObserverTimer, &QTimer::timeout,
           this, &ServiceHandler::onHeartBeatObserverTimerTimeout);
 
 
   HEARTBEAT_OBSERVER_INTERVAL = Settings::observerIntervall();
-  DEBUG_LOG() << HEARTBEAT_OBSERVER_INTERVAL;
+  DEBUG_LOG(m_logger) << HEARTBEAT_OBSERVER_INTERVAL;
   m_heartBeatObserverTimer->start(HEARTBEAT_OBSERVER_INTERVAL);
 
-  DEBUG_LOG() << "ServiceHandler successfully initialized.";
+  DEBUG_LOG(m_logger) << "ServiceHandler successfully initialized.";
   return true;
 }
 
@@ -78,21 +78,21 @@ ServiceManagement::ServiceProcess *ServiceManagement::ServiceHandler::getProcess
 void ServiceManagement::ServiceHandler::onRestartServiceRequest(const rti::core::SampleIdentity &cookie,
                                                                 const RestartServiceRequest &request)
 {
-  DEBUG_LOG() << "onRestartServiceRequest " << request;
+  DEBUG_LOG(m_logger) << "onRestartServiceRequest " << request;
 
   ServiceProcess *proc = serviceProcessFromServiceProcId(request.id());
 
   Core::FunctionReplyObject ret(request.id());
   if (proc == nullptr)
   {
-    INFO_LOG() << "Got restart request for non existing service ID "
+    INFO_LOG(m_logger) << "Got restart request for non existing service ID "
                        << request.id();
     ret.setStr(tr_lts("dds", "There is no ServiceProcess with id %1")).arg(request.id());
     m_ddsHandler->fts()->restartServiceReply(cookie, ret);
     return;
   }
 
-  DEBUG_LOG() << "Restart request for service "
+  DEBUG_LOG(m_logger) << "Restart request for service "
                       << proc->serviceName()
                       << ", domain "
                       << proc->domainId()
@@ -108,7 +108,7 @@ void ServiceManagement::ServiceHandler::onRestartServiceRequest(const rti::core:
 
 void ServiceManagement::ServiceHandler::stopAllServices()
 {
-  INFO_LOG() << "Stopping all Services ...";
+  INFO_LOG(m_logger) << "Stopping all Services ...";
 
   // shutdown async
   for (Service *service : std::as_const(m_services))
@@ -116,12 +116,12 @@ void ServiceManagement::ServiceHandler::stopAllServices()
   for (Service *service : std::as_const(m_services))
     service->waitForStopped();
 
-  INFO_LOG() << "... all Services stopped :)";
+  INFO_LOG(m_logger) << "... all Services stopped :)";
 }
 
 void ServiceManagement::ServiceHandler::onNewServiceInfoFromProc(const ServiceInformation &info)
 {
-  TRACE_LOG() << "Publishing new ServiceInformation: " << info;
+  TRACE_LOG(m_logger) << "Publishing new ServiceInformation: " << info;
 
   m_ddsHandler->dts()->publish(info);
 
@@ -133,11 +133,11 @@ void ServiceManagement::ServiceHandler::onNewServiceInfoFromDds(const Core::Curr
   if (type == DataModification::eRemoved)
     return;
 
-  TRACE_LOG() << "Got new CurrentRunningState: " << data;
+  TRACE_LOG(m_logger) << "Got new CurrentRunningState: " << data;
 
   if (!data.pid())
   {
-    INFO_LOG() << "PID 0 is not allowed.";
+    INFO_LOG(m_logger) << "PID 0 is not allowed.";
     return;
   }
 
@@ -153,7 +153,7 @@ void ServiceManagement::ServiceHandler::onNewServiceInfoFromDds(const Core::Curr
       {
         if (currentProc->remotePid() == data.pid())
         {
-          DEBUG_LOG() << "Found my prog " << data.pid() << " to "<< currentProc->pid() << " " << currentProc->serviceName();
+          DEBUG_LOG(m_logger) << "Found my prog " << data.pid() << " to "<< currentProc->pid() << " " << currentProc->serviceName();
           proc = currentProc;
           retData.pid() = proc->processId();
           found = true;
@@ -170,7 +170,7 @@ void ServiceManagement::ServiceHandler::onNewServiceInfoFromDds(const Core::Curr
   {
     if (!m_unknownPidsWarned.contains(data.pid()))
     {
-      ERROR_LOG() << "Got CurrentRunningState for non existing process with PID "
+      ERROR_LOG(m_logger) << "Got CurrentRunningState for non existing process with PID "
                           << data.pid();
       m_unknownPidsWarned += data.pid();
     }
@@ -238,7 +238,7 @@ void ServiceManagement::ServiceHandler::onHeartBeatObserverTimerTimeout()
 
       if (currentProc->lastHeartbeatMSec() < minAge)
       {
-        WARNING_LOG() << "Heartbeat TIMEOUT for " << currentProc->debugInfo()
+        WARNING_LOG(m_logger) << "Heartbeat TIMEOUT for " << currentProc->debugInfo()
                               << " - Restarting ..."
                               << " min heartbeat age: " << QDateTime::fromMSecsSinceEpoch(minHeartbeatAge).toString(QStringLiteral("HH:mm:ss"));
         currentProc->addStartAttempt();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_handler.h
index b5221b462..ebb5023d5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_handler.h
@@ -52,6 +52,8 @@ private Q_SLOTS:
   void onHeartBeatObserverTimerTimeout();
 
 private: // methods
+
+NGL::INGLLogger &m_logger;
   Service *serviceFromId(int id);
   ServiceProcess *serviceProcessFromPid(qint64 pid);
   ServiceProcess *serviceProcessFromServiceProcId(int32_t id);
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 3df44853b..011f90ae3 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
@@ -17,8 +17,7 @@
 
 int ServiceManagement::ServiceProcess::s_serviceProcessIdCounter = 0;
 
-ServiceManagement::ServiceProcess::ServiceProcess(const GroupRequest &groupData, ServiceManagement::Service *parentService)
-  : QProcess(parentService)
+ServiceManagement::ServiceProcess::ServiceProcess(const GroupRequest &groupData, ServiceManagement::Service *parentService) : QProcess(parentService)
   , m_serviceId(parentService->id())
   , m_serviceProcessId(s_serviceProcessIdCounter++)
   , m_abbreviation(parentService->abbreviation())
@@ -33,8 +32,8 @@ ServiceManagement::ServiceProcess::ServiceProcess(const GroupRequest &groupData,
   , m_isInDevMode(parentService->devMode())
   , m_failedStartAttemptCounter(0)
   , m_stoppedFromRequest(false)
-  , m_pidProc(new QProcess(this))
-{
+  , m_pidProc(new QProcess(this)),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   QStringList args({QStringLiteral("-e"), QString::number(m_groupData.exercisePartitionId()),
                     QStringLiteral("-d"), QString::number(m_groupData.domainId())});
 
@@ -59,7 +58,7 @@ ServiceManagement::ServiceProcess::ServiceProcess(const GroupRequest &groupData,
 #ifndef LTS_DEBUG
   if (m_name == QStringLiteral("HighLevelArchitecture"))
   {
-    DEBUG_LOG() <<" START HLA REMOTE";
+    DEBUG_LOG(m_logger) <<" START HLA REMOTE";
     killallRemote();
 
     //QString sshCmd =  QStringLiteral("ssh ctcap03 '/shd/CTC/SV/bin/svcHighLevelArchitecture %1 &'").arg(arguments().join(QLatin1Char(' ')));
@@ -73,7 +72,7 @@ ServiceManagement::ServiceProcess::ServiceProcess(const GroupRequest &groupData,
 
   if (m_name == QStringLiteral("Buildings"))
   {
-    DEBUG_LOG() <<" START Buildings Remote";
+    DEBUG_LOG(m_logger) <<" START Buildings Remote";
     killallRemote();
 
     //QString sshCmd =  QStringLiteral("ssh ctcap03 '/shd/CTC/SV/bin/svcHighLevelArchitecture %1 &'").arg(arguments().join(QLatin1Char(' ')));
@@ -116,7 +115,7 @@ Core::RunningState ServiceManagement::ServiceProcess::runningState() const
 
 bool ServiceManagement::ServiceProcess::start(OpenMode mode)
 {
-  DEBUG_LOG() << "Starting ServiceProcess "
+  DEBUG_LOG(m_logger) << "Starting ServiceProcess "
                       << debugInfo()
                       << " executable: " << program()
                       << " in dir: " << workingDirectory()
@@ -129,10 +128,10 @@ bool ServiceManagement::ServiceProcess::start(OpenMode mode)
 #ifndef LTS_DEBUG
     if (m_name == QStringLiteral("HighLevelArchitecture"))
     {
-      DEBUG_LOG() <<" START HLA REMOTE";
+      DEBUG_LOG(m_logger) <<" START HLA REMOTE";
 
       //QString sshCmd =  QStringLiteral("ssh ctcap03 '/shd/CTC/SV/bin/svcHighLevelArchitecture %1 &echo $! '").arg(arguments().join(QLatin1Char(' ')));
-      //DEBUG_LOG() << sshCmd;
+      //DEBUG_LOG(m_logger) << sshCmd;
       setProgram(QStringLiteral("ssh"));
 
       if (state() == QProcess::NotRunning)
@@ -140,11 +139,11 @@ bool ServiceManagement::ServiceProcess::start(OpenMode mode)
         QProcess::start(mode);
         waitForStarted(5000);
       }
-      DEBUG_LOG() << program() << " " << arguments().join(QLatin1Char(' '));
+      DEBUG_LOG(m_logger) << program() << " " << arguments().join(QLatin1Char(' '));
 
       m_pidProc->kill();
       m_pidProc->setProgram(QStringLiteral("ssh"));
-      //DEBUG_LOG() << sshCmd;
+      //DEBUG_LOG(m_logger) << sshCmd;
       QStringList args({QStringLiteral("-e"), QString::number(m_groupData.exercisePartitionId()),
                         QStringLiteral("-d"), QString::number(m_groupData.domainId())});
       setProgram(QStringLiteral("ssh"));
@@ -169,26 +168,26 @@ bool ServiceManagement::ServiceProcess::start(OpenMode mode)
         m_pidProc->waitForReadyRead(5000);
       });
 
-      DEBUG_LOG() << m_pidProc->program() << " " << m_pidProc->arguments().join(QLatin1Char(' '));
+      DEBUG_LOG(m_logger) << m_pidProc->program() << " " << m_pidProc->arguments().join(QLatin1Char(' '));
 
     }else if (m_name == QStringLiteral("Buildings"))
     {
-      DEBUG_LOG() <<" START Buildings REMOTE";
+      DEBUG_LOG(m_logger) <<" START Buildings REMOTE";
       setProgram(QStringLiteral("ssh"));
       //QString sshCmd =  QStringLiteral("ssh ctcap03 '/shd/CTC/SV/bin/svcHighLevelArchitecture %1 &echo $! '").arg(arguments().join(QLatin1Char(' ')));
-      //DEBUG_LOG() << sshCmd;
+      //DEBUG_LOG(m_logger) << sshCmd;
 
       if (state() == QProcess::NotRunning)
       {
         QProcess::start(mode);
         waitForStarted(5000);
       }
-      DEBUG_LOG() << program() << " " << arguments().join(QLatin1Char(' '));
+      DEBUG_LOG(m_logger) << program() << " " << arguments().join(QLatin1Char(' '));
 
 
       m_pidProc->kill();
       m_pidProc->setProgram(QStringLiteral("ssh"));
-      //DEBUG_LOG() << sshCmd;
+      //DEBUG_LOG(m_logger) << sshCmd;
       QStringList args({QStringLiteral("-e"), QString::number(m_groupData.exercisePartitionId()),
                         QStringLiteral("-d"), QString::number(m_groupData.domainId())});
       setProgram(QStringLiteral("ssh"));
@@ -215,7 +214,7 @@ bool ServiceManagement::ServiceProcess::start(OpenMode mode)
         m_pidProc->waitForReadyRead(5000);
       });
 
-      DEBUG_LOG() << m_pidProc->program() << " " << m_pidProc->arguments().join(QLatin1Char(' '));
+      DEBUG_LOG(m_logger) << m_pidProc->program() << " " << m_pidProc->arguments().join(QLatin1Char(' '));
     }
     else
 #endif
@@ -230,7 +229,7 @@ bool ServiceManagement::ServiceProcess::start(OpenMode mode)
   }
   else
   {
-    ERROR_LOG() << "Could not start service "
+    ERROR_LOG(m_logger) << "Could not start service "
                         << debugInfo()
                         << " because there is no licence for it.";
     return false;
@@ -244,7 +243,7 @@ int ServiceManagement::ServiceProcess::serviceProcessId() const
 
 void ServiceManagement::ServiceProcess::setNewStateFromHeartbeat(const Core::CurrentRunningState &data)
 {
-  DEBUG_LOG() << "Heartbeat for " << debugInfo() << ", running state: " << data.runningState();
+  DEBUG_LOG(m_logger) << "Heartbeat for " << debugInfo() << ", running state: " << data.runningState();
   m_failedStartAttemptCounter = 0;
   m_lastHeartbeatMSec = QDateTime::currentMSecsSinceEpoch();
   m_runningState = data.runningState();
@@ -287,7 +286,7 @@ void ServiceManagement::ServiceProcess::killallRemote()
   sh.startDetached();
 #else
   sh.start();
-#endif  DEBUG_LOG() << "kill remote " << sh.program() << " " << args.join(QLatin1Char(' '));
+#endif  DEBUG_LOG(m_logger) << "kill remote " << sh.program() << " " << args.join(QLatin1Char(' '));
 }
 
 void ServiceManagement::ServiceProcess::restart()
@@ -420,7 +419,7 @@ void ServiceManagement::ServiceProcess::setNewStateFromChangeRequest(const Core:
 
 void ServiceManagement::ServiceProcess::onNewInfoFromProc(ProcessState state)
 {
-  DEBUG_LOG() << "New state for " << debugInfo() << ": " << state;
+  DEBUG_LOG(m_logger) << "New state for " << debugInfo() << ": " << state;
   QString errString;
   switch (state)
   {
@@ -428,10 +427,10 @@ void ServiceManagement::ServiceProcess::onNewInfoFromProc(ProcessState state)
     if (exitStatus() == QProcess::NormalExit)
     {
       if (exitCode() == 0)
-        DEBUG_LOG() << "Normal exit for " << debugInfo()
+        DEBUG_LOG(m_logger) << "Normal exit for " << debugInfo()
                             << ": " << readAllStandardError() << ", " << readAllStandardOutput();
       else
-        ERROR_LOG() << "Normal exit with exit code " << exitCode() << " for " << debugInfo()
+        ERROR_LOG(m_logger) << "Normal exit with exit code " << exitCode() << " for " << debugInfo()
                             << ": " << readAllStandardError() << ", " << readAllStandardOutput();
       m_runningState = Core::RunningState::StoppedNormally;
     }
@@ -452,7 +451,7 @@ void ServiceManagement::ServiceProcess::onNewInfoFromProc(ProcessState state)
         m_runningState = Core::RunningState::StoppedError;
       }
       errString += QLatin1String(" error string: ") + errorString();
-      ERROR_LOG() << "Crashed Error for " << debugInfo() << ", error: " << errorString() << ":\n"
+      ERROR_LOG(m_logger) << "Crashed Error for " << debugInfo() << ", error: " << errorString() << ":\n"
                           << readAll();
     }
     m_parentService->licenceDonator()->freeLicence(m_name);
@@ -463,7 +462,7 @@ void ServiceManagement::ServiceProcess::onNewInfoFromProc(ProcessState state)
     m_runningState = Core::RunningState::Starting;
     break;
   case QProcess::Running:
-    DEBUG_LOG() << "Process " << m_name
+    DEBUG_LOG(m_logger) << "Process " << m_name
                         << " has now the PID " << usablePid();
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/ModuleTests/srp_dt_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/ModuleTests/srp_dt_tests.cpp
index aecc02f2c..3d5f4acf1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/ModuleTests/srp_dt_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/ModuleTests/srp_dt_tests.cpp
@@ -19,12 +19,11 @@
 //---------------------------------------------------------------------------------
 namespace SituationReplay
 {
-SrpDtTests::SrpDtTests(QObject *parent)
-  : QObject(parent)
+SrpDtTests::SrpDtTests(QObject *parent) : QObject(parent)
   , m_replayPartitionId(0)
   , m_situationReplayId(0)
-  , m_bTestsSuccessful(true)
-{
+  , m_bTestsSuccessful(true),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   qRegisterMetaType<Core::FunctionReply>("Core::FunctionReply");
 }
 
@@ -35,7 +34,7 @@ SrpDtTests::~SrpDtTests()
 //---------------------------------------------------------------------------------
 bool SrpDtTests::init(int domainId, int replayPartitionId)
 {
-  DEBUG_LOG() << "init begin";
+  DEBUG_LOG(m_logger) << "init begin";
   m_replayPartitionId = replayPartitionId;
 
   // initialize DDS
@@ -51,11 +50,11 @@ bool SrpDtTests::init(int domainId, int replayPartitionId)
   // DdsInterface Publisher
   //m_ddsConnector->setPublisher(new Publisher(domainId, m_ddsConnector->getPartition(), m_ddsConnector->getDomainParticipant()));
 
-  DEBUG_LOG() << "Create dtc";
+  DEBUG_LOG(m_logger) << "Create dtc";
   m_dtc = SituationReplay::Interface::Dtc::create(m_ddsConnector);
-  DEBUG_LOG() << "Init dtc";
+  DEBUG_LOG(m_logger) << "Init dtc";
   bool bRet = m_dtc->enableAll();
-  DEBUG_LOG() << "init end - bRet = " << bRet;
+  DEBUG_LOG(m_logger) << "init end - bRet = " << bRet;
 
   connect(m_dtc.get(), &SituationReplay::Interface::Dtc::sitReplayChanged,
           this, &SrpDtTests::onReceiveSituationReplayData);
@@ -66,26 +65,26 @@ bool SrpDtTests::init(int domainId, int replayPartitionId)
 //---------------------------------------------------------------------------------
 void SrpDtTests::startTest()
 {
-  INFO_LOG() << "startTest";
+  INFO_LOG(m_logger) << "startTest";
   QTimer::singleShot(1000, this, &SrpDtTests::tryGetAllSituationReplays);
 }
 
 //---------------------------------------------------------------------------------
 void SrpDtTests::tryGetAllSituationReplays()
 {
-  INFO_LOG() << "trying to get all situationReplays";
+  INFO_LOG(m_logger) << "trying to get all situationReplays";
   const QMap<qint32, SituationReplay::SitReplay> map = m_dtc->sitReplays();
   if (map.isEmpty())
   {
-    ERROR_LOG() << "Error requesting all situation replay data";
+    ERROR_LOG(m_logger) << "Error requesting all situation replay data";
     failExit();
   }
   else
   {
-    INFO_LOG() << "Amout of existing situation replays = " << map.size();
+    INFO_LOG(m_logger) << "Amout of existing situation replays = " << map.size();
     m_situationReplayId = map.firstKey();
     for(auto it = map.begin(); it != map.end(); ++it)
-      INFO_LOG() << "situationReplay(" << it.key() << ") : " << it.value().replayPartitionId() ;
+      INFO_LOG(m_logger) << "situationReplay(" << it.key() << ") : " << it.value().replayPartitionId() ;
   }
 
   QTimer::singleShot(10, this, &SrpDtTests::tryGetSituationReplay);
@@ -94,17 +93,17 @@ void SrpDtTests::tryGetAllSituationReplays()
 //---------------------------------------------------------------------------------
 void SrpDtTests::tryGetSituationReplay()
 {
-  INFO_LOG() << "trying get itemData for situationReplay " << m_situationReplayId;
+  INFO_LOG(m_logger) << "trying get itemData for situationReplay " << m_situationReplayId;
   SituationReplay::SitReplay data = m_dtc->sitReplay(m_situationReplayId);
 
   if (data.id() <= 0)
   {
-    ERROR_LOG() << "Error receiving data for situation replay " << m_situationReplayId;
+    ERROR_LOG(m_logger) << "Error receiving data for situation replay " << m_situationReplayId;
     failExit();
   }
   else
   {
-    INFO_LOG() << "## SitReplay(" << data.id() << "), replayPartition: " << data.replayPartitionId()
+    INFO_LOG(m_logger) << "## SitReplay(" << data.id() << "), replayPartition: " << data.replayPartitionId()
                        << ", on exercise " << data.exerciseId();
     QTimer::singleShot(0, qApp, &QCoreApplication::quit);
   }
@@ -114,7 +113,7 @@ void SrpDtTests::tryGetSituationReplay()
 void SrpDtTests::onReceiveSituationReplayData(const SituationReplay::SitReplay &data)
 {
   if (m_situationReplayId == data.id())
-    INFO_LOG() << "##################### Data for id = " << data.id() << " received";
+    INFO_LOG(m_logger) << "##################### Data for id = " << data.id() << " received";
 }
 
 // ------------------------------------------------------------------------------
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/ModuleTests/srp_ft_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/ModuleTests/srp_ft_tests.cpp
index 84f8f4751..0226eaea2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/ModuleTests/srp_ft_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/ModuleTests/srp_ft_tests.cpp
@@ -36,7 +36,7 @@ SrpFtTests::~SrpFtTests()
 //--------------------------------------------------------------------------------------------------------
 bool SrpFtTests::init(int domainId, TestId testId, int replayPartitionId, int srpId)
 {
-  INFO_LOG() << "init begin";
+  INFO_LOG(m_logger) << "init begin";
 
   m_testId = testId;
   m_replayPartitionId = replayPartitionId;
@@ -53,11 +53,11 @@ bool SrpFtTests::init(int domainId, TestId testId, int replayPartitionId, int sr
   // Publish/Subscribe on replayPartition
   m_ddsConnector->initPublisherSubscriber();
 
-  DEBUG_LOG() << "create ftc";
+  DEBUG_LOG(m_logger) << "create ftc";
   m_ftc = SituationReplay::Interface::Ftc::create(m_ddsConnector);
-  DEBUG_LOG() << "init ftc";
+  DEBUG_LOG(m_logger) << "init ftc";
   bool bRet = m_ftc->enableAll();
-  DEBUG_LOG() << "init end - bRet = " << bRet;
+  DEBUG_LOG(m_logger) << "init end - bRet = " << bRet;
 
   return bRet;
 }
@@ -65,7 +65,7 @@ bool SrpFtTests::init(int domainId, TestId testId, int replayPartitionId, int sr
 //--------------------------------------------------------------------------------------------------------
 void SrpFtTests::startTest()
 {
-  INFO_LOG() << "startTest";
+  INFO_LOG(m_logger) << "startTest";
 
   if (m_testId <= TryStart)
     QTimer::singleShot(0, this, &SrpFtTests::tryStart);
@@ -82,7 +82,7 @@ void SrpFtTests::startTest()
 //--------------------------------------------------------------------------------------------------------
 void SrpFtTests::tryStart()
 {
-  INFO_LOG() << "trying to send startReplay";
+  INFO_LOG(m_logger) << "trying to send startReplay";
   m_currentTestId = TryStart;
 
   qint64 beginTime = 1468401389668;
@@ -99,7 +99,7 @@ void SrpFtTests::tryStart()
 
   if (!m_ftc->changeReplayStateRequest(req, this))
   {
-    ERROR_LOG() << "Error starting replay for srp " << m_replayPartitionId;
+    ERROR_LOG(m_logger) << "Error starting replay for srp " << m_replayPartitionId;
     failExit();
   }
 }
@@ -107,7 +107,7 @@ void SrpFtTests::tryStart()
 //--------------------------------------------------------------------------------------------------------
 void SrpFtTests::tryNotAllowedChange()
 {
-  INFO_LOG() << "trying to send changeReplayState (start) => should fail (not possible with this method)";
+  INFO_LOG(m_logger) << "trying to send changeReplayState (start) => should fail (not possible with this method)";
   m_currentTestId = TryNotAllowedChange;
   switchToState(SituationReplay::SrpState::Started);
 }
@@ -115,7 +115,7 @@ void SrpFtTests::tryNotAllowedChange()
 //--------------------------------------------------------------------------------------------------------
 void SrpFtTests::tryChangePaused()
 {
-  INFO_LOG() << "trying to send changeReplayState (Paused)";
+  INFO_LOG(m_logger) << "trying to send changeReplayState (Paused)";
   m_currentTestId = TryChangePaused;
   switchToState(SituationReplay::SrpState::Paused);
 }
@@ -123,7 +123,7 @@ void SrpFtTests::tryChangePaused()
 //--------------------------------------------------------------------------------------------------------
 void SrpFtTests::tryChangeResumed()
 {
-  INFO_LOG() << "trying to send changeReplayState (Resumed)";
+  INFO_LOG(m_logger) << "trying to send changeReplayState (Resumed)";
   m_currentTestId = TryChangeResumed;
   switchToState(SituationReplay::SrpState::Resumed);
 }
@@ -131,7 +131,7 @@ void SrpFtTests::tryChangeResumed()
 //--------------------------------------------------------------------------------------------------------
 void SrpFtTests::tryStop()
 {
-  INFO_LOG() << "trying to send stopReplay";
+  INFO_LOG(m_logger) << "trying to send stopReplay";
   m_currentTestId = TryStop;
   switchToState(SituationReplay::SrpState::Stopped);
 }
@@ -139,7 +139,7 @@ void SrpFtTests::tryStop()
 //--------------------------------------------------------------------------------------------------------
 void SrpFtTests::startReplayReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got startReplayReply with id " << replyObject.id();
+  INFO_LOG(m_logger) << "Got startReplayReply with id " << replyObject.id();
   m_situationReplayId = replyObject.id();
   if (m_testId == 0 && !replyObject.error())
     QTimer::singleShot(0, this, &SrpFtTests::tryNotAllowedChange);
@@ -150,9 +150,9 @@ void SrpFtTests::startReplayReply(const Core::FunctionReplyObject &replyObject)
 //--------------------------------------------------------------------------------------------------------
 void SrpFtTests::changeReplayStateReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got changeReplayStateReply with id " << replyObject.id();
+  INFO_LOG(m_logger) << "Got changeReplayStateReply with id " << replyObject.id();
   if (replyObject.error())
-    INFO_LOG() << ", string: " << replyObject.translated();
+    INFO_LOG(m_logger) << ", string: " << replyObject.translated();
   if (m_testId == 0 && !replyObject.error())
   {
     if (m_currentTestId == TryNotAllowedChange)
@@ -169,7 +169,7 @@ void SrpFtTests::changeReplayStateReply(const Core::FunctionReplyObject &replyOb
 //--------------------------------------------------------------------------------------------------------
 void SrpFtTests::stopReplayReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got stopReplayReply with id " << replyObject.id() ;
+  INFO_LOG(m_logger) << "Got stopReplayReply with id " << replyObject.id() ;
 
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
@@ -213,7 +213,7 @@ void SrpFtTests::switchToState(SrpState state)
 
   if (!m_ftc->changeReplayStateRequest(req, this))
   {
-    ERROR_LOG() << "Error changing replay state for srp " << m_situationReplayId << "(" << m_replayPartitionId << ")";
+    ERROR_LOG(m_logger) << "Error changing replay state for srp " << m_situationReplayId << "(" << m_replayPartitionId << ")";
     failExit();
   }
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/db_reader.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/db_reader.cpp
index 483418be2..7dcc47530 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/db_reader.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/db_reader.cpp
@@ -36,17 +36,17 @@ bool DbReader::loadPlugin(const LtsPluginManager::PluginInstance &pi)
   RecordReplay::RecordReplayPlugin *recPlugin = qobject_cast<RecordReplay::RecordReplayPlugin*>(pi.plugin);
   if (!recPlugin)
   {
-    ERROR_LOG() << "Cannot load RecordReplayPlugin " << pi.fileName;
+    ERROR_LOG(m_logger) << "Cannot load RecordReplayPlugin " << pi.fileName;
     return false;
   }
 
   if (!recPlugin->initDts(m_ddsConnector, m_exerciseId, m_bCanHandleSchemas, *m_query))
   {
-    ERROR_LOG() << "Initialisation for RecordReplayPlugin " << pi.fileName << " failed ";
+    ERROR_LOG(m_logger) << "Initialisation for RecordReplayPlugin " << pi.fileName << " failed ";
     return false;
   }
 
-  INFO_LOG() << "Loaded record replay plugin " << recPlugin->pluginName();
+  INFO_LOG(m_logger) << "Loaded record replay plugin " << recPlugin->pluginName();
   m_plugins.push_back(recPlugin);
 
   return true;
@@ -67,67 +67,67 @@ bool DbReader::init(const QSqlDatabase &db)
 
 bool DbReader::setReplayStartTime(qint64 startTime)
 {
-  INFO_LOG() << "IN setReplayStartTime " << startTime;
+  INFO_LOG(m_logger) << "IN setReplayStartTime " << startTime;
   if (!m_query)
   {
-    WARNING_LOG() << "Internal error - no query!";
+    WARNING_LOG(m_logger) << "Internal error - no query!";
     return false;
   }
   for (RecordReplay::RecordReplayPlugin *recPlugin : m_plugins)
   {
-    INFO_LOG() << "IN setReplayStartTime, current Plugin: " << recPlugin->pluginName()
+    INFO_LOG(m_logger) << "IN setReplayStartTime, current Plugin: " << recPlugin->pluginName()
                        << " typename=" << typeid(*recPlugin).name();
     if (!recPlugin->setReplayStartTime(*m_query, startTime))
     {
-      WARNING_LOG() << "setReplayStartTime for plugin " << recPlugin->svcShortName() << " failed!";
+      WARNING_LOG(m_logger) << "setReplayStartTime for plugin " << recPlugin->svcShortName() << " failed!";
       return false;
     }
   }
-  INFO_LOG() << "IN setReplayStartTime " << startTime << " DONE";
+  INFO_LOG(m_logger) << "IN setReplayStartTime " << startTime << " DONE";
   return true;
 }
 
 bool DbReader::readData(qint64 fromTime, qint64 toTime)
 {
-  INFO_LOG() << "IN readData " << fromTime << " to " << toTime;
+  INFO_LOG(m_logger) << "IN readData " << fromTime << " to " << toTime;
   if (!m_query)
   {
-    WARNING_LOG() << "Internal error - no query!";
+    WARNING_LOG(m_logger) << "Internal error - no query!";
     return false;
   }
   for (RecordReplay::RecordReplayPlugin *recPlugin : m_plugins)
   {
     if (!recPlugin->ddsTopicsFromDatabase(*m_query, fromTime, toTime))
     {
-      WARNING_LOG() << "ddsTopicsFromDatabase for plugin " << recPlugin->svcShortName() << " failed!";
+      WARNING_LOG(m_logger) << "ddsTopicsFromDatabase for plugin " << recPlugin->svcShortName() << " failed!";
       return false;
     }
   }
-  INFO_LOG() << "IN readData " << fromTime << " to " << toTime << " DONE";
+  INFO_LOG(m_logger) << "IN readData " << fromTime << " to " << toTime << " DONE";
   return true;
 }
 
 void DbReader::publish(qint64 desiredTime)
 {
-  INFO_LOG() << "IN publish " << desiredTime;
+  INFO_LOG(m_logger) << "IN publish " << desiredTime;
   for (RecordReplay::RecordReplayPlugin *recPlugin : m_plugins)
     if (!recPlugin->publishData(desiredTime))
-      WARNING_LOG() << "publishData for plugin " << recPlugin->svcShortName() << " failed!";
-  INFO_LOG() << "IN publish " << desiredTime << " DONE";
+      WARNING_LOG(m_logger) << "publishData for plugin " << recPlugin->svcShortName() << " failed!";
+  INFO_LOG(m_logger) << "IN publish " << desiredTime << " DONE";
 }
 
 void DbReader::waitForAsyncOperations(qint64 desiredTime)
 {
-  INFO_LOG() << "IN waitForAsyncOperations " << desiredTime;
+  INFO_LOG(m_logger) << "IN waitForAsyncOperations " << desiredTime;
   for (RecordReplay::RecordReplayPlugin *recPlugin : m_plugins)
     if (!recPlugin->waitForAsyncOperations(desiredTime))
-      WARNING_LOG() << "waitForAsyncOperations for plugin " << recPlugin->svcShortName() << " failed!";
+      WARNING_LOG(m_logger) << "waitForAsyncOperations for plugin " << recPlugin->svcShortName() << " failed!";
 }
 
 
 void DbReader::clearData()
 {
-  INFO_LOG() << "IN clearData";
+  INFO_LOG(m_logger) << "IN clearData";
   for (RecordReplay::RecordReplayPlugin *recPlugin : m_plugins)
     recPlugin->clearData();
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/db_reader.h b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/db_reader.h
index bf6693382..0a7519c19 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/db_reader.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/db_reader.h
@@ -35,8 +35,10 @@ public:
   void waitForAsyncOperations(qint64 desiredTime);
   void clearData();
 private:
+  NGL::INGLLogger &m_logger;
   bool loadPlugin(const LtsPluginManager::PluginInstance &pi);
 private:
+  NGL::INGLLogger &m_logger;
   int                                         m_exerciseId;
   NSqlQuery                                  *m_query;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/dds_handler.cpp
index f3090998e..6edb64c1e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/dds_handler.cpp
@@ -35,15 +35,15 @@ static std::shared_ptr<DDSConnector::DdsConnector> makeConnector(const Connectio
 DdsHandler::DdsHandler(const ConnectionParams &output)
   : m_ddsConnectorReplay(makeConnector(output, IDL::PartitionType::Replay, DDS::QosProfile::ConnectionType::ShmUdpLocalhost))
 {
-  DEBUG_LOG() << "DdsHandler Replay(" << output.partitionId << ") for partition: " << m_ddsConnectorReplay->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler Replay(" << output.partitionId << ") for partition: " << m_ddsConnectorReplay->getDefaultPartition();
 }
 
 DdsHandler::DdsHandler(const ConnectionParams &input, const ConnectionParams &output)
   : m_ddsConnectorExercise(makeConnector(input, IDL::PartitionType::Exercise, DDS::QosProfile::ConnectionType::Client))
   , m_ddsConnectorReplay(makeConnector(output, IDL::PartitionType::Replay, DDS::QosProfile::ConnectionType::Shm))
 {
-  DEBUG_LOG() << "DdsHandler Exercise(" << input.partitionId << ") for partition: " << m_ddsConnectorExercise->getDefaultPartition();
-  DEBUG_LOG() << "DdsHandler Replay(" << output.partitionId << ") for partition: " << m_ddsConnectorReplay->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler Exercise(" << input.partitionId << ") for partition: " << m_ddsConnectorExercise->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler Replay(" << output.partitionId << ") for partition: " << m_ddsConnectorReplay->getDefaultPartition();
 }
 
 DdsHandler::~DdsHandler()
@@ -61,7 +61,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
   if ((m_ddsConnectorExercise && !m_ddsConnectorExercise->init(qosFileList)) ||
       !m_ddsConnectorReplay->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -80,10 +80,10 @@ bool DdsHandler::init(const QStringList &qosFileList)
   m_ddsDts = SituationReplay::Interface::Dts::create(m_ddsConnectorReplay);
   m_ddsFts = SituationReplay::Interface::Fts::create(m_ddsConnectorReplay);
   bool bRet = m_ddsDts->enableAll();
-  INFO_LOG() << "Dts initialised";
+  INFO_LOG(m_logger) << "Dts initialised";
 
   bRet &= m_ddsFts->enableAll();
-  INFO_LOG() << "Fts initialised";
+  INFO_LOG(m_logger) << "Fts initialised";
 
   initReplayRouting();
 
@@ -92,7 +92,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
 
 void DdsHandler::publishPartitionTime(const Core::PartitionTime &partitionTime)
 {
-  INFO_LOG() << "publish partitionTime: " << partitionTime.timeStamp();
+  INFO_LOG(m_logger) << "publish partitionTime: " << partitionTime.timeStamp();
   m_dtsPartitionTime->write(partitionTime);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/dds_handler.h
index 3c75f546a..e3d4f0104 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/dds_handler.h
@@ -46,8 +46,10 @@ public:
   static bool parseOptions(const QString &opts, ConnectionParams &params);
 
 private:
+  NGL::INGLLogger &m_logger;
   void initReplayRouting();
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector>      m_ddsConnectorExercise;
   std::shared_ptr<DDSConnector::DdsConnector>      m_ddsConnectorReplay;
   std::shared_ptr<SituationReplay::Interface::Dts> m_ddsDts;
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 7df9fb273..56353a95a 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
@@ -46,7 +46,7 @@ bool HandlerSituationReplay::init(int exerciseId, int partitionId)
   NSqlQuery q(m_db->database());
   const qint64 exerciseStartTime = (q.execAndFetch(stmt) ? q.value(0).toLongLong() : 0);
 
-  DEBUG_LOG() << "stmt: " << stmt << ", res " << exerciseStartTime;
+  DEBUG_LOG(m_logger) << "stmt: " << stmt << ", res " << exerciseStartTime;
 
   Database::SrpSituationReplay newData;
   newData.srpStateId        = SrpState::Stopped;
@@ -67,14 +67,14 @@ bool HandlerSituationReplay::createObject(const Database::SrpSituationReplay &ne
   {
     delete m_objSrp;
     m_objSrp = nullptr;
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
   }
   return m_objSrp != nullptr;
 }
 
 Core::FunctionReplyObject HandlerSituationReplay::startReplayRequest(const SituationReplay::ChangeReplayStateRequest &request)
 {
-  DEBUG_LOG() << "onStartReplayRequest: " << request;
+  DEBUG_LOG(m_logger) << "onStartReplayRequest: " << request;
   // Start only own replay
   if (request.replayPartitionId() != m_partitionId)
     return Core::FunctionReplyObject(request.replayPartitionId(),tr_lts("dds", "Wrong replay partition"));
@@ -102,7 +102,7 @@ Core::FunctionReplyObject HandlerSituationReplay::startReplayRequest(const Situa
 
 Core::FunctionReplyObject HandlerSituationReplay::stopReplayRequest(const SituationReplay::ChangeReplayStateRequest &request)
 {
-  DEBUG_LOG() << "onStopReplayRequest: " << request;
+  DEBUG_LOG(m_logger) << "onStopReplayRequest: " << request;
 
   if (m_objSrp == nullptr)
     return Core::FunctionReplyObject(request.id(), tr_lts("dds", "SituationReplay for replayPartitionId %1 not found")).arg(request.replayPartitionId());
@@ -144,7 +144,7 @@ Core::FunctionReplyObject HandlerSituationReplay::changeReplayStateRequest(const
     return startReplayRequest(request);
   case SrpState_def::Resumed:
   {
-    DEBUG_LOG() << "Resume request: " << request.beginTime() << ", cur playback time: " << m_objSrp->currentReplayTime();
+    DEBUG_LOG(m_logger) << "Resume request: " << request.beginTime() << ", cur playback time: " << m_objSrp->currentReplayTime();
     if (request.beginTime() != 0 && request.beginTime() != m_objSrp->currentReplayTime())
     {
       stopReplayRequest(request);
@@ -163,10 +163,10 @@ Core::FunctionReplyObject HandlerSituationReplay::changeReplayStateRequest(const
 void HandlerSituationReplay::onChangeReplayStateRequest(const rti::core::SampleIdentity &cookie,
                                                         const ChangeReplayStateRequest &request)
 {
-  DEBUG_LOG() << "onChangeReplayStateRequest: " << request;
+  DEBUG_LOG(m_logger) << "onChangeReplayStateRequest: " << request;
   auto ret = changeReplayStateRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_ddsHandler->fts()->changeReplayStateReply(cookie, ret);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay.h b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay.h
index 50268be1d..e9caa2da4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay.h
@@ -37,6 +37,7 @@ public:
   bool init(int exerciseId, int partitionId);
 
 private:
+  NGL::INGLLogger &m_logger;
   bool createObject(const Database::SrpSituationReplay &newData);
   Core::FunctionReplyObject startReplayRequest(const ChangeReplayStateRequest &request);
   Core::FunctionReplyObject stopReplayRequest(const ChangeReplayStateRequest &request);
@@ -46,6 +47,7 @@ private:
                                   const ChangeReplayStateRequest &request) override;
 
 private:
+  NGL::INGLLogger &m_logger;
   ObjectSituationReplay              *m_objSrp; // only one (!) replay per partition possible
   const std::shared_ptr<DdsHandler>   m_ddsHandler;
   const std::shared_ptr<DatabaseInterface> m_db;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay_sqlite.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay_sqlite.cpp
index 2c641a6c0..de87d572a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay_sqlite.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay_sqlite.cpp
@@ -57,7 +57,7 @@ bool HandlerSituationReplaySqlite::createObject(const Database::SrpSituationRepl
   {
     delete m_objSrp;
     m_objSrp = nullptr;
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
     return false;
   }
   connect(m_objSrp, &ObjectSituationReplay::replayTimeChanged, this, &HandlerSituationReplaySqlite::replayTimeChanged);
@@ -70,7 +70,7 @@ bool HandlerSituationReplaySqlite::createObject(const Database::SrpSituationRepl
 
 bool HandlerSituationReplaySqlite::onStartReplayRequest(qint64 begin, qint64 end, double pace)
 {
-  DEBUG_LOG() << "onStartReplayRequest: " << begin << ", " << end << ", " << pace;
+  DEBUG_LOG(m_logger) << "onStartReplayRequest: " << begin << ", " << end << ", " << pace;
 
   Database::SrpSituationReplay newData;
   newData.srpStateId        = SrpState::Started;
@@ -86,11 +86,11 @@ bool HandlerSituationReplaySqlite::onStartReplayRequest(qint64 begin, qint64 end
 
 bool HandlerSituationReplaySqlite::onStopReplayRequest()
 {
-  DEBUG_LOG() << "onStopReplayRequest";
+  DEBUG_LOG(m_logger) << "onStopReplayRequest";
 
   if (m_objSrp == nullptr)
   {
-    ERROR_LOG() << "onStopReplayRequest - internal error";
+    ERROR_LOG(m_logger) << "onStopReplayRequest - internal error";
     return false;
   }
 
@@ -99,7 +99,7 @@ bool HandlerSituationReplaySqlite::onStopReplayRequest()
     ret = m_objSrp->removeObject();
 
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
 
   // remove all old data from DDS-Bus & clear maps
   m_dbReader->clearData();
@@ -111,7 +111,7 @@ bool HandlerSituationReplaySqlite::onPauseReplayRequest()
 {
   if (m_objSrp == nullptr)
   {
-    ERROR_LOG() << "onChangeReplayStateRequest - internal error";
+    ERROR_LOG(m_logger) << "onChangeReplayStateRequest - internal error";
     return false;
   }
   return onChangeReplayStateRequest(SrpState::Paused, m_objSrp->pace());
@@ -121,7 +121,7 @@ bool HandlerSituationReplaySqlite::onResumeReplayRequest()
 {
   if (m_objSrp == nullptr)
   {
-    ERROR_LOG() << "onChangeReplayStateRequest - internal error";
+    ERROR_LOG(m_logger) << "onChangeReplayStateRequest - internal error";
     return false;
   }
   return onChangeReplayStateRequest(SrpState::Resumed, m_objSrp->pace());
@@ -130,17 +130,17 @@ bool HandlerSituationReplaySqlite::onResumeReplayRequest()
 
 bool HandlerSituationReplaySqlite::onChangeReplayStateRequest(const SituationReplay::SrpState &newState, double newPace)
 {
-  DEBUG_LOG() << "onChangeReplayStateRequest: " << newState << ", " << newPace;
+  DEBUG_LOG(m_logger) << "onChangeReplayStateRequest: " << newState << ", " << newPace;
 
   if (m_objSrp == nullptr)
   {
-    ERROR_LOG() << "onChangeReplayStateRequest - internal error";
+    ERROR_LOG(m_logger) << "onChangeReplayStateRequest - internal error";
     return false;
   }
 
   if (newState != SrpState::Resumed && newState != SrpState::Paused)
   {
-    ERROR_LOG() << "onChangeReplayStateRequest: SrpStateChange not possible, only resumed & paused allowed";
+    ERROR_LOG(m_logger) << "onChangeReplayStateRequest: SrpStateChange not possible, only resumed & paused allowed";
     return false;
   }
 
@@ -148,7 +148,7 @@ bool HandlerSituationReplaySqlite::onChangeReplayStateRequest(const SituationRep
   const Core::FunctionReplyObject ret = m_objSrp->switchToState(newState);
 
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
 
   return !ret.error();
 }
@@ -157,7 +157,7 @@ bool HandlerSituationReplaySqlite::onPaceChangeRequest(double newPace)
 {
   if (m_objSrp == nullptr)
   {
-    ERROR_LOG() << "onChangeReplayStateRequest - internal error";
+    ERROR_LOG(m_logger) << "onChangeReplayStateRequest - internal error";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay_sqlite.h b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay_sqlite.h
index d556a5e46..8e8fe98ec 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay_sqlite.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay_sqlite.h
@@ -52,8 +52,10 @@ public:
   bool onChangeReplayStateRequest(const SrpState &newState, double newPace);
   bool onPaceChangeRequest(double newPace);
 private:
+  NGL::INGLLogger &m_logger;
   bool createObject(const Database::SrpSituationReplay &newData);
 private:
+  NGL::INGLLogger &m_logger;
   ObjectSituationReplay              *m_objSrp; // only one (!) replay per partition possible
   const std::shared_ptr<DdsHandler>   m_ddsHandler;
   const std::shared_ptr<DbReader>     m_dbReader;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler.cpp
index 3e93bb2b2..1e2ad5d46 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler.cpp
@@ -38,7 +38,7 @@ bool MainHandler::init(const SituationReplay::ConnectionParams &input,
   m_dbHandler = std::make_shared<DbHandler>();
   if (!m_dbHandler->init(input.partitionId, Settings::settings()))
   {
-    ERROR_LOG() << "Initialisation dbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler.h
index c9170fe7e..1f6609ddd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler.h
@@ -34,9 +34,11 @@ public:
             const ConnectionParams &output);
 
 private:
+  NGL::INGLLogger &m_logger;
   bool initSrpHandler(int partitionIdIn, int partitionIdOut);
 
 private:
+  NGL::INGLLogger &m_logger;
   std::unique_ptr<HandlerSituationReplay> m_handlerSrp;
   std::shared_ptr<DdsHandler>             m_ddsInterface;
   std::shared_ptr<DbHandler>              m_dbHandler;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler_sqlite.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler_sqlite.cpp
index 616e4ed6c..63cdea865 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler_sqlite.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler_sqlite.cpp
@@ -53,7 +53,7 @@ bool MainHandlerSqlite::initDb(const ReplayInformation &replayInformation,
 {
   if (!m_ddsInterface)
   {
-    WARNING_LOG() << "dds must be initialized first!";
+    WARNING_LOG(m_logger) << "dds must be initialized first!";
     return false;
   }
 
@@ -102,15 +102,15 @@ bool MainHandlerSqlite::initDb(const ReplayInformation &replayInformation,
   m_dbHandler = std::make_shared<DbHandler>();
   if (!m_dbHandler->init(partitionIdIn, m_dbSqlite))
   {
-    ERROR_LOG() << "Initialisation dbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "opening sqlite db successful";
+  DEBUG_LOG(m_logger) << "opening sqlite db successful";
 
   m_dbReader = std::make_shared<DbReader>(m_ddsInterface->ddsReplay(), partitionIdIn, false);
   if (!m_dbReader->init(m_dbHandler->db()->database()))
   {
-    ERROR_LOG() << "Could not initialize database reader";
+    ERROR_LOG(m_logger) << "Could not initialize database reader";
     return false;
   }
 
@@ -120,7 +120,7 @@ bool MainHandlerSqlite::initDb(const ReplayInformation &replayInformation,
   if (!initSrpHandler(partitionIdIn, m_ddsInterface->ddsReplay()->getPartitionId(),
                       replayInformation.timeSpan.begin, replayInformation.timeSpan.end))
   {
-    ERROR_LOG() << "Could not initialize situation replay handler";
+    ERROR_LOG(m_logger) << "Could not initialize situation replay handler";
     return false;
   }
 
@@ -178,14 +178,14 @@ bool MainHandlerSqlite::loadReplayConfig(const QString &replayConfigPath)
   QFile f(replayConfigPath);
   if (!f.open(QIODevice::ReadOnly))
   {
-    WARNING_LOG() << "Could not open '" << replayConfigPath << "' for reading - no replay config loaded";
+    WARNING_LOG(m_logger) << "Could not open '" << replayConfigPath << "' for reading - no replay config loaded";
     return false;
   }
   QJsonParseError error;
   const QJsonDocument doc(QJsonDocument::fromJson(f.readAll(), &error));
   if (error.error != QJsonParseError::NoError)
   {
-    WARNING_LOG() << "Could not parse replay config loaded json file: " << error.errorString();
+    WARNING_LOG(m_logger) << "Could not parse replay config loaded json file: " << error.errorString();
     return false;
   }
   const QJsonObject obj = doc.object();
@@ -246,7 +246,7 @@ void MainHandlerSqlite::maybeAddNewOverlay(qint64 curTime)
       return;
     m_curOverlayArrayIdx = nextIdx;
     m_currentVisibleOverlays += m_overlays.at(nextIdx);
-    DEBUG_LOG() << "Showing new overlay with id " << m_overlays.at(m_curOverlayArrayIdx).overlayId
+    DEBUG_LOG(m_logger) << "Showing new overlay with id " << m_overlays.at(m_curOverlayArrayIdx).overlayId
                          << " at time " << curTime;
     emit applyNewOverlay(m_overlays.at(m_curOverlayArrayIdx).overlayId);
   }
@@ -254,7 +254,7 @@ void MainHandlerSqlite::maybeAddNewOverlay(qint64 curTime)
 
 void MainHandlerSqlite::removeOutdatedOverlays(qint64 curTime)
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " curTime = "<< curTime
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " curTime = "<< curTime
                       << " m_currentVisibleOverlays.size()= "<< m_currentVisibleOverlays.size();
 
   const qint64 curTimeRelative = curTime - m_replay.timeSpan.begin + m_replay.relativeTimeSpan.begin;  // + m_replay.relativeTimeSpan.begin
@@ -262,7 +262,7 @@ void MainHandlerSqlite::removeOutdatedOverlays(qint64 curTime)
   {
     const qint64 endTime = m_currentVisibleOverlays.at(i).relativeTimeSpan.end;
 
-    DEBUG_LOG() << Q_FUNC_INFO << " curTimeRelative = " << curTimeRelative << " endTime = " << endTime;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " curTimeRelative = " << curTimeRelative << " endTime = " << endTime;
 
     if (curTimeRelative > endTime)
     {
@@ -308,7 +308,7 @@ int MainHandlerSqlite::findNextIndex(qint64 curTime, int curIdx, const QVector<F
   // startTime: msec, rel. to begin of SCRIPT
   const qint64 startTime = data.at(nextIdx).relativeTimeSpan.begin;
 
-  DEBUG_LOG() << Q_FUNC_INFO << " curTimeRelative = " << curTimeRelative << " startTime = " << startTime;
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " curTimeRelative = " << curTimeRelative << " startTime = " << startTime;
 
   if (curTimeRelative < startTime)
     return -1;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler_sqlite.h b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler_sqlite.h
index c63d76751..2cb5434e8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler_sqlite.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/main_handler_sqlite.h
@@ -103,6 +103,7 @@ Q_SIGNALS:
   void removeOverlay(int overlayId);
   void fileContentAvailable(const FileManagement::Database::FlmFileContent &data);
 private:
+  NGL::INGLLogger &m_logger;
   bool initSrpHandler(int partitionIdIn, int partitionIdOut, qint64 beginTime, qint64 endTime);
   bool initStaticPublisher();
   bool loadReplayConfig(const QString &replayConfigPath);
@@ -117,6 +118,7 @@ private Q_SLOTS:
   void onReplayTimeMaybeJumped(qint64 curTime);
 
 private:
+  NGL::INGLLogger &m_logger;
   QVector<FilterInformation> m_filter;
   QVector<FilterInformation> m_overlays;
   QVector<FilterInformation> m_currentVisibleOverlays;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/object_situation_replay.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/object_situation_replay.cpp
index 0fce54ca7..222563ef3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/object_situation_replay.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/object_situation_replay.cpp
@@ -20,14 +20,13 @@ namespace SituationReplay
 ObjectSituationReplay::ObjectSituationReplay(const std::shared_ptr<DdsHandler> &ddsHandler,
                                              const std::shared_ptr<DatabaseInterface> &db,
                                              const std::shared_ptr<DbReader> &dbReader,
-                                             int exerciseId)
-  : m_ddsInterface(ddsHandler)
+                                             int exerciseId) : m_ddsInterface(ddsHandler)
   , m_db(db)
   , m_dbReader(dbReader)
   , m_exerciseId(exerciseId)
   , m_replayTimer(new QTimer(this))
-  , m_currentReplayTime(0)
-{
+  , m_currentReplayTime(0),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   connect(m_replayTimer, &QTimer::timeout, this, &ObjectSituationReplay::onReplayTimerTimeout);
 }
 
@@ -67,7 +66,7 @@ Core::FunctionReplyObject ObjectSituationReplay::createObject(const Database::Sr
   }
 
   // Id is serial -> will be generated by db => inside m_data after db-insert
-  DEBUG_LOG() << "New srpId: " << m_data.id;
+  DEBUG_LOG(m_logger) << "New srpId: " << m_data.id;
 
   switchToState(SituationReplay::SrpState_def::Stopped);
 
@@ -90,7 +89,7 @@ bool ObjectSituationReplay::setPace(double newPace)
 {
   if (newPace < 0)
   {
-    WARNING_LOG() << "Trying to set a pace < 0";
+    WARNING_LOG(m_logger) << "Trying to set a pace < 0";
     return false;
   }
   m_data.pace = newPace;
@@ -113,7 +112,7 @@ bool ObjectSituationReplay::setSrpData(const Database::SrpSituationReplay &newDa
   {
     if (!m_db->update(m_data))
     {
-      ERROR_LOG() << "Error updating SitReplay data in database (exerciseState)";
+      ERROR_LOG(m_logger) << "Error updating SitReplay data in database (exerciseState)";
       return false;
     }
 
@@ -129,7 +128,7 @@ bool ObjectSituationReplay::setSrpData(const Database::SrpSituationReplay &newDa
 
     // record SrpStateChange
     if (!m_db->insert(stateChange))
-      WARNING_LOG() << "Recording change of srpState failed";
+      WARNING_LOG(m_logger) << "Recording change of srpState failed";
   }
 
   // Publish Data via DTS
@@ -140,7 +139,7 @@ bool ObjectSituationReplay::setSrpData(const Database::SrpSituationReplay &newDa
 
 bool ObjectSituationReplay::start()
 {
-  INFO_LOG() << "start: " << m_currentReplayTime;
+  INFO_LOG(m_logger) << "start: " << m_currentReplayTime;
   m_currentReplayTime = m_data.beginTime;
 
   emit started(m_currentReplayTime);
@@ -156,7 +155,7 @@ bool ObjectSituationReplay::start()
 
 bool ObjectSituationReplay::pause()
 {
-  INFO_LOG() << "paused: " << m_currentReplayTime;
+  INFO_LOG(m_logger) << "paused: " << m_currentReplayTime;
   m_replayTimer->stop();
   emit paused();
   return true;
@@ -164,7 +163,7 @@ bool ObjectSituationReplay::pause()
 
 bool ObjectSituationReplay::resume()
 {
-  INFO_LOG() << "resumed" << m_currentReplayTime;
+  INFO_LOG(m_logger) << "resumed" << m_currentReplayTime;
   m_replayTimer->start(1000);
   emit resumed(m_currentReplayTime);
   return true;
@@ -172,7 +171,7 @@ bool ObjectSituationReplay::resume()
 
 bool ObjectSituationReplay::stop()
 {
-  INFO_LOG() << "stopped: " << m_currentReplayTime;
+  INFO_LOG(m_logger) << "stopped: " << m_currentReplayTime;
   m_replayTimer->stop();
   emit stopped();
   return true;
@@ -188,10 +187,10 @@ void ObjectSituationReplay::onPublishReplayInformation()
                                            m_data.endTime,
                                            m_data.pace);
 
-  INFO_LOG() << "Publish SitReplay data: " << ddsData;
+  INFO_LOG(m_logger) << "Publish SitReplay data: " << ddsData;
 
   if (!m_ddsInterface->dts()->publish(ddsData))
-    ERROR_LOG() << "Error publishing SitReplay data to dds";
+    ERROR_LOG(m_logger) << "Error publishing SitReplay data to dds";
 }
 
 void ObjectSituationReplay::onPublishReplayTime()
@@ -204,13 +203,13 @@ void ObjectSituationReplay::onPublishReplayTime()
 void ObjectSituationReplay::onReplayTimerTimeout()
 {
   m_currentReplayTime += qRound64(m_data.pace * 1000);
-  DEBUG_LOG() << "onReplayTimerTimeout, endTime: " << m_data.endTime << " - " << m_currentReplayTime;
+  DEBUG_LOG(m_logger) << "onReplayTimerTimeout, endTime: " << m_data.endTime << " - " << m_currentReplayTime;
   checkPublishData();
 }
 
 bool ObjectSituationReplay::checkPublishData()
 {
-  INFO_LOG() << " checkPublishData...";
+  INFO_LOG(m_logger) << " checkPublishData...";
 
   onPublishReplayTime();
   if (m_data.endTime != 0 && m_data.endTime < m_currentReplayTime)
@@ -225,7 +224,7 @@ bool ObjectSituationReplay::checkPublishData()
     // publish data for current time
     m_dbReader->publish(m_currentReplayTime);
 
-          if (m_logger.isInfoEnabled()) INFO_LOG() << "m_dbReader->publish took " << timer.elapsed() << " [ms]";
+          if (m_logger.isInfoEnabled()) INFO_LOG(m_logger) << "m_dbReader->publish took " << timer.elapsed() << " [ms]";
 
 
     if (qFuzzyIsNull(m_data.pace))  // pace == 0 -> snapshot
@@ -236,7 +235,7 @@ bool ObjectSituationReplay::checkPublishData()
       if (switchToState(SrpState_def::Stopped).error())
         return false;
 
-          if (m_logger.isInfoEnabled()) INFO_LOG() << "m_dbReader->waitForAsyncOperations took " << timerReadData.elapsed() << " [ms]";
+          if (m_logger.isInfoEnabled()) INFO_LOG(m_logger) << "m_dbReader->waitForAsyncOperations took " << timerReadData.elapsed() << " [ms]";
 
     }
     else
@@ -247,17 +246,17 @@ bool ObjectSituationReplay::checkPublishData()
       if (!m_dbReader->readData(m_currentReplayTime, m_currentReplayTime + qRound64(m_data.pace * 1000)))
         return false;
 
-            if (m_logger.isInfoEnabled()) INFO_LOG() << "m_dbReader->readData took " << timerReadData.elapsed() << " [ms]";
+            if (m_logger.isInfoEnabled()) INFO_LOG(m_logger) << "m_dbReader->readData took " << timerReadData.elapsed() << " [ms]";
     }
   }
-  INFO_LOG() << " checkPublishData... DONE";
+  INFO_LOG(m_logger) << " checkPublishData... DONE";
   return true;
 }
 
 Core::FunctionReplyObject ObjectSituationReplay::switchToState(SrpState newSrpState)
 {
   Core::FunctionReplyObject ret(m_data.id);
-  INFO_LOG() << "-------------- switchTo: " << newSrpState
+  INFO_LOG(m_logger) << "-------------- switchTo: " << newSrpState
                      << ",  current: " << m_data.srpStateId;
   if (m_data.srpStateId != newSrpState)
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/object_situation_replay.h b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/object_situation_replay.h
index fb3ebac7b..202a91357 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/object_situation_replay.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/object_situation_replay.h
@@ -63,6 +63,7 @@ protected Q_SLOTS:
   void onReplayTimerTimeout();
 
 private:
+  NGL::INGLLogger &m_logger;
   bool checkPublishData();
 
 Q_SIGNALS:
@@ -74,6 +75,7 @@ Q_SIGNALS:
   void stopped();
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>           m_ddsInterface;
   std::shared_ptr<DatabaseInterface>    m_db;
   std::shared_ptr<DbReader>             m_dbReader;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/dds_handler.cpp
index cc1cfae67..0ca5b6414 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/dds_handler.cpp
@@ -17,14 +17,14 @@ namespace SoundManagement
 DdsHandler::DdsHandler(int domainId, int exerciseId)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise, exerciseId))
 {
-  DEBUG_LOG() << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -44,16 +44,16 @@ bool DdsHandler::init(const QStringList &qosFileList)
 
   m_dtsSom = SoundManagement::Interface::Dts::create(m_ddsConnector);
   bool bRet = m_dtsSom->enableAll();
-  INFO_LOG() << "Dts initialised";
+  INFO_LOG(m_logger) << "Dts initialised";
 
   m_ftsSom = SoundManagement::Interface::Fts::create(m_ddsConnector);
   bRet &= m_ftsSom->enableAll();
-  INFO_LOG() << "Fts initialised";
+  INFO_LOG(m_logger) << "Fts initialised";
 
   m_dtcSom = SoundManagement::Interface::Dtc::create(m_ddsConnector);
   if (!m_dtcSom->enableAll())
   {
-    ERROR_LOG() << "Could not initialize SOM data topics";
+    ERROR_LOG(m_logger) << "Could not initialize SOM data topics";
     return false;
   }
 
@@ -62,7 +62,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
       !m_dtcIsm->enableMountingPointAsset() ||
       !m_dtcIsm->enableInstrumentationAsset())
   {
-    ERROR_LOG() << "Could not initialize ISM data topics";
+    ERROR_LOG(m_logger) << "Could not initialize ISM data topics";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/dds_handler.h
index 93c1f740e..938fe93e4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/dds_handler.h
@@ -49,6 +49,7 @@ public:
   qint64 currentPartitionTime() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<Core::Interface::Dtc>       m_dtcCore;
   std::shared_ptr<Core::Pacemaker>            m_pacemaker;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/handler_sounds.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/handler_sounds.cpp
index 4f4f2436a..e82fa3115 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/handler_sounds.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/handler_sounds.cpp
@@ -41,7 +41,7 @@ bool HandlerSounds::init()
   SoundManagement::Sounds topicData;
   SoundManagement::Sound  sound;
 
-  INFO_LOG() << "HandlerConfigureSounds::init";
+  INFO_LOG(m_logger) << "HandlerConfigureSounds::init";
 
   auto dtcIsm = m_ddsHandler->dtcIsm();
   auto dtcSom = m_ddsHandler->dtcSom();
@@ -59,14 +59,14 @@ bool HandlerSounds::init()
   QVector<Database::SomSound> soundVec;
   if (!m_dbHandler->db()->select(soundVec))
   {
-    ERROR_LOG() << "Error reading data from database 'som_sound'!";
+    ERROR_LOG(m_logger) << "Error reading data from database 'som_sound'!";
     return false;
   }
 
   for (const Database::SomSound &data : std::as_const(soundVec))
   {
     static int index = 0;
-    DEBUG_LOG() << "SomSound from DB data: id=" << data.id
+    DEBUG_LOG(m_logger) << "SomSound from DB data: id=" << data.id
                         << " categoryId=" << data.categoryId
                         << " name=" << data.name
                         << " displayName=" << data.displayName;
@@ -80,7 +80,7 @@ bool HandlerSounds::init()
     soundEntry.duration     = data.duration;
     soundEntry.isRepeatable = data.isRepeatable;
     m_soundNames.append(soundEntry);
-    DEBUG_LOG() << "id=" << index
+    DEBUG_LOG(m_logger) << "id=" << index
                         << " SomSound from DB data: id=" << soundEntry.index
                         << " categoryId=" << soundEntry.category
                         << " name=" << soundEntry.name
@@ -116,10 +116,10 @@ bool HandlerSounds::init()
 
 void HandlerSounds::getActiveSounds()
 {
-  DEBUG_LOG() << "getActiveSounds";
+  DEBUG_LOG(m_logger) << "getActiveSounds";
   if (m_hostnames.size() == 0)
   {
-    DEBUG_LOG() << "No EGCUs available send empty topic ActiveSounds";
+    DEBUG_LOG(m_logger) << "No EGCUs available send empty topic ActiveSounds";
     m_updateActiveSoundsTimer->stop();
     // TODO alle aktiven Sounds vom DDS-Bus loeschen
     return;
@@ -133,7 +133,7 @@ void HandlerSounds::getActiveSounds()
   {
     i.next();
     QString hostname = i.value();
-    DEBUG_LOG() << "getActiveSound hostname=" << hostname;
+    DEBUG_LOG(m_logger) << "getActiveSound hostname=" << hostname;
     getActiveSound(getAssetId(hostname));
   }
 }
@@ -144,7 +144,7 @@ void HandlerSounds::onGetActiveSoundsRequest(const rti::core::SampleIdentity &co
 {
   // 200{ "ID":"0x510","Name":"Sound Report","sounds":[{"category":"Explosions","sound":"0001"}]}
   Core::FunctionReplyObject reply = Core::FunctionReplyObject(0, tr_lts("dds", "GetActiveSounds "));
-  DEBUG_LOG() << "onGetActiveSoundsRequest: " << request;
+  DEBUG_LOG(m_logger) << "onGetActiveSoundsRequest: " << request;
   m_ddsHandler->ftsSom()->getActiveSoundsReply(cookie, reply);
   // Request each EGCU
   // Wait for response from each EGCU
@@ -156,7 +156,7 @@ void HandlerSounds::onGetActiveSoundsRequest(const rti::core::SampleIdentity &co
 void HandlerSounds::onStopAllSoundsRequest(const rti::core::SampleIdentity &cookie,
                                            const StopAllSoundsRequest &request)
 {
-  DEBUG_LOG() << "StopAllSounds: " << request;
+  DEBUG_LOG(m_logger) << "StopAllSounds: " << request;
   int failedCount = 0;
 
   if (request.egcuId() == -1) // stopp all sounds on each EGCU
@@ -167,7 +167,7 @@ void HandlerSounds::onStopAllSoundsRequest(const rti::core::SampleIdentity &cook
     {
       i.next();
       const QString hostname = m_hostnames.value(i.key());
-      DEBUG_LOG() << "hostname=" << hostname;
+      DEBUG_LOG(m_logger) << "hostname=" << hostname;
       if (!stopAllSounds(i.key()).isEmpty()) // BLOCKING
         failedCount++;
     }
@@ -176,7 +176,7 @@ void HandlerSounds::onStopAllSoundsRequest(const rti::core::SampleIdentity &cook
   else
   {
     QString hostname = m_hostnames.value(request.egcuId());
-    DEBUG_LOG() << "getActiveSound hostname=" << hostname;
+    DEBUG_LOG(m_logger) << "getActiveSound hostname=" << hostname;
     if (!stopAllSounds(request.egcuId()).isEmpty()) // BLOCKING
       failedCount++;
   }
@@ -192,7 +192,7 @@ void HandlerSounds::onGetSoundsRequest(const rti::core::SampleIdentity &cookie,
                                        const GetSoundsRequest &request)
 {
   Core::FunctionReplyObject reply = Core::FunctionReplyObject(0, tr_lts("dds", "GetSounds"));
-  DEBUG_LOG() << "GetSounds: " << request;
+  DEBUG_LOG(m_logger) << "GetSounds: " << request;
   m_ddsHandler->ftsSom()->getSoundsReply(cookie, reply);
 }
 
@@ -251,10 +251,10 @@ SoundManagement::SoundCategory HandlerSounds::stringToEnum(const QString &catego
  * void HandlerMenuStruct::onModifyMenuStructRequest(const rti::core::SampleIdentity &cookie,
                                                   const MenuStruct &request)
 {
-  DEBUG_LOG() << "onModifyMenuStructRequest: " << request;
+  DEBUG_LOG(m_logger) << "onModifyMenuStructRequest: " << request;
   auto ret = request.id() > 0 ? modifyMenuStructRequest(request) : createMenuStructRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   m_fts->modifyMenuStructReply(cookie, ret);
 }
 
@@ -262,7 +262,7 @@ Core::FunctionReplyObject HandlerMenuStruct::createMenuStructRequest(const MenuS
 {
   ObjectMenuStruct *ifs = new ObjectMenuStruct(m_dts, m_db);
 
-  DEBUG_LOG() << "request.menuEntries.size() : " << request.menuEntries().size();
+  DEBUG_LOG(m_logger) << "request.menuEntries.size() : " << request.menuEntries().size();
   Core::FunctionReplyObject ret = ifs->createFromDds(request);
 
   if (ret.error())
@@ -279,7 +279,7 @@ Core::FunctionReplyObject HandlerMenuStruct::createMenuStructRequest(const MenuS
 void HandlerSounds::onControlSoundRequest(const rti::core::SampleIdentity &cookie,
                                        const ControlSoundRequest &request)
 {
-  DEBUG_LOG() << "ControlSound: " << request
+  DEBUG_LOG(m_logger) << "ControlSound: " << request
                       << " category=" << request.category();
 
   const QString user = Settings::somUser();
@@ -304,7 +304,7 @@ void HandlerSounds::onControlSoundRequest(const rti::core::SampleIdentity &cooki
       const int soundId = request.soundId();
       const int egcuId = request.egcuId();
       const SoundManagement::SoundCategory category = request.category();
-      DEBUG_LOG() << "Play: durationMs=" << durationMs
+      DEBUG_LOG(m_logger) << "Play: durationMs=" << durationMs
                            << " egcuId=" << egcuId
                            << " soundId=" << soundId
                            << " loop=" << loop;
@@ -332,7 +332,7 @@ void HandlerSounds::onControlSoundRequest(const rti::core::SampleIdentity &cooki
       soundState.id(m_indexActiveSound);
       soundState.sampleTime(QDateTime::currentMSecsSinceEpoch());
       soundState.inLoop(loop);
-      DEBUG_LOG() << "id=" << m_indexActiveSound
+      DEBUG_LOG(m_logger) << "id=" << m_indexActiveSound
                           << " category=" << request.category()
                           << " egcuId=" << request.egcuId()
                           << " soundId=" << request.soundId()
@@ -370,7 +370,7 @@ void HandlerSounds::onStopSingleSound(const int egcuId,  const SoundManagement::
   QString passwd = Settings::somPasswd();
   QString host = m_hostnames.value(egcuId);
 
-  DEBUG_LOG() << "egcuId=" << egcuId
+  DEBUG_LOG(m_logger) << "egcuId=" << egcuId
                       << " soundId=" << soundId
                       << " category=" << enumToString(soundCategory);
 
@@ -381,7 +381,7 @@ void HandlerSounds::onStopSingleSound(const int egcuId,  const SoundManagement::
     const SoundState &item = it.next();
     if ((item.soundId() == soundId) && (item.egcuId() == egcuId) && item.category() == soundCategory)
     {
-      DEBUG_LOG() << "remove Sound from DDS-BUS id=" << item.id()
+      DEBUG_LOG(m_logger) << "remove Sound from DDS-BUS id=" << item.id()
                           << " egcuId=" << item.egcuId();
 
       {
@@ -439,11 +439,11 @@ QString HandlerSounds::stopAllSounds(const int egcuId)
   {
     const SoundState &ss(it.next());
 
-    DEBUG_LOG() << "Sound EGCU=" << ss.egcuId() << " soundId=" << ss.soundId();
+    DEBUG_LOG(m_logger) << "Sound EGCU=" << ss.egcuId() << " soundId=" << ss.soundId();
     if (ss.egcuId() != egcuId)
       continue;
 
-    DEBUG_LOG() << "remove Sound from DDS-BUS id=" << ss.id()
+    DEBUG_LOG(m_logger) << "remove Sound from DDS-BUS id=" << ss.id()
                         << " egcuId=" << ss.egcuId();
     m_ddsHandler->dtsSom()->removeSoundStateByKey(ss.id());
     it.remove();
@@ -469,7 +469,7 @@ void HandlerSounds::getActiveSound(const int egcuId)
   url.setUrl(request);
   url.setUserName(user);
   url.setPassword(passwd);
-  DEBUG_LOG() << "startRequest: " << url.toString();
+  DEBUG_LOG(m_logger) << "startRequest: " << url.toString();
   startRequest(url);
 }
 
@@ -492,14 +492,14 @@ QString HandlerSounds::playBackgroundSound(const QString &user,
   url.setUrl(request);
   url.setUserName(user);
   url.setPassword(passwd);
-  DEBUG_LOG() << "startRequest: " << url.toString()
+  DEBUG_LOG(m_logger) << "startRequest: " << url.toString()
                       << " host=" << host;
   return startRequestBlocking(url);
 }
 
 QString HandlerSounds::startRequestBlocking(const QUrl &requestedUrl)
 {
-  DEBUG_LOG() << "startRequest: " << requestedUrl.toString();
+  DEBUG_LOG(m_logger) << "startRequest: " << requestedUrl.toString();
   m_httpRequestAborted = false;
   auto reply = m_qnam.get(QNetworkRequest(requestedUrl));
   await(reply, &QNetworkReply::finished);
@@ -508,7 +508,7 @@ QString HandlerSounds::startRequestBlocking(const QUrl &requestedUrl)
 
 void HandlerSounds::startRequest(const QUrl &requestedUrl)
 {
-  DEBUG_LOG() << "startRequest: " << requestedUrl.toString();
+  DEBUG_LOG(m_logger) << "startRequest: " << requestedUrl.toString();
   m_httpRequestAborted = false;
   auto reply = m_qnam.get(QNetworkRequest(requestedUrl));
   connect(reply, &QNetworkReply::finished, this, &HandlerSounds::httpFinished);
@@ -516,7 +516,7 @@ void HandlerSounds::startRequest(const QUrl &requestedUrl)
 
 QString HandlerSounds::httpFinishedBlocking(QNetworkReply *reply)
 {
-  DEBUG_LOG() << "httpFinishedBlocking";
+  DEBUG_LOG(m_logger) << "httpFinishedBlocking";
   QUrl url;
 //  auto reply = qobject_cast<QNetworkReply *>(sender());
 //  Q_ASSERT(reply);
@@ -527,7 +527,7 @@ QString HandlerSounds::httpFinishedBlocking(QNetworkReply *reply)
 
   if (m_httpRequestAborted)
   {
-    ERROR_LOG() << "httpRequestAborted";
+    ERROR_LOG(m_logger) << "httpRequestAborted";
     reply->deleteLater();
     return QString::fromStdString(tr_lts("dds", "httpRequestAborted"));
   }
@@ -536,7 +536,7 @@ QString HandlerSounds::httpFinishedBlocking(QNetworkReply *reply)
   {
     QByteArray data = reply->readAll();
     QString dataStr = QString::fromStdString(data.toStdString());
-    ERROR_LOG() << "reply->error: " << reply->errorString()
+    ERROR_LOG(m_logger) << "reply->error: " << reply->errorString()
                         << " host=" << url.host()
                         << " query='" << url.query()
                         << "' '" << qUtf8Printable(url.toString()) << "'"
@@ -545,7 +545,7 @@ QString HandlerSounds::httpFinishedBlocking(QNetworkReply *reply)
     QString query = url.query();
     if (query.contains(QStringLiteral("control=5")))
     {
-      DEBUG_LOG() << "m_activeSounds.insert host=" << url.host();
+      DEBUG_LOG(m_logger) << "m_activeSounds.insert host=" << url.host();
       m_activeSounds.insert(url.host(), QString());
     }
     reply->deleteLater();
@@ -557,7 +557,7 @@ QString HandlerSounds::httpFinishedBlocking(QNetworkReply *reply)
 
   //parse the reply JSON and display result in the UI
   const QByteArray json(reply->readAll());
-  DEBUG_LOG() << "Sucess " << json;
+  DEBUG_LOG(m_logger) << "Sucess " << json;
   QString jsonStr = QString::fromStdString(json.toStdString());
   if (jsonStr.contains(QStringLiteral("510"))) // 510 = Sound Report
     handleSoundReport(jsonStr, url.host());
@@ -568,7 +568,7 @@ QString HandlerSounds::httpFinishedBlocking(QNetworkReply *reply)
 
 void HandlerSounds::httpFinished()
 {
-  DEBUG_LOG() << "httpFinished";
+  DEBUG_LOG(m_logger) << "httpFinished";
   QUrl url;
   auto reply = qobject_cast<QNetworkReply *>(sender());
   if (!reply)
@@ -578,7 +578,7 @@ void HandlerSounds::httpFinished()
 
   if (m_httpRequestAborted)
   {
-    ERROR_LOG() << "httpRequestAborted";
+    ERROR_LOG(m_logger) << "httpRequestAborted";
     reply->deleteLater();
     return;
   }
@@ -587,7 +587,7 @@ void HandlerSounds::httpFinished()
   {
     QByteArray data = reply->readAll();
     QString dataStr = QString::fromStdString(data.toStdString());
-    ERROR_LOG() << "reply->error: " << reply->errorString()
+    ERROR_LOG(m_logger) << "reply->error: " << reply->errorString()
                         << " host=" << url.host()
                         << " query='" << url.query()
                         << "' '" << qUtf8Printable(url.toString()) << "'"
@@ -596,7 +596,7 @@ void HandlerSounds::httpFinished()
     QString query = url.query();
     if (query.contains(QStringLiteral("control=5")))
     {
-      DEBUG_LOG() << "m_activeSounds.insert host=" << url.host();
+      DEBUG_LOG(m_logger) << "m_activeSounds.insert host=" << url.host();
       m_activeSounds.insert(url.host(), QString());
     }
     reply->deleteLater();
@@ -608,7 +608,7 @@ void HandlerSounds::httpFinished()
 
   //parse the reply JSON and display result in the UI
   const QByteArray json(reply->readAll());
-  DEBUG_LOG() << "Sucess " << json;
+  DEBUG_LOG(m_logger) << "Sucess " << json;
   QString jsonStr = QString::fromStdString(json.toStdString());
   if (jsonStr.contains(QStringLiteral("510"))) // 510 = Sound Report
     handleSoundReport(jsonStr, url.host());
@@ -645,7 +645,7 @@ int HandlerSounds::getDuration(const SoundManagement::SoundCategory& category,co
     if (   soundId == soundName.soundId
         && category == soundName.category)
     {
-      DEBUG_LOG() << "Duration=" << soundName.duration << "ms";
+      DEBUG_LOG(m_logger) << "Duration=" << soundName.duration << "ms";
       return soundName.duration;
     }
   } // for
@@ -657,15 +657,15 @@ void HandlerSounds::handleSoundReport(const QString &json, const QString &host)
   SoundManagement::SoundState soundState;
   QString jsonString;
   QString jsonStr = QString::fromStdString(json.toStdString());
-  DEBUG_LOG() << "remove 200";
+  DEBUG_LOG(m_logger) << "remove 200";
   jsonString = jsonStr.remove(QStringLiteral("200"));
   m_activeSounds.insert(host, jsonString);
   // Send Result Topic
-  DEBUG_LOG() << "Send Result Topic";
+  DEBUG_LOG(m_logger) << "Send Result Topic";
 
-  DEBUG_LOG() << "m_updateActiveSoundsTimer->stop();";
+  DEBUG_LOG(m_logger) << "m_updateActiveSoundsTimer->stop();";
 
-  DEBUG_LOG() << "host=" << host
+  DEBUG_LOG(m_logger) << "host=" << host
                       << " jsonString= " << jsonString;
   // decode JSON-Object
   QJsonDocument doc = QJsonDocument::fromJson(jsonString.toUtf8());
@@ -698,7 +698,7 @@ void HandlerSounds::handleSoundReport(const QString &json, const QString &host)
         soundState.category(category);
         soundState.id(m_indexActiveSound);
         soundState.sampleTime(QDateTime::currentMSecsSinceEpoch());
-        DEBUG_LOG() << "id=" << m_indexActiveSound
+        DEBUG_LOG(m_logger) << "id=" << m_indexActiveSound
                             << " category=" << categoryStr
                             << " name=" << name
                             << " egcuId=" << egcuId
@@ -711,7 +711,7 @@ void HandlerSounds::handleSoundReport(const QString &json, const QString &host)
                (item.category() == soundState.category()) &&
                (item.soundId()  == soundState.soundId()) )
           {
-            DEBUG_LOG() << "Sound is already on DDS-Bus";
+            DEBUG_LOG(m_logger) << "Sound is already on DDS-Bus";
             found = true;
             break;
           }
@@ -720,28 +720,28 @@ void HandlerSounds::handleSoundReport(const QString &json, const QString &host)
         if (!found)
         {
           m_indexActiveSound++;
-          DEBUG_LOG() << "Sound publish";
+          DEBUG_LOG(m_logger) << "Sound publish";
           m_ddsHandler->dtsSom()->publish(soundState);
           m_soundStates.append(soundState);
         }
       }
     }
     else
-      ERROR_LOG() << "Document is not an object";
+      ERROR_LOG(m_logger) << "Document is not an object";
   }
   else
   {
     if (jsonStr.size() == 0)
-      DEBUG_LOG() << "No Sounds for " << host;
+      DEBUG_LOG(m_logger) << "No Sounds for " << host;
     else
-      ERROR_LOG() << "Invalid JSON...\n" << jsonStr;
+      ERROR_LOG(m_logger) << "Invalid JSON...\n" << jsonStr;
   }
   m_updateActiveSoundsTimer->stop();
 }
 
 void HandlerSounds::onTimerTimeout()
 {
-  ERROR_LOG() << "Problem when querying the active sounds from the EGCU's";
+  ERROR_LOG(m_logger) << "Problem when querying the active sounds from the EGCU's";
 }
 
 void HandlerSounds::onInstrumentationAssetChanged(const InfrastructureManagement::InstrumentationAsset &data, DataModification modType)
@@ -750,7 +750,7 @@ void HandlerSounds::onInstrumentationAssetChanged(const InfrastructureManagement
       modType != DataModification::eModified)
     return;
 
-  DEBUG_LOG() << "onInstrumentationAssetChanged id=" << data.id()
+  DEBUG_LOG(m_logger) << "onInstrumentationAssetChanged id=" << data.id()
                       << " hostname=" << QString::fromStdString(data.hostname())
                       << " mountingPointTypeId=" << data.mountingPointTypeId()
                       << " assetStateId=" << data.assetStateId();
@@ -759,14 +759,14 @@ void HandlerSounds::onInstrumentationAssetChanged(const InfrastructureManagement
       && data.hostname().size() > 0)
   {
     QString hostname = QString::fromStdString(data.hostname());
-    DEBUG_LOG() << "m_hostnames.insert id=" << data.id()
+    DEBUG_LOG(m_logger) << "m_hostnames.insert id=" << data.id()
                         << " hostname=" << hostname
                         << " hostname.size=" << hostname.size()
                         << " mountingPointTypeId=" << data.mountingPointTypeId()
                         << " assetStateId=" << data.assetStateId();
     if (hostname.size() > 0 )
     {
-      DEBUG_LOG() << "insert EGCU in m_hostnames " << data.hostname();
+      DEBUG_LOG(m_logger) << "insert EGCU in m_hostnames " << data.hostname();
       m_hostnames.insert(data.id(), QString::fromStdString(data.hostname()));
     }
   }
@@ -777,7 +777,7 @@ void HandlerSounds::onMountingPointAssetChanged(const InfrastructureManagement::
   if (modType != DataModification::eAdded &&
       modType != DataModification::eModified)
     return;
-  DEBUG_LOG() << "onMountingPointAssetChanged"
+  DEBUG_LOG(m_logger) << "onMountingPointAssetChanged"
                       << " id= " << data.id()
                       << " assetId= " << data.assetId()
                       << " structureElementId= " << data.structureElementId();
@@ -786,7 +786,7 @@ void HandlerSounds::onMountingPointAssetChanged(const InfrastructureManagement::
 
 void HandlerSounds::onSoundStateChanged(const SoundManagement::SoundState &data, DataModification modType)
 {
-  DEBUG_LOG() << "onSoundStateChanged"
+  DEBUG_LOG(m_logger) << "onSoundStateChanged"
                       << " id= " << data.id()
                       << " egcuId= " << data.egcuId()
                       << " soundId=" << data.soundId()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/handler_sounds.h b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/handler_sounds.h
index 791b41b7f..704e539d4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/handler_sounds.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/handler_sounds.h
@@ -72,6 +72,8 @@ private Q_SLOTS:
 
 private: // methods
 
+
+NGL::INGLLogger &m_logger;
   QString httpFinishedBlocking(QNetworkReply *reply);
 
   void onGetActiveSoundsRequest(const rti::core::SampleIdentity &cookie,
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/main_handler.cpp
index 2c6726d26..01df28113 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/main_handler.cpp
@@ -19,11 +19,10 @@
 namespace SoundManagement
 {
 
-MainHandler::MainHandler(QObject *parent)
-  : QObject(parent)
+MainHandler::MainHandler(QObject *parent) : QObject(parent)
   , m_ddsHandler(nullptr)
-  , m_dbHandler(nullptr)
-{}
+  , m_dbHandler(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 MainHandler::~MainHandler()
 {
@@ -35,26 +34,26 @@ MainHandler::~MainHandler()
 
 bool MainHandler::init(int domainId, int exerciseId)
 {
-  INFO_LOG() << "MainHandler::init";
+  INFO_LOG(m_logger) << "MainHandler::init";
 
   // initialize database
   m_dbHandler = std::make_shared<DbHandler>();
 
   if (!m_dbHandler->init(0, Settings::settings()))
   {
-    ERROR_LOG() << "Initialisation dbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation dbHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation dbHandler succesful.";
 
   // initialize DDS
   m_ddsHandler = std::make_shared<DdsHandler>(domainId, exerciseId);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation ddsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation ddsHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation ddsHandler succesful.";
 
   NOTICE_LOG(m_logger) << "setNewState Core::RunningState::Starting ";
   m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Starting);
@@ -65,7 +64,7 @@ bool MainHandler::init(int domainId, int exerciseId)
 
   if (!m_handlerSounds->init())
   {
-    ERROR_LOG() << "Initialisation HandlerSounds failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerSounds failed.";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/main_handler.h
index 9dbaf4f8f..fbad37dc3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/main_handler.h
@@ -39,6 +39,7 @@ public:
 
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>            m_ddsHandler;
   std::shared_ptr<DbHandler>             m_dbHandler;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/ModuleTests/tgt_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/ModuleTests/tgt_tests.cpp
index 9c7d38641..4867a8428 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/ModuleTests/tgt_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/ModuleTests/tgt_tests.cpp
@@ -59,7 +59,7 @@ TgtTests::TgtTests(QObject *parent)
 // ------------------------------------------------------------------
 bool TgtTests::init(int domainId, int testId, int operatorId, int shootbackAreaId)
 {
-  INFO_LOG() << "init begin";
+  INFO_LOG(m_logger) << "init begin";
 
   m_testId           = testId;
   m_operatorId       = operatorId;
@@ -89,7 +89,7 @@ bool TgtTests::init(int domainId, int testId, int operatorId, int shootbackAreaI
 // ------------------------------------------------------------------
 void TgtTests::startTest()
 {
-  INFO_LOG() << "startTest m_testId=" << m_testId;
+  INFO_LOG(m_logger) << "startTest m_testId=" << m_testId;
   if (m_testId == 1) // Send FTC ConfigureAlarms and EEM Event
   {
     QTimer::singleShot(0, this, &TgtTests::tryCreateParticipant);
@@ -132,7 +132,7 @@ void TgtTests::tryCreateShootbackArea()
 
   if (!m_ftcTgt->shootbackAreaModifyRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting create Shootback Area";
+    ERROR_LOG(m_logger) << "Error requesting create Shootback Area";
     failExit();
   }
 
@@ -148,7 +148,7 @@ void TgtTests::tryUpdateShootbackArea()
 
   if (!m_ftcTgt->shootbackAreaModifyRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting modify Shootback Area";
+    ERROR_LOG(m_logger) << "Error requesting modify Shootback Area";
     failExit();
   }
 
@@ -163,7 +163,7 @@ void TgtTests::tryRemoveShootbackArea()
 
   if (!m_ftcTgt->shootbackAreaRemoveRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting remove Shootback Area";
+    ERROR_LOG(m_logger) << "Error requesting remove Shootback Area";
     failExit();
   }
 
@@ -172,7 +172,7 @@ void TgtTests::tryRemoveShootbackArea()
 // ------------------------------------------------------------------
 void TgtTests::tryRequestTechnicalState()
 {
-  INFO_LOG() << "trying to send createRequest Operator Message";
+  INFO_LOG(m_logger) << "trying to send createRequest Operator Message";
 
   ConfigureTargetRequest request;
 
@@ -182,7 +182,7 @@ void TgtTests::tryRequestTechnicalState()
 
   if (!m_ftcTgt->configureTargetRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
 } // tryRequestTechnicalState
@@ -190,7 +190,7 @@ void TgtTests::tryRequestTechnicalState()
 // ------------------------------------------------------------------
 void TgtTests::tryConfigureTargetMode()
 {
-  INFO_LOG() << "trying to send createRequest Operator Message";
+  INFO_LOG(m_logger) << "trying to send createRequest Operator Message";
 
   ConfigureTargetRequest request;
 
@@ -203,7 +203,7 @@ void TgtTests::tryConfigureTargetMode()
 
   if (!m_ftcTgt->configureTargetRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
 } // tryConfigureTargetMode
@@ -211,7 +211,7 @@ void TgtTests::tryConfigureTargetMode()
 // ------------------------------------------------------------------
 void TgtTests::tryConfigureTargetWeapon()
 {
-  INFO_LOG() << "trying to send createRequest Operator Message";
+  INFO_LOG(m_logger) << "trying to send createRequest Operator Message";
 
   ConfigureTargetRequest request;
 
@@ -222,7 +222,7 @@ void TgtTests::tryConfigureTargetWeapon()
 
   if (!m_ftcTgt->configureTargetRequest(request, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
 } // tryConfigureTargetWeapon
@@ -241,7 +241,7 @@ void TgtTests::tryCreateTargetData()
 
   if (!m_dtsTab->publish(targetData))
   {
-    ERROR_LOG() << "Error publish targetData";
+    ERROR_LOG(m_logger) << "Error publish targetData";
     failExit();
   }
 }
@@ -249,7 +249,7 @@ void TgtTests::tryCreateTargetData()
 // ------------------------------------------------------------------
 void TgtTests::tryCreateParticipant()
 {
-  INFO_LOG() << "trying to create Participant index = " << m_participantIndex;
+  INFO_LOG(m_logger) << "trying to create Participant index = " << m_participantIndex;
   ParticipantManagement::Participant participant;
   participant.id(5);
   participant.superiorId(0);
@@ -258,10 +258,10 @@ void TgtTests::tryCreateParticipant()
   participant.inferiorIds().at(1) = 3;
   participant.partyId(5);
   participant.equipmentNumber(1001);
-  DEBUG_LOG() << "Publishing Participant";
+  DEBUG_LOG(m_logger) << "Publishing Participant";
   if (!m_dtsPpm->publish(participant))
   {
-    ERROR_LOG() << "Error publish Participant";
+    ERROR_LOG(m_logger) << "Error publish Participant";
     failExit();
   }
   m_participantIndex++;
@@ -271,11 +271,11 @@ void TgtTests::tryCreateParticipant()
 // ------------------------------------------------------------------
 void TgtTests::onShootbackAreaModifyReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "onShootbackAreaModifyReply on id " << replyObject.id()
+  INFO_LOG(m_logger) << "onShootbackAreaModifyReply on id " << replyObject.id()
                      << " and error = " << replyObject.error();
   if (replyObject.error())
   {
-    ERROR_LOG() << "Error onShoobackAreaModifyReply - aborting";
+    ERROR_LOG(m_logger) << "Error onShoobackAreaModifyReply - aborting";
     failExit();
   }
 
@@ -286,11 +286,11 @@ void TgtTests::onShootbackAreaModifyReply(const Core::FunctionReplyObject &reply
 // ------------------------------------------------------------------
 void TgtTests::onShootbackAreaRemoveReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "onShootbackAreaModifyReply on id " << replyObject.id()
+  INFO_LOG(m_logger) << "onShootbackAreaModifyReply on id " << replyObject.id()
                      << " and error = " << replyObject.error();
   if (replyObject.error())
   {
-    ERROR_LOG() << "Error onShootbackAreaRemoveReply - aborting";
+    ERROR_LOG(m_logger) << "Error onShootbackAreaRemoveReply - aborting";
     failExit();
   }
 
@@ -300,10 +300,10 @@ void TgtTests::onShootbackAreaRemoveReply(const Core::FunctionReplyObject &reply
 // ------------------------------------------------------------------
 void TgtTests::onConfigureTargetReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "onConfigureTargetReply, error = " << replyObject.error();
+  INFO_LOG(m_logger) << "onConfigureTargetReply, error = " << replyObject.error();
   if (replyObject.error())
   {
-    ERROR_LOG() << "Error ConfigureTargets - aborting";
+    ERROR_LOG(m_logger) << "Error ConfigureTargets - aborting";
     failExit();
   }
 } // onConfigureTargetReply
@@ -311,11 +311,11 @@ void TgtTests::onConfigureTargetReply(const Core::FunctionReplyObject &replyObje
 // ------------------------------------------------------------------
 void TgtTests::checkAlarm()
 {
-  INFO_LOG() << "checkAlarm";
+  INFO_LOG(m_logger) << "checkAlarm";
   m_dtcTgt->waitForHistoricalDataTargetConfig();
   //qint32 id = 0;
   /*TargetManagement::Notification notification = m_dtcTgt->notification(id);
-  INFO_LOG() << "Recived TargetManagement::Notification: " << notification
+  INFO_LOG(m_logger) << "Recived TargetManagement::Notification: " << notification
                      << " testId: " << m_testId;
 
   switch (m_testId)
@@ -323,12 +323,12 @@ void TgtTests::checkAlarm()
   case 1:
   case 2:
   case 3:
-    INFO_LOG() << "ExitSuccess";
+    INFO_LOG(m_logger) << "ExitSuccess";
     ExitSuccess();
     break;
   default:
     // nothing
-    INFO_LOG() << "failExit";
+    INFO_LOG(m_logger) << "failExit";
     failExit();
     break;
   }*/
@@ -344,7 +344,7 @@ void TgtTests::failExit()
 // ------------------------------------------------------------------
 void TgtTests::ExitSuccess()
 {
-  DEBUG_LOG() << "SUCCESS";
+  DEBUG_LOG(m_logger) << "SUCCESS";
   m_bTestsSuccessful = true;
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 } // ExitSuccess
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/ModuleTests/tgt_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/ModuleTests/tgt_tests.h
index 2809bd515..30c49f849 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/ModuleTests/tgt_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/ModuleTests/tgt_tests.h
@@ -53,6 +53,7 @@ protected Q_SLOTS:
   void ExitSuccess();
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onConfigureTargetReply(const Core::FunctionReplyObject &replyObject) override final;
   void onShootbackAreaModifyReply(const Core::FunctionReplyObject &replyObject) override final;
   void onShootbackAreaRemoveReply(const Core::FunctionReplyObject &replyObject) override final;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/UnitTests/UnitTestShootback/unit_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/UnitTests/UnitTestShootback/unit_test.cpp
index 577260103..269fc1c86 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/UnitTests/UnitTestShootback/unit_test.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/UnitTests/UnitTestShootback/unit_test.cpp
@@ -169,7 +169,7 @@ void tgtTestShootbackTarget::testShootbackArea()
     // verify mod
     {
       TargetManagement::ShootbackArea modData = m_dtcTgt->shootbackArea(m_replyShootbackAreaId);
-      INFO_LOG() << Q_FUNC_INFO << "modData=" << modData;
+      INFO_LOG(m_logger) << Q_FUNC_INFO << "modData=" << modData;
       QVERIFY2((modData.id() == m_replyShootbackAreaId), " shootbackArea failed");
       QVERIFY2((modData.name().compare(request.name()) == 0), " verify name failed");
     }
@@ -220,13 +220,13 @@ void tgtTestShootbackTarget::testShootbackTarget()
     QSignalSpy spy(m_dtcTgt.get(), &TargetManagement::Interface::Dtc::shootbackTargetChanged);
     if (spy.count() == 0)
       spy.wait(2000);
-    INFO_LOG() << Q_FUNC_INFO << "spy.count()=" << spy.count();
+    INFO_LOG(m_logger) << Q_FUNC_INFO << "spy.count()=" << spy.count();
     QVERIFY2((spy.count() == 1), " spy failed");
 
     // verify mod
     {
       TargetManagement::ShootbackTarget modData = m_dtcTgt->shootbackTarget(m_replyShootbackTargetId);
-      INFO_LOG() << Q_FUNC_INFO << "modData=" << modData;
+      INFO_LOG(m_logger) << Q_FUNC_INFO << "modData=" << modData;
       QVERIFY2((modData.id() == m_replyShootbackTargetId), " shootbackTarget failed");
       QVERIFY2((modData.name().compare(request.name()) == 0), " verify name failed");
     }
@@ -268,7 +268,7 @@ void tgtTestShootbackTarget::testTargetAreaAssignment()
     QSignalSpy spy(m_dtcTgt.get(), &TargetManagement::Interface::Dtc::targetAreaAssignmentChanged);
     if (spy.count() == 0)
       spy.wait(2000);
-    INFO_LOG() << Q_FUNC_INFO << "spy.count()=" << spy.count();
+    INFO_LOG(m_logger) << Q_FUNC_INFO << "spy.count()=" << spy.count();
     QVERIFY2((spy.count() == 1), " spy failed");
 
     // time to process reply
@@ -288,13 +288,13 @@ void tgtTestShootbackTarget::testTargetAreaAssignment()
     QSignalSpy spy(m_dtcTgt.get(), &TargetManagement::Interface::Dtc::targetAreaAssignmentChanged);
     if (spy.count() == 0)
       spy.wait(2000);
-    INFO_LOG() << Q_FUNC_INFO << "spy.count()=" << spy.count();
+    INFO_LOG(m_logger) << Q_FUNC_INFO << "spy.count()=" << spy.count();
     QVERIFY2((spy.count() == 1), " spy failed");
 
     // verify mod
     {
       TargetManagement::TargetAreaAssignment modData = m_dtcTgt->targetAreaAssignment(m_replyTargetAreaAssignmentId);
-      INFO_LOG() << Q_FUNC_INFO << "modData=" << modData;
+      INFO_LOG(m_logger) << Q_FUNC_INFO << "modData=" << modData;
       QVERIFY2((modData.id() == m_replyTargetAreaAssignmentId), " targetAreaAssignment failed");
       QVERIFY2((modData.name().compare(request.name()) == 0), " verify name failed");
     }
@@ -387,7 +387,7 @@ void tgtTestShootbackTarget::createArea(int &areaIdInOut, const QString &name, d
 
   // time to process reply
   QTest::qWait(100);
-  INFO_LOG() << Q_FUNC_INFO << " got m_replyShootbackAreaId: " << m_replyShootbackAreaId;
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " got m_replyShootbackAreaId: " << m_replyShootbackAreaId;
 
   areaIdInOut = m_replyShootbackAreaId;
 }
@@ -447,7 +447,7 @@ void tgtTestShootbackTarget::createTarget(int &targetIdOut, int targetParticipan
 
   // time to process reply
   QTest::qWait(100);
-  INFO_LOG() << Q_FUNC_INFO << " got m_replyShootbackTargetId: " << m_replyShootbackTargetId;
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " got m_replyShootbackTargetId: " << m_replyShootbackTargetId;
 
   targetIdOut = m_replyShootbackTargetId;
 }
@@ -515,7 +515,7 @@ void tgtTestShootbackTarget::createAssignment(int areaId, int targetParticipantI
 
   // time to process reply
   QTest::qWait(100);
-  INFO_LOG() << Q_FUNC_INFO << " got m_replyTargetAreaAssignmentId: " << m_replyTargetAreaAssignmentId;
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " got m_replyTargetAreaAssignmentId: " << m_replyTargetAreaAssignmentId;
 
   assignmentIdOut = m_replyTargetAreaAssignmentId;
 }
@@ -572,7 +572,7 @@ void tgtTestShootbackTarget::moveParticipant(int participantId, double lon, doub
   posReq.partyId(2);                                // 0 and 1 will be skipped
   if (!m_dtsPpm->publish(posReq))
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Error publish posReq";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Error publish posReq";
     return;
   }
 }
@@ -878,7 +878,7 @@ void tgtTestShootbackTarget::onShootbackAreaModifyReply(const Core::FunctionRepl
   m_replyShootbackAreaId = reply.id();
   if (reply.error())
   {
-    ERROR_LOG() << "Error onShootbackAreaRemoveReply - aborting: '" << reply.str() << "'";
+    ERROR_LOG(m_logger) << "Error onShootbackAreaRemoveReply - aborting: '" << reply.str() << "'";
     m_replyShootbackAreaId = -1;
   }
 }
@@ -888,7 +888,7 @@ void tgtTestShootbackTarget::onShootbackAreaRemoveReply(const Core::FunctionRepl
   m_replyShootbackAreaId = reply.id();
   if (reply.error())
   {
-    ERROR_LOG() << "Error onShootbackAreaRemoveReply - aborting: '" << reply.str() << "'"
+    ERROR_LOG(m_logger) << "Error onShootbackAreaRemoveReply - aborting: '" << reply.str() << "'"
                         << ", id="<< reply.id();
     m_replyShootbackAreaId = -1;
   }
@@ -901,7 +901,7 @@ void tgtTestShootbackTarget::onShootbackTargetModifyReply(const Core::FunctionRe
   m_replyShootbackTargetId = reply.id();
   if (reply.error())
   {
-    ERROR_LOG() << "Error onShootbackAreaRemoveReply - aborting: '" << reply.str() << "'";
+    ERROR_LOG(m_logger) << "Error onShootbackAreaRemoveReply - aborting: '" << reply.str() << "'";
     m_replyShootbackTargetId = -1;
   }
 }
@@ -911,7 +911,7 @@ void tgtTestShootbackTarget::onShootbackTargetRemoveReply(const Core::FunctionRe
   m_replyShootbackTargetId = reply.id();
   if (reply.error())
   {
-    ERROR_LOG() << "Error onShootbackAreaRemoveReply - aborting: '" << reply.str() << "'"
+    ERROR_LOG(m_logger) << "Error onShootbackAreaRemoveReply - aborting: '" << reply.str() << "'"
                         << ", id="<< reply.id();
     m_replyShootbackTargetId = -1;
   }
@@ -924,7 +924,7 @@ void tgtTestShootbackTarget::onTargetAreaAssignmentModifyReply(const Core::Funct
   m_replyTargetAreaAssignmentId = reply.id();
   if (reply.error())
   {
-    ERROR_LOG() << "Error onShootbackAreaRemoveReply - aborting: '" << reply.str() << "'";
+    ERROR_LOG(m_logger) << "Error onShootbackAreaRemoveReply - aborting: '" << reply.str() << "'";
     m_replyTargetAreaAssignmentId = -1;
   }
 }
@@ -934,7 +934,7 @@ void tgtTestShootbackTarget::onTargetAreaAssignmentRemoveReply(const Core::Funct
   m_replyTargetAreaAssignmentId = reply.id();
   if (reply.error())
   {
-    ERROR_LOG() << "Error onShootbackAreaRemoveReply - aborting: '" << reply.str() << "'"
+    ERROR_LOG(m_logger) << "Error onShootbackAreaRemoveReply - aborting: '" << reply.str() << "'"
                         << ", id="<< reply.id();
     m_replyTargetAreaAssignmentId = -1;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/UnitTests/UnitTestShootback/unit_test.h b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/UnitTests/UnitTestShootback/unit_test.h
index 572e1bbd3..4a1003fff 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/UnitTests/UnitTestShootback/unit_test.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/UnitTests/UnitTestShootback/unit_test.h
@@ -70,6 +70,8 @@ private Q_SLOTS:
   void cleanupTestCase(); // one time at the end
 
 protected:
+
+NGL::INGLLogger &m_logger;
   void onShootbackAreaModifyReply(const Core::FunctionReplyObject &reply) override final;
   void onShootbackAreaRemoveReply(const Core::FunctionReplyObject &reply) override final;
 
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 e864a3215..9bc70d6f8 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
@@ -17,14 +17,14 @@ namespace TargetManagement
 DdsHandler::DdsHandler(int domainId, int exerciseId)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise, exerciseId))
 {
-  DEBUG_LOG() << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -43,18 +43,18 @@ bool DdsHandler::init(const QStringList &qosFileList)
   // DTS Target
   m_dtsTgt = TargetManagement::Interface::Dts::create(m_ddsConnector);
   bool bRet = m_dtsTgt->enableAll();
-  INFO_LOG() << "Dts initialised";
+  INFO_LOG(m_logger) << "Dts initialised";
 
   // FTS Target
   m_ftsTgt = TargetManagement::Interface::Fts::create(m_ddsConnector);
   bRet &= m_ftsTgt->enableAll();
-  INFO_LOG() << "Fts initialised";
+  INFO_LOG(m_logger) << "Fts initialised";
 
   // DTC TrainingAreaBase
   m_dtcTab = TrainingAreaBase::Interface::Dtc::create(m_ddsConnector);
   if (!m_dtcTab->enableTargetData())
   {
-    ERROR_LOG() << "Could not enable receive TAB";
+    ERROR_LOG(m_logger) << "Could not enable receive TAB";
     return false;
   }
 
@@ -62,7 +62,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
   m_ftcTab = TrainingAreaBase::Interface::Ftc::create(m_ddsConnector);
   if (!m_ftcTab->enableSendTargetData())
   {
-    ERROR_LOG() << "Could not enable Send TAB";
+    ERROR_LOG(m_logger) << "Could not enable Send TAB";
     return false;
   }
 
@@ -75,7 +75,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
         m_dtcPpm->enableEquipmentType()
        ))
   {
-    ERROR_LOG() << "Could not initialize ParticipantManagement enableXXX data topic client";
+    ERROR_LOG(m_logger) << "Could not initialize ParticipantManagement enableXXX data topic client";
     return false;
   }
   // Get 'static' data for all participants (playerdata)
@@ -103,7 +103,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
 int DdsHandler::participantId2EquipNo(const int participantId) const
 {
   int ret = m_partId2EquipNoMap.value(participantId, 0);
-  INFO_LOG() << "participantId2EquipNo participantId=" << participantId
+  INFO_LOG(m_logger) << "participantId2EquipNo participantId=" << participantId
                      << " EquipmentNumber=" << ret;
   return ret;
 } // end of participantId2EquipNo()
@@ -111,7 +111,7 @@ int DdsHandler::participantId2EquipNo(const int participantId) const
 int DdsHandler::equipNo2participantId(const int equipmentNumber) const
 {
   int ret = m_equipNo2partIdMap.value(equipmentNumber, 0);
-  INFO_LOG() << "EquipNo2participantId equipmentNumber=" << equipmentNumber
+  INFO_LOG(m_logger) << "EquipNo2participantId equipmentNumber=" << equipmentNumber
                      << " ParticipantId=" << ret;
   return ret;
 } // end of EquipNo2participantId()
@@ -121,7 +121,7 @@ int DdsHandler::equipNo2participantId(const int equipmentNumber) const
 // ///////////////////////////////////
 void DdsHandler::onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType)
 {
-  DEBUG_LOG() << "onParticipantChanged";
+  DEBUG_LOG(m_logger) << "onParticipantChanged";
   if (modType == DataModification::eRemoved)
     m_partId2EquipNoMap.remove(data.id());
   else
@@ -135,7 +135,7 @@ void DdsHandler::onParticipantChanged(const ParticipantManagement::Participant &
   {
     for (auto i = m_partId2EquipNoMap.begin(); i != m_partId2EquipNoMap.end(); ++i)
     {
-      TRACE_LOG() << " partId2EquipNoMap.size(): " << m_partId2EquipNoMap.size()
+      TRACE_LOG(m_logger) << " partId2EquipNoMap.size(): " << m_partId2EquipNoMap.size()
                           << " partId: " << i.key()
                           << " eqNo: " << i.value();
     }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/dds_handler.h
index 0ed3ac710..87ce90d3a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/dds_handler.h
@@ -65,6 +65,7 @@ private Q_SLOTS:
   void onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType);
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<Core::Interface::Dtc>       m_dtcCore;
   std::shared_ptr<Core::Pacemaker>            m_pacemaker;
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 e7cd942d8..77cc26d46 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
@@ -20,21 +20,21 @@ HandlerShootbackArea::HandlerShootbackArea(MainHandler *mainHandler)
   , m_mainHandler(mainHandler)
   , m_dtsTgt(m_mainHandler->dds()->dtsTgt())
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 //--------------------------------------------------------------------------
 HandlerShootbackArea::~HandlerShootbackArea()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 //--------------------------------------------------------------------------
 bool HandlerShootbackArea::init()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   //  connect(m_dtcTab.get(), &TrainingAreaBase::Interface::Dtc::targetDataChanged,
   //          this, &HandlerShootbackArea::onTargetDataChanged);
@@ -43,13 +43,13 @@ bool HandlerShootbackArea::init()
   //  create objects
   auto cb = [this, &bRet](const Database::TgtShootbackArea & data)
   {
-    DEBUG_LOG() << "Reading from DB ShootbackArea with id = " << data.id;
+    DEBUG_LOG(m_logger) << "Reading from DB ShootbackArea with id = " << data.id;
     ObjectShootbackArea *ifs(new ObjectShootbackArea(m_mainHandler));
     Core::FunctionReplyObject ret = ifs->createObject(ObjectShootbackArea::toDdsData(data));
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       bRet = false;
       return;
     }
@@ -57,10 +57,10 @@ bool HandlerShootbackArea::init()
   };
   if (!m_mainHandler->db()->select(cb) || !bRet)
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
-  DEBUG_LOG() << "m_objectMap.size() = " << m_objectMap.size();
+  DEBUG_LOG(m_logger) << "m_objectMap.size() = " << m_objectMap.size();
 
   return true;
 }
@@ -79,7 +79,7 @@ void HandlerShootbackArea::onShootbackAreaModifyRequest(const rti::core::SampleI
 {
   const auto ret = shootbackAreaModifyRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
 
   // For ShootbackController
   emit objectChanged(ret.id(), false);
@@ -90,7 +90,7 @@ void HandlerShootbackArea::onShootbackAreaModifyRequest(const rti::core::SampleI
 //--------------------------------------------------------------------------
 Core::FunctionReplyObject HandlerShootbackArea::shootbackAreaModifyRequest(const ShootbackArea &request)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   // modify
   if (request.id() > 0)
   {
@@ -109,7 +109,7 @@ Core::FunctionReplyObject HandlerShootbackArea::shootbackAreaModifyRequest(const
   }
   else
     m_objectMap.insert(ifs->getId(), ifs);
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return ret;
 }
 
@@ -117,7 +117,7 @@ Core::FunctionReplyObject HandlerShootbackArea::shootbackAreaModifyRequest(const
 void HandlerShootbackArea::onShootbackAreaRemoveRequest(const rti::core::SampleIdentity &cookie,
                                                         const Core::RemoveElementRequest &request)
 {
-  TRACE_LOG()  << Q_FUNC_INFO << " request=" << request;
+  TRACE_LOG(m_logger)  << Q_FUNC_INFO << " request=" << request;
 
   Core::FunctionReplyObject ret;
   ObjectShootbackArea *ifs = m_objectMap.value(request.id());
@@ -149,7 +149,7 @@ void HandlerShootbackArea::onShootbackAreaRemoveRequest(const rti::core::SampleI
   ret = ifs->removeObject();
 
   if (ret.error())
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
   else
   {
     // delete Object
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_area.h
index ba03d16d4..4c6c7a6e4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_area.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_area.h
@@ -56,6 +56,8 @@ Q_SIGNALS:
 private Q_SLOTS:
 
 private: // methods
+
+NGL::INGLLogger &m_logger;
   void onShootbackAreaModifyRequest(const rti::core::SampleIdentity &cookie,
                                     const ShootbackArea &request) override;
   Core::FunctionReplyObject shootbackAreaModifyRequest(const ShootbackArea &request);
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 954539cc2..713c02255 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
@@ -21,21 +21,21 @@ HandlerShootbackTarget::HandlerShootbackTarget(MainHandler *mainHandler)
   , m_mainHandler(mainHandler)
   , m_dtsTgt(m_mainHandler->dds()->dtsTgt())
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 //--------------------------------------------------------------------------
 HandlerShootbackTarget::~HandlerShootbackTarget()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 //--------------------------------------------------------------------------
 bool HandlerShootbackTarget::init()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   //  connect(m_dtcTab.get(), &TrainingAreaBase::Interface::Dtc::targetDataChanged,
   //          this, &HandlerShootbackTarget::onTargetDataChanged);
@@ -44,13 +44,13 @@ bool HandlerShootbackTarget::init()
   //  create objects
   auto cb = [this, &bRet](const Database::TgtShootbackTarget & data)
   {
-    DEBUG_LOG() << "Reading from DB ShootbackTarget with id = " << data.id;
+    DEBUG_LOG(m_logger) << "Reading from DB ShootbackTarget with id = " << data.id;
     ObjectShootbackTarget *ifs(new ObjectShootbackTarget(m_mainHandler));
     Core::FunctionReplyObject ret = ifs->createObject(ObjectShootbackTarget::toDdsData(data));
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       bRet = false;
       return;
     }
@@ -58,10 +58,10 @@ bool HandlerShootbackTarget::init()
   };
   if (!m_mainHandler->db()->select(cb) || !bRet)
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
-  DEBUG_LOG() << "m_objectMap.size() = " << m_objectMap.size();
+  DEBUG_LOG(m_logger) << "m_objectMap.size() = " << m_objectMap.size();
 
   return true;
 }
@@ -93,7 +93,7 @@ void HandlerShootbackTarget::onShootbackTargetModifyRequest(const rti::core::Sam
 {
   const auto ret = shootbackTargetModifyRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   else
     emit objectChanged(ret.id(), false);   // For ShootbackController
 
@@ -103,7 +103,7 @@ void HandlerShootbackTarget::onShootbackTargetModifyRequest(const rti::core::Sam
 //--------------------------------------------------------------------------
 Core::FunctionReplyObject HandlerShootbackTarget::shootbackTargetModifyRequest(const ShootbackTarget &request)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   // modify
   if (request.id() > 0)
   {
@@ -127,7 +127,7 @@ Core::FunctionReplyObject HandlerShootbackTarget::shootbackTargetModifyRequest(c
   }
   else
     m_objectMap.insert(ifs->getId(), ifs);
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return ret;
 }
 
@@ -135,7 +135,7 @@ Core::FunctionReplyObject HandlerShootbackTarget::shootbackTargetModifyRequest(c
 void HandlerShootbackTarget::onShootbackTargetRemoveRequest(const rti::core::SampleIdentity &cookie,
                                                             const Core::RemoveElementRequest &request)
 {
-  TRACE_LOG()  << Q_FUNC_INFO << " request=" << request;
+  TRACE_LOG(m_logger)  << Q_FUNC_INFO << " request=" << request;
 
   Core::FunctionReplyObject ret;
   ObjectShootbackTarget *ifs = m_objectMap.value(request.id());
@@ -166,7 +166,7 @@ void HandlerShootbackTarget::onShootbackTargetRemoveRequest(const rti::core::Sam
   ret = ifs->removeObject();
 
   if (ret.error())
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
   else
   {
     // delete Object
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_target.h b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_target.h
index 19a77a955..d3cf1879f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_target.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_shootback_target.h
@@ -54,6 +54,8 @@ Q_SIGNALS:
 private Q_SLOTS:
 
 private: // methods
+
+NGL::INGLLogger &m_logger;
   void onShootbackTargetModifyRequest(const rti::core::SampleIdentity &cookie,
                                       const ShootbackTarget &request) override;
   Core::FunctionReplyObject shootbackTargetModifyRequest(const ShootbackTarget &request);
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 864331b1e..31fdbb4fe 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
@@ -20,21 +20,21 @@ HandlerTargetAreaAssignment::HandlerTargetAreaAssignment(MainHandler *mainHandle
   , m_mainHandler(mainHandler)
   , m_dtsTgt(m_mainHandler->dds()->dtsTgt())
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 //--------------------------------------------------------------------------
 HandlerTargetAreaAssignment::~HandlerTargetAreaAssignment()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 //--------------------------------------------------------------------------
 bool HandlerTargetAreaAssignment::init()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   //  connect(m_dtcTab.get(), &TrainingAreaBase::Interface::Dtc::targetDataChanged,
   //          this, &HandlerTargetAreaAssignment::onTargetDataChanged);
@@ -43,13 +43,13 @@ bool HandlerTargetAreaAssignment::init()
   //  create objects
   auto cb = [this, &bRet](const Database::TgtTargetAreaAssignment & data)
   {
-    DEBUG_LOG() << "Reading from DB TargetAreaAssignment with id = " << data.id;
+    DEBUG_LOG(m_logger) << "Reading from DB TargetAreaAssignment with id = " << data.id;
     ObjectTargetAreaAssignment *ifs(new ObjectTargetAreaAssignment(m_mainHandler));
     Core::FunctionReplyObject ret = ifs->createObject(ObjectTargetAreaAssignment::toDdsData(data));
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       bRet = false;
       return;
     }
@@ -57,10 +57,10 @@ bool HandlerTargetAreaAssignment::init()
   };
   if (!m_mainHandler->db()->select(cb) || !bRet)
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
-  DEBUG_LOG() << "m_objectMap.size() = " << m_objectMap.size();
+  DEBUG_LOG(m_logger) << "m_objectMap.size() = " << m_objectMap.size();
 
   return true;
 }
@@ -87,7 +87,7 @@ void HandlerTargetAreaAssignment::onTargetAreaAssignmentModifyRequest(const rti:
 {
   const auto ret = TargetAreaAssignmentModifyRequest(request);
   if (ret.error())
-    WARNING_LOG() << ret();
+    WARNING_LOG(m_logger) << ret();
   else
     emit objectChanged(ret.id(), false);   // For ShootbackController
 
@@ -97,7 +97,7 @@ void HandlerTargetAreaAssignment::onTargetAreaAssignmentModifyRequest(const rti:
 //--------------------------------------------------------------------------
 Core::FunctionReplyObject HandlerTargetAreaAssignment::TargetAreaAssignmentModifyRequest(const TargetAreaAssignment &request)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   // modify
   if (request.id() > 0)
   {
@@ -116,7 +116,7 @@ Core::FunctionReplyObject HandlerTargetAreaAssignment::TargetAreaAssignmentModif
   }
   else
     m_objectMap.insert(ifs->getId(), ifs);
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return ret;
 }
 
@@ -124,7 +124,7 @@ Core::FunctionReplyObject HandlerTargetAreaAssignment::TargetAreaAssignmentModif
 void HandlerTargetAreaAssignment::onTargetAreaAssignmentRemoveRequest(const rti::core::SampleIdentity &cookie,
                                                                       const Core::RemoveElementRequest &request)
 {
-  TRACE_LOG()  << Q_FUNC_INFO << " request=" << request;
+  TRACE_LOG(m_logger)  << Q_FUNC_INFO << " request=" << request;
 
   Core::FunctionReplyObject ret;
   ObjectTargetAreaAssignment *ifs = m_objectMap.value(request.id());
@@ -146,7 +146,7 @@ void HandlerTargetAreaAssignment::onTargetAreaAssignmentRemoveRequest(const rti:
   ret = ifs->removeObject();
 
   if (ret.error())
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
   else
   {
     // delete Object
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_area_assignment.h b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_area_assignment.h
index e277a78cf..577530526 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_area_assignment.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_area_assignment.h
@@ -48,6 +48,8 @@ Q_SIGNALS:
 private Q_SLOTS:
 
 private: // methods
+
+NGL::INGLLogger &m_logger;
   void onTargetAreaAssignmentModifyRequest(const rti::core::SampleIdentity &cookie,
                                            const TargetAreaAssignment &request) override;
   Core::FunctionReplyObject TargetAreaAssignmentModifyRequest(const TargetAreaAssignment &request);
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 269b109f6..5831201d5 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
@@ -25,7 +25,7 @@ HandlerTargetConfig::HandlerTargetConfig(const std::shared_ptr<DdsHandler> &ddsH
 
 bool HandlerTargetConfig::init()
 {
-  INFO_LOG() << "init";
+  INFO_LOG(m_logger) << "init";
   connect(m_dtcTab.get(), &TrainingAreaBase::Interface::Dtc::targetDataChanged,
           this, &HandlerTargetConfig::onTargetDataChanged);
 
@@ -40,10 +40,10 @@ void HandlerTargetConfig::onTargetDataChanged(const TrainingAreaBase::TargetData
 
   uint8_t responseCmd = 100;
   TargetManagement::TargetConfig tgtTargetData;
-  INFO_LOG() << "onTargetDataChanged payload.size=" << targetData.payload().size();
+  INFO_LOG(m_logger) << "onTargetDataChanged payload.size=" << targetData.payload().size();
   tgtTargetData.participantId(m_ddsHandler->equipNo2participantId(targetData.equipmentNumber()));
   for (size_t i = 0; i < targetData.payload().size(); i++)
-    INFO_LOG() << "payload[" << i << "]=" << targetData.payload()[i];
+    INFO_LOG(m_logger) << "payload[" << i << "]=" << targetData.payload()[i];
 
   if (targetData.payload().size() < 6)
     return;
@@ -51,29 +51,29 @@ void HandlerTargetConfig::onTargetDataChanged(const TrainingAreaBase::TargetData
   tgtTargetData.tgtCommand(static_cast <TargetManagement::TgtCommand_def::type>(targetData.payload()[0] - responseCmd));
   tgtTargetData.mode(static_cast <TargetManagement::Mode_def::type>(targetData.payload()[1]));
   tgtTargetData.weapon(targetData.payload()[2]);
-  INFO_LOG() << "tgtTargetData.tgtCommand =" << tgtTargetData.tgtCommand()
+  INFO_LOG(m_logger) << "tgtTargetData.tgtCommand =" << tgtTargetData.tgtCommand()
                      << " mode=" << tgtTargetData.mode()
                      << " weapon=" << tgtTargetData.weapon();
   if (!m_dtsTgt->publish(tgtTargetData))
-    ERROR_LOG() << "Error publish targetData";
+    ERROR_LOG(m_logger) << "Error publish targetData";
 } // end of onTargetDataChanged
 
 void HandlerTargetConfig::onSendTargetDataReply(const Core::FunctionReplyObject &replyObject)
 {
   if (replyObject.error())
-    WARNING_LOG() << "Can not send target data to target participant : " << replyObject();
+    WARNING_LOG(m_logger) << "Can not send target data to target participant : " << replyObject();
   else
-    DEBUG_LOG() << "onSendTargetDataReply for id " << replyObject.id() << " success";
+    DEBUG_LOG(m_logger) << "onSendTargetDataReply for id " << replyObject.id() << " success";
 }
 
 // Send to TAB
 void HandlerTargetConfig::onConfigureTargetRequest(const rti::core::SampleIdentity &cookie,
                                                    const ConfigureTargetRequest &request)
 {
-  INFO_LOG()  << "onConfigureTargetRequest";
+  INFO_LOG(m_logger)  << "onConfigureTargetRequest";
   Core::FunctionReplyObject reply = Core::FunctionReplyObject(request.id());
 
-  DEBUG_LOG() << "HandlerTargetConfig onTargetConfigChanged participantId=" << request.participantId();
+  DEBUG_LOG(m_logger) << "HandlerTargetConfig onTargetConfigChanged participantId=" << request.participantId();
 
   TrainingAreaBase::SendTargetDataRequest tgt;
   const int participantId = request.participantId();
@@ -87,7 +87,7 @@ void HandlerTargetConfig::onConfigureTargetRequest(const rti::core::SampleIdenti
   case TargetManagement::TgtCommand_def::Unknown:
   case TargetManagement::TgtCommand_def::PlaySound:
   {
-    WARNING_LOG() << "onTargetConfigChanged Command =" << request.tgtCommand() << " not handled.";
+    WARNING_LOG(m_logger) << "onTargetConfigChanged Command =" << request.tgtCommand() << " not handled.";
     m_ddsHandler->ftsTgt()->configureTargetReply(cookie, reply);
     return;
   }
@@ -101,7 +101,7 @@ void HandlerTargetConfig::onConfigureTargetRequest(const rti::core::SampleIdenti
   {
     if (!request.mode().is_set())
     {
-      ERROR_LOG() << "Set mode requested, but mode ist not set";
+      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;
     }
@@ -112,7 +112,7 @@ void HandlerTargetConfig::onConfigureTargetRequest(const rti::core::SampleIdenti
   {
     if (!request.weapon().is_set())
     {
-      ERROR_LOG() << "Set weapon requested, but weapon ist not set";
+      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")));
       return;
     }
@@ -123,7 +123,7 @@ void HandlerTargetConfig::onConfigureTargetRequest(const rti::core::SampleIdenti
   {
     if (!request.parameterSet().is_set())
     {
-      ERROR_LOG() << "Set parameterset requested, but parameterset ist not set";
+      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")));
       return;
     }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_config.h b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_config.h
index 5665677dd..e6af7ce38 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_config.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_config.h
@@ -55,6 +55,8 @@ private Q_SLOTS:
   void onTargetDataChanged(const TrainingAreaBase::TargetData &targetData, DataModification modType);
 
 private: // methoden
+
+NGL::INGLLogger &m_logger;
   void onConfigureTargetRequest(const rti::core::SampleIdentity &cookie,
                                 const ConfigureTargetRequest &request) override;
   Core::FunctionReplyObject configureTargetRequest(const ConfigureTargetRequest &request);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/main_handler.cpp
index a9a81fa3d..adc33f7a1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/main_handler.cpp
@@ -18,11 +18,10 @@
 namespace TargetManagement
 {
 
-MainHandler::MainHandler(QObject *parent)
-  : QObject(parent)
+MainHandler::MainHandler(QObject *parent) : QObject(parent)
   , m_ddsHandler(nullptr)
-  , m_dbHandler(nullptr)
-{}
+  , m_dbHandler(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 MainHandler::~MainHandler()
 {
@@ -42,7 +41,7 @@ MainHandler::~MainHandler()
 
 bool MainHandler::init(int domainId, int exerciseId)
 {
-  INFO_LOG() << "MainHandler::init";
+  INFO_LOG(m_logger) << "MainHandler::init";
 
   // initialize database
   m_dbHandler = std::make_shared<DbHandler>();
@@ -53,10 +52,10 @@ bool MainHandler::init(int domainId, int exerciseId)
   m_ddsHandler = std::make_shared<DdsHandler>(domainId, exerciseId);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation ddsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation ddsHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation ddsHandler succesful.";
 
   NOTICE_LOG(m_logger) << "setNewState Core::RunningState::Starting ";
   m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Starting);
@@ -66,7 +65,7 @@ bool MainHandler::init(int domainId, int exerciseId)
 
   if (!m_handlerTargetConfig->init())
   {
-    ERROR_LOG() << "Initialisation HandlerTargetConfig failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerTargetConfig failed.";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
   }
@@ -84,7 +83,7 @@ bool MainHandler::init(int domainId, int exerciseId)
     QFileInfo fi(elevationFileAbs);
     if (!fi.exists(elevationFileAbs))
     {
-      ERROR_LOG() << Q_FUNC_INFO << ", elevationFile '" << elevationFileAbs << "' doesn't exists";
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << ", elevationFile '" << elevationFileAbs << "' doesn't exists";
       return false;
     }
 
@@ -98,7 +97,7 @@ bool MainHandler::init(int domainId, int exerciseId)
 
     if (!m_handlerShootbackArea->init())
     {
-      ERROR_LOG() << "Initialisation HandlerShootbackArea failed.";
+      ERROR_LOG(m_logger) << "Initialisation HandlerShootbackArea failed.";
       m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
       return false;
     }
@@ -108,7 +107,7 @@ bool MainHandler::init(int domainId, int exerciseId)
 
     if (!m_handlerShootbackTarget->init())
     {
-      ERROR_LOG() << "Initialisation HandlerShootbackTarget failed.";
+      ERROR_LOG(m_logger) << "Initialisation HandlerShootbackTarget failed.";
       m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
       return false;
     }
@@ -118,7 +117,7 @@ bool MainHandler::init(int domainId, int exerciseId)
 
     if (!m_handlerTargetAreaAssignment->init())
     {
-      ERROR_LOG() << "Initialisation HandlerTargetAreaAssignment failed.";
+      ERROR_LOG(m_logger) << "Initialisation HandlerTargetAreaAssignment failed.";
       m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
       return false;
     }
@@ -132,7 +131,7 @@ bool MainHandler::init(int domainId, int exerciseId)
 
     if (!(initLos && initDds))
     {
-      ERROR_LOG() << "Initialisation ShootbackController failed.";
+      ERROR_LOG(m_logger) << "Initialisation ShootbackController failed.";
       m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
       return false;
     }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/main_handler.h
index a9e8a786a..5919dc4fa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/main_handler.h
@@ -42,6 +42,7 @@ public:
 
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>            m_ddsHandler;
   std::shared_ptr<DbHandler>             m_dbHandler;
 
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 8ffad5365..acbc223a5 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
@@ -13,20 +13,19 @@
 //------------------------------------------------------------------------------
 namespace TargetManagement
 {
-ObjectShootbackArea::ObjectShootbackArea(MainHandler *mainHandler)
-  : m_mainHandler(mainHandler)
-{
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+ObjectShootbackArea::ObjectShootbackArea(MainHandler *mainHandler) : m_mainHandler(mainHandler),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 //------------------------------------------------------------------------------
 ObjectShootbackArea::~ObjectShootbackArea()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (isValid())
     m_mainHandler->dds()->dtsTgt()->removeShootbackAreaByKey(m_data.id());
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 //------------------------------------------------------------------------------
@@ -44,7 +43,7 @@ bool ObjectShootbackArea::isUsed() const
 //------------------------------------------------------------------------------
 Core::FunctionReplyObject ObjectShootbackArea::createObject(const ShootbackArea &data)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_data = data;
 
   if (m_data.id() <= 0)
@@ -57,20 +56,20 @@ Core::FunctionReplyObject ObjectShootbackArea::createObject(const ShootbackArea
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting ShootbackArea-data into database"));
 
     m_data.id(dbData.id);
-    DEBUG_LOG() << "New TgtShootbackArea: " << m_data.id();
+    DEBUG_LOG(m_logger) << "New TgtShootbackArea: " << m_data.id();
   }
 
   // Publish Data via DTS
   onPublishData();
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return Core::FunctionReplyObject(m_data.id());
 }
 
 //------------------------------------------------------------------------------
 Core::FunctionReplyObject ObjectShootbackArea::updateObject(const ShootbackArea &data)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (!isValid())
     return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Object not valid/blocked"));
 
@@ -81,12 +80,12 @@ Core::FunctionReplyObject ObjectShootbackArea::updateObject(const ShootbackArea
     return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating ShootbackArea-data into database"));
 
   m_data = data;
-  DEBUG_LOG() << "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() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return Core::FunctionReplyObject(m_data.id());
 }
 
@@ -107,7 +106,7 @@ Core::FunctionReplyObject ObjectShootbackArea::setUsed(bool isUsed)
 //------------------------------------------------------------------------------
 Core::FunctionReplyObject ObjectShootbackArea::removeObject()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (isUsed())
     return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "ShootbackArea still in use"));
 
@@ -117,17 +116,17 @@ Core::FunctionReplyObject ObjectShootbackArea::removeObject()
   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() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return Core::FunctionReplyObject(m_data.id());
 }
 
 //------------------------------------------------------------------------------
 void ObjectShootbackArea::onPublishData()
 {
-  TRACE_LOG() << "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() << "Error publishing ShootbackArea-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing ShootbackArea-data to dds";
 }
 
 // -------------------------------------------------------------------------------------------------------
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 07780ce8c..2deb04dc2 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
@@ -48,6 +48,7 @@ public:
   static ShootbackArea toDdsData(const Database::TgtShootbackArea &dbData);  // db -> dds
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onPublishData();
 
 private:
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 b9189fe7d..26fd36fa5 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
@@ -13,20 +13,19 @@
 //------------------------------------------------------------------------------
 namespace TargetManagement
 {
-ObjectShootbackTarget::ObjectShootbackTarget(MainHandler *mainHandler)
-  : m_mainHandler(mainHandler)
-{
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+ObjectShootbackTarget::ObjectShootbackTarget(MainHandler *mainHandler) : m_mainHandler(mainHandler),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 //------------------------------------------------------------------------------
 ObjectShootbackTarget::~ObjectShootbackTarget()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (isValid())
     m_mainHandler->dds()->dtsTgt()->removeShootbackTargetByKey(m_data.id());
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 //------------------------------------------------------------------------------
@@ -44,7 +43,7 @@ bool ObjectShootbackTarget::isUsed() const
 //------------------------------------------------------------------------------
 Core::FunctionReplyObject ObjectShootbackTarget::createObject(const ShootbackTarget &data)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_data = data;
 
   if (m_data.id() <= 0)
@@ -57,20 +56,20 @@ Core::FunctionReplyObject ObjectShootbackTarget::createObject(const ShootbackTar
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting ShootbackTarget-data into database"));
 
     m_data.id(dbData.id);
-    DEBUG_LOG() << "New TgtShootbackTarget: " << m_data.id();
+    DEBUG_LOG(m_logger) << "New TgtShootbackTarget: " << m_data.id();
   }
 
   // Publish Data via DTS
   onPublishData();
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return Core::FunctionReplyObject(m_data.id());
 }
 
 //------------------------------------------------------------------------------
 Core::FunctionReplyObject ObjectShootbackTarget::updateObject(const ShootbackTarget &data)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, id=" << data.id()
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, id=" << data.id()
                       << " size =" << data.visibleParticipants().size();
   if (!isValid())
     return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Object not valid/blocked"));
@@ -85,12 +84,12 @@ Core::FunctionReplyObject ObjectShootbackTarget::updateObject(const ShootbackTar
   }
 
   m_data = data;
-  DEBUG_LOG() << "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() << Q_FUNC_INFO << " END, id=" << data.id()
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, id=" << data.id()
                       << " size =" << data.visibleParticipants().size();
   return Core::FunctionReplyObject(m_data.id());
 }
@@ -112,7 +111,7 @@ Core::FunctionReplyObject ObjectShootbackTarget::setUsed(bool isUsed)
 //------------------------------------------------------------------------------
 Core::FunctionReplyObject ObjectShootbackTarget::removeObject()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (isUsed())
     return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "ShootbackTarget still in use"));
 
@@ -122,7 +121,7 @@ Core::FunctionReplyObject ObjectShootbackTarget::removeObject()
   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() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return Core::FunctionReplyObject(m_data.id());
 }
 
@@ -145,10 +144,10 @@ void ObjectShootbackTarget::updateVolatileData(const Core::GeoPosition &position
 //------------------------------------------------------------------------------
 void ObjectShootbackTarget::onPublishData()
 {
-  TRACE_LOG() << "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() << "Error publishing ShootbackTarget-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing ShootbackTarget-data to dds";
 }
 
 // -------------------------------------------------------------------------------------------------------
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 d2f5d7f95..596835aa5 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
@@ -54,6 +54,7 @@ public:
   bool isDifferent(const Database::TgtShootbackTarget &dbData);
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onPublishData();
 
 private:
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 343843b6c..b68ff821b 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
@@ -13,20 +13,19 @@
 //------------------------------------------------------------------------------
 namespace TargetManagement
 {
-ObjectTargetAreaAssignment::ObjectTargetAreaAssignment(MainHandler *mainHandler)
-  : m_mainHandler(mainHandler)
-{
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+ObjectTargetAreaAssignment::ObjectTargetAreaAssignment(MainHandler *mainHandler) : m_mainHandler(mainHandler),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 //------------------------------------------------------------------------------
 ObjectTargetAreaAssignment::~ObjectTargetAreaAssignment()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (isValid())
     m_mainHandler->dds()->dtsTgt()->removeTargetAreaAssignmentByKey(m_data.id());
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 //------------------------------------------------------------------------------
@@ -44,7 +43,7 @@ bool ObjectTargetAreaAssignment::isUsed() const
 //------------------------------------------------------------------------------
 Core::FunctionReplyObject ObjectTargetAreaAssignment::createObject(const TargetAreaAssignment &data)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   m_data = data;
 
   if (m_data.id() <= 0)
@@ -56,7 +55,7 @@ Core::FunctionReplyObject ObjectTargetAreaAssignment::createObject(const TargetA
     if (!m_mainHandler->db()->insert(dbData))
     {
       QString errText = m_mainHandler->db()->getLastError().nativeErrorCode();
-      ERROR_LOG() << "Error inserting TargetAreaAssignment into database: " << m_mainHandler->db()->getLastError().text();
+      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());
       else
@@ -64,20 +63,20 @@ Core::FunctionReplyObject ObjectTargetAreaAssignment::createObject(const TargetA
     }
 
     m_data.id(dbData.id);
-    DEBUG_LOG() << "New TgtTargetAreaAssignment: " << m_data.id();
+    DEBUG_LOG(m_logger) << "New TgtTargetAreaAssignment: " << m_data.id();
   }
 
   // Publish Data via DTS
   onPublishData();
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return Core::FunctionReplyObject(m_data.id());
 }
 
 //------------------------------------------------------------------------------
 Core::FunctionReplyObject ObjectTargetAreaAssignment::updateObject(const TargetAreaAssignment &data)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (!isValid())
     return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Object not valid/blocked"));
 
@@ -88,12 +87,12 @@ Core::FunctionReplyObject ObjectTargetAreaAssignment::updateObject(const TargetA
     return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating TargetAreaAssignment-data into database"));
 
   m_data = data;
-  DEBUG_LOG() << "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() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return Core::FunctionReplyObject(m_data.id());
 }
 
@@ -114,7 +113,7 @@ Core::FunctionReplyObject ObjectTargetAreaAssignment::setUsed(bool isUsed)
 //------------------------------------------------------------------------------
 Core::FunctionReplyObject ObjectTargetAreaAssignment::removeObject()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
   if (isUsed())
     return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "TargetAreaAssignment still in use"));
 
@@ -124,17 +123,17 @@ Core::FunctionReplyObject ObjectTargetAreaAssignment::removeObject()
   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() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return Core::FunctionReplyObject(m_data.id());
 }
 
 //------------------------------------------------------------------------------
 void ObjectTargetAreaAssignment::onPublishData()
 {
-  TRACE_LOG() << "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() << "Error publishing TargetAreaAssignment-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing TargetAreaAssignment-data to dds";
 }
 
 // -------------------------------------------------------------------------------------------------------
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 1be4aa332..6f603487f 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
@@ -48,6 +48,7 @@ public:
   static TargetAreaAssignment toDdsData(const Database::TgtTargetAreaAssignment &dbData);  // db -> dds
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onPublishData();
 
 private:
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 1f6d0cf9a..aecbd57b5 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
@@ -67,19 +67,18 @@ QString toString(const std::vector<int> &cont)
 //
 // class ShootbackController
 //
-ShootbackController::ShootbackController(MainHandler *mainHandler)
-  : BaseClass(mainHandler)
+ShootbackController::ShootbackController(MainHandler *mainHandler) : BaseClass(mainHandler)
   , m_mainHandler(mainHandler)
   , m_elevationMap(nullptr)
-  , m_losCalculation(nullptr)
-{
-  TRACE_LOG() << Q_FUNC_INFO << " START";
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  , m_losCalculation(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 ShootbackController::~ShootbackController()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   // disconnect external "signals"..
   disconnect(m_mainHandler->dds()->dtcPpm().get());
@@ -91,27 +90,27 @@ ShootbackController::~ShootbackController()
   delete m_losCalculation;
   m_losCalculation = nullptr;
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 bool ShootbackController::initLOS(SituationMap::ElevationMap *elevationMap)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, elevationMap = " << elevationMap
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, elevationMap = " << elevationMap
                       << " isValid = " << elevationMap->isValid();
 
   if (!elevationMap->isValid())
   {
-    ERROR_LOG() << Q_FUNC_INFO << " elevationMap not valid -> return";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " elevationMap not valid -> return";
     return false;
   }
 
   delete m_losCalculation;
   m_elevationMap = elevationMap;
 
-  INFO_LOG() << Q_FUNC_INFO << " m_elevationMap.isValid() =" << m_elevationMap->isValid();
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " m_elevationMap.isValid() =" << m_elevationMap->isValid();
   m_losCalculation = new SituationMap::LineOfSightCalculation(m_elevationMap);
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
   return true;
 }
 
@@ -151,7 +150,7 @@ bool ShootbackController::initDds(std::shared_ptr<HandlerShootbackArea> handlerA
 
 void ShootbackController::onShootbackAreaChanged1(qint32 areaId, bool removed)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START" << " shootbackAreaId=" << areaId << " removed=" << removed;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START" << " shootbackAreaId=" << areaId << " removed=" << removed;
 
   if (removed)
   {
@@ -168,7 +167,7 @@ void ShootbackController::onShootbackAreaChanged1(qint32 areaId, bool removed)
     auto it = areaMap.find(areaId);
     if (it == areaMap.end())
     {
-      ERROR_LOG() << Q_FUNC_INFO << " obj changes, but connot be found" << " shootbackAreaId=" << areaId;
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " obj changes, but connot be found" << " shootbackAreaId=" << areaId;
       return;
     }
     onShootbackAreaChanged2(*(it.value()));
@@ -176,13 +175,13 @@ void ShootbackController::onShootbackAreaChanged1(qint32 areaId, bool removed)
   }
 
   syncExternal();
-  TRACE_LOG() << Q_FUNC_INFO << " END" << " shootbackAreaId=" << areaId << " removed=" << removed;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" << " shootbackAreaId=" << areaId << " removed=" << removed;
 }
 
 void ShootbackController::onShootbackAreaChanged2(const TargetManagement::ObjectShootbackArea &area)
 {
   const int areaId = area.getId();
-  TRACE_LOG() << Q_FUNC_INFO << " START" << " shootbackAreaId=" << areaId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START" << " shootbackAreaId=" << areaId;
 
   // handle new/modified area and check all participants:
   const QMap<qint32, ParticipantManagement::ParticipantPosition> &participantPositions =
@@ -193,12 +192,12 @@ void ShootbackController::onShootbackAreaChanged2(const TargetManagement::Object
     updateInternal_participantPerArea(area, posData);
   } // for
 
-  TRACE_LOG() << Q_FUNC_INFO << " END" << " shootbackAreaId=" << areaId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" << " shootbackAreaId=" << areaId;
 }
 
 void ShootbackController::onShootbackTargetChanged(qint32 targetId, bool removed)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START" << ", targetId=" << targetId << ", removed=" << removed;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START" << ", targetId=" << targetId << ", removed=" << removed;
 
   // Note:
   // updateInternalLos is not required if (removed == true)
@@ -214,12 +213,12 @@ void ShootbackController::onShootbackTargetChanged(qint32 targetId, bool removed
     updateInternalLos({}, {}, {targetId});
   syncExternal();
 
-  TRACE_LOG() << Q_FUNC_INFO << " END" << " targetId=" << targetId << " removed=" << removed;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" << " targetId=" << targetId << " removed=" << removed;
 }
 
 void ShootbackController::onTargetAreaAssignmentChanged(qint32 assignmentId, bool removed)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START" << " assignmentId=" << assignmentId << " removed=" << removed;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START" << " assignmentId=" << assignmentId << " removed=" << removed;
 
   // Note:
   // updateInternalLos is not required on removed == true
@@ -231,16 +230,16 @@ void ShootbackController::onTargetAreaAssignmentChanged(qint32 assignmentId, boo
     updateInternalLos({assignmentId}, {}, {});
   syncExternal();
 
-  TRACE_LOG() << Q_FUNC_INFO << " END" << " assignmentId=" << assignmentId << " removed=" << removed;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" << " assignmentId=" << assignmentId << " removed=" << removed;
 }
 
 void ShootbackController::onParticipantPositionChanged(const ParticipantManagement::ParticipantPosition &posData, DataModification modType)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " participantId changed, participantId=" << posData << " mod=" << modType;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " participantId changed, participantId=" << posData << " mod=" << modType;
 
   if (!participantPositionTopicIsValid(posData))
   {
-//    DEBUG_LOG() << Q_FUNC_INFO << " NOT VALID, participantId=" << posData.participantId();
+//    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " NOT VALID, participantId=" << posData.participantId();
     return;
   }
 
@@ -249,30 +248,30 @@ void ShootbackController::onParticipantPositionChanged(const ParticipantManageme
   bool bIsTarget = false;
   if (isTarget(participantId, bIsTarget) && bIsTarget)
   {
-    INFO_LOG() << Q_FUNC_INFO << " TARGET, participantId=" << participantId;
+    INFO_LOG(m_logger) << Q_FUNC_INFO << " TARGET, participantId=" << participantId;
 
     ObjectShootbackTarget *osbTarget = m_handlerShootbackTarget->dataForTargetParticipantId(participantId);
     if (!osbTarget)
     {
-      ERROR_LOG() << Q_FUNC_INFO << " ObjectShootbackTarget not found for participantId=" << participantId;
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " ObjectShootbackTarget not found for participantId=" << participantId;
       return;
     }
     osbTarget->updateVolatileData(posData.pos());
   }
 
-  INFO_LOG() << Q_FUNC_INFO << " participantId=" << participantId << ", isTarget=" << bIsTarget;
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " participantId=" << participantId << ", isTarget=" << bIsTarget;
 
   if ((modType == DataModification::eAdded) || (modType == DataModification::eModified))
   {
     // update
     const QHash<int, ObjectShootbackArea *> &objMap = m_handlerShootbackArea->getObjectMap();
-    DEBUG_LOG() << Q_FUNC_INFO << " objMap.size" << objMap.size();
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " objMap.size" << objMap.size();
 
     QMapIterator< int, QSet<int>> it(m_participantsPerArea);
     while (it.hasNext())
     {
       it.next();
-      DEBUG_LOG() << " areaId = " << it.key() << "-> partIdRef VORHERXX" << toString(it.value());
+      DEBUG_LOG(m_logger) << " areaId = " << it.key() << "-> partIdRef VORHERXX" << toString(it.value());
     }
 
     for (const auto &area : std::as_const(objMap))
@@ -286,7 +285,7 @@ void ShootbackController::onParticipantPositionChanged(const ParticipantManageme
       while (it_inner.hasNext())
       {
         it_inner.next();
-        DEBUG_LOG() << " areaId = " << it_inner.key() << "-> partIdRef NACHHERXX" << toString(it_inner.value());
+        DEBUG_LOG(m_logger) << " areaId = " << it_inner.key() << "-> partIdRef NACHHERXX" << toString(it_inner.value());
       }
     }
 
@@ -322,7 +321,7 @@ bool ShootbackController::isTarget(qint32 participantId, bool &bIsTarget) const
   std::shared_ptr<ParticipantManagement::Interface::Dtc> dtcPpm = m_mainHandler->dds()->dtcPpm();
   if (!dtcPpm)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no dtcPpm, return";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no dtcPpm, return";
     return false;
   }
 
@@ -372,9 +371,9 @@ void ShootbackController::updateInternal_participantPerArea(const ObjectShootbac
   QSet<int> &partIdRef = m_participantsPerArea[areaId];
   bool alreadyInCont = partIdRef.contains(participantId);
 
-  DEBUG_LOG() << " areaId = " << area.getId() << " ---> partIdRef VORHER" << toString(partIdRef);
+  DEBUG_LOG(m_logger) << " areaId = " << area.getId() << " ---> partIdRef VORHER" << toString(partIdRef);
 
-  DEBUG_LOG() << Q_FUNC_INFO << " "
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " "
                       << " shootbackAreaId=" << areaId
                       << " shootbackAreaName=" << area.getName()
                       << " area.position=" << area.getData().position()
@@ -387,17 +386,17 @@ void ShootbackController::updateInternal_participantPerArea(const ObjectShootbac
   {
     // ENTER
     partIdRef.insert(participantId);
-    DEBUG_LOG() << Q_FUNC_INFO << " ENTER: participantId=" << participantId << " areaId=" << areaId;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " ENTER: participantId=" << participantId << " areaId=" << areaId;
 
   }
   else if (!contains && alreadyInCont)
   {
     // LEAVE
-    DEBUG_LOG() << Q_FUNC_INFO << " ENTER: participantId=" << participantId << " areaId=" << areaId;
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " ENTER: participantId=" << participantId << " areaId=" << areaId;
     partIdRef.remove(participantId);
   }
 
-  DEBUG_LOG() << " areaId = " << area.getId() << " ---> partIdRef NACHER" << toString(partIdRef);
+  DEBUG_LOG(m_logger) << " areaId = " << area.getId() << " ---> partIdRef NACHER" << toString(partIdRef);
 }
 
 bool ShootbackController::areaContainsPosition(const TargetManagement::ObjectShootbackArea &area,
@@ -453,7 +452,7 @@ QSet<int> ShootbackController::areasWithParticipant(qint32 participantId) const
 
 QSet<int> ShootbackController::assignmentsWithTargetParticipantId(qint32 targetParticipantId) const
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START" << " targetParticipantId=" << targetParticipantId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START" << " targetParticipantId=" << targetParticipantId;
 
   QSet<int> ret;
   // all assignments
@@ -467,7 +466,7 @@ QSet<int> ShootbackController::assignmentsWithTargetParticipantId(qint32 targetP
       ret += targetAreaAssignment->getId();
   } // for
 
-  TRACE_LOG() << Q_FUNC_INFO << " END" << " areaId=" << targetParticipantId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" << " areaId=" << targetParticipantId;
   return ret;
 }
 
@@ -483,7 +482,7 @@ void ShootbackController::updateInternalLos(const QSet<int> &changingAssignmentI
                                             const QSet<int> &changingTartgetIds,           // ~dynamic
                                             int changedParticipantId)               // ~dynamic
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " START"
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START"
                       << ", changingAssigmentIds=" << toString(changingAssignmentIds)
                       << ", changingAreaIds=" << toString(changingAreaIds)
                       << ", changingTartgetIds=" << toString(changingTartgetIds)
@@ -491,13 +490,13 @@ void ShootbackController::updateInternalLos(const QSet<int> &changingAssignmentI
 
   // loop over every assignment
   const QHash<int, ObjectTargetAreaAssignment *> &allAssignments = m_handlerTargetAreaAssignment->getObjectMap();
-  DEBUG_LOG() << Q_FUNC_INFO << " allAssignments.size() " << allAssignments.size();
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " allAssignments.size() " << allAssignments.size();
 
   for (ObjectTargetAreaAssignment *assignment : allAssignments)
   {
     if (!assignment)
     {
-      DEBUG_LOG() << Q_FUNC_INFO << " continue, curAssignment " << assignment->getId();
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " continue, curAssignment " << assignment->getId();
       continue;
     }
 
@@ -505,7 +504,7 @@ void ShootbackController::updateInternalLos(const QSet<int> &changingAssignmentI
     const int assignmentId = assignment->getId();
     if (!idIsRelevantHelper(changingAssignmentIds, assignmentId))
     {
-      DEBUG_LOG() << Q_FUNC_INFO << " continue, curAssignment " << assignment->getId();
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " continue, curAssignment " << assignment->getId();
       continue;
     }
 
@@ -515,7 +514,7 @@ void ShootbackController::updateInternalLos(const QSet<int> &changingAssignmentI
     const int areaId = assignmentData.areaId();
     if (!idIsRelevantHelper(changingAreaIds, areaId))
     {
-      DEBUG_LOG() << Q_FUNC_INFO << " continue, curAssignment " << assignment->getId();
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " continue, curAssignment " << assignment->getId();
       continue;
     }
 
@@ -524,7 +523,7 @@ void ShootbackController::updateInternalLos(const QSet<int> &changingAssignmentI
     const int targetDataId = m_handlerShootbackTarget->targetDataIdForTargetParticipantId(targetParticpantId);
     if (!idIsRelevantHelper(changingTartgetIds, targetDataId))
     {
-      DEBUG_LOG() << Q_FUNC_INFO << " continue, curAssignment " << assignment->getId()
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " continue, curAssignment " << assignment->getId()
                           << ", changingTartgetIds=" << toString(changingTartgetIds)
                           << ", targetParticpantId=" << targetParticpantId
                           << ", targetDataId=" << targetDataId;
@@ -536,13 +535,13 @@ void ShootbackController::updateInternalLos(const QSet<int> &changingAssignmentI
     {
       // Note: m_participantsPerArea is up-to-date
       QSet<int> areasWithPart = areasWithParticipant(changedParticipantId);
-      DEBUG_LOG() << Q_FUNC_INFO << " areasWithPart=" << areasWithPart.size();
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " areasWithPart=" << areasWithPart.size();
       for (auto curAreaId : std::as_const(areasWithPart))
-        DEBUG_LOG() << Q_FUNC_INFO << "  -> curAreaId=" << curAreaId;
+        DEBUG_LOG(m_logger) << Q_FUNC_INFO << "  -> curAreaId=" << curAreaId;
 
       if (!idIsRelevantHelper(areasWithPart, areaId))
       {
-        DEBUG_LOG() << Q_FUNC_INFO << " continue, curAssignment " << assignment->getId();
+        DEBUG_LOG(m_logger) << Q_FUNC_INFO << " continue, curAssignment " << assignment->getId();
         continue;
       }
     }
@@ -551,11 +550,11 @@ void ShootbackController::updateInternalLos(const QSet<int> &changingAssignmentI
     // one assignment -> single target, single area, some participants (which are in that single area):
 
     if (!updateInternalLosSingleAssignment(assignment))
-      ERROR_LOG() << Q_FUNC_INFO << " updateInternalLosSingleAssignment failed, assignmentId=" << assignment->getId();
+      ERROR_LOG(m_logger) << Q_FUNC_INFO << " updateInternalLosSingleAssignment failed, assignmentId=" << assignment->getId();
 
   } // for
 
-  TRACE_LOG() << Q_FUNC_INFO << " END"
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END"
                       << ", changingAssigmentIds=" << changingAssignmentIds.size()
                       << ", changingAreaIds=" << changingAreaIds.size()
                       << ", changingTartgetIds=" << changingTartgetIds.size()
@@ -567,14 +566,14 @@ bool ShootbackController::updateInternalLosSingleAssignment(ObjectTargetAreaAssi
   if (!assignment)
     return false;
   const int assignmentId = assignment->getId();
-  TRACE_LOG() << Q_FUNC_INFO << " START, assignmentId=" << assignmentId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, assignmentId=" << assignmentId;
 
 
   const TargetAreaAssignment &assignmentData = assignment->getData();
   const int areaId       = assignmentData.areaId();
   const int targetParticipantId = assignmentData.targetParticipantId();
 
-  DEBUG_LOG() << Q_FUNC_INFO << " START, assignmentId=" << assignmentId
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, assignmentId=" << assignmentId
                       << ", areaId = " << areaId
                       << ", targetParticipantId = " << targetParticipantId;
 
@@ -585,14 +584,14 @@ bool ShootbackController::updateInternalLosSingleAssignment(ObjectTargetAreaAssi
     // Neverless, for this assignment -> area there are no participants visible:
     // clear container:
     m_visibleParticipantsPerAssignment[assignmentId] = {};
-    ERROR_LOG() << Q_FUNC_INFO << " no area for areaId=" << areaId;
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no area for areaId=" << areaId;
     return false;
   }
 
   ObjectShootbackTarget *target = m_handlerShootbackTarget->dataForTargetParticipantId(targetParticipantId);
   if (!target)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " no target for targetParticipantId=" << targetParticipantId;
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " no target for targetParticipantId=" << targetParticipantId;
     return false;
   }
 
@@ -604,7 +603,7 @@ bool ShootbackController::updateInternalLosSingleAssignment(ObjectTargetAreaAssi
     for (auto participantId : std::as_const(partIdRef))
     {
       // check lineOfSight:
-      DEBUG_LOG() << Q_FUNC_INFO << " check lineOfSight for: assignmentId=" << assignmentId
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " check lineOfSight for: assignmentId=" << assignmentId
                           << ", areaId = " << areaId
                           << ", targetParticipantId = " << targetParticipantId
                           << ", participantId=" << participantId;
@@ -619,13 +618,13 @@ bool ShootbackController::updateInternalLosSingleAssignment(ObjectTargetAreaAssi
 
       if (participantPos.participantId() != participantId)
       {
-        ERROR_LOG() << Q_FUNC_INFO << " no position for participantId=" << participantId;
+        ERROR_LOG(m_logger) << Q_FUNC_INFO << " no position for participantId=" << participantId;
         return false;
       }
       const Core::GeoPosition &participantGeoPos = participantPos.pos();
 
       bool visi = lineOfSight(sbTargetGeoPos, participantGeoPos);
-      DEBUG_LOG() << Q_FUNC_INFO << " current targetId = " << target->getId() << " visi = " << visi;
+      DEBUG_LOG(m_logger) << Q_FUNC_INFO << " current targetId = " << target->getId() << " visi = " << visi;
 
       if (visi)
         visiPartCont.insert(participantId);
@@ -635,19 +634,19 @@ bool ShootbackController::updateInternalLosSingleAssignment(ObjectTargetAreaAssi
 
   } // if (m_participantsPerArea.contains(areaId))
 
-  DEBUG_LOG() << Q_FUNC_INFO << " assignmentId = " << assignmentId
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " assignmentId = " << assignmentId
                       << " visiPartCont.size() " << visiPartCont.size();
 
   // store at member
   m_visibleParticipantsPerAssignment[assignmentId] = visiPartCont;
 
-  TRACE_LOG() << Q_FUNC_INFO << " END, assignmentId=" << assignmentId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, assignmentId=" << assignmentId;
   return true;
 }
 
 QSet<int> ShootbackController::visibleParticipantsPerTargetParticipantId(int targetParticipantId)
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START, targetParticipantId = " << targetParticipantId;
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, targetParticipantId = " << targetParticipantId;
 
   QSet<int> visiPartPerTarget;
 
@@ -658,19 +657,19 @@ QSet<int> ShootbackController::visibleParticipantsPerTargetParticipantId(int tar
       visiPartPerTarget += m_visibleParticipantsPerAssignment[assignmentId];
   }
 
-  TRACE_LOG() << Q_FUNC_INFO << " END, targetParticipantId = " << targetParticipantId
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, targetParticipantId = " << targetParticipantId
                       << ", visiPartPerTarget = " << toString(visiPartPerTarget);
   return visiPartPerTarget;
 }
 
 void ShootbackController::syncExternal()
 {
-  TRACE_LOG() << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
   // loop over all targets
   const QHash<int, ObjectShootbackTarget *> &allTargets = m_handlerShootbackTarget->getObjectMap();
 
-  INFO_LOG() << Q_FUNC_INFO << " allTargets.size() " << allTargets.size();
+  INFO_LOG(m_logger) << Q_FUNC_INFO << " allTargets.size() " << allTargets.size();
 
   for (ObjectShootbackTarget *target : allTargets)
   {
@@ -680,7 +679,7 @@ void ShootbackController::syncExternal()
     const QSet<int> &visiPartPerTarget = visibleParticipantsPerTargetParticipantId(target->getTargetParticipantId()); // QSet -> unique and sorted
     std::vector<int32_t> visiPartPerTargetStd;
     visiPartPerTargetStd.reserve(visiPartPerTarget.size());
-    INFO_LOG() << Q_FUNC_INFO << " targetId " << target->getId() << ", visiPartPerTarget = " << toString(visiPartPerTarget);
+    INFO_LOG(m_logger) << Q_FUNC_INFO << " targetId " << target->getId() << ", visiPartPerTarget = " << toString(visiPartPerTarget);
     for (auto id : std::as_const(visiPartPerTarget))
       visiPartPerTargetStd.push_back(id);
 
@@ -689,26 +688,26 @@ void ShootbackController::syncExternal()
     if (visiPartPerTargetStd != sbTarget.visibleParticipants())
     {
       // data has changed
-      INFO_LOG() << Q_FUNC_INFO << " targetId differ -> updateObject..";
-      INFO_LOG() << Q_FUNC_INFO << " visiOld =" << toString(sbTarget.visibleParticipants());
-      INFO_LOG() << Q_FUNC_INFO << " visiNew =" << toString(visiPartPerTargetStd);
+      INFO_LOG(m_logger) << Q_FUNC_INFO << " targetId differ -> updateObject..";
+      INFO_LOG(m_logger) << Q_FUNC_INFO << " visiOld =" << toString(sbTarget.visibleParticipants());
+      INFO_LOG(m_logger) << Q_FUNC_INFO << " visiNew =" << toString(visiPartPerTargetStd);
       target->updateVolatileData(visiPartPerTargetStd);     // update and publish
     }
   } // for
 
-  TRACE_LOG() << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
 
 
 bool ShootbackController::lineOfSight(const Core::GeoPosition &observerPos, const Core::GeoPosition &targetPos) const
 {
-  DEBUG_LOG() << Q_FUNC_INFO << " calculate m_losCalculation = " << m_losCalculation
+  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " calculate m_losCalculation = " << m_losCalculation
                       << ", observerPos=" << observerPos
                       << ", targetPos=" << targetPos;
 
   if (!m_losCalculation)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " Error: no m_losCalculation";
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " Error: no m_losCalculation";
     return false;
   }
 
@@ -720,7 +719,7 @@ bool ShootbackController::lineOfSight(const Core::GeoPosition &observerPos, cons
 
   if (!success)
   {
-    ERROR_LOG() << Q_FUNC_INFO << " calculate failed:"
+    ERROR_LOG(m_logger) << Q_FUNC_INFO << " calculate failed:"
                         << " observerPos=" << observerPos
                         << " targetPos=" << targetPos;
     return false;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/shootback_controller.h b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/shootback_controller.h
index 923c78df8..f32ae348f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/shootback_controller.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/shootback_controller.h
@@ -61,6 +61,7 @@ protected Q_SLOTS:
   void onParticipantPositionChanged(const ParticipantManagement::ParticipantPosition &posData, DataModification modType);
 
 protected:
+  NGL::INGLLogger &m_logger;
   bool participantPositionTopicIsValid(const ParticipantManagement::ParticipantPosition &posData);
   bool isTarget(qint32 participantId, bool &bIsTarget) const;
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/avs_interface.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/avs_interface.cpp
index fddd62e6e..de1b70b5c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/avs_interface.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/avs_interface.cpp
@@ -17,16 +17,15 @@
 namespace VideoOverlayManagement
 {
 
-AvsInterface::AvsInterface(bool enableTryReconnect, QObject *parent)
-  : QObject(parent)
+AvsInterface::AvsInterface(bool enableTryReconnect, QObject *parent) : QObject(parent)
   , m_waitTime(1)
   , m_enableTryReconnect(enableTryReconnect)
   , m_tryReconnect(false)
   , m_avsKeepAliveTimer(new QTimer(this))
   , m_keepAliveTime(Settings::getAvsKeepAliveTime())
   , m_avsIfConnectionState(AvsIfConnectionState::Undefined)
-  , m_socket(nullptr)
-{
+  , m_socket(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   doConnect();
 
   connect(m_avsKeepAliveTimer, &QTimer::timeout,
@@ -45,7 +44,7 @@ AvsInterface::~AvsInterface()
 
 void AvsInterface::doConnect()
 {
-  DEBUG_LOG() << "doConnect TCP-Socket ";
+  DEBUG_LOG(m_logger) << "doConnect TCP-Socket ";
 
   if (m_socket)
     m_socket->deleteLater();
@@ -62,7 +61,7 @@ void AvsInterface::doConnect()
 
   if (m_tryReconnect)
   {
-    INFO_LOG() << "Try reconnect to host: " << m_hostName
+    INFO_LOG(m_logger) << "Try reconnect to host: " << m_hostName
                        << " port: " << m_hostPort
                        << " ip-address: " << m_ipAddressDNS;
 
@@ -78,12 +77,12 @@ void AvsInterface::start(const QString &hostName, quint16 port)
   const QList<QHostAddress> ipList = hostInfo.addresses();
   if (ipList.isEmpty())
   {
-    ERROR_LOG() << "Non ip-address found for hostname: " << hostName;
+    ERROR_LOG(m_logger) << "Non ip-address found for hostname: " << hostName;
     m_ipAddressDNS.clear();
   }
   else
   {
-    INFO_LOG() << "Try connect to AVS: " << hostName
+    INFO_LOG(m_logger) << "Try connect to AVS: " << hostName
                        << " port: " << port
                        << " ip-address: " << ipList.at(0).toString();
 
@@ -97,7 +96,7 @@ void AvsInterface::start(const QString &hostName, quint16 port)
 
 void AvsInterface::onConnected()
 {
-  INFO_LOG() << "Connected to "
+  INFO_LOG(m_logger) << "Connected to "
                      << m_socket->peerAddress().toString()
                      << ":" << m_socket->peerPort();
   m_waitTime = 1;
@@ -112,7 +111,7 @@ void AvsInterface::onConnected()
 
 void AvsInterface::onDisonnected()
 {
-  INFO_LOG() << "Disconnected from " << m_socket->peerAddress().toString()
+  INFO_LOG(m_logger) << "Disconnected from " << m_socket->peerAddress().toString()
                      << ":" << m_socket->peerPort();
 
   m_avsKeepAliveTimer->stop();
@@ -125,7 +124,7 @@ void AvsInterface::onError(QAbstractSocket::SocketError err)
 {
   if (m_enableTryReconnect)
   {
-    ERROR_LOG() << "Socket error: " << err
+    ERROR_LOG(m_logger) << "Socket error: " << err
                         << " \""  << m_socket->errorString() << "\""
                         << " Hostname: " << m_hostName
                         << " Port:" << m_hostPort
@@ -134,7 +133,7 @@ void AvsInterface::onError(QAbstractSocket::SocketError err)
   }
   else
   {
-    ERROR_LOG() << "Socket error: " << err
+    ERROR_LOG(m_logger) << "Socket error: " << err
                         << " \""  << m_socket->errorString() << "\""
                         << " Hostname: " << m_hostName
                         << " Port:" << m_hostPort
@@ -179,7 +178,7 @@ void AvsInterface::onReadyRead()
     if (data.isEmpty())
       continue;
 
-    INFO_LOG() << "Incoming RCP_AVA: '" << data << "'";
+    INFO_LOG(m_logger) << "Incoming RCP_AVA: '" << data << "'";
     int cmdNr = -1;
     bool bOk = false;
 
@@ -236,11 +235,11 @@ bool AvsInterface::sendCommand(const QByteArray &qba)
 {
   bool bOk = true;
 
-  INFO_LOG() << "Send command: " << qba.trimmed();
+  INFO_LOG(m_logger) << "Send command: " << qba.trimmed();
 
   if (m_socket->state() != QTcpSocket::ConnectedState)
   {
-    ERROR_LOG() << "sendCommand()"
+    ERROR_LOG(m_logger) << "sendCommand()"
                         << " '" << qba.trimmed()
                         << "' No socket connection established.";
     return false;
@@ -251,7 +250,7 @@ bool AvsInterface::sendCommand(const QByteArray &qba)
   if (trxBytes != qba.size())
   {
     bOk = false;
-    ERROR_LOG() << "Insufficient number of tansfered bytes."
+    ERROR_LOG(m_logger) << "Insufficient number of tansfered bytes."
                         << " Soll: " << trxBytes << " Ist: " << qba.size();
   }
   m_socket->flush();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/avs_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/avs_interface.h
index d66ebf57a..07dfbd097 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/avs_interface.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/avs_interface.h
@@ -99,6 +99,8 @@ protected Q_SLOTS:
   void onAvsKeepAliveTimeout();
 
 private: // methode
+
+NGL::INGLLogger &m_logger;
   void tryReconnect();
 
 private: // attributes
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/dds_handler.cpp
index c9c67c27b..cec318fa7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/dds_handler.cpp
@@ -16,17 +16,17 @@ namespace VideoOverlayManagement
 DdsHandler::DdsHandler(int domainId, int exerciseId)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise, exerciseId))
 {
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 } // end of ctor()
 //-----------------------------------------------------------------------------
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
-  INFO_LOG() << "--- Start VideoOverlayManagement DDSHandler.";
+  INFO_LOG(m_logger) << "--- Start VideoOverlayManagement DDSHandler.";
 
   if (!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/dds_handler.h
index cbf19bd7d..ee9bd9aaa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/dds_handler.h
@@ -36,6 +36,7 @@ public:
   }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<Core::Pacemaker>            m_pacemaker;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_infrastructure_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_infrastructure_data.cpp
index 7bd65a1bf..21ca4c404 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_infrastructure_data.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_infrastructure_data.cpp
@@ -13,11 +13,10 @@
 
 using namespace VideoOverlayManagement;
 
-HandlerInfrastructureData::HandlerInfrastructureData(const std::shared_ptr<DdsHandler> &ddsHandler, QObject *parent)
-  : QObject(parent)
+HandlerInfrastructureData::HandlerInfrastructureData(const std::shared_ptr<DdsHandler> &ddsHandler, QObject *parent) : QObject(parent)
   , m_ddsHandler(ddsHandler)
-  , m_exerciseId(0)
-{
+  , m_exerciseId(0),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 } // end of ctor()
 //-----------------------------------------------------------------------------
 
@@ -33,7 +32,7 @@ bool HandlerInfrastructureData::init(int exerciseId)
   m_dtc = InfrastructureManagement::Interface::Dtc::create(m_ddsHandler->dds());
   if (m_dtc == nullptr)
   {
-    ERROR_LOG() << "Could not create DTC InfrastructureManagement";
+    ERROR_LOG(m_logger) << "Could not create DTC InfrastructureManagement";
     return false;
   }
 
@@ -44,7 +43,7 @@ bool HandlerInfrastructureData::init(int exerciseId)
       !m_dtc->waitForHistoricalDataMountingPointAsset() ||
       !m_dtc->waitForHistoricalDataInstrumentationAsset())
   {
-    ERROR_LOG() << "init() DTC InfrastructureManagement failed";
+    ERROR_LOG(m_logger) << "init() DTC InfrastructureManagement failed";
     return false;
   }
 
@@ -58,7 +57,7 @@ bool HandlerInfrastructureData::init(int exerciseId)
   };
   if (!m_dtc->getAllAssetsPerRoom(predicate, assetsMap))
   {
-    WARNING_LOG() << "HandlerInfrastructureData::getAllAssetsPerRoom() failed"
+    WARNING_LOG(m_logger) << "HandlerInfrastructureData::getAllAssetsPerRoom() failed"
                           << " assetsMap.size(): " << assetsMap.size();
   }
 
@@ -71,7 +70,7 @@ bool HandlerInfrastructureData::init(int exerciseId)
                           asset.availableInExercise().end(), m_exerciseId);
       if (it == asset.availableInExercise().end())
       {
-        DEBUG_LOG() << "Asset " << asset.id()
+        DEBUG_LOG(m_logger) << "Asset " << asset.id()
                             << " is not available in current exercise - skipping";
         continue;
       }
@@ -79,16 +78,16 @@ bool HandlerInfrastructureData::init(int exerciseId)
       m_roomId2CameraNameMap.insert(roomId, QString::fromStdString(asset.name()));
       // und fuer subscribe in m_assetId2RoomIdMap eintragen
       m_assetId2RoomIdMap.insert(asset.id(), roomId);
-      DEBUG_LOG() << " assetId: " << asset.id()
+      DEBUG_LOG(m_logger) << " assetId: " << asset.id()
                           << " mountingPointTypeId: " << asset.mountingPointTypeId()
                           << " name: " << asset.name();
     }
   }  // for(auto i = assetMap...
 
-  INFO_LOG() << "m_roomId2CameraNameMap.size(): " << m_roomId2CameraNameMap.size();
+  INFO_LOG(m_logger) << "m_roomId2CameraNameMap.size(): " << m_roomId2CameraNameMap.size();
   for (auto i = m_roomId2CameraNameMap.begin(); i != m_roomId2CameraNameMap.end(); ++i)
   {
-    INFO_LOG() << "roomId: " << i.key()
+    INFO_LOG(m_logger) << "roomId: " << i.key()
                        << " cameraName: " << i.value();
   }
 
@@ -100,7 +99,7 @@ bool HandlerInfrastructureData::init(int exerciseId)
   m_dtc->enableMainStructureElement(false);
   m_dtc->enableMountingPointAsset(false);
 
-  INFO_LOG() << "HandlerInfrastructureData::init() finished. "
+  INFO_LOG(m_logger) << "HandlerInfrastructureData::init() finished. "
                      << " m_roomId2CameraNameMap.size(): " << m_roomId2CameraNameMap.size();
   return true;
 } // end of init()
@@ -116,7 +115,7 @@ QString HandlerInfrastructureData::getStreamNameFromRoomId(int roomId) const
 {
   auto it = m_roomId2CameraNameMap.find(roomId);
   const QString qs(it == m_roomId2CameraNameMap.end() ? QString() : it.value());
-  DEBUG_LOG() << "streamName for roomId: " << roomId << " '" << qs << "' ";
+  DEBUG_LOG(m_logger) << "streamName for roomId: " << roomId << " '" << qs << "' ";
 
   return qs;
 } // end of getStreamNameFromRoomId()
@@ -128,7 +127,7 @@ void HandlerInfrastructureData::onAssetChanged(const InfrastructureManagement::I
   if (data.mountingPointTypeId() != InfrastructureManagement::MountingPointType::IndoorCamera)
     return;
 
-  INFO_LOG() << "onAssetChanged()"
+  INFO_LOG(m_logger) << "onAssetChanged()"
                      << " assetId: " << data.id()
                      << " name: " << data.name();
 
@@ -136,7 +135,7 @@ void HandlerInfrastructureData::onAssetChanged(const InfrastructureManagement::I
                       data.availableInExercise().end(), m_exerciseId);
   if (it == data.availableInExercise().end())
   {
-    DEBUG_LOG() << "Asset " << data.id()
+    DEBUG_LOG(m_logger) << "Asset " << data.id()
                         << " is not available in current exercise - skipping";
     return;
   }
@@ -146,7 +145,7 @@ void HandlerInfrastructureData::onAssetChanged(const InfrastructureManagement::I
 
   for (auto i = m_roomId2CameraNameMap.begin(); i != m_roomId2CameraNameMap.end(); ++i)
   {
-    DEBUG_LOG() << "m_roomId2CameraNameMap changed... "
+    DEBUG_LOG(m_logger) << "m_roomId2CameraNameMap changed... "
                         << " m_roomId2CameraNameMap.size(): " << m_roomId2CameraNameMap.size()
                         << " roomId: " << i.key()
                         << " cameraName: " << *i;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_infrastructure_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_infrastructure_data.h
index 615dfede3..73c817a6d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_infrastructure_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_infrastructure_data.h
@@ -56,6 +56,8 @@ private Q_SLOTS:
   void onAssetChanged(const InfrastructureManagement::InstrumentationAsset &data, DataModification modType);
 
 private: // methoden
+
+NGL::INGLLogger &m_logger;
   /**
     * Returns the room id for the given assetId
     * @param[in] assetId    Id of the asset to get the room id for
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_overlays.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_overlays.cpp
index 18dc8d3b7..0d8742708 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_overlays.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_overlays.cpp
@@ -19,13 +19,12 @@ HandlerOverlays::HandlerOverlays(AvsInterface *avsIf,
                                  const std::shared_ptr<HandlerParticipantData> &handlerParticipantData,
                                  const std::shared_ptr<HandlerInfrastructureData> &handlerInfrastructureData,
                                  int exerciseId,
-                                 QObject *parent)
-  : QObject(parent)
+                                 QObject *parent) : QObject(parent)
   , m_avsIf(avsIf)
   , m_handlerParticipantData(handlerParticipantData)
   , m_handlerInfrastructureData(handlerInfrastructureData)
-  , m_exerciseId(exerciseId)
-{
+  , m_exerciseId(exerciseId),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 } // end of ctor()
 //-----------------------------------------------------------------------------
 
@@ -36,7 +35,7 @@ HandlerOverlays::~HandlerOverlays()
 
 bool HandlerOverlays::init()
 {
-  INFO_LOG() << "Start VideoOverlay Handler.";
+  INFO_LOG(m_logger) << "Start VideoOverlay Handler.";
 
   // internal Signal/Slot connection (must be done before calling initParticipantsInRoomMap() !)
   connect(this, &HandlerOverlays::participantsInRoomMapChanged,
@@ -48,7 +47,7 @@ bool HandlerOverlays::init()
   connect(m_handlerParticipantData.get(), &HandlerParticipantData::participantPositionChanged,
           this, &HandlerOverlays::onParticipantPositionChanged);
 
-  INFO_LOG() << "VOM Handler initialized. ";
+  INFO_LOG(m_logger) << "VOM Handler initialized. ";
 
   return true;
 } // end of init()
@@ -56,7 +55,7 @@ bool HandlerOverlays::init()
 
 void HandlerOverlays::onParticipantPositionChanged(int oldRoomId, int newRoomId, int participantId)
 {
-  DEBUG_LOG() << "onParticipantPositionChanged() "
+  DEBUG_LOG(m_logger) << "onParticipantPositionChanged() "
                       << " oldRoomId: " << oldRoomId
                       << " newRoomId: " << newRoomId
                       << " participantId: " << participantId
@@ -72,7 +71,7 @@ void HandlerOverlays::onParticipantPositionChanged(int oldRoomId, int newRoomId,
 
 void HandlerOverlays::onParticipantsInRoomMapChanged(int roomId, const QSet<int> &participants)
 {
-  DEBUG_LOG() << "onParticipantsInRoomMapChanged() "
+  DEBUG_LOG(m_logger) << "onParticipantsInRoomMapChanged() "
                       << " roomId: " << roomId
                       << " partId: " << getAllEquipmentNumbers(participants, false)
                       << " eqNo: " << getAllEquipmentNumbers(participants, true)
@@ -81,7 +80,7 @@ void HandlerOverlays::onParticipantsInRoomMapChanged(int roomId, const QSet<int>
 
   if (!m_handlerInfrastructureData->isCameraAvailable(roomId))
   {
-    WARNING_LOG() << "onParticipantsInRoomMapChanged()  Non camera available in roomId: " << roomId << " No data will be send to AVS.";
+    WARNING_LOG(m_logger) << "onParticipantsInRoomMapChanged()  Non camera available in roomId: " << roomId << " No data will be send to AVS.";
     return;
   }
 
@@ -93,7 +92,7 @@ void HandlerOverlays::onParticipantsInRoomMapChanged(int roomId, const QSet<int>
 
   if (streamName.isEmpty())
   {
-    ERROR_LOG() << "onParticipantsInRoomMapChanged()  No streamName found for roomId: " << roomId << " No data will be send to AVS.";
+    ERROR_LOG(m_logger) << "onParticipantsInRoomMapChanged()  No streamName found for roomId: " << roomId << " No data will be send to AVS.";
     return;
   }
 
@@ -116,7 +115,7 @@ void HandlerOverlays::onParticipantsInRoomMapChanged(int roomId, const QSet<int>
   QByteArray qba = cmd.toLatin1();
   qba += "\r\n";
 
-  INFO_LOG() << "onParticipantsInRoomMapChanged() sendCommand: " << qba ;
+  INFO_LOG(m_logger) << "onParticipantsInRoomMapChanged() sendCommand: " << qba ;
   m_avsIf->sendCommand(qba);
 
   // room entry der keine participants enthaelt loeschen
@@ -137,7 +136,7 @@ void HandlerOverlays::initParticipantsInRoomMap()
 
 void HandlerOverlays::addPartIdToParticipantsInRoomMap(int roomId, int participantId)
 {
-  DEBUG_LOG() << "addPartIdToParticipantsInRoomMap() "
+  DEBUG_LOG(m_logger) << "addPartIdToParticipantsInRoomMap() "
                       << " roomId: " << roomId
                       << " participantId: " << participantId
                       ;
@@ -154,7 +153,7 @@ void HandlerOverlays::addPartIdToParticipantsInRoomMap(int roomId, int participa
   m_participantsInRoomMap.insert(roomId, participants);
 
   ///
-  DEBUG_LOG() << "emit participantsInRoomMapChanged()"
+  DEBUG_LOG(m_logger) << "emit participantsInRoomMapChanged()"
                       << " roomId: " << roomId
                       << " partId: " << getAllEquipmentNumbers(participants, false)
                       << " eqNo: " << getAllEquipmentNumbers(participants, true)
@@ -167,7 +166,7 @@ void HandlerOverlays::addPartIdToParticipantsInRoomMap(int roomId, int participa
 
 void HandlerOverlays::removePartIdFromParticipantsInRoomMap(int roomId, int participantId)
 {
-  DEBUG_LOG() << "removePartIdFromParticipantsInRoomMap() "
+  DEBUG_LOG(m_logger) << "removePartIdFromParticipantsInRoomMap() "
                       << " roomId: " << roomId
                       << " participantId: " << participantId
                       ;
@@ -181,7 +180,7 @@ void HandlerOverlays::removePartIdFromParticipantsInRoomMap(int roomId, int part
     participants.remove(participantId);
     m_participantsInRoomMap.insert(roomId, participants);
 
-    DEBUG_LOG() << "emit participantsInRoomMapChanged()"
+    DEBUG_LOG(m_logger) << "emit participantsInRoomMapChanged()"
                         << " roomId: " << roomId
                         << " partId: " << getAllEquipmentNumbers(participants, false)
                         << " eqNo: " << getAllEquipmentNumbers(participants, true)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_overlays.h b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_overlays.h
index 0941b45d3..65ef4e0a2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_overlays.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_overlays.h
@@ -62,6 +62,8 @@ private Q_SLOTS:
   void onParticipantsInRoomMapChanged(int roomId, const QSet<int> &participants);
 
 private: // methodes
+
+NGL::INGLLogger &m_logger;
   /**
     * Initialize 'participantsInRoomMap'
     */
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 0837aa0c6..d16696804 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
@@ -13,10 +13,9 @@
 
 using namespace VideoOverlayManagement;
 
-HandlerParticipantData::HandlerParticipantData(const std::shared_ptr<DdsHandler> &ddsHandler, QObject *parent)
-  : QObject(parent)
-  , m_ddsHandler(ddsHandler)
-{
+HandlerParticipantData::HandlerParticipantData(const std::shared_ptr<DdsHandler> &ddsHandler, QObject *parent) : QObject(parent)
+  , m_ddsHandler(ddsHandler),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 } // end of ctor()
 //-----------------------------------------------------------------------------
 
@@ -31,14 +30,14 @@ bool HandlerParticipantData::init()
   m_dtc = ParticipantManagement::Interface::Dtc::create(m_ddsHandler->dds());
   if (m_dtc == nullptr)
   {
-    ERROR_LOG() << "Could not create DTC ParticipantManagement";
+    ERROR_LOG(m_logger) << "Could not create DTC ParticipantManagement";
     return false;
   }
 
   // only subscribe to the topics we're interested in
   if (!m_dtc->enableParticipant() || !m_dtc->enableParticipantPosition())
   {
-    ERROR_LOG() << "init() DTC ParticipantManagement failed";
+    ERROR_LOG(m_logger) << "init() DTC ParticipantManagement failed";
     return false;
   }
 
@@ -60,7 +59,7 @@ bool HandlerParticipantData::init()
   };
   m_dtc->participantPositions(cbParticipantPos);
 
-  INFO_LOG() << "HandlerParticipantData::init() finished. "
+  INFO_LOG(m_logger) << "HandlerParticipantData::init() finished. "
                      << " m_partId2EquipNoMap.size(): " << m_partId2EquipNoMap.size()
                      << " m_participantsPositionMap.size(): " << m_participantsPositionMap.size();
   return true;
@@ -87,7 +86,7 @@ QMap<int, int> HandlerParticipantData::getAllAssignedParticipants() const
 
 void HandlerParticipantData::onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType)
 {
-  INFO_LOG() << "onParticipantChanged() participantId:" << data.id();
+  INFO_LOG(m_logger) << "onParticipantChanged() participantId:" << data.id();
 
   if (modType != DataModification::eRemoved && data.equipmentNumber().is_set())
     m_partId2EquipNoMap.insert(data.id(), data.equipmentNumber().get());
@@ -97,7 +96,7 @@ void HandlerParticipantData::onParticipantChanged(const ParticipantManagement::P
   if (m_logger.isDebugEnabled())
   {
     for (auto i = m_partId2EquipNoMap.begin(); i != m_partId2EquipNoMap.end(); ++i)
-      DEBUG_LOG() << " partId2EquipNoMap.size(): " << m_partId2EquipNoMap.size()
+      DEBUG_LOG(m_logger) << " partId2EquipNoMap.size(): " << m_partId2EquipNoMap.size()
                           << " partId: " << i.key()
                           << " eqNo: " << i.value();
   }
@@ -116,7 +115,7 @@ void HandlerParticipantData::onParticipantPositionChanged(const ParticipantManag
   if (newRoomId != oldRoomId)
     emit participantPositionChanged(oldRoomId, newRoomId, data.participantId());
 
-  INFO_LOG() << "onParticipantPositionChanged()"
+  INFO_LOG(m_logger) << "onParticipantPositionChanged()"
                      << " oldRoomId: " << oldRoomId
                      << " newRoomId: " << newRoomId
                      << " participantId: " << data.participantId();
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_participant_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_participant_data.h
index 9506a474f..b9aace986 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_participant_data.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_participant_data.h
@@ -60,6 +60,8 @@ private Q_SLOTS:
 
 private: // methoden
 
+
+NGL::INGLLogger &m_logger;
 private: // attributes
   std::shared_ptr<DdsHandler>                       m_ddsHandler;  ///< Pointer to VOM DDS handler
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/main_handler.cpp
index 7fbff7182..225333d22 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/main_handler.cpp
@@ -15,8 +15,7 @@
 
 using namespace VideoOverlayManagement;
 
-MainHandler::MainHandler(QObject *parent)
-  : QObject(parent)
+MainHandler::MainHandler(QObject *parent) : QObject(parent)
   , m_exerciseId(0)
   , m_avsIf(new AvsInterface(true, this))
   , m_avsConnectionState(AvsIfConnectionState::Undefined)
@@ -26,8 +25,8 @@ MainHandler::MainHandler(QObject *parent)
   , m_handlerOverlays(nullptr)
   , m_checkConnectTimer(new QTimer(this))
   , m_keepAliveTriggerTimer(new QTimer(this))
-  , m_bAvsSocketWarnedOnce(false)
-{
+  , m_bAvsSocketWarnedOnce(false),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 } // end of ctor()
 //-----------------------------------------------------------------------------
 
@@ -39,14 +38,14 @@ MainHandler::~MainHandler()
 
 bool MainHandler::init(int domainId, int exerciseId)
 {
-  INFO_LOG() << "Start VideoOverlayManagement MainHandler.";
+  INFO_LOG(m_logger) << "Start VideoOverlayManagement MainHandler.";
 
   m_exerciseId = exerciseId;
 
   // init AVS-Interface
   QString hostName = Settings::getAvsHostname();
   quint16 port = Settings::getAvsAvaPort();
-  INFO_LOG() << "Init AVS-Interface Hostname/Ip:" << hostName
+  INFO_LOG(m_logger) << "Init AVS-Interface Hostname/Ip:" << hostName
                      << " Port: " << port;
 
   m_avsIf->start(hostName, port);
@@ -68,7 +67,7 @@ bool MainHandler::init(int domainId, int exerciseId)
   m_ddsHandler.reset(new DdsHandler(domainId, exerciseId));
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation DdsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
     if (m_ddsHandler->pacemaker())
       m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
@@ -79,7 +78,7 @@ bool MainHandler::init(int domainId, int exerciseId)
 
   if (!m_handlerParticipantData->init())
   {
-    ERROR_LOG() << "Initialisation HandlerPlayerData failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerPlayerData failed.";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
   }
@@ -89,7 +88,7 @@ bool MainHandler::init(int domainId, int exerciseId)
 
   if (!m_handlerInfrastructureData->init(m_exerciseId))
   {
-    ERROR_LOG() << "Initialisation HandlerInfrastructreData failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerInfrastructreData failed.";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
   }
@@ -99,7 +98,7 @@ bool MainHandler::init(int domainId, int exerciseId)
           this, &MainHandler::onTryToInitOverlayHandler);
   m_checkConnectTimer->start(1000);
 
-  INFO_LOG() << "VOM Handler initialized. (Connection to AVS may be still pending) ";
+  INFO_LOG(m_logger) << "VOM Handler initialized. (Connection to AVS may be still pending) ";
   m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Starting);
 
   return true;
@@ -114,7 +113,7 @@ bool MainHandler::onTryToInitOverlayHandler()
     if (!m_bAvsSocketWarnedOnce)
     {
       m_bAvsSocketWarnedOnce = true;
-      WARNING_LOG() << "MainHandler::onTryToInitOverlayHandler()"
+      WARNING_LOG(m_logger) << "MainHandler::onTryToInitOverlayHandler()"
                             << " Wait for AvsIfConnectionState::Connected... ";
     }
     return false;
@@ -128,12 +127,12 @@ bool MainHandler::onTryToInitOverlayHandler()
 
   if (!m_handlerOverlays->init())
   {
-    ERROR_LOG() << "Initialisation HandlerOverlays failed.";
+    ERROR_LOG(m_logger) << "Initialisation HandlerOverlays failed.";
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StoppedError);
     return false;
   }
 
-  INFO_LOG() << "VOM Handler initialized. (Connection to AVS established) ";
+  INFO_LOG(m_logger) << "VOM Handler initialized. (Connection to AVS established) ";
   m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
 
   return true;
@@ -145,7 +144,7 @@ void MainHandler::onAvsIfConnectionState(AvsIfConnectionState state)
   switch (state)
   {
   case AvsIfConnectionState::Connected:
-    INFO_LOG() << "AvsIfConnectionState::Connected ... start keepAliveTriggerTimer";
+    INFO_LOG(m_logger) << "AvsIfConnectionState::Connected ... start keepAliveTriggerTimer";
     m_keepAliveTriggerTimer->start(Settings::getAvsKeepAliveTriggerRequestTime());
     break;
   case AvsIfConnectionState::Disconnected:
@@ -155,13 +154,13 @@ void MainHandler::onAvsIfConnectionState(AvsIfConnectionState state)
     m_keepAliveTriggerTimer->stop();
     break;
   case AvsIfConnectionState::ConnectionError:
-    ERROR_LOG() << "AvsIfConnectionState::ConnectionError !";
+    ERROR_LOG(m_logger) << "AvsIfConnectionState::ConnectionError !";
     m_keepAliveTriggerTimer->stop();
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StoppedError);
     break;
   case AvsIfConnectionState::Undefined:
   default:
-    WARNING_LOG() << "Undefined AvsIfConnectionState !";
+    WARNING_LOG(m_logger) << "Undefined AvsIfConnectionState !";
     break;
   }
 } // end of onAvsIfConnectionState()
@@ -173,17 +172,17 @@ void MainHandler::onAvsCmdState(AvsCmdState state)
   switch (state)
   {
   case AvsCmdState::Ok:
-    INFO_LOG() << "AvsCmdState::Ok";
+    INFO_LOG(m_logger) << "AvsCmdState::Ok";
     bOk = true;
     break;
   case AvsCmdState::BadArguments:
-    WARNING_LOG() << "AvsCmdState::BadArguments";
+    WARNING_LOG(m_logger) << "AvsCmdState::BadArguments";
     break;
   case AvsCmdState::CommandNotStateValid:
-    WARNING_LOG() << "AvsCmdState::CommandNotStateValid";
+    WARNING_LOG(m_logger) << "AvsCmdState::CommandNotStateValid";
     break;
   case AvsCmdState::KeepAlive:
-    DEBUG_LOG() << "AvsCmdState::KeepAlive";
+    DEBUG_LOG(m_logger) << "AvsCmdState::KeepAlive";
     break;
   default:
     break;
@@ -199,7 +198,7 @@ void MainHandler::onAvsCmdState(AvsCmdState state)
 void MainHandler::onAvsKeepAliveTimeout()
 {
   // ToDo: Fehlermeldung an ServiceManagement senden
-  WARNING_LOG() << "AVS KeepAlive timeout !";
+  WARNING_LOG(m_logger) << "AVS KeepAlive timeout !";
 } // end of onAvsKeepAliveTimeout()
 //-----------------------------------------------------------------------------
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/main_handler.h
index 7b8796136..2ac970104 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/main_handler.h
@@ -51,6 +51,9 @@ private Q_SLOTS:
 
 
 private: // attributes
+
+
+NGL::INGLLogger &m_logger;
   int m_exerciseId;                                                       ///< Exercise id
   AvsInterface                              *m_avsIf;                     ///< Pointer to AVS-Interface
   AvsIfConnectionState                       m_avsConnectionState;        ///< AVS connection state
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/ModuleTests/whg_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/ModuleTests/whg_tests.cpp
index 148abf0c9..e11226ccf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/ModuleTests/whg_tests.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/ModuleTests/whg_tests.cpp
@@ -49,7 +49,7 @@ WhgTests::~WhgTests()
 //-----------------------------------------------------------------------------
 bool WhgTests::init(int domainId, int testId, int eqtTypeWhId, int injuryModelWhId, int equipNo, int boxId)
 {
-  INFO_LOG() << "WhgTests::init() "
+  INFO_LOG(m_logger) << "WhgTests::init() "
                      << " domainId:" << domainId                   
                      << " testId: " << testId
                      << " equipmentTypeWhId: " << eqtTypeWhId
@@ -70,24 +70,24 @@ bool WhgTests::init(int domainId, int testId, int eqtTypeWhId, int injuryModelWh
   m_ddsConnector->initPublisherSubscriber();
 
   // Access to FTC
-  DEBUG_LOG() << "create ftc";
+  DEBUG_LOG(m_logger) << "create ftc";
   m_ftc = WarehouseGuez::Interface::Ftc::create(m_ddsConnector);
-  DEBUG_LOG() << "init ftc";
+  DEBUG_LOG(m_logger) << "init ftc";
   bool bRet = m_ftc->enableAll();
-  DEBUG_LOG() << "init end - bRet = " << bRet;
+  DEBUG_LOG(m_logger) << "init end - bRet = " << bRet;
 
   // Access to DTC
-  DEBUG_LOG() << "create dtc";
+  DEBUG_LOG(m_logger) << "create dtc";
   m_dtc = WarehouseGuez::Interface::Dtc::create(m_ddsConnector);
-  DEBUG_LOG() << "init dtc";
+  DEBUG_LOG(m_logger) << "init dtc";
   bRet = m_dtc->enableAll();
-  DEBUG_LOG() << "init end - bRet = " << bRet;
+  DEBUG_LOG(m_logger) << "init end - bRet = " << bRet;
 
   connect(&m_wsClient, &QWebSocket::connected, this, &WhgTests::onConnected);
   connect(&m_wsClient, &QWebSocket::textMessageReceived, this, &WhgTests::onTextMessageReceived);
 
   int port = NGL::Connections::port(NGL::Connections::eConnection::LVS);
-  ERROR_LOG() << "Port:_ " << port;
+  ERROR_LOG(m_logger) << "Port:_ " << port;
   //QUrl url(QStringLiteral("ws://%1:%2").arg(QStringLiteral("localhost"), QString::number(9094)));
   QUrl url(QStringLiteral("ws://%1:%2").arg(QStringLiteral("localhost"), QString::number(port)));
 
@@ -98,20 +98,20 @@ bool WhgTests::init(int domainId, int testId, int eqtTypeWhId, int injuryModelWh
 
 void WhgTests::onConnected()
 {
-  ERROR_LOG() << "wsClient connected";
+  ERROR_LOG(m_logger) << "wsClient connected";
   startTest();
 }
 
 void WhgTests::onTextMessageReceived(const QString &msg)
 {
-  INFO_LOG() << "new text message: " << msg;
+  INFO_LOG(m_logger) << "new text message: " << msg;
 //QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
 
 //-----------------------------------------------------------------------------
 void WhgTests::startTest()
 {
-  INFO_LOG() << "startTest()"
+  INFO_LOG(m_logger) << "startTest()"
                      << " testId:" << m_testId
                      << " eqtTypeWhId:" << m_equipmentTypeWhId
                      ;
@@ -139,7 +139,7 @@ void WhgTests::startTest()
     QTimer::singleShot(0, this, &WhgTests::tryGetBiteData);
   else
   {
-    ERROR_LOG() << "Unknown test id " << m_testId;
+    ERROR_LOG(m_logger) << "Unknown test id " << m_testId;
     failExit();
   }
   //QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -153,10 +153,10 @@ void WhgTests::tryCreate()
   EquipmentTypeWh data;
   getEqtTypeWhCreateRequestData(data);
 
-  INFO_LOG() << "trying to send  create EquipmentTypeWh Request";
+  INFO_LOG(m_logger) << "trying to send  create EquipmentTypeWh Request";
   if (!m_ftc->modifyEquipmentTypeWhRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
 } // end of tryCreate()
@@ -168,10 +168,10 @@ void WhgTests::tryModify()
   EquipmentTypeWh data;
   getEqtTypeWhModifyRequestData(data);
 
-  INFO_LOG() << "trying to send ModifyEquipementTypeWhRequest for eqtTypeWhId:" << data.id();
+  INFO_LOG(m_logger) << "trying to send ModifyEquipementTypeWhRequest for eqtTypeWhId:" << data.id();
   if (!m_ftc->modifyEquipmentTypeWhRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting modify data for eqtTypeWhId:" << data.id();
+    ERROR_LOG(m_logger) << "Error requesting modify data for eqtTypeWhId:" << data.id();
     failExit();
   }
 } // end of tryModify()
@@ -184,10 +184,10 @@ void WhgTests::tryRemove()
 
   data.id(m_equipmentTypeWhId);
 
-  INFO_LOG() << "trying to send remove request for eqtTypeWhId:" << data.id();
+  INFO_LOG(m_logger) << "trying to send remove request for eqtTypeWhId:" << data.id();
   if (!m_ftc->removeEquipmentTypeWhRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting remove data for eqtTypeWhId:" << data.id();
+    ERROR_LOG(m_logger) << "Error requesting remove data for eqtTypeWhId:" << data.id();
     failExit();
   }
 } // end of tryRemove()
@@ -196,22 +196,22 @@ void WhgTests::tryRemove()
 void WhgTests::tryGetAllEquipmentTypesWh()
 {
   m_eTestStep = eGetAllEquipmentTypesWh;
-  DEBUG_LOG() << "trying to get all eqtTypesWh";
+  DEBUG_LOG(m_logger) << "trying to get all eqtTypesWh";
 
   m_dtc->waitForHistoricalDataEquipmentTypeWh();
   const QMap<qint32, WarehouseGuez::EquipmentTypeWh> map = m_dtc->equipmentTypeWhs();
   if (map.isEmpty())
   {
-    ERROR_LOG() << "Error requesting all eqtTypesWh data";
+    ERROR_LOG(m_logger) << "Error requesting all eqtTypesWh data";
     QTimer::singleShot(0, qApp, &QCoreApplication::quit);
     return;
   }
 
-  INFO_LOG() << "Amout of existing eqtTypesWh:" << map.size();
+  INFO_LOG(m_logger) << "Amout of existing eqtTypesWh:" << map.size();
   m_equipmentTypeWhId = map.firstKey();
   for (auto it = map.begin(); it != map.end(); ++it)
   {
-    INFO_LOG() << "whg(" << it.key() << ") :"
+    INFO_LOG(m_logger) << "whg(" << it.key() << ") :"
                        << " name:"            << it.value().name()
                        << " minEquipNo:"      << it.value().minEquipNo()
                        << " maxEquipNo:"      << it.value().maxEquipNo()
@@ -225,14 +225,14 @@ void WhgTests::tryGetAllEquipmentTypesWh()
 //-----------------------------------------------------------------------------
 void WhgTests::tryGetEquipmentTypeWh()
 {
-  DEBUG_LOG() << "trying to get eqtTypeWh with id:" << m_equipmentTypeWhId;
+  DEBUG_LOG(m_logger) << "trying to get eqtTypeWh with id:" << m_equipmentTypeWhId;
 
   if (m_testId > 1)
     m_eTestStep = eGetEquipmentTypeWh;
 
   if (m_equipmentTypeWhId < 0)
   {
-    ERROR_LOG() << "invalid eqtTypeWhId - test aborted.";
+    ERROR_LOG(m_logger) << "invalid eqtTypeWhId - test aborted.";
     failExit();
   }
 
@@ -241,12 +241,12 @@ void WhgTests::tryGetEquipmentTypeWh()
 
   if (data.id() < 0)
   {
-    ERROR_LOG() << "Error receiving data for equipmentTypeId " << m_equipmentTypeWhId << " returnVal:" << data.id();
+    ERROR_LOG(m_logger) << "Error receiving data for equipmentTypeId " << m_equipmentTypeWhId << " returnVal:" << data.id();
     failExit();
   }
   else
   {
-    INFO_LOG() << "whg(" << data.id() << ") :"
+    INFO_LOG(m_logger) << "whg(" << data.id() << ") :"
                        << " name:"            << data.name()
                        << " minEquipNo:"      << data.minEquipNo()
                        << " maxEquipNo:"      << data.maxEquipNo()
@@ -259,7 +259,7 @@ void WhgTests::tryGetEquipmentTypeWh()
     {
       if (! onCompareCreatedData(data))
       {
-        ERROR_LOG() << "Compare created data failed!";
+        ERROR_LOG(m_logger) << "Compare created data failed!";
         failExit();
       }
       else
@@ -272,7 +272,7 @@ void WhgTests::tryGetEquipmentTypeWh()
     {
       if (! onCompareModifiedData(data))
       {
-        ERROR_LOG() << "Compare modified data failed!";
+        ERROR_LOG(m_logger) << "Compare modified data failed!";
         failExit();
       }
       else
@@ -291,19 +291,19 @@ void WhgTests::tryGetEquipmentTypeWh()
 //-----------------------------------------------------------------------------
 void WhgTests::onModifyEquipmentTypeWhReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got onModifyEquipmentTypeWhReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got onModifyEquipmentTypeWhReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   m_equipmentTypeWhId = replyObject.id();
 
   if (replyObject.error())
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
     return;
   }
   else
-    INFO_LOG() << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
+    INFO_LOG(m_logger) << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
 
   if (m_testId == 0)
     //    QTimer::singleShot(0, this, &WhgTests::tryModify()));
@@ -317,17 +317,17 @@ void WhgTests::onModifyEquipmentTypeWhReply(const Core::FunctionReplyObject &rep
 //-----------------------------------------------------------------------------
 void WhgTests::onRemoveEquipmentTypeWhReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got removeReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   if (replyObject.error())
   {
-    ERROR_LOG() << "Error requesting remove data for eqtTypeWhId:" << replyObject.id();
+    ERROR_LOG(m_logger) << "Error requesting remove data for eqtTypeWhId:" << replyObject.id();
     failExit();
     return;
   }
   else
-    DEBUG_LOG() << "Requesting remove data for eqtTypeWhId:" << replyObject.id() << " ... ok.";
+    DEBUG_LOG(m_logger) << "Requesting remove data for eqtTypeWhId:" << replyObject.id() << " ... ok.";
 
 
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -337,19 +337,19 @@ void WhgTests::onRemoveEquipmentTypeWhReply(const Core::FunctionReplyObject &rep
 //-----------------------------------------------------------------------------
 void WhgTests::onModifyInjuryModelAgdusWhReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got onModifyInjuryModelAgdusWhReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got onModifyInjuryModelAgdusWhReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   m_injuryModelWhId = replyObject.id();
 
   if (replyObject.error())
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
     return;
   }
   else
-    DEBUG_LOG() << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
+    DEBUG_LOG(m_logger) << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
 
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 
@@ -358,17 +358,17 @@ void WhgTests::onModifyInjuryModelAgdusWhReply(const Core::FunctionReplyObject &
 //-----------------------------------------------------------------------------
 void WhgTests::onRemoveInjuryModelAgdusWhReply(const Core::FunctionReplyObject &replyObject)
 {
-  INFO_LOG() << "Got removeReply with id " << replyObject.id()
+  INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
                      << " and errorString " << replyObject.translated();
 
   if (replyObject.error())
   {
-    ERROR_LOG() << "Error requesting remove data for injuryModelWhId:" << replyObject.id();
+    ERROR_LOG(m_logger) << "Error requesting remove data for injuryModelWhId:" << replyObject.id();
     failExit();
     return;
   }
   else
-    DEBUG_LOG() << "Requesting remove data for injuryModelWhId:" << replyObject.id() << " ... ok.";
+    DEBUG_LOG(m_logger) << "Requesting remove data for injuryModelWhId:" << replyObject.id() << " ... ok.";
 
 
   QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -378,25 +378,25 @@ void WhgTests::onRemoveInjuryModelAgdusWhReply(const Core::FunctionReplyObject &
 //-----------------------------------------------------------------------------
 void WhgTests::onReceiveEqtTypeChanged(const EquipmentTypeWh &data, DataModification modType)
 {
-  INFO_LOG() << "onReceiveEqtTypeChanged()  eqtTypeWhId:" << data.id()
+  INFO_LOG(m_logger) << "onReceiveEqtTypeChanged()  eqtTypeWhId:" << data.id()
                      << " modificationType: = " << (int)modType<< " received";
 
   switch (modType)
   {
   case DataModification::eAdded:
-    INFO_LOG() << "*** EquipmentTypeWh added received. eqtTypeWhId:" << data.id();
+    INFO_LOG(m_logger) << "*** EquipmentTypeWh added received. eqtTypeWhId:" << data.id();
     break;
 
   case DataModification::eModified:
-    INFO_LOG() << "*** EquipmentTypeWh modified received. eqtTypeWhId:" << data.id();
+    INFO_LOG(m_logger) << "*** EquipmentTypeWh modified received. eqtTypeWhId:" << data.id();
     break;
 
   case DataModification::eRemoved:
-    INFO_LOG() << "*** EquipmentTypeWh removed received. eqtTypeWhId:" << data.id();
+    INFO_LOG(m_logger) << "*** EquipmentTypeWh removed received. eqtTypeWhId:" << data.id();
     break;
 
   default:
-    INFO_LOG() << "DataModification::" << modType << " not implemented";
+    INFO_LOG(m_logger) << "DataModification::" << modType << " not implemented";
   }
 
 } // end of onReceiveEqtTypeChanged()
@@ -448,7 +448,7 @@ void WhgTests::getInjuryModelWhModifyRequestData(InjuryModelAgdusWh &data)
 //-----------------------------------------------------------------------------
 bool WhgTests::onCompareCreatedData(EquipmentTypeWh &data)
 {
-  DEBUG_LOG() << "start onCompareCreatedData() for id :" << data.id();
+  DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id();
 
   // Vergleicht die zurueckgelesen Datan mit den statischen create Daten
 
@@ -469,14 +469,14 @@ bool WhgTests::onCompareCreatedData(EquipmentTypeWh &data)
     return false;
 
 
-  DEBUG_LOG() << "successfull finished onCompareCreatedData() for id :" << data.id();
+  DEBUG_LOG(m_logger) << "successfull finished onCompareCreatedData() for id :" << data.id();
 
   return true;
 } // end of onCompareCreatedData()
 
 bool WhgTests::onCompareCreatedData(InjuryModelAgdusWh &data)
 {
-  DEBUG_LOG() << "start onCompareCreatedData() for id :" << data.id();
+  DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id();
 
   // Vergleicht die zurueckgelesen Datan mit den statischen create Daten
 
@@ -493,7 +493,7 @@ bool WhgTests::onCompareCreatedData(InjuryModelAgdusWh &data)
   if (createData.description() != data.description())
     return false;
 
-  DEBUG_LOG() << "successfull finished onCompareCreatedData() for id :" << data.id();
+  DEBUG_LOG(m_logger) << "successfull finished onCompareCreatedData() for id :" << data.id();
 
   return true;
 } // end of onCompareCreatedData()
@@ -501,7 +501,7 @@ bool WhgTests::onCompareCreatedData(InjuryModelAgdusWh &data)
 //-----------------------------------------------------------------------------
 bool WhgTests::onCompareModifiedData(EquipmentTypeWh &data)
 {
-  DEBUG_LOG() << "start onCompareModifiedData() for id :" << data.id();
+  DEBUG_LOG(m_logger) << "start onCompareModifiedData() for id :" << data.id();
 
   EquipmentTypeWh modifyData;
 
@@ -522,7 +522,7 @@ bool WhgTests::onCompareModifiedData(EquipmentTypeWh &data)
   if (modifyData.vbAgdusId() != data.vbAgdusId())
     return false;
 
-  DEBUG_LOG() << "successfully finished onCompareModifiedData() for id :" << data.id();
+  DEBUG_LOG(m_logger) << "successfully finished onCompareModifiedData() for id :" << data.id();
 
   return true;
 } // end of onCompareModifiedData()
@@ -530,7 +530,7 @@ bool WhgTests::onCompareModifiedData(EquipmentTypeWh &data)
 //-----------------------------------------------------------------------------
 bool WhgTests::onCompareModifiedData(InjuryModelAgdusWh &data)
 {
-  DEBUG_LOG() << "start onCompareModifiedData() for id :" << data.id();
+  DEBUG_LOG(m_logger) << "start onCompareModifiedData() for id :" << data.id();
 
   InjuryModelAgdusWh modifyData;
 
@@ -548,7 +548,7 @@ bool WhgTests::onCompareModifiedData(InjuryModelAgdusWh &data)
   if (modifyData.description() != data.description())
     return false;
 
-  DEBUG_LOG() << "successfull finished onCompareModifiedData() for id :" << data.id();
+  DEBUG_LOG(m_logger) << "successfull finished onCompareModifiedData() for id :" << data.id();
 
   return true;
 } // end of onCompareModifiedData()
@@ -561,10 +561,10 @@ void WhgTests::tryCreateInjuryModel()
   InjuryModelAgdusWh data;
   getInjuryModelWhCreateRequestData(data);
 
-  INFO_LOG() << "trying to send modifyInjuryModelAgdusWhRequest with id = 0 (create)";
+  INFO_LOG(m_logger) << "trying to send modifyInjuryModelAgdusWhRequest with id = 0 (create)";
   if (!m_ftc->modifyInjuryModelAgdusWhRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting create data";
+    ERROR_LOG(m_logger) << "Error requesting create data";
     failExit();
   }
 } // end of tryCreateInjuryModel()
@@ -576,10 +576,10 @@ void WhgTests::tryModifyInjuryModel()
   InjuryModelAgdusWh data;
   getInjuryModelWhModifyRequestData(data);
 
-  ERROR_LOG() << "trying to send modifyInjuryModelAgdusWhRequest for injuryModelWhId:" << data.id();
+  ERROR_LOG(m_logger) << "trying to send modifyInjuryModelAgdusWhRequest for injuryModelWhId:" << data.id();
   if (!m_ftc->modifyInjuryModelAgdusWhRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting modify data for injuryModelWhId:" << data.id();
+    ERROR_LOG(m_logger) << "Error requesting modify data for injuryModelWhId:" << data.id();
     failExit();
   }
 } // end of tryModifyInjuryModel()
@@ -592,10 +592,10 @@ void WhgTests::tryRemoveInjuryModel()
 
   data.id(m_injuryModelWhId);
 
-  INFO_LOG() << "trying to send remove request for injuryModelWhId:" << data.id();
+  INFO_LOG(m_logger) << "trying to send remove request for injuryModelWhId:" << data.id();
   if (!m_ftc->removeInjuryModelAgdusWhRequest(data, this))
   {
-    ERROR_LOG() << "Error requesting remove data for injuryModelWhId:" << data.id();
+    ERROR_LOG(m_logger) << "Error requesting remove data for injuryModelWhId:" << data.id();
     failExit();
   }
 } // end of tryRemoveInjuryModel()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/ModuleTests/whg_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/ModuleTests/whg_tests.h
index f637cff6e..1c6b67f0e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/ModuleTests/whg_tests.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/ModuleTests/whg_tests.h
@@ -68,6 +68,7 @@ protected Q_SLOTS:
   void onReceiveEqtTypeChanged(const WarehouseGuez::EquipmentTypeWh &data, DataModification modType);
 
 protected:
+  NGL::INGLLogger &m_logger;
   // Callbackfunctions for FTC
   void onModifyEquipmentTypeWhReply(const Core::FunctionReplyObject &replyObject) override final;
   void onRemoveEquipmentTypeWhReply(const Core::FunctionReplyObject &replyObject) override final;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/data_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/data_manager.cpp
index fa20ba9e5..e131cccd2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/data_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/data_manager.cpp
@@ -90,7 +90,7 @@ LtsWebSocket::ReplyMessage *DataManager::equipmentTypes(const QString &uuid) con
 
 
   QJsonObject obj = eTypes.toJsonAll();
-  INFO_LOG() << "equipTypeMap.size: " << etMap.size() << ", " << QJsonDocument(obj).toJson();
+  INFO_LOG(m_logger) << "equipTypeMap.size: " << etMap.size() << ", " << QJsonDocument(obj).toJson();
   return new EquipmentTypesMessage(obj, uuid);
 }
 
@@ -98,7 +98,7 @@ void DataManager::newExerciseInformationsFromEXCON(const EXCON::Exercises &ex)
 {
   const IWMS2ECC::exerciseMap exMap = ex.getExercises();
 
-  DEBUG_LOG() << "Exercises map.size: " << exMap.size();
+  DEBUG_LOG(m_logger) << "Exercises map.size: " << exMap.size();
 
   QVector<Database::Exercise> dataVec;
   m_mainHandler->db()->select(dataVec);
@@ -121,7 +121,7 @@ void DataManager::newExerciseInformationsFromEXCON(const EXCON::Exercises &ex)
 
     if (!ok)
     {
-      ERROR_LOG() << "Error while insert/update in exercise";
+      ERROR_LOG(m_logger) << "Error while insert/update in exercise";
       break;
     }
   }
@@ -175,15 +175,15 @@ void DataManager::participantsFromEXCON(const PlayerInfo &pl)
 
   if (plMap.isEmpty())
   {
-    DEBUG_LOG() << "No valid exercise -> no participants";
+    DEBUG_LOG(m_logger) << "No valid exercise -> no participants";
     return;
   }
 
   // first get exerciseId
   int exerciseId = plMap.firstKey() / s_exerciseOffset;
 
-  DEBUG_LOG() << "ExerciseId:   " << exerciseId;
-  DEBUG_LOG() << "plMap.size(): " << plMap.size();
+  DEBUG_LOG(m_logger) << "ExerciseId:   " << exerciseId;
+  DEBUG_LOG(m_logger) << "plMap.size(): " << plMap.size();
 
   // table is created at exercise creation
   QString tlnOut = tlnTable(exerciseId);
@@ -192,28 +192,28 @@ void DataManager::participantsFromEXCON(const PlayerInfo &pl)
 
   // If entries exist delete them
   QString stmt = QStringLiteral("DELETE FROM ") + tlnOut;
-  DEBUG_LOG() << "Executing delete statement: " << stmt;
+  DEBUG_LOG(m_logger) << "Executing delete statement: " << stmt;
   q.exec(stmt);
 
   stmt = QStringLiteral("INSERT INTO ") + tlnOut + QStringLiteral("( id, hierarchie,  typ_id,  ausstg_typ_id,  ausstg_nr,  zuordnung,  y_nr,  info,  loeschkennung,  zeit ) VALUES (" )
       + QStringLiteral(":id, :hierarchie, :typ_id, :ausstg_typ_id, :ausstg_nr, :zuordnung, :y_nr, :info, :loeschkennung, :zeit )");
 
-  DEBUG_LOG() << "Preparing insert statement: " << stmt;
+  DEBUG_LOG(m_logger) << "Preparing insert statement: " << stmt;
   q.prepare(stmt);
 
   for (const IWMS2ECC::PlayerInfo &pl : plMap)
   {
     bindPlayer(q, pl);
-    DEBUG_LOG() << "Executing insert statement for participant: " << pl.playerId;
+    DEBUG_LOG(m_logger) << "Executing insert statement for participant: " << pl.playerId;
 
     if (!q.exec())
-      ERROR_LOG() << "Error inserting data for participantId: " << pl.playerId;
+      ERROR_LOG(m_logger) << "Error inserting data for participantId: " << pl.playerId;
   }
 }
 
 bool DataManager::participantFromEXCON(const IWMS2ECC::PlayerInfo &pl, int modType)
 {
-  DEBUG_LOG() << "IN participantFromEXCON: modType: " << modType << ", participantId: " << pl.playerId;
+  DEBUG_LOG(m_logger) << "IN participantFromEXCON: modType: " << modType << ", participantId: " << pl.playerId;
 
   DataModification modificationType = static_cast<DataModification>(modType);
   int exerciseId = pl.playerId / s_exerciseOffset;
@@ -221,7 +221,7 @@ bool DataManager::participantFromEXCON(const IWMS2ECC::PlayerInfo &pl, int modTy
 
   NSqlQuery q(m_mainHandler->db()->database());
 
-  DEBUG_LOG() << "Executing delete statement: " << QStringLiteral("DELETE FROM %1 WHERE id = %2").arg(tlnOut).arg(pl.playerId);
+  DEBUG_LOG(m_logger) << "Executing delete statement: " << QStringLiteral("DELETE FROM %1 WHERE id = %2").arg(tlnOut).arg(pl.playerId);
   q.exec(QStringLiteral("DELETE FROM %1 WHERE id = %2").arg(tlnOut).arg(pl.playerId));
 
   switch(modificationType)
@@ -234,16 +234,16 @@ bool DataManager::participantFromEXCON(const IWMS2ECC::PlayerInfo &pl, int modTy
         QStringLiteral(":id, :hierarchie, :typ_id, :ausstg_typ_id, :ausstg_nr, :zuordnung, :y_nr, :info, :loeschkennung, :zeit )");
     if (!q.prepare(stmt))
     {
-      ERROR_LOG() << "Error while preparing insert stmt: " << stmt;
+      ERROR_LOG(m_logger) << "Error while preparing insert stmt: " << stmt;
       return false;
     }
 
     bindPlayer(q, pl);
-    DEBUG_LOG() << "Executing insert statement: " << stmt;
+    DEBUG_LOG(m_logger) << "Executing insert statement: " << stmt;
 
     if (!q.exec())
     {
-      ERROR_LOG() << "Error inserting data for participantId: " << pl.playerId;
+      ERROR_LOG(m_logger) << "Error inserting data for participantId: " << pl.playerId;
       return false;
     }
     break;
@@ -257,7 +257,7 @@ bool DataManager::participantFromEXCON(const IWMS2ECC::PlayerInfo &pl, int modTy
 
 bool DataManager::exerciseChanged(const IWMS2ECC::Exercise &data, DataModification modType)
 {
-  DEBUG_LOG() << "IN exerciseChanged: id = "  << data.id << ", actExercise: " << data.actExercise;
+  DEBUG_LOG(m_logger) << "IN exerciseChanged: id = "  << data.id << ", actExercise: " << data.actExercise;
 
   Database::Exercise exData;
   exData.id = data.id;
@@ -276,7 +276,7 @@ bool DataManager::exerciseChanged(const IWMS2ECC::Exercise &data, DataModificati
     {
       if (!m_mainHandler->db()->update(exData))
       {
-        ERROR_LOG() << "Error while updating exerciseData for exercise: " << data.id;
+        ERROR_LOG(m_logger) << "Error while updating exerciseData for exercise: " << data.id;
         return false;
       }
     }
@@ -284,7 +284,7 @@ bool DataManager::exerciseChanged(const IWMS2ECC::Exercise &data, DataModificati
     {
       if (!m_mainHandler->db()->insert(exData))
       {
-        ERROR_LOG() << "Error while inserting exerciseData for exercise: " << data.id;
+        ERROR_LOG(m_logger) << "Error while inserting exerciseData for exercise: " << data.id;
         return false;
       }
       createTableTlnOut(exData.id);
@@ -296,7 +296,7 @@ bool DataManager::exerciseChanged(const IWMS2ECC::Exercise &data, DataModificati
   {
     if (!m_mainHandler->db()->update(exData))
     {
-      ERROR_LOG() << "Error while updating exerciseData for exercise: " << data.id;
+      ERROR_LOG(m_logger) << "Error while updating exerciseData for exercise: " << data.id;
       return false;
     }
     return true;
@@ -305,20 +305,20 @@ bool DataManager::exerciseChanged(const IWMS2ECC::Exercise &data, DataModificati
   {
     if (!m_mainHandler->db()->removeExercise(data.id))
     {
-      ERROR_LOG() << "Error while removing exerciseData for exercise: " << data.id;
+      ERROR_LOG(m_logger) << "Error while removing exerciseData for exercise: " << data.id;
       return false;
     }
     return true;
   }
   }
 
-  ERROR_LOG() << "DataModification Type: " << modType << " not handled in switch";
+  ERROR_LOG(m_logger) << "DataModification Type: " << modType << " not handled in switch";
   return false;
 }
 
 void DataManager::createTableTlnOut(int exerciseId)
 {
-  ERROR_LOG() << "createTableTlnOut";
+  ERROR_LOG(m_logger) << "createTableTlnOut";
   // xmlPath
   const QString xmlPath = NGL::directory(NGL::FileType::ConfigFile, QLatin1String("xml"));
   QString xmlFile = xmlPath + QStringLiteral("/whg.xml");
@@ -326,7 +326,7 @@ void DataManager::createTableTlnOut(int exerciseId)
   CodeGen::SqlGenerator sqlGen(xmlFile);
 
   QString tlnOut = tlnTable(exerciseId);
-  ERROR_LOG() << "tlnOut: " << tlnOut;
+  ERROR_LOG(m_logger) << "tlnOut: " << tlnOut;
 
   sqlGen.createStatementsForTable(QStringLiteral("tln"), tlnOut);
 
@@ -337,18 +337,18 @@ void DataManager::createTableTlnOut(int exerciseId)
   NSqlQuery q(m_mainHandler->db()->database());
   for (const QString &stmt : stmts.createTables)
   {
-    ERROR_LOG() << "stmt: " << stmt;
+    ERROR_LOG(m_logger) << "stmt: " << stmt;
     if (record.isEmpty())
     {
       if (!q.exec(stmt))
-        ERROR_LOG() << "Error executing stmt: " << stmt;
+        ERROR_LOG(m_logger) << "Error executing stmt: " << stmt;
     }
   }
 }
 
 void DataManager::createTableTlnZuordnung(int exerciseId)
 {
-  ERROR_LOG() << "in createTableTlnZuordnung";
+  ERROR_LOG(m_logger) << "in createTableTlnZuordnung";
   // xmlPath
   const QString xmlPath = NGL::directory(NGL::FileType::ConfigFile, QLatin1String("xml"));
   QString xmlFile = xmlPath + QStringLiteral("/whg.xml");
@@ -356,7 +356,7 @@ void DataManager::createTableTlnZuordnung(int exerciseId)
   CodeGen::SqlGenerator sqlGen(xmlFile);
 
   const QString tlnZuordnung = tlnZuordnungTable(exerciseId);
-  ERROR_LOG() << "tlnZuordnung: " << tlnZuordnung;
+  ERROR_LOG(m_logger) << "tlnZuordnung: " << tlnZuordnung;
   sqlGen.createStatementsForTable(QStringLiteral("tln_zuordnung"), tlnZuordnung);
 
   const CodeGen::SqlGenerator::SqlStatements stmts = sqlGen.getStatements(CodeGen::Global);
@@ -366,20 +366,20 @@ void DataManager::createTableTlnZuordnung(int exerciseId)
   NSqlQuery q(m_mainHandler->db()->database());
   for (const QString &stmt : stmts.createTables)
   {
-    DEBUG_LOG() << "stmt: " << stmt;
+    DEBUG_LOG(m_logger) << "stmt: " << stmt;
     if (record.isEmpty())
     {
       if (!q.exec(stmt))
-        ERROR_LOG() << "Error executing stmt: " << stmt;
+        ERROR_LOG(m_logger) << "Error executing stmt: " << stmt;
     }
   }
   for (const QString &stmt : stmts.createSequences)
   {
-    DEBUG_LOG() << "stmt: " << stmt;
+    DEBUG_LOG(m_logger) << "stmt: " << stmt;
     if (record.isEmpty())
     {
       if (!q.exec(stmt))
-        ERROR_LOG() << "Error executing stmt: " << stmt;
+        ERROR_LOG(m_logger) << "Error executing stmt: " << stmt;
     }
   }
 
@@ -396,7 +396,7 @@ void DataManager::createTriggerForExercise(NSqlQuery &q, int exerciseId)
   stmt = QLatin1String("DROP TRIGGER IF EXISTS ") + triggerNameExercise +
       QLatin1String(" ON ") + tlnZuordnungTableExercise;
   if (!q.exec(stmt))
-    ERROR_LOG() << "Error dropping possible old trigger: " << stmt;
+    ERROR_LOG(m_logger) << "Error dropping possible old trigger: " << stmt;
 
   // Create trigger
   stmt = QLatin1String("CREATE OR REPLACE FUNCTION public.") + triggerNameExercise +
@@ -408,14 +408,14 @@ void DataManager::createTriggerForExercise(NSqlQuery &q, int exerciseId)
                                                                                       "$$ LANGUAGE plpgsql;");
 
   if (!q.exec(stmt))
-    ERROR_LOG() << "Error while creating function in statement: " << stmt;
+    ERROR_LOG(m_logger) << "Error while creating function in statement: " << stmt;
 
   stmt = QLatin1String("CREATE TRIGGER ") + triggerNameExercise +
       QLatin1String(" AFTER INSERT ON ") + tlnZuordnungTableExercise +
       QLatin1String(" FOR EACH ROW EXECUTE PROCEDURE public.") + triggerNameExercise + QLatin1String("();");
 
   if (!q.exec(stmt))
-    ERROR_LOG() << "Error while creating trigger in statement: " << stmt;
+    ERROR_LOG(m_logger) << "Error while creating trigger in statement: " << stmt;
 
   QSqlDriver *driver = m_mainHandler->db()->database().driver();
 
@@ -424,14 +424,14 @@ void DataManager::createTriggerForExercise(NSqlQuery &q, int exerciseId)
           this, &DataManager::onNotification, Qt::UniqueConnection);
 
   if (!driver->subscribeToNotification(triggerNameExercise))
-    WARNING_LOG() << "Error subscribing to DB notification " << triggerNameExercise;
+    WARNING_LOG(m_logger) << "Error subscribing to DB notification " << triggerNameExercise;
   else
-    DEBUG_LOG() << "Sucessfully subscribed to DB notification " << triggerNameExercise;
+    DEBUG_LOG(m_logger) << "Sucessfully subscribed to DB notification " << triggerNameExercise;
 }
 
 void DataManager::onInsertParticipantAssignment(int participantId, int exerciseId)
 {
-  INFO_LOG() << "Reading ParticipantAssignment from database!";
+  INFO_LOG(m_logger) << "Reading ParticipantAssignment from database!";
 
   NSqlQuery q(m_mainHandler->db()->database());
 
@@ -445,7 +445,7 @@ void DataManager::onInsertParticipantAssignment(int participantId, int exerciseI
 
   if (!q.exec(stmt))
   {
-    ERROR_LOG() << "Error selecting data for participantId: " << participantId << ", exerciseId: " << exerciseId;
+    ERROR_LOG(m_logger) << "Error selecting data for participantId: " << participantId << ", exerciseId: " << exerciseId;
     return;
   }
 
@@ -454,7 +454,7 @@ void DataManager::onInsertParticipantAssignment(int participantId, int exerciseI
   {
     // use the 'correct' participant id in case participantId == 0 was given (happens during startup)
     participantId = q.value(0).toInt() - (exerciseId * s_exerciseOffset);
-    DEBUG_LOG() << "participantId: " << participantId;
+    DEBUG_LOG(m_logger) << "participantId: " << participantId;
 
     Registration reg;
     reg.setPlayerId(participantId);
@@ -472,7 +472,7 @@ void DataManager::onInsertParticipantAssignment(int participantId, int exerciseI
 
     Messages::ParticipantRegisterInExconRequest *msg = new Messages::ParticipantRegisterInExconRequest(reg.toJson(),
                                                                                                        QLatin1String("blub"));
-    INFO_LOG() << "registration: " << msg->toJsonString();
+    INFO_LOG(m_logger) << "registration: " << msg->toJsonString();
     m_webSocketServer->sendToAllClients(msg);
   }
 }
@@ -482,7 +482,7 @@ void DataManager::onNotification(const QString &name, QSqlDriver::NotificationSo
   Q_UNUSED(source);
   // search coresponding signal
 
-  INFO_LOG() << "IN onNotification name: " << name;
+  INFO_LOG(m_logger) << "IN onNotification name: " << name;
 
   const QString triggerNameEx0 = triggerName(0);
   if (name.contains(triggerNameEx0))
@@ -491,7 +491,7 @@ void DataManager::onNotification(const QString &name, QSqlDriver::NotificationSo
     name_ = name_.mid(triggerNameEx0.size() + 1);
     int exerciseId = name_.toInt();
     int participantId = payload.toInt();
-    INFO_LOG() << "exerciseId: " << exerciseId << ", participantId: " << participantId;
+    INFO_LOG(m_logger) << "exerciseId: " << exerciseId << ", participantId: " << participantId;
     onInsertParticipantAssignment(participantId, exerciseId);
   }
 }
@@ -512,7 +512,7 @@ void DataManager::reconnectSignals()
 
 void DataManager::registerReply(int exerciseId, qint32 participantId, int returnValue)
 {
-  DEBUG_LOG() << "registerReply for exercise id = " << exerciseId << ", participant id = " << participantId << ", return value = " << returnValue;
+  DEBUG_LOG(m_logger) << "registerReply for exercise id = " << exerciseId << ", participant id = " << participantId << ", return value = " << returnValue;
 
   NSqlQuery q(m_mainHandler->db()->database());
 
@@ -523,15 +523,15 @@ void DataManager::registerReply(int exerciseId, qint32 participantId, int return
       QLatin1String(" WHERE id = ") + QString::number(newParticipantId) +
       QLatin1String(" AND gesendet = false");
 
-  DEBUG_LOG() << "registerReply: stmt = " << stmt;
+  DEBUG_LOG(m_logger) << "registerReply: stmt = " << stmt;
   if (!q.exec(stmt))
   {
-    ERROR_LOG() << "Cannot update reply entry for participant: " << participantId
+    ERROR_LOG(m_logger) << "Cannot update reply entry for participant: " << participantId
                         << " in exercise: " << exerciseId << ", returnValue: " << returnValue;
   }
   else
   {
-    INFO_LOG() << "Update successful for participant " << participantId << " in exercise: " << exerciseId;
+    INFO_LOG(m_logger) << "Update successful for participant " << participantId << " in exercise: " << exerciseId;
   }
 
   if (returnValue != 0)
@@ -541,16 +541,16 @@ void DataManager::registerReply(int exerciseId, qint32 participantId, int return
         QLatin1String(" SET ausstg_nr = -1, zeit = ") + QString::number(QDateTime::currentDateTimeUtc().toMSecsSinceEpoch()) +
         QLatin1String(" WHERE id = ") + QString::number(newParticipantId);
 
-    DEBUG_LOG() << "registerReply: stmt1 = " << stmt1;
+    DEBUG_LOG(m_logger) << "registerReply: stmt1 = " << stmt1;
 
     if (!q.exec(stmt1))
     {
-      ERROR_LOG() << "Cannot update austtg_nr for participant: " << participantId
+      ERROR_LOG(m_logger) << "Cannot update austtg_nr for participant: " << participantId
                           << " in exercise: " << exerciseId << ", returnValue: " << returnValue;
     }
     else
     {
-      INFO_LOG() << "Update ausstg_nr successful for participant " << participantId << " in exercise: " << exerciseId;
+      INFO_LOG(m_logger) << "Update ausstg_nr successful for participant " << participantId << " in exercise: " << exerciseId;
     }
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/ws_base_data_interface_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/ws_base_data_interface_handler.cpp
index 041bfede1..bade5fed4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/ws_base_data_interface_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/ws_base_data_interface_handler.cpp
@@ -36,34 +36,34 @@ bool WsBaseDataInterfaceHandler::init()
 {
   cleanup();
 
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "... ok";
 
-  DEBUG_LOG() << "Initialising DataManager";
+  DEBUG_LOG(m_logger) << "Initialising DataManager";
   m_dataManager = new DataManager(m_mainHandler);
   if (!m_dataManager->init())
   {
-    ERROR_LOG() << "Failed to initialise DataManager";
+    ERROR_LOG(m_logger) << "Failed to initialise DataManager";
     return false;
   }
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "... ok";
 
 
   m_messageFactory = new Messages::ClientMessageFactory(m_dataManager);
 
   m_webSocketServer = new LtsWebSocket::LtsWebSocketServer(m_messageFactory, this);
 
-  DEBUG_LOG() << "Initialising LtsWebSocketServer";
+  DEBUG_LOG(m_logger) << "Initialising LtsWebSocketServer";
   int port = NGL::Connections::port(NGL::Connections::eConnection::ZSLV);
 
-  ERROR_LOG() << "Port: " << port;
+  ERROR_LOG(m_logger) << "Port: " << port;
   if (!m_webSocketServer->init(QStringLiteral("localhost"), port))
   {
-    ERROR_LOG() << "Failed to initialise LtsWebSocketServer";
+    ERROR_LOG(m_logger) << "Failed to initialise LtsWebSocketServer";
     return false;
   }
-  DEBUG_LOG() << "... ok";
+  DEBUG_LOG(m_logger) << "... ok";
 
-  DEBUG_LOG() << "Connection signals and slots";
+  DEBUG_LOG(m_logger) << "Connection signals and slots";
 
   m_dataManager->setWebSocketServer(m_webSocketServer);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Connection/client_connection.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Connection/client_connection.cpp
index f62c5c229..8f09d7fa9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Connection/client_connection.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Connection/client_connection.cpp
@@ -36,7 +36,7 @@ bool ClientConnection::init()
 {
   if (m_socket == nullptr)
   {
-    ERROR_LOG() << "Initialisation failed due to an invalid socket";
+    ERROR_LOG(m_logger) << "Initialisation failed due to an invalid socket";
     return false;
   }
 
@@ -57,17 +57,17 @@ void ClientConnection::addMessage(const WarehouseGuez::WsBiteInterface::Messages
   if (!m_socket || m_socket->state() != QAbstractSocket::ConnectedState)
   {
     m_messageQueue.enqueue(message);
-    DEBUG_LOG() << "Adding message to queue, size: " << m_messageQueue.size();
+    DEBUG_LOG(m_logger) << "Adding message to queue, size: " << m_messageQueue.size();
     return;
   }
   const QString msg(message.toJsonString());
-  TRACE_LOG() << "Send msg: " << msg;
+  TRACE_LOG(m_logger) << "Send msg: " << msg;
   m_socket->sendTextMessage(msg);
 }
 
 void ClientConnection::onNewTextMessageFromSocket(const QString &message)
 {
-  DEBUG_LOG() << "Recv msg: " << message;
+  DEBUG_LOG(m_logger) << "Recv msg: " << message;
   emit newTextMessage(this, message);
 }
 
@@ -79,15 +79,15 @@ void ClientConnection::sendMessagesFromQueue()
   {
     Messages::ReplyMessage message = m_messageQueue.dequeue();
     const QString msg(message.toJsonString());
-    TRACE_LOG() << "Send msg: " << msg;
+    TRACE_LOG(m_logger) << "Send msg: " << msg;
     m_socket->sendTextMessage(msg);
-    DEBUG_LOG() << "Sent message from queue, new size: " << m_messageQueue.size();
+    DEBUG_LOG(m_logger) << "Sent message from queue, new size: " << m_messageQueue.size();
   }
 }
 
 void ClientConnection::onSocketDisconnect()
 {
-  DEBUG_LOG() << "Client with ip "
+  DEBUG_LOG(m_logger) << "Client with ip "
                       << m_ip.toString()
                       << " disconnected";
   emit disconnected(this);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Connection/client_connection.h b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Connection/client_connection.h
index 888a82930..74ba5e842 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Connection/client_connection.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Connection/client_connection.h
@@ -46,6 +46,8 @@ private Q_SLOTS:
   void onSocketDisconnect();
 
 private: // methods
+
+NGL::INGLLogger &m_logger;
   void sendMessages();
 
 private: // attributes
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Connection/connection_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Connection/connection_handler.cpp
index f6fe77b2f..7e56bdae8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Connection/connection_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Connection/connection_handler.cpp
@@ -19,9 +19,8 @@
 
 using namespace WarehouseGuez::WsBiteInterface::Connection;
 
-ConnectionHandler::ConnectionHandler()
-  : m_server(nullptr)
-{
+ConnectionHandler::ConnectionHandler() : m_server(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 ConnectionHandler::~ConnectionHandler()
@@ -48,13 +47,13 @@ bool ConnectionHandler::init()
   // TODO: read port from config?
   int port = NGL::Connections::port(NGL::Connections::eConnection::LVS);
 
-  DEBUG_LOG() << "Trying to listen to port " << port;
+  DEBUG_LOG(m_logger) << "Trying to listen to port " << port;
   if (!m_server->listen(QHostAddress::Any, port))
   {
-    ERROR_LOG() << "Not possible to listen to port " << port;
+    ERROR_LOG(m_logger) << "Not possible to listen to port " << port;
     return false;
   }
-  DEBUG_LOG() << "... ok - port: " << port;
+  DEBUG_LOG(m_logger) << "... ok - port: " << port;
 
   return true;
 }
@@ -66,7 +65,7 @@ void ConnectionHandler::onNewMessage(WarehouseGuez::WsBiteInterface::Messages::M
 
 void ConnectionHandler::onServerError(QWebSocketProtocol::CloseCode closeCode)
 {
-  ERROR_LOG() << "Got server error with close code " << closeCode;
+  ERROR_LOG(m_logger) << "Got server error with close code " << closeCode;
 }
 
 void ConnectionHandler::onNewConnection()
@@ -78,7 +77,7 @@ void ConnectionHandler::onNewConnection()
 
     if (!newConnection->init())
     {
-      ERROR_LOG() << "Failed to initialise new client";
+      ERROR_LOG(m_logger) << "Failed to initialise new client";
       delete newConnection;
       newConnection = nullptr;
       continue;
@@ -88,7 +87,7 @@ void ConnectionHandler::onNewConnection()
     connect(newConnection, &ClientConnection::disconnected, this, &ConnectionHandler::onDisconnected);
 
     m_connections.append(newConnection);
-    DEBUG_LOG() << "New client with ip " << newConnection->ip().toString() << " connected";
+    DEBUG_LOG(m_logger) << "New client with ip " << newConnection->ip().toString() << " connected";
   }
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Connection/connection_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Connection/connection_handler.h
index 8a2530f97..3ce47be6f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Connection/connection_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Connection/connection_handler.h
@@ -50,6 +50,8 @@ private Q_SLOTS:
   void onDisconnected(ClientConnection *conn);
 
 private: // attributes
+
+NGL::INGLLogger &m_logger;
   QWebSocketServer *m_server;
   QVector<ClientConnection *> m_connections;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Messages/message_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Messages/message_handler.cpp
index 67e00dbd1..476f13247 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Messages/message_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Messages/message_handler.cpp
@@ -18,9 +18,8 @@ namespace WsBiteInterface
 namespace Messages
 {
 
-MessageHandler::MessageHandler(DataManager *dataManager)
-  : m_dataManager(dataManager)
-{
+MessageHandler::MessageHandler(DataManager *dataManager) : m_dataManager(dataManager),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   Q_ASSERT(dataManager);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Messages/message_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Messages/message_handler.h
index cf9281e04..6455e8c96 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Messages/message_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/Messages/message_handler.h
@@ -34,6 +34,8 @@ public Q_SLOTS:
   void onNewTextMessage(MessageTransmitter *transmitter, const QString &message);
 
 private:
+
+NGL::INGLLogger &m_logger;
   DataManager   *m_dataManager;
 };
 } // namespace Messages
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/bite_data_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/bite_data_manager.cpp
index 3102dee11..c7761328c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/bite_data_manager.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/bite_data_manager.cpp
@@ -44,7 +44,7 @@ DataManager::DataManager(std::shared_ptr<DdsHandler> ddsHandler)
    m_tabDtc = TrainingAreaBase::Interface::Dtc::create(m_ddsHandler->dds());
    if (m_tabDtc == nullptr)
    {
-     ERROR_LOG() << "Could not create DTC TrainingAreaBase";
+     ERROR_LOG(m_logger) << "Could not create DTC TrainingAreaBase";
      return;
    }
 
@@ -64,7 +64,7 @@ DataManager::~DataManager()
 
 void DataManager::onConnected()
 {
-  DEBUG_LOG() << "SCM websocket port connected";
+  DEBUG_LOG(m_logger) << "SCM websocket port connected";
 
   connect(m_scmWebSocket, &QWebSocket::textMessageReceived, this, &DataManager::onTextMessageFromScm);
 
@@ -81,26 +81,26 @@ void DataManager::onTimerTimeout()
 
 void DataManager::onTextMessageFromScm(const QString &message)
 {
-  DEBUG_LOG() << "onTextMessageFromScm from scm: " << message;
+  DEBUG_LOG(m_logger) << "onTextMessageFromScm from scm: " << message;
   const QJsonDocument doc = QJsonDocument::fromJson(message.toUtf8());
   const QJsonArray exercises = doc.object().value(DATA()).toArray();
   for (const QJsonValue &valEx : exercises)
   {
     const QJsonObject &exercise = valEx.toObject();
     const int exerciseId = exercise.value(EXERCISE_ID()).toInt();
-    DEBUG_LOG() << "textMessageFromScm from scm - exerciseId " << exerciseId;
+    DEBUG_LOG(m_logger) << "textMessageFromScm from scm - exerciseId " << exerciseId;
 
     const QJsonArray services = exercise.value(SERVICES()).toArray();
     for (const QJsonValue &valSvc : services)
     {
       const QJsonObject &service = valSvc.toObject();
       const QString svcName = service.value(NAME_ABBREVATION()).toString().toUpper();
-      DEBUG_LOG() << "textMessageFromScm from scm - svcName " << svcName;
+      DEBUG_LOG(m_logger) << "textMessageFromScm from scm - svcName " << svcName;
 
       if (svcName != QStringLiteral("TAB"))
         continue;
 
-      DEBUG_LOG() << "service TAB ";
+      DEBUG_LOG(m_logger) << "service TAB ";
 
       const QJsonArray ports = service.value(PORTS()).toArray();
       for (const QJsonValue &valPort : ports)
@@ -110,7 +110,7 @@ void DataManager::onTextMessageFromScm(const QString &message)
         if (typeId == Core::PortType::WebSocketServer)
         {          
           int tabPort = port.value(NUMBER()).toInt();
-          DEBUG_LOG() << "connect to TAB - port: " << tabPort;
+          DEBUG_LOG(m_logger) << "connect to TAB - port: " << tabPort;
           connectToTabWebSocket(tabPort, exerciseId);
         }
       }
@@ -120,7 +120,7 @@ void DataManager::onTextMessageFromScm(const QString &message)
 
 void DataManager::onConnectedTab()
 {
-  DEBUG_LOG()  << "TAB connected";
+  DEBUG_LOG(m_logger)  << "TAB connected";
 }
 
 void DataManager::connectToTabWebSocket(int port, int exerciseId)
@@ -131,7 +131,7 @@ void DataManager::connectToTabWebSocket(int port, int exerciseId)
     // Websocket connection already exists?
     if (tabData.port == port)
     {
-      INFO_LOG() << "Connection to port " << port << " already exists.";
+      INFO_LOG(m_logger) << "Connection to port " << port << " already exists.";
       return;
     }
     else
@@ -142,7 +142,7 @@ void DataManager::connectToTabWebSocket(int port, int exerciseId)
     }
   }
 
-  INFO_LOG() << "New connection: exercise: " << exerciseId << ", port: " << port;
+  INFO_LOG(m_logger) << "New connection: exercise: " << exerciseId << ", port: " << port;
 
   const QUrl url(QStringLiteral("ws://%1:%2").arg(NGL::Connections::hostName(NGL::Connections::eConnection::SCM_WEBSOCKET)).arg(port));
 
@@ -152,7 +152,7 @@ void DataManager::connectToTabWebSocket(int port, int exerciseId)
   connect(webSocketTab, &QWebSocket::disconnected, this, &DataManager::closedTab);
   connect(webSocketTab, &QWebSocket::textMessageReceived, this, &DataManager::onTextMessageFromTab);
 
-  DEBUG_LOG() << "Trying to connect to TAB at " << url.toString();
+  DEBUG_LOG(m_logger) << "Trying to connect to TAB at " << url.toString();
   webSocketTab->open(url);
 
   TabData data;
@@ -168,7 +168,7 @@ void DataManager::onClientDisconnect(Messages::MessageTransmitter *transmitter)
   {
     if (ed.transmitter == transmitter)
     {
-      DEBUG_LOG() << "removed dead transmitter";
+      DEBUG_LOG(m_logger) << "removed dead transmitter";
       ed.transmitter = nullptr;
     }
   }
@@ -176,13 +176,13 @@ void DataManager::onClientDisconnect(Messages::MessageTransmitter *transmitter)
 
 void DataManager::onTextMessageFromTab(const QString &message)
 {
-  INFO_LOG() << "onTextMessageFromTab : " << message;
+  INFO_LOG(m_logger) << "onTextMessageFromTab : " << message;
   const QJsonDocument doc = QJsonDocument::fromJson(message.toUtf8());
 
   if (doc.object().value(TYPE()) != BITE_DATA() && doc.object().value(TYPE()) != POSITION_DATA())
     return;
 
-  INFO_LOG() << "TYPE: " << doc.object().value(TYPE()).toString();
+  INFO_LOG(m_logger) << "TYPE: " << doc.object().value(TYPE()).toString();
 
   QJsonObject data = doc.object().value(DATA()).toObject();
 
@@ -190,7 +190,7 @@ void DataManager::onTextMessageFromTab(const QString &message)
 
   int equipNo = data.value(EQUIP_NO()).toInt();
 
-  INFO_LOG() << "equipNo: " << equipNo;
+  INFO_LOG(m_logger) << "equipNo: " << equipNo;
   if (equipNo <= 0)
     return;
 
@@ -200,7 +200,7 @@ void DataManager::onTextMessageFromTab(const QString &message)
   if (doc.object().value(TYPE()) == POSITION_DATA())
   {
     m_equipDataMap[equipNo].lastPositionUpdate = data.value(LAST_POSITION_UPDATE()).toDouble();
-    INFO_LOG() << "lastPosUpdate: " << m_equipDataMap[equipNo].lastPositionUpdate;
+    INFO_LOG(m_logger) << "lastPosUpdate: " << m_equipDataMap[equipNo].lastPositionUpdate;
   }
 
   if (m_equipDataMap[equipNo].boxId >= 0)
@@ -209,7 +209,7 @@ void DataManager::onTextMessageFromTab(const QString &message)
 
     if (transmitter == nullptr)
     {
-      ERROR_LOG() << "transmitter for eqId " << equipNo << " no longer available";
+      ERROR_LOG(m_logger) << "transmitter for eqId " << equipNo << " no longer available";
       return;
     }
 
@@ -218,7 +218,7 @@ void DataManager::onTextMessageFromTab(const QString &message)
     biteData.insert(BOX(), boxId);
     biteData.insert(LAST_POSITION_UPDATE(), m_equipDataMap[equipNo].lastPositionUpdate);
     transmitter->addMessage(Messages::BiteDataMessage(biteData, m_equipDataMap[equipNo].uuid));
-    INFO_LOG() << "Send Message with boxId: " << boxId << ", equipNo: " << equipNo;
+    INFO_LOG(m_logger) << "Send Message with boxId: " << boxId << ", equipNo: " << equipNo;
     if (boxId == 0)
       boxId = -1; // only single request
   }
@@ -226,7 +226,7 @@ void DataManager::onTextMessageFromTab(const QString &message)
 
 void DataManager::setEquipNoBoxId(int equipNo, int boxId, Messages::MessageTransmitter *transmitter, const QString &uuid)
 {
-  INFO_LOG() << "equipNo: " << equipNo << ", boxId = " << boxId;
+  INFO_LOG(m_logger) << "equipNo: " << equipNo << ", boxId = " << boxId;
 
   // erase abonnement, no further biteData telegrams
   if (equipNo == 0)
@@ -259,7 +259,7 @@ void DataManager::setEquipNoBoxId(int equipNo, int boxId, Messages::MessageTrans
       data.insert(BOX(), boxId);      
       data.insert(LAST_POSITION_UPDATE(), equipData.lastPositionUpdate);
       transmitter->addMessage(Messages::BiteDataMessage(data, equipData.uuid));
-      INFO_LOG() << "Send Message with boxId: " << boxId << ", equipNo: " << equipNo;
+      INFO_LOG(m_logger) << "Send Message with boxId: " << boxId << ", equipNo: " << equipNo;
     }
   }
   else
@@ -273,7 +273,7 @@ void DataManager::setEquipNoBoxId(int equipNo, int boxId, Messages::MessageTrans
     equipData.biteMessage = data;
 
     transmitter->addMessage(Messages::BiteDataMessage(data, equipData.uuid));
-    INFO_LOG() << "Send Message with boxId: " << boxId << ", equipNo: " << equipNo << ", lastUpdate 0";
+    INFO_LOG(m_logger) << "Send Message with boxId: " << boxId << ", equipNo: " << equipNo << ", lastUpdate 0";
 
     // send bite request
     QJsonObject biteData;
@@ -283,7 +283,7 @@ void DataManager::setEquipNoBoxId(int equipNo, int boxId, Messages::MessageTrans
     biteData.insert(UUID_(), QUuid::createUuid().toString());
 
     QString message = QString::fromStdString(QJsonDocument(biteData).toJson(QJsonDocument::Compact).toStdString());
-    INFO_LOG() << "message: " << message;
+    INFO_LOG(m_logger) << "message: " << message;
     for (TabData dataTab : m_tabWebSocketMap)
       dataTab.websocket->sendTextMessage(message);
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/bite_data_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/bite_data_manager.h
index 45b3b83b8..a48227928 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/bite_data_manager.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/bite_data_manager.h
@@ -66,6 +66,8 @@ private Q_SLOTS:
 
 private: // methods
 
+
+NGL::INGLLogger &m_logger;
   void connectToTabWebSocket(int port, int exerciseId);
 
 private: // attributes  
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/ws_bite_interface_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/ws_bite_interface_handler.cpp
index ad5159cff..3669f525c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/ws_bite_interface_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBiteInterface/ws_bite_interface_handler.cpp
@@ -40,7 +40,7 @@ bool WsBiteInterfaceHandler::init()
   m_connectionHandler = new Connection::ConnectionHandler;
   if (!m_connectionHandler->init())
   {
-    ERROR_LOG() << "Failed to initialise ConnectionHandler";
+    ERROR_LOG(m_logger) << "Failed to initialise ConnectionHandler";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/dds_handler.cpp
index e1fd70a5f..04ac7b478 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/dds_handler.cpp
@@ -15,14 +15,14 @@ namespace WarehouseGuez
 DdsHandler::DdsHandler(int domainId)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Global))
 {
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
   if(!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -36,10 +36,10 @@ bool DdsHandler::init(const QStringList &qosFileList)
   m_ddsFts = WarehouseGuez::Interface::Fts::create(m_ddsConnector);
 
   bool bRet = m_ddsDts->enableAll();
-  INFO_LOG() << "Dts initialised";
+  INFO_LOG(m_logger) << "Dts initialised";
 
   bRet &= m_ddsFts->enableAll();
-  INFO_LOG() << "Fts initialised";
+  INFO_LOG(m_logger) << "Fts initialised";
 
   return bRet;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/dds_handler.h
index 3184fd803..2d50fe3cf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/dds_handler.h
@@ -44,6 +44,7 @@ public:
   std::shared_ptr<DDSConnector::DdsConnector> dds() const { return m_ddsConnector; }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<Core::Pacemaker>            m_pacemaker;
   std::shared_ptr<Core::TopicLockMaster>      m_topicLockMaster;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_equipment_type_wh.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_equipment_type_wh.cpp
index e905e6bd0..3f0dff779 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_equipment_type_wh.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_equipment_type_wh.cpp
@@ -35,7 +35,7 @@ bool HandlerEquipmentTypeWh::init()
     if (ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       bRet = false;
       return;
     }
@@ -43,11 +43,11 @@ bool HandlerEquipmentTypeWh::init()
   };
   if (!m_mainHandler->db()->select(cb) || !bRet)
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return true;
   }
 
-  DEBUG_LOG() << "m_exeObjMap.size() = " << m_equipmenttypewhObjMap.size();
+  DEBUG_LOG(m_logger) << "m_exeObjMap.size() = " << m_equipmenttypewhObjMap.size();
 
   return true;
 }
@@ -83,7 +83,7 @@ void convert(Database::EquipmentTypeWh &data, const EquipmentTypeWh &request)
 
 void HandlerEquipmentTypeWh::onModifyEquipmentTypeWhRequest(const rti::core::SampleIdentity &cookie, const EquipmentTypeWh &request)
 {
-  DEBUG_LOG() << "onModifyEquipmentTypeWhRequest() id:" << request.id();
+  DEBUG_LOG(m_logger) << "onModifyEquipmentTypeWhRequest() id:" << request.id();
 
   ObjectEquipmentTypeWh *ifs = nullptr;
   Core::FunctionReplyObject ret;
@@ -93,7 +93,7 @@ void HandlerEquipmentTypeWh::onModifyEquipmentTypeWhRequest(const rti::core::Sam
     convert(data, request);
     data.id = 0 - request.id();
 
-    DEBUG_LOG() << "Request.id = " << request.id() << ", data.id = " << data.id;
+    DEBUG_LOG(m_logger) << "Request.id = " << request.id() << ", data.id = " << data.id;
 
     ifs = new ObjectEquipmentTypeWh(m_mainHandler);
     ret = ifs->createObject(data, true);
@@ -102,7 +102,7 @@ void HandlerEquipmentTypeWh::onModifyEquipmentTypeWhRequest(const rti::core::Sam
     {
       delete ifs;
       ifs = nullptr;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
     }
     else
       m_equipmenttypewhObjMap.insert(ifs->getId(), ifs);
@@ -125,7 +125,7 @@ void HandlerEquipmentTypeWh::onModifyEquipmentTypeWhRequest(const rti::core::Sam
   }
 
   if (ret.error() || !ifs)
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
   else
     sendToEXCON();
 
@@ -137,7 +137,7 @@ void HandlerEquipmentTypeWh::onModifyEquipmentTypeWhRequest(const rti::core::Sam
 //-----------------------------------------------------------------------------
 void HandlerEquipmentTypeWh::onRemoveEquipmentTypeWhRequest(const rti::core::SampleIdentity &cookie, const Core::RemoveElementRequest &request)
 {
-  DEBUG_LOG() << "onRemoveEquipmentTypeWhRequest() id:" << request.id();
+  DEBUG_LOG(m_logger) << "onRemoveEquipmentTypeWhRequest() id:" << request.id();
 
   Core::FunctionReplyObject ret;
   ObjectEquipmentTypeWh *ifs = m_equipmenttypewhObjMap.value(request.id());
@@ -151,7 +151,7 @@ void HandlerEquipmentTypeWh::onRemoveEquipmentTypeWhRequest(const rti::core::Sam
   ret = ifs->removeObject();
 
   if (ret.error())
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
   else
   {
     // delete ObjectEquipmentTypeWH
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_equipment_type_wh.h b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_equipment_type_wh.h
index e30f1822b..64287617c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_equipment_type_wh.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_equipment_type_wh.h
@@ -27,11 +27,13 @@ public:
   bool init();
 
 private:
+  NGL::INGLLogger &m_logger;
   void onModifyEquipmentTypeWhRequest(const rti::core::SampleIdentity &cookie, const EquipmentTypeWh &request) override final;
   void onRemoveEquipmentTypeWhRequest(const rti::core::SampleIdentity &cookie, const Core::RemoveElementRequest &request) override final;
   void sendToEXCON();
 
 private:
+  NGL::INGLLogger &m_logger;
   QHash<int, ObjectEquipmentTypeWh*> m_equipmenttypewhObjMap;
   MainHandler                       *m_mainHandler;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_injury_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_injury_model.cpp
index 120b9b800..e2b5327b7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_injury_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_injury_model.cpp
@@ -36,7 +36,7 @@ bool HandlerInjuryModel::init()
     if(ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       bRet = false;
       return;
     }
@@ -44,18 +44,18 @@ bool HandlerInjuryModel::init()
   };
   if (!m_mainHandler->db()->select(cb) || !bRet)
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return true;
   }
 
-  DEBUG_LOG() << "m_exeObjMap.size() = " << m_injurymodelObjMap.size();
+  DEBUG_LOG(m_logger) << "m_exeObjMap.size() = " << m_injurymodelObjMap.size();
 
   return true;
 }
 
 void HandlerInjuryModel::onModifyInjuryModelAgdusWhRequest(const rti::core::SampleIdentity &cookie, const InjuryModelAgdusWh &request)
 {
-  DEBUG_LOG() << "onModifyInjuryModelAgdusWhRequest() id:" << request.id();
+  DEBUG_LOG(m_logger) << "onModifyInjuryModelAgdusWhRequest() id:" << request.id();
 
   Core::FunctionReplyObject ret;
   if (request.id() <= 0)
@@ -73,7 +73,7 @@ void HandlerInjuryModel::onModifyInjuryModelAgdusWhRequest(const rti::core::Samp
     {
       delete ifs;
       ifs = nullptr;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
     }
     else
       m_injurymodelObjMap.insert(ifs->getId(), ifs);
@@ -98,14 +98,14 @@ void HandlerInjuryModel::onModifyInjuryModelAgdusWhRequest(const rti::core::Samp
   }
 
   if (ret.error())
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
 
   m_mainHandler->dds()->fts()->modifyInjuryModelAgdusWhReply(cookie, ret);
 }
 
 void HandlerInjuryModel::onRemoveInjuryModelAgdusWhRequest(const rti::core::SampleIdentity &cookie, const Core::RemoveElementRequest &request)
 {
-  DEBUG_LOG() << "onRemoveInjuryModelAgdusWhRequest() id:" << request.id();
+  DEBUG_LOG(m_logger) << "onRemoveInjuryModelAgdusWhRequest() id:" << request.id();
 
   Core::FunctionReplyObject ret;
   ObjectInjuryModel *ifs = m_injurymodelObjMap.value(request.id());
@@ -119,7 +119,7 @@ void HandlerInjuryModel::onRemoveInjuryModelAgdusWhRequest(const rti::core::Samp
   ret = ifs->removeObject();
 
   if (ret.error())
-    ERROR_LOG() << ret();
+    ERROR_LOG(m_logger) << ret();
   else
   {
     // delete ObjectInjuryModel
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_injury_model.h b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_injury_model.h
index 191f47ac6..eb262cb27 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_injury_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_injury_model.h
@@ -26,10 +26,12 @@ public:
   bool init();
 
 private:
+  NGL::INGLLogger &m_logger;
   void onModifyInjuryModelAgdusWhRequest(const rti::core::SampleIdentity &cookie, const InjuryModelAgdusWh &request);
   void onRemoveInjuryModelAgdusWhRequest(const rti::core::SampleIdentity &cookie, const Core::RemoveElementRequest &request);
 
 private:
+  NGL::INGLLogger &m_logger;
   QHash<int, ObjectInjuryModel*> m_injurymodelObjMap;
   MainHandler*                   m_mainHandler;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_types.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_types.cpp
index d463adbbd..b2321baef 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_types.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_types.cpp
@@ -13,22 +13,21 @@
 namespace WarehouseGuez
 {
 
-HandlerTypes::HandlerTypes(MainHandler *mainHandler)
-  : m_mainHandler(mainHandler)
-{}
+HandlerTypes::HandlerTypes(MainHandler *mainHandler) : m_mainHandler(mainHandler),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 bool HandlerTypes::init()
 {
   m_ppmDtc = ParticipantManagement::Interface::Dtc::create(m_mainHandler->dds()->dds());
   if (m_ppmDtc == nullptr)
   {
-    ERROR_LOG() << "Could not create PPM DTC";
+    ERROR_LOG(m_logger) << "Could not create PPM DTC";
     return false;
   }
 
   if (!m_mainHandler->db()->truncateType())
   {
-    ERROR_LOG() << "Error reading types from  db";
+    ERROR_LOG(m_logger) << "Error reading types from  db";
     return false;
   }
 
@@ -50,7 +49,7 @@ static inline Database::Type convert(const ParticipantManagement::Type &data)
 
 void HandlerTypes::onTypeChanged(const ParticipantManagement::Type &data, DataModification modType)
 {
-  DEBUG_LOG() << "onTypeChanged: " << data << ", " << modType;
+  DEBUG_LOG(m_logger) << "onTypeChanged: " << data << ", " << modType;
 
   switch(modType)
   {
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_types.h b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_types.h
index 4d5435acb..dcba3d8c0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_types.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_types.h
@@ -28,6 +28,7 @@ private Q_SLOTS:
   void onTypeChanged(const ParticipantManagement::Type &data, DataModification modType);
 
 private:  
+  NGL::INGLLogger &m_logger;
   MainHandler*                                            m_mainHandler;
   std::shared_ptr<ParticipantManagement::Interface::Dtc>  m_ppmDtc;   ///< Pointer to DTC ParticipantManagement interface object
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/main_handler.cpp
index 1cd151e59..38cd70c7d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/main_handler.cpp
@@ -41,40 +41,40 @@ bool MainHandler::init(int domainId)
 
   if (!m_dbHandler->init(0, Settings::settings()))
   {
-    ERROR_LOG() << "Initialisation dbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation dbHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation dbHandler succesful.";
 
   // initialize DDS
   m_ddsHandler = std::make_shared<DdsHandler>(domainId);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation ddsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation ddsHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation ddsHandler succesful.";
 
-  DEBUG_LOG() << "WarehouseManagement FTC initialized";
+  DEBUG_LOG(m_logger) << "WarehouseManagement FTC initialized";
 
   m_handlerEquipTypeWh = std::make_shared<HandlerEquipmentTypeWh>(this);
   if (!m_handlerEquipTypeWh->init())
   {
-    ERROR_LOG() << "Initalisation HandlerEquipmentTYpeWH failed";
+    ERROR_LOG(m_logger) << "Initalisation HandlerEquipmentTYpeWH failed";
     return false;
   }
 
   m_handlerInjuryModel = std::make_shared<HandlerInjuryModel>(this);
   if (!m_handlerInjuryModel->init())
   {
-    ERROR_LOG() << "Initialisation HandlerInjuryModel failed";
+    ERROR_LOG(m_logger) << "Initialisation HandlerInjuryModel failed";
     return false;
   }
 
   m_handlerTypes = std::make_shared<HandlerTypes>(this);
   if (!m_handlerTypes->init())
   {
-    ERROR_LOG() << "Initialisation HandlerTypes failed";
+    ERROR_LOG(m_logger) << "Initialisation HandlerTypes failed";
     return false;
   }
 
@@ -82,14 +82,14 @@ bool MainHandler::init(int domainId)
   m_wsBaseDataHandler =  std::make_shared<WsBaseDataInterface::WsBaseDataInterfaceHandler>(this);
   if (!m_wsBaseDataHandler->init())
   {
-    ERROR_LOG() << "Initialisation WsBaseDataInterfaceHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation WsBaseDataInterfaceHandler failed.";
     return false;
   }
 
   m_wsBiteInterfaceHandler =  std::make_shared<WsBiteInterface::WsBiteInterfaceHandler>(new WsBiteInterface::DataManager(m_ddsHandler));
   if (!m_wsBiteInterfaceHandler->init())
   {
-    ERROR_LOG() << "Initialisation WsBiteInterfaceHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation WsBiteInterfaceHandler failed.";
     return false;
   }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/main_handler.h
index 2dfc30f42..a24959aba 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/main_handler.h
@@ -45,6 +45,7 @@ public:
   std::shared_ptr<WsBaseDataInterface::WsBaseDataInterfaceHandler> wsBaseDataHandler() { return m_wsBaseDataHandler; }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>                          m_ddsHandler;
   std::shared_ptr<DbHandler>                           m_dbHandler;
   std::shared_ptr<HandlerEquipmentTypeWh>              m_handlerEquipTypeWh;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_equipment_type_wh.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_equipment_type_wh.cpp
index a57130c0e..848133e04 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_equipment_type_wh.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_equipment_type_wh.cpp
@@ -27,7 +27,7 @@ Core::FunctionReplyObject ObjectEquipmentTypeWh::createObject(const Database::Eq
     if (!m_mainHandler->db()->insert(m_data))
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting EquipmentTypeWh-data into database"));
 
-    DEBUG_LOG() << "New EquipmentTypeId: " << m_data.id;
+    DEBUG_LOG(m_logger) << "New EquipmentTypeId: " << m_data.id;
   }
 
   // Publish Data via DTS
@@ -42,7 +42,7 @@ Core::FunctionReplyObject ObjectEquipmentTypeWh::updateObject(const Database::Eq
     return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating EquipmentTypeWh-data into database"));
 
   m_data = data;
-  DEBUG_LOG() << "Data changed for EquipmentTypeWhId: " << m_data.id;
+  DEBUG_LOG(m_logger) << "Data changed for EquipmentTypeWhId: " << m_data.id;
 
   // Publish Data via DTS
   onPublishData();
@@ -90,11 +90,11 @@ void ObjectEquipmentTypeWh::onPublishData()
   ddsData.vbNc(m_data.vbAcWaffen);
   ddsData.canDevices(m_data.canDevices);
 
-  INFO_LOG() << "Publish WhgEquipmentTypeWh-data to dds (" << m_data.id << ") ...";
+  INFO_LOG(m_logger) << "Publish WhgEquipmentTypeWh-data to dds (" << m_data.id << ") ...";
 
   if (!m_mainHandler->dds()->dts()->publish(ddsData))
   {
-    ERROR_LOG() << "Error publishing WhgEquipmentTypeWh-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing WhgEquipmentTypeWh-data to dds";
   }
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_equipment_type_wh.h b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_equipment_type_wh.h
index f709727e0..e6ed74712 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_equipment_type_wh.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_equipment_type_wh.h
@@ -27,6 +27,7 @@ public:
   Database::EquipmentTypeWh getData() const { return m_data; }
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onPublishData();
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_injury_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_injury_model.cpp
index 3e867bc2b..8f28abd4e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_injury_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_injury_model.cpp
@@ -25,7 +25,7 @@ Core::FunctionReplyObject ObjectInjuryModel::createObject(const Database::Injury
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting InjuryModel-data into database"));
   }
 
-  DEBUG_LOG() << "New InjuryModel: " << m_data.id;
+  DEBUG_LOG(m_logger) << "New InjuryModel: " << m_data.id;
 
   // Publish Data via DTS
   onPublishData();
@@ -39,7 +39,7 @@ Core::FunctionReplyObject ObjectInjuryModel::updateObject(const Database::Injury
     return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating InjuryModel-data into database"));
 
   m_data = data;
-  DEBUG_LOG() << "Data changed for InjuryModelId: " << m_data.id;
+  DEBUG_LOG(m_logger) << "Data changed for InjuryModelId: " << m_data.id;
 
   // Publish Data via DTS
   onPublishData();
@@ -66,11 +66,11 @@ void ObjectInjuryModel::onPublishData()
   ddsData.description(m_data.beschreibung.toStdString());
   ddsData.version(m_data.version.toStdString());
 
-  INFO_LOG() << "Publish InjuryModelAgdusWh-data to dds (" << m_data.id << ") ...";
+  INFO_LOG(m_logger) << "Publish InjuryModelAgdusWh-data to dds (" << m_data.id << ") ...";
 
   if (!m_mainHandler->dds()->dts()->publish(ddsData))
   {
-    ERROR_LOG() << "Error publishing WhgInjuryModel-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing WhgInjuryModel-data to dds";
   }
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_injury_model.h b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_injury_model.h
index a4bcf86aa..643bd583e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_injury_model.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_injury_model.h
@@ -27,6 +27,7 @@ public:
   Database::InjuryModelAgdusWh getData() const { return m_data; }
 
 protected:
+  NGL::INGLLogger &m_logger;
   void onPublishData();
 
 private:
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/dds_handler.cpp
index 8aa4f8bf0..964d27410 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/dds_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/dds_handler.cpp
@@ -20,7 +20,7 @@ namespace XxxXxxXxx
 DdsHandler::DdsHandler(int domainId, int exerciseId)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::FIXME, exerciseId))
 {
-  DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
+  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
 
 DdsHandler::~DdsHandler()
@@ -30,7 +30,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
 {
   if(!m_ddsConnector->init(qosFileList))
   {
-    ERROR_LOG() << "Error initializing dds connections - aborting";
+    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
     return false;
   }
 
@@ -46,10 +46,10 @@ bool DdsHandler::init(const QStringList &qosFileList)
   m_ddsFts = XxxXxxXxx::Interface::Fts::create(m_ddsConnector);
 
   bool bRet = m_ddsDts->enableAll();
-  INFO_LOG() << "Dts initialised";
+  INFO_LOG(m_logger) << "Dts initialised";
 
   bRet &= m_ddsFts->enableAll();
-  INFO_LOG() << "Fts initialised";
+  INFO_LOG(m_logger) << "Fts initialised";
 
   // TODO: call at the end of main_handler init:
   //m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/dds_handler.h
index 7af22fca0..3b8b56ab1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/dds_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/dds_handler.h
@@ -45,6 +45,7 @@ public:
   }
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<DTS::CurrentRunningState>   m_dtsCurrentRunningState;
   std::shared_ptr<Core::Pacemaker>            m_pacemaker;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/main_handler.cpp
index 61062cc6f..3bb65689d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/main_handler.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/main_handler.cpp
@@ -13,11 +13,10 @@
 namespace XxxXxxXxx
 {
 
-MainHandler::MainHandler(QObject *parent)
-  : QObject(parent)
+MainHandler::MainHandler(QObject *parent) : QObject(parent)
   , m_ddsHandler(nullptr)
-  , m_dbHandler(nullptr)
-{}
+  , m_dbHandler(nullptr),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 MainHandler::~MainHandler()
 {
@@ -33,19 +32,19 @@ bool MainHandler::init(int domainId)
 
   if (!m_dbHandler->init(0, Settings::settings(), m_logger))
   {
-    ERROR_LOG() << "Initialisation dbHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation dbHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation dbHandler succesful.";
 
   // initialize DDS
   m_ddsHandler = std::make_shared<DdsHandler>(domainId);
   if (!m_ddsHandler->init())
   {
-    ERROR_LOG() << "Initialisation ddsHandler failed.";
+    ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
     return false;
   }
-  DEBUG_LOG() << "Initialisation ddsHandler succesful.";
+  DEBUG_LOG(m_logger) << "Initialisation ddsHandler succesful.";
 
   // TODO
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/main_handler.h
index 1c0f0cb94..bd9a3e3f2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/main_handler.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/main_handler.h
@@ -33,6 +33,7 @@ public:
   std::shared_ptr<DatabaseInterface> db() const;
 
 private:
+  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>            m_ddsHandler;
   std::shared_ptr<DbHandler>             m_dbHandler;
 };
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/handler_xxx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/handler_xxx.cpp
index c3e4577f4..c6c31f6cd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/handler_xxx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/handler_xxx.cpp
@@ -20,11 +20,10 @@ namespace YyyYyyYyy
 
 HandlerXxx::HandlerXxx(const std::shared_ptr<DdsHandler> &ddsHandler,
                        const std::shared_ptr<DbHandler> &dbHandler,
-                       QObject *parent)
-  : QObject(parent)
+                       QObject *parent) : QObject(parent)
   , m_ddsHandler(ddsHandler)
-  , m_dbHandler(dbHandler)
-{}
+  , m_dbHandler(dbHandler),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
 
 HandlerXxx::~HandlerXxx()
 {}
@@ -35,7 +34,7 @@ bool HandlerXxx::init()
   // read all Xxxs from database
   if(!m_dbHandler->db()->select(dataVec))
   {
-    ERROR_LOG() << "Error reading data from database!";
+    ERROR_LOG(m_logger) << "Error reading data from database!";
     return false;
   }
 
@@ -47,13 +46,13 @@ bool HandlerXxx::init()
     if(ret.error())
     {
       delete ifs;
-      ERROR_LOG() << ret();
+      ERROR_LOG(m_logger) << ret();
       return false;
     }
     m_xxxObjMap.insert(ifs->getId(), ifs);
   }
 
-  DEBUG_LOG() << "m_exeObjMap.size() = " << m_xxxObjMap.size();
+  DEBUG_LOG(m_logger) << "m_exeObjMap.size() = " << m_xxxObjMap.size();
 
   return true;
 }
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/handler_xxx.h b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/handler_xxx.h
index 59031bbc9..4f3f17542 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/handler_xxx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/handler_xxx.h
@@ -29,7 +29,9 @@ public:
 
 private:
 
+  NGL::INGLLogger &m_logger;
 private:
+  NGL::INGLLogger &m_logger;
   QMap<int, ObjectXxx*>       m_xxxObjMap;
   std::shared_ptr<DdsHandler> m_ddsHandler;
   std::shared_ptr<DbHandler>  m_dbHandler;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/object_xxx.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/object_xxx.cpp
index 8b2e1aff6..f2f28ea95 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/object_xxx.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/object_xxx.cpp
@@ -56,11 +56,11 @@ void ObjectXxx::onPublishData()
 
   ddsData.id(m_data.id);
   // Todo: Copy as above
-  INFO_LOG() << "Publish YyyXxx-data to dds (" << m_data.id << ") ...";
+  INFO_LOG(m_logger) << "Publish YyyXxx-data to dds (" << m_data.id << ") ...";
 
   if (!m_ddsHandler->dts()->publish(ddsData))
   {
-    ERROR_LOG() << "Error publishing YyyXxx-data to dds";
+    ERROR_LOG(m_logger) << "Error publishing YyyXxx-data to dds";
   }
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/object_xxx.h b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/object_xxx.h
index 6953e965b..8568f67ce 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/object_xxx.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/object_xxx.h
@@ -39,6 +39,8 @@ namespace YyyYyyYyy
       void onPublishData();
 
     private:
+
+    NGL::INGLLogger &m_logger;
       std::shared_ptr<DdsHandler> m_ddsHandler;
       std::shared_ptr<DbHandler>  m_dbHandler;
       Database::YyyXxx   m_data;
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/result_watcher.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/result_watcher.h
index 87faf3709..d2421fb81 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/result_watcher.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/result_watcher.h
@@ -61,6 +61,8 @@ protected Q_SLOTS:
   }
 
 protected:
+
+NGL::INGLLogger &m_logger;
   bool m_alreadyEmitted = false;
 };
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_dictionary.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_dictionary.h
index 667b8a369..520807e16 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_dictionary.h
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_dictionary.h
@@ -99,6 +99,9 @@ public:
 
 protected:
 
+
+
+NGL::INGLLogger &m_logger;
   /*! \name Construction, Destruction */
   //@{
   /**
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CoPrtCnvHexDumpHelper.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CoPrtCnvHexDumpHelper.cpp
index 630ec4aaa..9981d431a 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CoPrtCnvHexDumpHelper.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CoPrtCnvHexDumpHelper.cpp
@@ -185,7 +185,7 @@ void dumpTelegram(NGL::INGLLogger &m_logger, int id, N_CoPrtCnv::CoPrtCnvRadioTe
   {
     uint8_t wirkfeldTyp = a_radioTelegram->getPayloadDataUInt32(5, 1);
     uint16_t wirkfeldKennung = a_radioTelegram->getPayloadDataUInt32(6, 2);
-    DEBUG_LOG() << commonLog
+    DEBUG_LOG(m_logger) << commonLog
                         << ", type: " << wirkfeldTyp2Str(wirkfeldTyp) << ", kennung: "
                         << wirkfeldKennung;
     break;
@@ -193,7 +193,7 @@ void dumpTelegram(NGL::INGLLogger &m_logger, int id, N_CoPrtCnv::CoPrtCnvRadioTe
   case GEF_DEAKTIVIERUNG_EINZELMINE: {
     uint32_t wirkfeldKennung = a_radioTelegram->getPayloadDataUInt32(9, 2);
     uint32_t minenKennung = a_radioTelegram->getPayloadDataUInt32(11, 2);
-    DEBUG_LOG() << commonLog
+    DEBUG_LOG(m_logger) << commonLog
                         << ", kennung: " << wirkfeldKennung << ", mineId: " << minenKennung;
     break;
   }
@@ -207,14 +207,14 @@ void dumpTelegram(NGL::INGLLogger &m_logger, int id, N_CoPrtCnv::CoPrtCnvRadioTe
   case GEF_DEAKTIVIEREN_FUNKTIONSRAUM:
   {
     uint16_t wirkfeldKennung = a_radioTelegram->getPayloadDataUInt32(5, 2);
-    DEBUG_LOG() << commonLog << ", kennung: " << wirkfeldKennung;
+    DEBUG_LOG(m_logger) << commonLog << ", kennung: " << wirkfeldKennung;
     break;
   }
   case GEF_TECHNIK_FUNKTIONSRAUM:
   {
     uint16_t funktionsraumkennung = a_radioTelegram->getPayloadDataUInt32(5, 2);
     uint8_t funktionsraumtyp      = a_radioTelegram->getPayloadDataUInt32(7, 1);
-    DEBUG_LOG() << commonLog
+    DEBUG_LOG(m_logger) << commonLog
                         << ", kennung: " << funktionsraumkennung
                         << " type: " << int(funktionsraumtyp);
     break;
@@ -222,19 +222,19 @@ void dumpTelegram(NGL::INGLLogger &m_logger, int id, N_CoPrtCnv::CoPrtCnvRadioTe
   case GEF_WF_SAMMELDEAKTIVIERUNG:
   case GEF_WF_SAMMELDEAKTIVIERUNG_DUS_MINEN:
   case GEF_WF_SAMMELDEAKTIVIERUNG_FUNKTIONSRAUM:
-    DEBUG_LOG() << commonLog  << ", Ids: " << dumpSammeldeaktivierung(a_radioTelegram);
+    DEBUG_LOG(m_logger) << commonLog  << ", Ids: " << dumpSammeldeaktivierung(a_radioTelegram);
     break;
   case GEF_NOP:
   {
     uint16_t bcFrom = a_radioTelegram->getPayloadDataUInt32(3, 2);
     uint16_t bcTo = a_radioTelegram->getPayloadDataUInt32(5, 2);
-    DEBUG_LOG() << prefix
+    DEBUG_LOG(m_logger) << prefix
                         << commonLog
                         << ", from BC " << bcFrom << " to " << bcTo;
     break;
   }
   default:
-    DEBUG_LOG() << commonLog;
+    DEBUG_LOG(m_logger) << commonLog;
     break;
   }
 }
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CoPrtCnvRadioTelegram.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CoPrtCnvRadioTelegram.cpp
index b08f0b457..0d51a98da 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CoPrtCnvRadioTelegram.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CoPrtCnvRadioTelegram.cpp
@@ -217,7 +217,7 @@ CoPrtCnvRadioTelegram::CoPrtCnvRadioTelegram(const std::shared_ptr<CoPrtCnvRadio
   const uint8_t nbrOfFragmentedTelegrams = uint8_t((payloadSize - 1) / MAX_TELEGRAM_SIZE);
   if (nbrOfFragmentedTelegrams > (MAX_NBR_OF_FRAGMENTS - 1))
   {
-    ERROR_LOG() << "Radio-telegram is too big (" << nbrOfFragmentedTelegrams + 1
+    ERROR_LOG(m_logger) << "Radio-telegram is too big (" << nbrOfFragmentedTelegrams + 1
                         << " fragments). There are max " << MAX_NBR_OF_FRAGMENTS
                         << " fragments of size=" << MAX_RADIO_TELEGRAM_PAYLOAD_LENGTH
                         << " (=" << MAX_NBR_OF_FRAGMENTS *MAX_RADIO_TELEGRAM_PAYLOAD_LENGTH
@@ -227,7 +227,7 @@ CoPrtCnvRadioTelegram::CoPrtCnvRadioTelegram(const std::shared_ptr<CoPrtCnvRadio
   }
   if (nbrOfFragmentedTelegrams == 0)
   {
-    ERROR_LOG() << "Radio-telegram is too small for fragmentation. It must have at least a size of "
+    ERROR_LOG(m_logger) << "Radio-telegram is too small for fragmentation. It must have at least a size of "
                         << (MAX_RADIO_TELEGRAM_PAYLOAD_LENGTH + 1);
     a_error = true;
     return;
@@ -271,7 +271,7 @@ CoPrtCnvRadioTelegram::CoPrtCnvRadioTelegram(const std::shared_ptr<CoPrtCnvRadio
   else
   {
     
-    ERROR_LOG() << "Internal error: size must be bigger than 1";
+    ERROR_LOG(m_logger) << "Internal error: size must be bigger than 1";
     a_error = true;
     return;
   }
@@ -283,7 +283,7 @@ CoPrtCnvRadioTelegram::CoPrtCnvRadioTelegram(const std::shared_ptr<CoPrtCnvRadio
 CoPrtCnvRadioTelegram::~CoPrtCnvRadioTelegram()
 {
   if (m_BroadcastOnlyTelegram != nullptr)
-    ERROR_LOG() << "Internal error: m_BroadcastOnlyTelegram was not nullptr while deletion of radio-telegram";
+    ERROR_LOG(m_logger) << "Internal error: m_BroadcastOnlyTelegram was not nullptr while deletion of radio-telegram";
 }
 
 
@@ -403,7 +403,7 @@ uint32_t CoPrtCnvRadioTelegram::getPayloadDataUInt32(size_t a_offset, uint16_t a
     break;
   default:
     Q_ASSERT(false);
-    ERROR_LOG() << "a_size must be between 1..4";
+    ERROR_LOG(m_logger) << "a_size must be between 1..4";
   }
 
   return value;
@@ -531,7 +531,7 @@ bool CoPrtCnvRadioTelegram::isCrcOk() const
 
     if (sum != checksum)
     {
-      ERROR_LOG() << "Checksum of telegram is wrong: " << QString::number(checksum, 16)
+      ERROR_LOG(m_logger) << "Checksum of telegram is wrong: " << QString::number(checksum, 16)
                           << " (expected: " << QString::number(sum, 16) << "), issi: " << getUInt32(5);
       return true; 
     }
@@ -778,7 +778,7 @@ uint8_t CoPrtCnvRadioTelegram::getPriority() const
     case GEF_WF_SAMMELDEAKTIVIERUNG_FUNKTIONSRAUM:
       return 99;
     default:
-      ERROR_LOG() << "Priority of telegram with telId=" << getTelID() << " not defined.";
+      ERROR_LOG(m_logger) << "Priority of telegram with telId=" << getTelID() << " not defined.";
       
 #ifdef DEBUG
       abort();
@@ -1269,7 +1269,7 @@ bool CoPrtCnvRadioTelegram::isContentValid()
       {
         if (wirkfeldkennung > 0 && wirkfeldkennung <= 32767)
           return true; 
-        ERROR_LOG() << "Wirkfeldkennung (" << wirkfeldkennung << ") of telegram with telId=" << getTelID() << " is invalid. Must be 1..32768.";
+        ERROR_LOG(m_logger) << "Wirkfeldkennung (" << wirkfeldkennung << ") of telegram with telId=" << getTelID() << " is invalid. Must be 1..32768.";
         return false; 
       }
       if (GEF_WIRKFELD_AENDERUNG_BEZEICHNER == getTelID() && wirkfeldkennung > 0)
@@ -1277,7 +1277,7 @@ bool CoPrtCnvRadioTelegram::isContentValid()
 
       
       
-      ERROR_LOG() << "Wirkfeldtyp (" << wirkfeldtyp << ") of telegram with telId=" << getTelID() << " is invalid. Must be 1..5 or 8.";
+      ERROR_LOG(m_logger) << "Wirkfeldtyp (" << wirkfeldtyp << ") of telegram with telId=" << getTelID() << " is invalid. Must be 1..5 or 8.";
       return false; 
 
     case GEF_DEAKTIVIERUNG_EINZELMINE:
@@ -1287,7 +1287,7 @@ bool CoPrtCnvRadioTelegram::isContentValid()
         {
           if (wirkfeldkennung > 32767)
           {
-            ERROR_LOG() << "DeaktivierungEinzelmine: wirkfeldkennung=" << wirkfeldkennung << " too big. Must be 1..32767";
+            ERROR_LOG(m_logger) << "DeaktivierungEinzelmine: wirkfeldkennung=" << wirkfeldkennung << " too big. Must be 1..32767";
             return false; 
           }
         }
@@ -1303,7 +1303,7 @@ bool CoPrtCnvRadioTelegram::isContentValid()
       if (funktionsraumkennung > 0)
         return true; 
 
-      ERROR_LOG() << "Funktionsraumkennung (" << funktionsraumkennung << ") of telegram with telId=" << getTelID() << " is invalid. Must be 1..65535.";
+      ERROR_LOG(m_logger) << "Funktionsraumkennung (" << funktionsraumkennung << ") of telegram with telId=" << getTelID() << " is invalid. Must be 1..65535.";
       return false; 
     }
     case GEF_EINTRETEN_FUNKTIONSRAUM:
@@ -1313,7 +1313,7 @@ bool CoPrtCnvRadioTelegram::isContentValid()
         if (funktionsraumkennung > 0)
           return true; 
 
-        ERROR_LOG() << "Funktionsraumkennung (" << funktionsraumkennung << ") of telegram with telId=" << getTelID() << " is invalid. Must be 1..65535.";
+        ERROR_LOG(m_logger) << "Funktionsraumkennung (" << funktionsraumkennung << ") of telegram with telId=" << getTelID() << " is invalid. Must be 1..65535.";
         return false; 
       }
       return false; 
@@ -1324,7 +1324,7 @@ bool CoPrtCnvRadioTelegram::isContentValid()
       if (sprache <= 3)
         return true; 
 
-      ERROR_LOG() << "Sprache (" << sprache << ") of telegram with telId=" << getTelID() << " is invalid. Must be 0..3.";
+      ERROR_LOG(m_logger) << "Sprache (" << sprache << ") of telegram with telId=" << getTelID() << " is invalid. Must be 0..3.";
       return false; 
     }
 
@@ -1375,7 +1375,7 @@ bool CoPrtCnvRadioTelegram::isContentValid()
       if (length >= MIN_LENGTH)
         return true;
 
-      ERROR_LOG() << "The payload-length of telegram with telId=" << getTelID() << " must be at least " << MIN_LENGTH << ", but it is only " << length;
+      ERROR_LOG(m_logger) << "The payload-length of telegram with telId=" << getTelID() << " must be at least " << MIN_LENGTH << ", but it is only " << length;
       return false;
     }
 
@@ -1472,7 +1472,7 @@ bool CoPrtCnvRadioTelegram::isPayloadLengthOk(uint16_t a_minLength,
     uint16_t expectedLength = dataSize + a_minLength;
     if (expectedLength != length)
     {
-      WARNING_LOG() << "The payload-length of telegram with telId: "
+      WARNING_LOG(m_logger) << "The payload-length of telegram with telId: "
                           << getTelID() << " must be " << expectedLength
                           << ", but it is " << length << " (the amount of variable data in telegram was "
                           << dataAmount << " => " << dataSize << " bytes)";
@@ -1481,7 +1481,7 @@ bool CoPrtCnvRadioTelegram::isPayloadLengthOk(uint16_t a_minLength,
   }
   else
   {
-    WARNING_LOG() << "The payload-length of telegram with telId: " << getTelID()
+    WARNING_LOG(m_logger) << "The payload-length of telegram with telId: " << getTelID()
                           << " must be at least " << a_minLength << ", but it is only " << length;
     return false;
   }
@@ -1497,7 +1497,7 @@ bool CoPrtCnvRadioTelegram::isPayloadLengthOk(uint16_t a_minLength,
   const uint16_t length = getPayloadSize();
   if (length < a_minLength)
   {
-    WARNING_LOG() << "The payload-length of telegram with telId: "
+    WARNING_LOG(m_logger) << "The payload-length of telegram with telId: "
                         << getTelID() << " must be greater or equal to "
                         << a_minLength << ", but it is " << length;
     return false;
@@ -1505,7 +1505,7 @@ bool CoPrtCnvRadioTelegram::isPayloadLengthOk(uint16_t a_minLength,
 
   if (length > a_maxLength)
   {
-    WARNING_LOG() << "The payload-length of telegram with telId: "
+    WARNING_LOG(m_logger) << "The payload-length of telegram with telId: "
                         << getTelID() << " must be fewer than "
                         << a_minLength << ", but it is " << length;
     return false;
@@ -1519,7 +1519,7 @@ bool CoPrtCnvRadioTelegram::isPayloadLengthOk(uint16_t a_length) const
   if (length == a_length)
     return true;
 
-  WARNING_LOG() << "The payload-length of telegram with telId: "
+  WARNING_LOG(m_logger) << "The payload-length of telegram with telId: "
                       << getTelID() << " must be "
                       << a_length << ", but it is " << length;
   return false;
@@ -1531,7 +1531,7 @@ bool CoPrtCnvRadioTelegram::isPayloadLengthOk(const std::vector<uint16_t> &a_len
   if (std::any_of(a_lengths.begin(), a_lengths.end(), [length](int len) { return len == length;}))
     return true;
 
-  WARNING_LOG() << "The payload-length of telegram with telId: "
+  WARNING_LOG(m_logger) << "The payload-length of telegram with telId: "
                       << getTelID() << ", is: " << length;
   return false;
 }
@@ -1555,7 +1555,7 @@ bool CoPrtCnvRadioTelegram::mustBeSentAsBroadcast(time_t a_currentTime, bool &a_
         if (s_2ndDelay >= 0)
         {
           m_NextSendTime = time(nullptr) + s_2ndDelay;
-          INFO_LOG() << "1st Broadcast-Telegram telId=" << getTelID() << " BC=" << getBroadcastIndex();
+          INFO_LOG(m_logger) << "1st Broadcast-Telegram telId=" << getTelID() << " BC=" << getBroadcastIndex();
           break;
         }
         ++m_BroadcastCounter;
@@ -1564,13 +1564,13 @@ bool CoPrtCnvRadioTelegram::mustBeSentAsBroadcast(time_t a_currentTime, bool &a_
         if (s_3rdDelay >= 0)
         {
           m_NextSendTime = time(nullptr) + s_3rdDelay;
-          INFO_LOG() << "2nd Broadcast-Telegram telId=" << getTelID() << " BC=" << getBroadcastIndex();
+          INFO_LOG(m_logger) << "2nd Broadcast-Telegram telId=" << getTelID() << " BC=" << getBroadcastIndex();
           break;
         }
         ++m_BroadcastCounter;
         Q_FALLTHROUGH();
       default:
-        INFO_LOG() << "3rd Broadcast-Telegram telId=" << getTelID() << " BC=" << getBroadcastIndex();
+        INFO_LOG(m_logger) << "3rd Broadcast-Telegram telId=" << getTelID() << " BC=" << getBroadcastIndex();
         m_NextSendTime = 0;
         a_wasLastBroadcast = true;
       }
@@ -1636,10 +1636,10 @@ bool CoPrtCnvRadioTelegram::isBroadcastOnly() const
 void CoPrtCnvRadioTelegram::setBroadcastonlyTelegram(const std::shared_ptr<N_CoPrtCnv::CoPrtCnvRadioTelegram> &a_radioTelegram)
 {
   if (a_radioTelegram != nullptr && m_BroadcastOnlyTelegram != nullptr)
-    ERROR_LOG() << "Internal error: m_BroadcastOnlyTelegram was not nullptr";
+    ERROR_LOG(m_logger) << "Internal error: m_BroadcastOnlyTelegram was not nullptr";
   if (a_radioTelegram != nullptr)
   {
-    INFO_LOG() << "Set braodcastonly-telegram: telId=" << a_radioTelegram->getTelID()
+    INFO_LOG(m_logger) << "Set braodcastonly-telegram: telId=" << a_radioTelegram->getTelID()
                        << " BC=" << a_radioTelegram->getBroadcastIndex();
   }
   m_BroadcastOnlyTelegram = a_radioTelegram;
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewField.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewField.cpp
index 46a700f1d..8e8eda8b9 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewField.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewField.cpp
@@ -165,7 +165,7 @@ int64_t LogViewField::getHighestValue() const
     return highest;
   }
   default:
-    ERROR_LOG() << "Case not implemented";
+    ERROR_LOG(m_logger) << "Case not implemented";
   }
   return 0;
 }
@@ -193,7 +193,7 @@ int64_t LogViewField::getLowestValue() const
     return lowest;
   }
   default:
-    ERROR_LOG() << "Case not implemented";
+    ERROR_LOG(m_logger) << "Case not implemented";
     break;
   }
   return 0;
@@ -203,16 +203,16 @@ int64_t LogViewField::getLowestValue() const
 
 void LogViewField::dump(const QString &a_indent) const
 {
-  INFO_LOG() << a_indent << "[";
-  INFO_LOG() << a_indent << "Field[" << m_Name << "]: m_Kind=" << m_Kind << " m_Offset=" << m_Offset << " m_Size=" << m_Size << " m_MaxArraySize=" << m_MaxArraySize << " m_IsRightAligned=" << m_IsRightAligned << " m_IsDynamicArray=" << m_IsDynamicArray << " m_ToolTipText=" << m_ToolTipText;
+  INFO_LOG(m_logger) << a_indent << "[";
+  INFO_LOG(m_logger) << a_indent << "Field[" << m_Name << "]: m_Kind=" << m_Kind << " m_Offset=" << m_Offset << " m_Size=" << m_Size << " m_MaxArraySize=" << m_MaxArraySize << " m_IsRightAligned=" << m_IsRightAligned << " m_IsDynamicArray=" << m_IsDynamicArray << " m_ToolTipText=" << m_ToolTipText;
 
   for (int i=0; i<m_ValueList.size(); i++)
-    INFO_LOG() << a_indent << "m_Value[" << i << "]=" << m_ValueList[i];
+    INFO_LOG(m_logger) << a_indent << "m_Value[" << i << "]=" << m_ValueList[i];
 
   for (auto *c : m_Child)
     c->dump(a_indent + QLatin1Char(' '));
 
-  INFO_LOG() << a_indent << "]";
+  INFO_LOG(m_logger) << a_indent << "]";
 }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewGui.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewGui.cpp
index 7bdd7978b..2b7eb4875 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewGui.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewGui.cpp
@@ -527,7 +527,7 @@ void LogViewGui::onReplayTimerTimeout()
     return;
 
   uint64_t nextSendTime = (tele->getLogTimeMsec() - curSendTime);  
-  DEBUG_LOG() << "Next SendTime: " << nextSendTime
+  DEBUG_LOG(m_logger) << "Next SendTime: " << nextSendTime
                       << ", telId: " << tele->getTelId()
                       << ", next row: " << m_currentReplayRow
                       << ", equipNo: " << tele->getParticipantId();
@@ -545,7 +545,7 @@ void LogViewGui::loadSpecificationFiles()
   
   QString defString = QCoreApplication::applicationDirPath() + QLatin1String("/training_area_telegrams.h");
   QString filename = settings.value(LogViewOptionDialog::P0_FILENAME, defString).toString();
-  INFO_LOG() << "Load central-protocol spezification-file: " << filename.toStdString();
+  INFO_LOG(m_logger) << "Load central-protocol spezification-file: " << filename.toStdString();
   if (!QFile::exists(filename))
   {
     QMessageBox::warning(this, tr("LogView"), tr("Die Spezifikations-Datei \'%1\' fuer Zentral-Telegramme existiert nicht!<br><br>Werde die Default-Datei verwenden...").arg(filename));
@@ -556,7 +556,7 @@ void LogViewGui::loadSpecificationFiles()
   
   defString = QCoreApplication::applicationDirPath() + QLatin1String("/zsksxd_tetraForLogView.x");
   filename = settings.value(LogViewOptionDialog::P5_FILENAME, defString).toString();
-  INFO_LOG() << "Load tetra-protocol spezification-file: " << filename.toStdString();
+  INFO_LOG(m_logger) << "Load tetra-protocol spezification-file: " << filename.toStdString();
   if (!QFile::exists(filename))
   {
     QMessageBox::warning(this, tr("LogView"), tr("Die Spezifikations-Datei \'%1\' fuer TETRA-Telegramme existiert nicht!<br><br>Werde die Default-Datei verwenden...").arg(filename));
@@ -565,7 +565,7 @@ void LogViewGui::loadSpecificationFiles()
 
   LogViewTelegram::tetraParser()->parseX_File(filename);
 
-  INFO_LOG() << "Browse telegram-log-file";
+  INFO_LOG(m_logger) << "Browse telegram-log-file";
   newTelegramFile();
 }
 
@@ -635,7 +635,7 @@ void LogViewGui::updateLogfile()
       }
       catch (const std::exception& e)
       {
-        WARNING_LOG() << "Error: " << e.what();
+        WARNING_LOG(m_logger) << "Error: " << e.what();
         
       }
     }
@@ -715,7 +715,7 @@ void LogViewGui::readTelegramsFromLogFile(const QString& a_fileName, const qint6
             
             if (!telegram->isValid())
             {
-              ERROR_LOG() << "Trying to read/parse unknown data from logfile '" << a_fileName
+              ERROR_LOG(m_logger) << "Trying to read/parse unknown data from logfile '" << a_fileName
                                   << "' at position " << telegramFile.pos() - (telegramLength + sizeof(lh));
               continue;
             }
@@ -728,7 +728,7 @@ void LogViewGui::readTelegramsFromLogFile(const QString& a_fileName, const qint6
         else
         {
           QMessageBox::warning(this, tr("Falsche Version"), tr("LogViewer kann Telegramm-Logs der Version %1 nicht einlesen").arg(lh.m_Version));
-          ERROR_LOG() << "Trying to read/parse unknown data from logfile '" << a_fileName
+          ERROR_LOG(m_logger) << "Trying to read/parse unknown data from logfile '" << a_fileName
                               << "' at position " << telegramFile.pos() - sizeof(lh);
         }
       }
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewInjectionThread.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewInjectionThread.cpp
index b50008cfd..494ebb53a 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewInjectionThread.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewInjectionThread.cpp
@@ -95,7 +95,7 @@ void LogViewInjectionThread::tryToConnect()
   m_Timer->setInterval(3000);
   m_Timer->start();
 
-  INFO_LOG() << "Try to connect to injection-server of TETRA-If (" << m_Hostname << ":" << m_Port << ")";
+  INFO_LOG(m_logger) << "Try to connect to injection-server of TETRA-If (" << m_Hostname << ":" << m_Port << ")";
   m_Socket->connectToHost(m_Hostname, m_Port);
 }
 
@@ -103,7 +103,7 @@ void LogViewInjectionThread::tryToConnect()
 
 void LogViewInjectionThread::doConnect()
 {
-  INFO_LOG() << "LogView has successful connected to injection-server of TETRA-If";
+  INFO_LOG(m_logger) << "LogView has successful connected to injection-server of TETRA-If";
   m_SendingPossible = true;
   m_Timer->stop();
   emit updateStatus(QLatin1String(":/image/GreenLamp.png"),
@@ -114,7 +114,7 @@ void LogViewInjectionThread::doConnect()
 
 void LogViewInjectionThread::doDisconnect()
 {
-  INFO_LOG() << "LogView was disconnected from injection-server of TETRA-If";
+  INFO_LOG(m_logger) << "LogView was disconnected from injection-server of TETRA-If";
   m_SendingPossible = false;
   emit updateStatus(QLatin1String(":/image/RedLamp.png"),
                     tr("LogView ist nicht mehr mit TETRA-If-Injection-Server (%1:%2) verbunden").arg(m_Hostname).arg(m_Port));
@@ -125,10 +125,10 @@ void LogViewInjectionThread::doDisconnect()
 
 void LogViewInjectionThread::sendTelegram(LogViewTelegram* a_telegram, const bool a_doSendAsCentralTelegram)
 {
-  INFO_LOG() << "inject " << (a_doSendAsCentralTelegram ? "central" : "Tetra") << " telegram";
+  INFO_LOG(m_logger) << "inject " << (a_doSendAsCentralTelegram ? "central" : "Tetra") << " telegram";
   if (!m_Socket || m_Socket->state() != QAbstractSocket::ConnectedState)
   {
-    ERROR_LOG() << "Try to write a telegramm but we are not connected";
+    ERROR_LOG(m_logger) << "Try to write a telegramm but we are not connected";
     return;
   }
   N_CoPrtCnv::CoPrtCnvInjectionHeader injectionHeader;
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegram.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegram.cpp
index 56c295c82..cbbafc490 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegram.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegram.cpp
@@ -617,7 +617,7 @@ void LogViewTelegram::resetOffset()
       m_ActOffset = START_OFFSET_CENTRAL;
       break;
     default:
-      ERROR_LOG() << "resetOffset is only for Central-Protocol implemented";
+      ERROR_LOG(m_logger) << "resetOffset is only for Central-Protocol implemented";
   }
 }
 
@@ -1000,7 +1000,7 @@ MemberInformation LogViewTelegram::memberFromStructInformation(const StructInfor
 
 LogViewField* LogViewTelegram::getFieldTree(const QString& a_type, const QString& a_name, uint16_t a_arraySize, const LogViewXdrType* a_parentElement, const bool a_hasContent)
 {
-  DEBUG_LOG() << "a_type=" << a_type << " a_name=" << a_name << " a_arraySize=" << a_arraySize;
+  DEBUG_LOG(m_logger) << "a_type=" << a_type << " a_name=" << a_name << " a_arraySize=" << a_arraySize;
   const LogViewXdrElement* xdrElement = tetraParser()->getElement(a_type);
   if (!xdrElement)
     return nullptr;
@@ -1038,7 +1038,7 @@ LogViewField* LogViewTelegram::getFieldTree(const QString& a_type, const QString
       int arraySize = child->getArraySize();
       if (0 == arraySize && !isScalar(child))
       {
-        INFO_LOG() << "dyn. array of struc";
+        INFO_LOG(m_logger) << "dyn. array of struc";
         arraySize = getDynArraySize(m_ActOffset);
         isDynArray = true;
       }
@@ -1082,7 +1082,7 @@ LogViewField* LogViewTelegram::getFieldTree(const QString& a_type, const QString
     else
     {
       
-      INFO_LOG() << "typedef dynamisch";
+      INFO_LOG(m_logger) << "typedef dynamisch";
     }
     maxArraySize = static_cast<const LogViewXdrType*>(xdrElement)->getMaxArraySize(); 
     while (xdrElement->getKind() != LogViewXdrElement::e_KindStandardType)
@@ -1408,10 +1408,10 @@ LogViewField* LogViewTelegram::getContent(const LogViewXdrStandardType* a_standa
           const quint64 value = getUIntX(i*size+a_offset, size, byteOrder);
           if (8 == size) {
             field->addValue(QString::number(xdrToDouble(value)));
-            INFO_LOG() << "value=" << xdrToDouble(value);
+            INFO_LOG(m_logger) << "value=" << xdrToDouble(value);
           } else {
             field->addValue(QString::number(xdrToFloat(value)));
-            INFO_LOG() << "value=" << xdrToFloat(value);
+            INFO_LOG(m_logger) << "value=" << xdrToFloat(value);
           }
         }
         field->setIsRightAligned(true); 
@@ -1440,7 +1440,7 @@ LogViewField* LogViewTelegram::getContent(const LogViewXdrStandardType* a_standa
       break;
 
     default:
-      ERROR_LOG() << "ValueKind " << a_standardType->getValueKind() << " not implemented!";
+      ERROR_LOG(m_logger) << "ValueKind " << a_standardType->getValueKind() << " not implemented!";
       break;
   }
   uint16_t sizeOfContent = arraySize * size;
@@ -1612,7 +1612,7 @@ bool LogViewTelegram::isScalar(const LogViewXdrType* a_xdrType) const
       
 
       default:
-        ERROR_LOG() << "name=" << xdrElement->getName().toStdString() << " kind=" << xdrElement->getKind() << " case not implemented!";
+        ERROR_LOG(m_logger) << "name=" << xdrElement->getName().toStdString() << " kind=" << xdrElement->getKind() << " case not implemented!";
         return false;
     }
   }
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramDialog.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramDialog.cpp
index 65f72af34..09fca44ed 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramDialog.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramDialog.cpp
@@ -228,7 +228,7 @@ void LogViewTelegramDialog::showTree(LogViewField *a_fieldTree, QGridLayout *a_b
 
 void LogViewTelegramDialog::fillTelegram(LogViewTelegram *a_telegram)
 {
-  INFO_LOG() << "******************************************";
+  INFO_LOG(m_logger) << "******************************************";
 
   
   
@@ -236,7 +236,7 @@ void LogViewTelegramDialog::fillTelegram(LogViewTelegram *a_telegram)
   {
     if (!ptr->isValid())
     {
-      INFO_LOG() << ptr->field()->name() << " is invalid";
+      INFO_LOG(m_logger) << ptr->field()->name() << " is invalid";
       return; 
     }
   }
@@ -387,7 +387,7 @@ void LogViewTelegramDialog::showEditField(LogViewField *a_logViewField, QGridLay
       if (w)
         a_box->addWidget(w, a_box->rowCount() - 1, 1);
       else
-        WARNING_LOG() << "Internal error - LogViewWidget is not derived from QWidget... !?";
+        WARNING_LOG(m_logger) << "Internal error - LogViewWidget is not derived from QWidget... !?";
       break;
     }
     
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEdit.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEdit.cpp
index 0e3340629..1a7c37962 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEdit.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEdit.cpp
@@ -299,12 +299,12 @@ void TelegramEdit::injectTelegram(const QSharedPointer<LogViewTelegram> &a_teleg
 {
   if (!isInjectionPossible())
   {
-    WARNING_LOG() << "Try to inject a telegramm but the injection thread is not running";
+    WARNING_LOG(m_logger) << "Try to inject a telegramm but the injection thread is not running";
     return;
   }
   if (a_telegram.isNull())
   {
-    WARNING_LOG() << "Try to inject a telegramm but no telegramm selected";
+    WARNING_LOG(m_logger) << "Try to inject a telegramm but no telegramm selected";
     return;
   }
   a_telegram->actualizeGpsTime();
@@ -545,7 +545,7 @@ void TelegramEdit::loadTelegramList(bool checkAppend)
       stream >> waitTime >> name >> gpsFieldOffset >> telegramSize;
       if (telegramSize > 0)
       {
-        DEBUG_LOG() << "telegramSize=" << telegramSize;
+        DEBUG_LOG(m_logger) << "telegramSize=" << telegramSize;
         QByteArray buf(telegramSize, Qt::Uninitialized);
         stream.readRawData(buf.data(), telegramSize);
         NGL::NGLLoggerHelper::hexDumpHelper(m_logger, NGL::LogLevel::Debug, buf);
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.cpp
index e8bb50989..2bcabcdb2 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.cpp
@@ -80,7 +80,7 @@ bool LogViewTetraTelegramsParser::parse(const QString &filename)
   QFile f(filename);
   if (!f.open(QIODevice::ReadOnly))
   {
-    WARNING_LOG() << "Can not open file " << filename << " for reading: " << f.errorString();
+    WARNING_LOG(m_logger) << "Can not open file " << filename << " for reading: " << f.errorString();
     return false;
   }
 
@@ -151,7 +151,7 @@ int LogViewTetraTelegramsParser::parseStruct(const QVector<QStringRef> &lines, i
   {
     if (tokens.at(2) != QLatin1String(":"))
     {
-      WARNING_LOG() << "Could not parse struct: '" << lines.at(iStartPos).toString() << "', line: " << iStartPos + 1;
+      WARNING_LOG(m_logger) << "Could not parse struct: '" << lines.at(iStartPos).toString() << "', line: " << iStartPos + 1;
       return -1;
     }
 
@@ -159,7 +159,7 @@ int LogViewTetraTelegramsParser::parseStruct(const QVector<QStringRef> &lines, i
     {
       if (!si.baseStruct.isEmpty())
       {
-        WARNING_LOG() << "Could not parse struct: '" << lines.at(iStartPos).toString() << "', line: " << iStartPos + 1;
+        WARNING_LOG(m_logger) << "Could not parse struct: '" << lines.at(iStartPos).toString() << "', line: " << iStartPos + 1;
         return -1;
       }
       QStringRef base = tokens.at(i);
@@ -205,13 +205,13 @@ int LogViewTetraTelegramsParser::parseStruct(const QVector<QStringRef> &lines, i
       if (tokens.size() > parserCommentPos)
       {
         const QStringRef &comment = tokens.at(parserCommentPos);
-        DEBUG_LOG() << "comment: " << comment.toString();
+        DEBUG_LOG(m_logger) << "comment: " << comment.toString();
         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();
           structStr.replace(QLatin1Char(';'), QLatin1String(";\n"));
-          DEBUG_LOG() << "structStr: " << structStr;
+          DEBUG_LOG(m_logger) << "structStr: " << structStr;
           parseStruct(structStr.splitRef(QLatin1Char('\n')), 0);
 
           mi.type = si.type + QLatin1String("::") + tokens.at(0).toString();
@@ -250,13 +250,13 @@ int LogViewTetraTelegramsParser::parseStruct(const QVector<QStringRef> &lines, i
   if (m_logger.isDebugEnabled())
   {
     if (si.baseStruct.isEmpty())
-      DEBUG_LOG() << "Found Struct: " << si.type;
+      DEBUG_LOG(m_logger) << "Found Struct: " << si.type;
     else
-      DEBUG_LOG() << "Found Struct: " << si.type << ", base: " << si.baseStruct;
+      DEBUG_LOG(m_logger) << "Found Struct: " << si.type << ", base: " << si.baseStruct;
     for (int j = 0; j < si.member.size(); ++j)
     {
       const MemberInformation &mi = si.member.at(j);
-      DEBUG_LOG() << "Member[" << j << "]: " << mi.type << " - " << mi.name;
+      DEBUG_LOG(m_logger) << "Member[" << j << "]: " << mi.type << " - " << mi.name;
     }
   }
 
@@ -312,7 +312,7 @@ int LogViewTetraTelegramsParser::parseEnum(const QVector<QStringRef> &lines, int
         si->member.push_back(std::move(mi));
         break;
       }
-      WARNING_LOG() << "Could not parse enum: '" << lines.at(i).toString() << "', line: " << i + 1;
+      WARNING_LOG(m_logger) << "Could not parse enum: '" << lines.at(i).toString() << "', line: " << i + 1;
       return -1;
     }
 
@@ -334,9 +334,9 @@ int LogViewTetraTelegramsParser::parseEnum(const QVector<QStringRef> &lines, int
     ++i;
   }
 
-  DEBUG_LOG() << "Found Enum: " << ei.type;
+  DEBUG_LOG(m_logger) << "Found Enum: " << ei.type;
   for (const EnumValue &ev : std::as_const(ei.values))
-    DEBUG_LOG() << "Member[" << i << "]: " << ev.key << " = " << ev.value;
+    DEBUG_LOG(m_logger) << "Member[" << i << "]: " << ev.key << " = " << ev.value;
 
   if (ei.type == QLatin1String("TelegramId"))
     m_telegramIdEnum = ei;
@@ -351,18 +351,18 @@ int LogViewTetraTelegramsParser::parseConstraint(const QVector<QStringRef> &line
   const QVector<QStringRef> tokens = tokenize(lines.at(iStartPos));
   if (tokens.size() != 4)
   {
-    WARNING_LOG() << "Could not parse constraint: '" << lines.at(iStartPos).toString() << "'";
+    WARNING_LOG(m_logger) << "Could not parse constraint: '" << lines.at(iStartPos).toString() << "'";
     return -1;
   }
   const QStringRef &cs = tokens.at(3);
   if (!cs.startsWith(QLatin1String("Constraints<")) || !cs.endsWith(QLatin1Char('>')))
   {
-    WARNING_LOG() << "Could not parse constraint: '" << lines.at(iStartPos).toString() << "'";
+    WARNING_LOG(m_logger) << "Could not parse constraint: '" << lines.at(iStartPos).toString() << "'";
     return -1;
   }
   QStringRef structName = cs.mid(QLatin1String("Constraints<").size());
   structName.chop(1);
-  DEBUG_LOG() << "Constraint: " << structName.toString();
+  DEBUG_LOG(m_logger) << "Constraint: " << structName.toString();
 
   int i = iStartPos + 1;
   while (i < lines.size())
@@ -384,7 +384,7 @@ int LogViewTetraTelegramsParser::parseConstraint(const QVector<QStringRef> &line
     const QVector<QStringRef> parts = tokens.at(6).split(QLatin1String("::"));
     if (parts.size() != 2)
     {
-      WARNING_LOG() << "Could not parse constraint: '" << lines.at(i).toString() << "'";
+      WARNING_LOG(m_logger) << "Could not parse constraint: '" << lines.at(i).toString() << "'";
       return -1;
     }
 
@@ -403,7 +403,7 @@ int LogViewTetraTelegramsParser::parseConstraint(const QVector<QStringRef> &line
     }
     if (!bFound)
     {
-      WARNING_LOG() << "Could not find enum value '" << enumKey.toString() << "' in enum TelegramId";
+      WARNING_LOG(m_logger) << "Could not find enum value '" << enumKey.toString() << "' in enum TelegramId";
       return -1;
     }
     ++i;
@@ -461,7 +461,7 @@ QVector<QStringRef> LogViewTetraTelegramsParser::tokenize(const QStringRef &line
         break;
       const QStringRef &lastToken = ret.last();
       const QStringRef newToken = QStringRef(token.string(), token.position(), lastToken.position() - token.position() + lastToken.size());
-      DEBUG_LOG() << "New Token: " << newToken.toString();
+      DEBUG_LOG(m_logger) << "New Token: " << newToken.toString();
       ret.resize(i + 1);
       ret[i] = newToken;
       break;
@@ -478,7 +478,7 @@ QVector<QStringRef> LogViewTetraTelegramsParser::tokenize(const QStringRef &line
     }
     const QStringRef &nextToken = ret.at(i + 1);
     const QStringRef newToken = QStringRef(token.string(), token.position(), nextToken.position() - token.position() + nextToken.size());
-    DEBUG_LOG() << "New Token: " << newToken.toString();
+    DEBUG_LOG(m_logger) << "New Token: " << newToken.toString();
     ret.removeAt(i + 1);
     ret[i] = newToken;
   }
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewWidget.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewWidget.cpp
index 31fd075ed..6ca8a06b3 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewWidget.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewWidget.cpp
@@ -114,7 +114,7 @@ void LogViewWidget::updateToolTip(const QString &a_text)
     break;
   }
   default:
-    ERROR_LOG() << "Case not implemented";
+    ERROR_LOG(m_logger) << "Case not implemented";
   }
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrElement.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrElement.cpp
index cb931eef4..c2414c0fe 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrElement.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrElement.cpp
@@ -25,13 +25,13 @@ LogViewXdrElement::LogViewXdrElement(const QString& a_name, const E_ElementKind
   , m_logger(getLogger(loggerName))
 {
   if (a_name.indexOf(QLatin1Char('<')) >= 0 || a_name.indexOf(QLatin1Char('[')) >= 0)
-    ERROR_LOG() << "Element \'" << a_name.toStdString() << "\' has a problem";
+    ERROR_LOG(m_logger) << "Element \'" << a_name.toStdString() << "\' has a problem";
 }
 
 
 void LogViewXdrElement::dump() const 
 {
-  INFO_LOG() << "Element[" << getName() << "]: kind=" << getKindName();
+  INFO_LOG(m_logger) << "Element[" << getName() << "]: kind=" << getKindName();
 }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrParser.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrParser.cpp
index d21302ea7..13767c11f 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrParser.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrParser.cpp
@@ -388,7 +388,7 @@ void LogViewXdrParser::parseEnum(const QString &a_line, const uint16_t a_enumSiz
             if (ok)
               m_ActElement->addElement(name, value, LogViewXdrElement::e_KindEnumElement);
             else
-              ERROR_LOG() << "Problem with converting text to number: name=" << name.toStdString() << " valueText=" << valueText.toStdString();
+              ERROR_LOG(m_logger) << "Problem with converting text to number: name=" << name.toStdString() << " valueText=" << valueText.toStdString();
           }
         }
         break;
@@ -461,7 +461,7 @@ void LogViewXdrParser::parseStruct(const QString &a_line)
       uint16_t dynArrayOffset;
       uint16_t arraySize = parseArray(name, dynArrayOffset);
       if(firstBit >= 0)
-        DEBUG_LOG() << "Add Element " << name
+        DEBUG_LOG(m_logger) << "Add Element " << name
             << " with type " << type
             << " array size: " << arraySize
             << " first:last " << firstBit << ":" << lastBit
@@ -683,7 +683,7 @@ int64_t LogViewXdrParser::calcValue(const QString& a_calcText, bool& a_isOk)
         default:
           break;
       }
-      ERROR_LOG() << "Problem with converting '" << a_calcText << "' to integer";
+      ERROR_LOG(m_logger) << "Problem with converting '" << a_calcText << "' to integer";
     }
     else
     {
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 042852475..0c07ed95e 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
@@ -19,8 +19,7 @@
 #include <PrtCnv/PrtCnvRadioThread.hpp>
 #include <PrtCnv/PrtCnvThreadStarter.hpp>
 
-TetraIF::TetraIF(const QHostAddress &addr, unsigned short port, unsigned short issi)
-  : QObject()
+TetraIF::TetraIF(const QHostAddress &addr, unsigned short port, unsigned short issi) : QObject()
   , m_addr(addr)
   , m_port(port)
   , m_issi(issi)
@@ -31,9 +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::getLogger()) {
   connect(m_socket, &QTcpSocket::connected, this, &TetraIF::onConnected);
   connect(m_socket, &QTcpSocket::disconnected,  this, &TetraIF::onDisconnected);
   connect(m_socket, &QTcpSocket::readyRead, this, &TetraIF::onReadyRead);
@@ -58,7 +56,7 @@ void TetraIF::listenMode(const QStringList &args)
     m_outputDir = args[0];
   if (!QDir().mkpath(m_outputDir))
   {
-    ERROR_LOG() << "Error creating directory "
+    ERROR_LOG(m_logger) << "Error creating directory "
                         << m_outputDir;
     usage();
   }
@@ -70,26 +68,26 @@ void TetraIF::randomMode(const QStringList &args)
 {
   if (args.count() < 3)
   {
-    ERROR_LOG() << "Invalid argument count";
+    ERROR_LOG(m_logger) << "Invalid argument count";
     usage();
   }
   bool bOk;
   int dataSize = args[0].toInt(&bOk);
   if (!bOk || dataSize > 256 || dataSize < 0)
   {
-    ERROR_LOG() << "Invalid data size " << args[0];
+    ERROR_LOG(m_logger) << "Invalid data size " << args[0];
     usage();
   }
   m_count = args[1].toInt(&bOk);
   if (!bOk || m_count == 0 || m_count < -1)
   {
-    ERROR_LOG() << "Invalid count " << args[1];
+    ERROR_LOG(m_logger) << "Invalid count " << args[1];
     usage();
   }
   m_telegramsPerSecond = args[2].toInt(&bOk);
   if (!bOk || m_telegramsPerSecond < 1)
   {
-    ERROR_LOG() << "Invalid telegrams/second " << args[2];
+    ERROR_LOG(m_logger) << "Invalid telegrams/second " << args[2];
     usage();
   }
   m_data.reserve(dataSize);
@@ -98,7 +96,7 @@ void TetraIF::randomMode(const QStringList &args)
 
   parseISSIs(args.mid(3));
 
-  INFO_LOG() << "Sending " << m_data.size()
+  INFO_LOG(m_logger) << "Sending " << m_data.size()
                      << " bytes, " << m_telegramsPerSecond
                      << " telegrams/second for " << m_count
                      << " time(s) to issi(s) " << getIssisAsString();
@@ -110,31 +108,31 @@ void TetraIF::fileMode(const QStringList &args)
 {
   if (args.count() < 3)
   {
-    ERROR_LOG() << "Invalid argument count";
+    ERROR_LOG(m_logger) << "Invalid argument count";
     usage();
   }
   QFile f(args[0]);
   if (!f.exists() || f.size() > 256)
   {
-    ERROR_LOG() << "Invalid file: " << args[0];
+    ERROR_LOG(m_logger) << "Invalid file: " << args[0];
     usage();
   }
   bool bOk;
   m_count = args[1].toInt(&bOk);
   if (!bOk || m_count == 0 || m_count < -1)
   {
-    ERROR_LOG() << "Invalid count " << args[1];
+    ERROR_LOG(m_logger) << "Invalid count " << args[1];
     usage();
   }
   m_telegramsPerSecond = args[2].toInt(&bOk);
   if (!bOk || m_telegramsPerSecond < 1)
   {
-    ERROR_LOG() << "Invalid telegrams/second " << args[2];
+    ERROR_LOG(m_logger) << "Invalid telegrams/second " << args[2];
     usage();
   }
   if (!f.open(QIODevice::ReadOnly))
   {
-    ERROR_LOG() << "Error opening file "
+    ERROR_LOG(m_logger) << "Error opening file "
                         << f.fileName()
                         << " for reading - error: "
                         << f.errorString();
@@ -143,7 +141,7 @@ void TetraIF::fileMode(const QStringList &args)
 
   parseISSIs(args.mid(3));
 
-  INFO_LOG() << "Sending " << m_data.size()
+  INFO_LOG(m_logger) << "Sending " << m_data.size()
                      << " bytes, " << m_telegramsPerSecond
                      << " telegrams/second for " << m_count
                      << " time(s) to issi(s) " << getIssisAsString();
@@ -164,13 +162,13 @@ void TetraIF::usage()
 
 void TetraIF::onConnected()
 {
-  INFO_LOG() << "Connected to " << m_socket->peerName() << ":" << m_socket->peerPort();
+  INFO_LOG(m_logger) << "Connected to " << m_socket->peerName() << ":" << m_socket->peerPort();
   doInitialLogin();
 }
 
 void TetraIF::onDisconnected()
 {
-  INFO_LOG() << "Disconnected - exiting application";
+  INFO_LOG(m_logger) << "Disconnected - exiting application";
   QCoreApplication::quit();
 }
 
@@ -178,7 +176,7 @@ void TetraIF::onReadyRead()
 {
   do
   {
-    DEBUG_LOG() << "Got " << m_socket->bytesAvailable() << " bytes from socket";
+    DEBUG_LOG(m_logger) << "Got " << m_socket->bytesAvailable() << " bytes from socket";
     
     N_CoPrtCnv::CoPrtCnvRadioTelegram::PrtCnvRadioGwHeader header;
     if (m_socket->bytesAvailable() < int(sizeof(header)))
@@ -187,14 +185,14 @@ void TetraIF::onReadyRead()
     m_socket->peek(reinterpret_cast<char *>(&header), sizeof(header));
     if (N_CoPrtCnv::CoPrtCnvRadioTelegram::MAGIC_NUMBER != header.m_MagicNumber)
     {
-      ERROR_LOG() << "Incorrect magic number (0x"
+      ERROR_LOG(m_logger) << "Incorrect magic number (0x"
                           << QString::number(header.m_MagicNumber, 16)
                           << " - aborting";
       exit(2);
     }
     if (!N_CoPrtCnv::CoPrtCnvRadioTelegram::isTelegramLengthOk(header.m_Length))
     {
-      ERROR_LOG() <<  "Radio-Telegram length to big: "
+      ERROR_LOG(m_logger) <<  "Radio-Telegram length to big: "
                           << header.m_Length
                           << ", but I proceed with this telegram.";
     }
@@ -202,7 +200,7 @@ void TetraIF::onReadyRead()
     const quint16 dataSize = header.m_Length + sizeof(header);
     if (m_socket->bytesAvailable() < dataSize)
     {
-      INFO_LOG() << "not enough bytes available - waiting for more data";
+      INFO_LOG(m_logger) << "not enough bytes available - waiting for more data";
       return;
     }
     QByteArray buf(dataSize, Qt::Uninitialized);
@@ -215,7 +213,7 @@ void TetraIF::onReadyRead()
 
 void TetraIF::onError(QAbstractSocket::SocketError err)
 {
-  ERROR_LOG() << "Socket error "
+  ERROR_LOG(m_logger) << "Socket error "
                       << err
                       << " ("
                       << m_socket->errorString()
@@ -259,7 +257,7 @@ void TetraIF::handleReceivedTelegram(const QByteArray &data)
   default:
     return;
   }
-  INFO_LOG() << "PDU Type: " << type;
+  INFO_LOG(m_logger) << "PDU Type: " << type;
   dumpData(data);
 }
 
@@ -269,7 +267,7 @@ void TetraIF::handleRegisterRsp(const uint8_t a_registrationStatus)
   switch (a_registrationStatus)
   {
   case N_CoPrtCnv::CoPrtCnvRadioTelegram::e_IssiSuccessfulRegistered:
-    INFO_LOG() << "Valid register response from Tetra ";
+    INFO_LOG(m_logger) << "Valid register response from Tetra ";
     if (m_timer)
       m_timer->start();
     return;
@@ -293,7 +291,7 @@ void TetraIF::handleRegisterRsp(const uint8_t a_registrationStatus)
     break;
   }
 
-  ERROR_LOG() << logText;
+  ERROR_LOG(m_logger) << logText;
   exit(2);
 }
 
@@ -308,7 +306,7 @@ void TetraIF::dumpData(const QByteArray &data)
     QFile f(m_outputDir + timeStr + QLatin1String(".dat"));
     if (!f.open(QIODevice::WriteOnly))
     {
-      ERROR_LOG() << "Error opening file "
+      ERROR_LOG(m_logger) << "Error opening file "
                           << f.fileName()
                           << " for writing - error: "
                           << f.errorString();
@@ -319,7 +317,7 @@ void TetraIF::dumpData(const QByteArray &data)
   if (data.size() > 27)
   {
     N_CoPrtCnv::CoPrtCnvRadioTelegram tele(data);
-    INFO_LOG() << "Got telegram from "
+    INFO_LOG(m_logger) << "Got telegram from "
                        << tele.getSrcISSI()
                        << " with size "
                        << data.size()
@@ -329,7 +327,7 @@ void TetraIF::dumpData(const QByteArray &data)
     QFile f(m_outputDir + QStringLiteral("payload-%1-%2.dat").arg(QString::number(tele.getSrcISSI()), timeStr));
     if (!f.open(QIODevice::WriteOnly))
     {
-      ERROR_LOG() << "Error opening file "
+      ERROR_LOG(m_logger) << "Error opening file "
                           << f.fileName()
                           << " for writing - error: "
                           << f.errorString();
@@ -367,14 +365,14 @@ void TetraIF::onSendData()
       tele.setSrcISSI(m_issi);
       tele.setDestISSI(dest_issi);
       tele.setZaehler(s_counter++);
-      DEBUG_LOG() << "Sending " << tele.getSize() << " bytes to Tetra (ISSI: " << dest_issi << ")";
+      DEBUG_LOG(m_logger) << "Sending " << tele.getSize() << " bytes to Tetra (ISSI: " << dest_issi << ")";
       m_socket->write(tele.data());
     }
     if (m_count > 0)
     {
       if (--m_count <= 0)
       {
-        INFO_LOG() << "Finsihed";
+        INFO_LOG(m_logger) << "Finsihed";
         m_socket->disconnectFromHost();
       }
     }
@@ -397,7 +395,7 @@ void TetraIF::parseISSIs(const QStringList &issiList)
     unsigned short issi = issiStr.toUShort(&bOk);
     if (!bOk)
     {
-      ERROR_LOG() << "Not a valid issi number: " << issiStr;
+      ERROR_LOG(m_logger) << "Not a valid issi number: " << issiStr;
       usage();
     }
     m_issiList += issi;
@@ -428,7 +426,7 @@ void TetraIF::handleDataIndReq(const QByteArray &data)
       handleLoginTelegram(radioTelegram);
       break;
     default:
-      ERROR_LOG() << "Unknown payload-status!: " << radioTelegram->getFragmentStatus();
+      ERROR_LOG(m_logger) << "Unknown payload-status!: " << radioTelegram->getFragmentStatus();
       break;
     }
 
@@ -445,10 +443,10 @@ void TetraIF::handleLoginTelegram(N_CoPrtCnv::CoPrtCnvRadioTelegram *a_loginTele
   {
     bool sent = sendLoginResponse(issi);
     if (sent)
-      INFO_LOG() << "Login: New TPU with Id=" << identity << " and ISSI=" << issi << " logged in";
+      INFO_LOG(m_logger) << "Login: New TPU with Id=" << identity << " and ISSI=" << issi << " logged in";
     else
 
-      INFO_LOG() << "Login: New TPU with Id=" << identity << " and ISSI=" << issi << " is NOT logged in";
+      INFO_LOG(m_logger) << "Login: New TPU with Id=" << identity << " and ISSI=" << issi << " is NOT logged in";
   }
 
 }
@@ -464,7 +462,7 @@ bool TetraIF::sendLoginResponse(const uint32_t a_ISSI)
   gef_telegramm_id_et telId = a_telegram->isNormalTelegram() ? a_telegram->getTelID() : GEF_BESTAETIGUNG;
 
   
-  INFO_LOG() << "Send telegram to radio: telId=" << telId << " wcounter=" << a_telegram->zaehler() << " size= 28";
+  INFO_LOG(m_logger) << "Send telegram to radio: telId=" << telId << " wcounter=" << a_telegram->zaehler() << " size= 28";
 
 
   
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTest/tetra_if.h b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTest/tetra_if.h
index 16b71cc93..d63b4272c 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTest/tetra_if.h
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/LastTest/tetra_if.h
@@ -29,6 +29,7 @@ protected Q_SLOTS:
   void onError(QAbstractSocket::SocketError);
   void onSendData();
 protected:
+NGL::INGLLogger &m_logger;
   void doInitialLogin();
   void handleReceivedTelegram(const QByteArray &data);
   void handleRegisterRsp(const uint8_t a_registrationStatus);
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvApplication.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvApplication.cpp
index d2bcebc5d..fe6a608f6 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvApplication.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvApplication.cpp
@@ -70,7 +70,7 @@ PrtCnvApplication::~PrtCnvApplication()
 
 void PrtCnvApplication::waitForCreate(const E_ThreadId a_threadId)
 {
-  INFO_LOG() << "Wait for others until we can create " << threadIdToString(a_threadId);
+  INFO_LOG(m_logger) << "Wait for others until we can create " << threadIdToString(a_threadId);
   setConstructed(a_threadId);
   switch (a_threadId)
   {
@@ -80,7 +80,7 @@ void PrtCnvApplication::waitForCreate(const E_ThreadId a_threadId)
              isConstructed(e_Log) &&
              isConstructed(e_Injection)))
     {
-      DEBUG_LOG() << "wait...";
+      DEBUG_LOG(m_logger) << "wait...";
       QThread::sleep(1);
     }
     break;
@@ -91,7 +91,7 @@ void PrtCnvApplication::waitForCreate(const E_ThreadId a_threadId)
              isConstructed(e_Log) &&
              isConstructed(e_Injection)))
     {
-      DEBUG_LOG() << "wait...";
+      DEBUG_LOG(m_logger) << "wait...";
       QThread::sleep(1);
     }
     break;
@@ -100,14 +100,14 @@ void PrtCnvApplication::waitForCreate(const E_ThreadId a_threadId)
     while (!(isConstructed(e_Radio) &&
              isConstructed(e_Central)))
     {
-      DEBUG_LOG() << "wait...";
+      DEBUG_LOG(m_logger) << "wait...";
       QThread::sleep(1);
     }
     break;
   default:
     break;
   }
-  INFO_LOG() << "Now we can create " << threadIdToString(a_threadId);
+  INFO_LOG(m_logger) << "Now we can create " << threadIdToString(a_threadId);
 }
 
 
@@ -116,7 +116,7 @@ void PrtCnvApplication::waitForCreate(const E_ThreadId a_threadId)
 
 void PrtCnvApplication::waitForInit(E_ThreadId a_threadId)
 {
-  INFO_LOG() << "Wait for others until we can initialize " << threadIdToString(a_threadId);
+  INFO_LOG(m_logger) << "Wait for others until we can initialize " << threadIdToString(a_threadId);
   setCreated(a_threadId);
   switch (a_threadId)
   {
@@ -124,7 +124,7 @@ void PrtCnvApplication::waitForInit(E_ThreadId a_threadId)
     while (!(isCreated(e_Db) &&
              isCreated(e_Radio)))
     {
-      DEBUG_LOG() << "wait...";
+      DEBUG_LOG(m_logger) << "wait...";
       QThread::sleep(1);
     }
     break;
@@ -133,7 +133,7 @@ void PrtCnvApplication::waitForInit(E_ThreadId a_threadId)
     while (!(isCreated(e_Db) &&
              isCreated(e_Central)))
     {
-      DEBUG_LOG() << "wait...";
+      DEBUG_LOG(m_logger) << "wait...";
       QThread::sleep(1);
     }
     break;
@@ -142,14 +142,14 @@ void PrtCnvApplication::waitForInit(E_ThreadId a_threadId)
     while (!(isCreated(e_Radio) &&
              isCreated(e_Central)))
     {
-      DEBUG_LOG() << "wait...";
+      DEBUG_LOG(m_logger) << "wait...";
       QThread::sleep(1);
     }
     break;
   default:
     break;
   }
-  INFO_LOG() << "Now we can initialize " << threadIdToString(a_threadId);
+  INFO_LOG(m_logger) << "Now we can initialize " << threadIdToString(a_threadId);
 }
 
 
@@ -157,7 +157,7 @@ void PrtCnvApplication::waitForInit(E_ThreadId a_threadId)
 
 void PrtCnvApplication::waitForStart(E_ThreadId a_threadId)
 {
-  INFO_LOG() << "Wait for others until we can start " << threadIdToString(a_threadId);
+  INFO_LOG(m_logger) << "Wait for others until we can start " << threadIdToString(a_threadId);
   setInitialized(a_threadId);
   switch (a_threadId)
   {
@@ -167,7 +167,7 @@ void PrtCnvApplication::waitForStart(E_ThreadId a_threadId)
              isStarted(e_Log) &&
              isStarted(e_Injection)))
     {
-      DEBUG_LOG() << "wait...";
+      DEBUG_LOG(m_logger) << "wait...";
       QThread::sleep(1);
     }
     break;
@@ -179,7 +179,7 @@ void PrtCnvApplication::waitForStart(E_ThreadId a_threadId)
              isStarted(e_Injection) &&
              isInitialized(e_RadioTraffic)))
     {
-      DEBUG_LOG() << "wait...";
+      DEBUG_LOG(m_logger) << "wait...";
       QThread::sleep(1);
     }
     break;
@@ -189,7 +189,7 @@ void PrtCnvApplication::waitForStart(E_ThreadId a_threadId)
              isInitialized(e_Central) &&
              isStarted(e_Log)))
     {
-      DEBUG_LOG() << "wait...";
+      DEBUG_LOG(m_logger) << "wait...";
       QThread::sleep(1);
     }
     break;
@@ -198,14 +198,14 @@ void PrtCnvApplication::waitForStart(E_ThreadId a_threadId)
     while (!(isInitialized(e_Radio) &&
              isStarted(e_Log)))
     {
-      DEBUG_LOG() << "wait...";
+      DEBUG_LOG(m_logger) << "wait...";
       QThread::sleep(1);
     }
     break;
   default:
     break;
   }
-  INFO_LOG() << "Now we can start " << threadIdToString(a_threadId);
+  INFO_LOG(m_logger) << "Now we can start " << threadIdToString(a_threadId);
 }
 
 
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvBroadcastMgr.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvBroadcastMgr.cpp
index 782449795..3e03e616a 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvBroadcastMgr.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvBroadcastMgr.cpp
@@ -22,8 +22,7 @@
 namespace PrtCnv
 {
 
-PrtCnvBroadcastMgr::PrtCnvBroadcastMgr()
-  : m_ClaimWindow(0)
+PrtCnvBroadcastMgr::PrtCnvBroadcastMgr() : m_ClaimWindow(0)
   , m_HighLoadFactor(0)
   , m_BroadcastLimit(0)
   , m_Config(nullptr)
@@ -35,8 +34,8 @@ PrtCnvBroadcastMgr::PrtCnvBroadcastMgr()
   , m_IsFullLoad(false)
   , m_FinishedBroadcastIndex(0)
   , m_FirstBroadcastIndexOfBc1(0)
-  , m_loggerBcRequest(getLogger("PrtCnvBroadcastMgr.BcRequest"))
-{
+  , m_loggerBcRequest(getLogger("PrtCnvBroadcastMgr.BcRequest")),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
 }
 
 
@@ -163,7 +162,7 @@ void PrtCnvBroadcastMgr::handleNachforderungBroadcastTelegram(int identity, int
     m_claimerArray.emplace_back(identity, broadcastIndex);
     return;
   }
-  WARNING_LOG() << "NachforderungBroadcast from TNE with id=" << identity
+  WARNING_LOG(m_logger) << "NachforderungBroadcast from TNE with id=" << identity
                         << ": resetCounter different we have: " << int(m_DbThread->getResetCounter())
                         << "; TNE has: " << resetCounter << " => discarded";
 }
@@ -180,7 +179,7 @@ std::shared_ptr<N_CoPrtCnv::CoPrtCnvRadioTelegram> PrtCnvBroadcastMgr::getNextBr
   
   
   
-  DEBUG_LOG() << "getNextBroadcastTelegramToSend, startIdx: " << a_beginSearchWithBroadcastIndex;
+  DEBUG_LOG(m_logger) << "getNextBroadcastTelegramToSend, startIdx: " << a_beginSearchWithBroadcastIndex;
   auto iter = m_BroadcastMap.upper_bound(0 == a_beginSearchWithBroadcastIndex ? m_FinishedBroadcastIndex : a_beginSearchWithBroadcastIndex);
   while (iter != m_BroadcastMap.end())
   {
@@ -318,7 +317,7 @@ void PrtCnvBroadcastMgr::removeExpiredTelegrams()
       return;
 
     auto radioTelegram = iter->second;
-    INFO_LOG() << "Remove expired telegram with telId=" << radioTelegram->getTelID()
+    INFO_LOG(m_logger) << "Remove expired telegram with telId=" << radioTelegram->getTelID()
                        << " and BC=" << radioTelegram->getBroadcastIndex() << " from BC-list";
     uint16_t wirkfeldKennung = radioTelegram->getPayloadDataUInt32(5, 2);
     removeWirkfeldTelegrams(wirkfeldKennung);
@@ -535,7 +534,7 @@ std::shared_ptr<N_CoPrtCnv::CoPrtCnvRadioTelegram> PrtCnvBroadcastMgr::createAcc
   const int idsToSendNow = m_activatedDusMines.size();
   if (idsToSendNow > 500)
   {
-    WARNING_LOG() << "More than 500 activated DUS mines in system - this is not allowed!";
+    WARNING_LOG(m_logger) << "More than 500 activated DUS mines in system - this is not allowed!";
     Q_ASSERT(false);
     return {};
   }
@@ -669,7 +668,7 @@ void PrtCnvBroadcastMgr::getAllFinishedBroadcastsFromDb(const bool a_doRestore)
     if (!radioTelegram)
       break;
     broadcastIndex = radioTelegram->getBroadcastIndex();
-    INFO_LOG() << "Move Broadcast-telegram from DbThread>BroadcastMgr with telId="
+    INFO_LOG(m_logger) << "Move Broadcast-telegram from DbThread>BroadcastMgr with telId="
                        << radioTelegram->getTelID() << " BC=" << broadcastIndex;
     dumpTelegram(m_logger, broadcastIndex, radioTelegram.get());
     
@@ -696,7 +695,7 @@ void PrtCnvBroadcastMgr::getAllFinishedBroadcastsFromDb(const bool a_doRestore)
     static int iBroadcastDumpCounter = 0;
     if ((iBroadcastDumpCounter++ % 30) == 0)
     {
-      DEBUG_LOG() << "Dumping broadcast map:";
+      DEBUG_LOG(m_logger) << "Dumping broadcast map:";
       for (const auto &it : m_BroadcastMap)
         dumpTelegram(m_logger, it.first, it.second.get());
     }
@@ -717,14 +716,14 @@ void PrtCnvBroadcastMgr::getAllFinishedBroadcastsFromDb(const bool a_doRestore)
 
 void PrtCnvBroadcastMgr::addToBroadcastMap(const std::shared_ptr<N_CoPrtCnv::CoPrtCnvRadioTelegram> &a_radioTelegram)
 {
-  INFO_LOG() << "Move from radioList to bcList: BC=" << a_radioTelegram->getBroadcastIndex()
+  INFO_LOG(m_logger) << "Move from radioList to bcList: BC=" << a_radioTelegram->getBroadcastIndex()
                      << " telID=" << a_radioTelegram->getTelID();
   switch (a_radioTelegram->getTelID())
   {
   
   case GEF_INIT:
   case GEF_UMGEBUNGS_MELDUNG2:
-    ERROR_LOG() << "Internal error: telegram with telId=" << a_radioTelegram->getTelID() << " should never be a normal broadcast";
+    ERROR_LOG(m_logger) << "Internal error: telegram with telId=" << a_radioTelegram->getTelID() << " should never be a normal broadcast";
     break;
   
   case GEF_DATENVERKEHR_TDS_SRT:
@@ -754,11 +753,11 @@ void PrtCnvBroadcastMgr::addToBroadcastMap(const std::shared_ptr<N_CoPrtCnv::CoP
   {
     
     const uint16_t wirkfeldKennung = a_radioTelegram->getPayloadDataUInt32(5, 2);
-    INFO_LOG() << "Adding to braodcast map, Telegram Id: " << a_radioTelegram->getTelID()
+    INFO_LOG(m_logger) << "Adding to braodcast map, Telegram Id: " << a_radioTelegram->getTelID()
                        << ", kennung: " << wirkfeldKennung;
     if (isEffectSimulationIdDeactivated(wirkfeldKennung))
     {
-      INFO_LOG() << "Got tele with tel id " << telegramId2String(a_radioTelegram->getTelID())
+      INFO_LOG(m_logger) << "Got tele with tel id " << telegramId2String(a_radioTelegram->getTelID())
                          << ", wirkfeldkennung: " << wirkfeldKennung << ", bcIndex: " << a_radioTelegram->getBroadcastIndex()
                          << " but this effect simulation is already deactivated... ignoring";
       dumpTelegram(m_logger, a_radioTelegram->getBroadcastIndex(), a_radioTelegram.get());
@@ -796,7 +795,7 @@ void PrtCnvBroadcastMgr::addToBroadcastMap(const std::shared_ptr<N_CoPrtCnv::CoP
     else
     {
       
-      ERROR_LOG() << "Internal error: Got invalid kennung: " << wirkfeldKennung;
+      ERROR_LOG(m_logger) << "Internal error: Got invalid kennung: " << wirkfeldKennung;
     }
     break;
   }
@@ -805,7 +804,7 @@ void PrtCnvBroadcastMgr::addToBroadcastMap(const std::shared_ptr<N_CoPrtCnv::CoP
   {
     auto  wirkfeldTyp = static_cast<TrainingAreaBase::TetraIcd::AreaEffectSimulationType>(a_radioTelegram->getPayloadDataUInt32(5, 1));
     uint16_t wirkfeldKennung = a_radioTelegram->getPayloadDataUInt32(6, 2);
-    INFO_LOG() << "addToBroadcastMap - Wirkfeld Aenderung Bezeichner for type "
+    INFO_LOG(m_logger) << "addToBroadcastMap - Wirkfeld Aenderung Bezeichner for type "
                        << wirkfeldTyp2Str(wirkfeldTyp) << " - kennung: "
                        << wirkfeldKennung;
     addWirkfeldTelegram(a_radioTelegram, wirkfeldKennung);
@@ -815,7 +814,7 @@ void PrtCnvBroadcastMgr::addToBroadcastMap(const std::shared_ptr<N_CoPrtCnv::CoP
   {
     auto  wirkfeldTyp = static_cast<TrainingAreaBase::TetraIcd::AreaEffectSimulationType>(a_radioTelegram->getPayloadDataUInt32(5, 1));
     uint16_t wirkfeldKennung = a_radioTelegram->getPayloadDataUInt32(6, 2);
-    INFO_LOG() << "Deaktivierung Wirkfeld for type "
+    INFO_LOG(m_logger) << "Deaktivierung Wirkfeld for type "
                        << wirkfeldTyp2Str(wirkfeldTyp) << " - kennung: "
                        << wirkfeldKennung << ", bc: " << a_radioTelegram->getBroadcastIndex();
     switch (wirkfeldTyp)
@@ -838,13 +837,13 @@ void PrtCnvBroadcastMgr::addToBroadcastMap(const std::shared_ptr<N_CoPrtCnv::CoP
       else
       {
         
-        ERROR_LOG() << "Internal error: Got invalid kennung: " << wirkfeldKennung;
+        ERROR_LOG(m_logger) << "Internal error: Got invalid kennung: " << wirkfeldKennung;
       }
       break;
     case TrainingAreaBase::TetraIcd::AreaEffectSimulationType::FunctionalArea: 
     default:
       
-      ERROR_LOG() << "Internal error: WirkfeldTyp " << wirkfeldTyp2Str(wirkfeldTyp) << " in GEF_DEAKTIVIERUNG_WIRKFELD not implemented";
+      ERROR_LOG(m_logger) << "Internal error: WirkfeldTyp " << wirkfeldTyp2Str(wirkfeldTyp) << " in GEF_DEAKTIVIERUNG_WIRKFELD not implemented";
     }
     m_BroadcastMap.insert(std::make_pair(a_radioTelegram->getBroadcastIndex(), a_radioTelegram));
     break;
@@ -999,7 +998,7 @@ int PrtCnvBroadcastMgr::getSammeltelegramIndex(const std::shared_ptr<N_CoPrtCnv:
     nbrLength = 2;
     break;
   default:
-    ERROR_LOG() << "Unknown Sammeltelegram with telId=" << a_sammelTelegram->getTelID();
+    ERROR_LOG(m_logger) << "Unknown Sammeltelegram with telId=" << a_sammelTelegram->getTelID();
     return -1;
   }
   
@@ -1027,7 +1026,7 @@ void PrtCnvBroadcastMgr::deactivateSingleMine(const std::shared_ptr<N_CoPrtCnv::
   {
     removeFromActivatedDusMine(minenkennung);
     addToDeactivatedDusMine(minenkennung, a_radioTelegram->getBroadcastIndex());
-    DEBUG_LOG() << "Deactivating DUS-Mine: " << minenkennung << ", #deactivated mines: " << m_deactivatedBcIndex2DusMine.size();
+    DEBUG_LOG(m_logger) << "Deactivating DUS-Mine: " << minenkennung << ", #deactivated mines: " << m_deactivatedBcIndex2DusMine.size();
     removeDusMineDeactivationFromBroadcastMap(minenkennung);  
     m_BroadcastMap.insert(std::make_pair(a_radioTelegram->getBroadcastIndex(), a_radioTelegram));
   }
@@ -1095,24 +1094,24 @@ bool PrtCnvBroadcastMgr::deactivateEinzelmineFromMinensperre(const uint16_t a_wi
           bool dummy;
           if (radioTelegram->mustBeSentAsBroadcast(std::numeric_limits<time_t>::max(), dummy, false))
           {
-            INFO_LOG() << "A normal broadcast-telegram WirkfeldStatusMinensperre still exists";
+            INFO_LOG(m_logger) << "A normal broadcast-telegram WirkfeldStatusMinensperre still exists";
             return false;
           }
           return true;
         }
         else
-          ERROR_LOG() << "Got corrupt telegram WirkfeldstatusMinensperre with nbrOfMines=" << nbrOfMines << " and payloadSize=" << radioTelegram->getPayloadSize();
+          ERROR_LOG(m_logger) << "Got corrupt telegram WirkfeldstatusMinensperre with nbrOfMines=" << nbrOfMines << " and payloadSize=" << radioTelegram->getPayloadSize();
       }
       else
       {
         
-        ERROR_LOG() << "Mine with kennung=" << a_minenKennung << " does not fit into status (nbrOfMines=" << nbrOfMines << ")";
+        ERROR_LOG(m_logger) << "Mine with kennung=" << a_minenKennung << " does not fit into status (nbrOfMines=" << nbrOfMines << ")";
       }
       return true;
     }
     ++iter;
   }
-  ERROR_LOG() << "Did not find the WirkfeldStatusMinensperre with kennung=" << a_wirkfeldKennung
+  ERROR_LOG(m_logger) << "Did not find the WirkfeldStatusMinensperre with kennung=" << a_wirkfeldKennung
                       << ", therefore deactivated mine with kennung=" << a_minenKennung << " could not be updated.";
   return true;
 }
@@ -1127,7 +1126,7 @@ void PrtCnvBroadcastMgr::reactivateDusMine(const std::shared_ptr<N_CoPrtCnv::CoP
   
   const uint32_t nbrOfMines = a_radioTelegram->getPayloadDataUInt32(5, 2);  
 
-  DEBUG_LOG() << "Reactivating DUS-Mines, #mines: " << nbrOfMines;
+  DEBUG_LOG(m_logger) << "Reactivating DUS-Mines, #mines: " << nbrOfMines;
   if (0 == nbrOfMines)
   {
     
@@ -1145,7 +1144,7 @@ void PrtCnvBroadcastMgr::reactivateDusMine(const std::shared_ptr<N_CoPrtCnv::CoP
     for (uint32_t i = 0; i < nbrOfMines; i++)
     {
       const int dusMineId = a_radioTelegram->getPayloadDataUInt32(7 + 2 * i, 2);
-      DEBUG_LOG() << "Reactivating DUS-Mines, mindId: " << dusMineId;
+      DEBUG_LOG(m_logger) << "Reactivating DUS-Mines, mindId: " << dusMineId;
       removeDusMineDeactivationFromBroadcastMap(dusMineId);
       removeFromDeactivatedDusMine(dusMineId);
       addToActivatedDusMine(dusMineId);
@@ -1187,11 +1186,11 @@ void PrtCnvBroadcastMgr::addWirkfeldTelegram(const std::shared_ptr<N_CoPrtCnv::C
         {
           uint16_t mineIndex = radioTelegram->getPayloadDataUInt32(11, 2);
           isSameMine = mineIndex == a_minenKennung;
-          INFO_LOG() << "Mine with kennung=" << a_minenKennung << " found: " << isSameMine;
+          INFO_LOG(m_logger) << "Mine with kennung=" << a_minenKennung << " found: " << isSameMine;
         }
       }
       else
-        ERROR_LOG() << "Internal error: Only telegrams 'Deaktivierung_Einzelmine' must be called with a_mineKennung. I proceed without respecting mine-kennung...";
+        ERROR_LOG(m_logger) << "Internal error: Only telegrams 'Deaktivierung_Einzelmine' must be called with a_mineKennung. I proceed without respecting mine-kennung...";
     }
     
     if ((radioTelegram->getTelID() == a_radioTelegram->getTelID() || radioTelegram->getTelID() == a_telId) && isSameMine)
@@ -1205,7 +1204,7 @@ void PrtCnvBroadcastMgr::addWirkfeldTelegram(const std::shared_ptr<N_CoPrtCnv::C
   }
 
   
-  INFO_LOG() << "Add kennung: " << a_wirkfeldKennung
+  INFO_LOG(m_logger) << "Add kennung: " << a_wirkfeldKennung
                      << " telId=" << a_radioTelegram->getTelID()
                      << " BC=" << a_radioTelegram->getBroadcastIndex();
   m_WirkfeldTelegramMapByKennung.insert(std::make_pair(a_wirkfeldKennung, a_radioTelegram));
@@ -1223,7 +1222,7 @@ void PrtCnvBroadcastMgr::addWirkfeldTelegram(const std::shared_ptr<N_CoPrtCnv::C
 
 void PrtCnvBroadcastMgr::removeWirkfeldTelegrams(const uint16_t a_kennung)
 {
-  INFO_LOG() << "Removing all Wirkfeld-Telegrams with kennung=" << a_kennung;
+  INFO_LOG(m_logger) << "Removing all Wirkfeld-Telegrams with kennung=" << a_kennung;
   
   auto iter = m_WirkfeldTelegramMapByKennung.find(a_kennung);
   while (iter != m_WirkfeldTelegramMapByKennung.end())
@@ -1255,7 +1254,7 @@ void PrtCnvBroadcastMgr::removeFromFunktionsAndBroadcastMaps(const uint16_t a_fu
     auto radioTelegram = iter->second;
     
     
-    INFO_LOG() << "Removing Funktionsraum-telegram with kennung=" << a_funktionsraumKennung
+    INFO_LOG(m_logger) << "Removing Funktionsraum-telegram with kennung=" << a_funktionsraumKennung
                        << " and BC=" << radioTelegram->getBroadcastIndex();
     m_FunktionsraumTelegramMap.erase(iter);
 
@@ -1281,7 +1280,7 @@ void PrtCnvBroadcastMgr::removeFromTechnikFunktionsAndBroadcastMaps(const uint16
     auto radioTelegram = iter->second;
     
     
-    INFO_LOG() << "Removing Funktionsraum-telegram with kennung=" << a_funktionsraumKennung
+    INFO_LOG(m_logger) << "Removing Funktionsraum-telegram with kennung=" << a_funktionsraumKennung
                        << " and BC=" << radioTelegram->getBroadcastIndex();
     m_TechnikFunktionsraumTelegramMap.erase(iter);
 
@@ -1305,7 +1304,7 @@ void PrtCnvBroadcastMgr::removeFromWirkfeldAndBroadcastMaps(const std::multimap<
 {
   auto radioTelegram = a_wirkfeldTelegramMapByKennungIterator->second;
 
-  INFO_LOG() << "Removing wirkfeld-telegram with telId=" << radioTelegram->getTelID()
+  INFO_LOG(m_logger) << "Removing wirkfeld-telegram with telId=" << radioTelegram->getTelID()
                      << ", kennung=" << a_wirkfeldTelegramMapByKennungIterator->first
                      << " and BC=" << radioTelegram->getBroadcastIndex()
                      << " from byWirkfeldKennung-map";
@@ -1322,7 +1321,7 @@ void PrtCnvBroadcastMgr::removeFromWirkfeldAndBroadcastMaps(const std::multimap<
     {
       if (iter->second == radioTelegram)
       {
-        INFO_LOG() << "Removing wirkfeld-telegram with telId=" << radioTelegram->getTelID()
+        INFO_LOG(m_logger) << "Removing wirkfeld-telegram with telId=" << radioTelegram->getTelID()
                            << " also from byTime-map";
         m_WirkfeldTelegramMapByTime.erase(iter);
         break;
@@ -1412,7 +1411,7 @@ void removeFromMap(T &cont, const std::shared_ptr<N_CoPrtCnv::CoPrtCnvRadioTeleg
 
 void PrtCnvBroadcastMgr::removeFromAllMaps(const std::shared_ptr<N_CoPrtCnv::CoPrtCnvRadioTelegram> &a_radioTelegram)
 {
-  INFO_LOG() << "Remove telegram with telId=" << a_radioTelegram->getTelID() << " BC=" << a_radioTelegram->getBroadcastIndex();
+  INFO_LOG(m_logger) << "Remove telegram with telId=" << a_radioTelegram->getTelID() << " BC=" << a_radioTelegram->getBroadcastIndex();
 
   removeFromBroadcastMap(a_radioTelegram);
 
@@ -1441,7 +1440,7 @@ void PrtCnvBroadcastMgr::replaceLastTelegramAndAddAtEnd(const std::shared_ptr<N_
   {
     auto lastRadioTelegram = iter->second;
     
-    INFO_LOG() << "remove last telegram with telId=" << lastRadioTelegram->getTelID()
+    INFO_LOG(m_logger) << "remove last telegram with telId=" << lastRadioTelegram->getTelID()
                        << " and BC=" << lastRadioTelegram->getBroadcastIndex();
     removeFromBroadcastMap(lastRadioTelegram);
     m_LastTelegramMap.erase(iter);
@@ -1450,7 +1449,7 @@ void PrtCnvBroadcastMgr::replaceLastTelegramAndAddAtEnd(const std::shared_ptr<N_
   m_BroadcastMap.insert(std::make_pair(a_newRadioTelegram->getBroadcastIndex(), a_newRadioTelegram));
   
   m_LastTelegramMap.insert(std::make_pair(a_newRadioTelegram->getTelID(), a_newRadioTelegram));
-  INFO_LOG() << "New last telegram with with telId=" << a_newRadioTelegram->getTelID()
+  INFO_LOG(m_logger) << "New last telegram with with telId=" << a_newRadioTelegram->getTelID()
                      << " and BC=" << a_newRadioTelegram->getBroadcastIndex();
 }
 
@@ -1469,7 +1468,7 @@ void PrtCnvBroadcastMgr::moveTelegramInBroadcastMap(const std::shared_ptr<N_CoPr
                                                     const std::shared_ptr<N_CoPrtCnv::CoPrtCnvRadioTelegram> &a_attachTelegram)
 {
   
-  INFO_LOG() << "Move telId=" << a_radioTelegram->getTelID()
+  INFO_LOG(m_logger) << "Move telId=" << a_radioTelegram->getTelID()
                      << " from BC=" << a_radioTelegram->getBroadcastIndex()
                      << " to BC=" << a_newBroadcastIndex;
   removeFromBroadcastMap(a_radioTelegram);
@@ -1479,7 +1478,7 @@ void PrtCnvBroadcastMgr::moveTelegramInBroadcastMap(const std::shared_ptr<N_CoPr
   
   if (a_attachTelegram && (a_attachTelegram->getTelID() != GEF_REAKTIVIERUNG_DUS_MINE))
   {
-    INFO_LOG() << "Attach telID=" << a_attachTelegram->getTelID()
+    INFO_LOG(m_logger) << "Attach telID=" << a_attachTelegram->getTelID()
                        << " to telID=" << a_radioTelegram->getTelID()
                        << " BC=" << a_newBroadcastIndex;
     a_radioTelegram->setBroadcastonlyTelegram(a_attachTelegram);
@@ -1534,7 +1533,7 @@ void PrtCnvBroadcastMgr::addBroadcastOnlyTelegramToMap(const std::shared_ptr<N_C
   if (m_BroadcastMap.end() == iter)
   {
     
-    INFO_LOG() << "Insert telId=" << a_broadcastOnlyTelegram->getTelID()
+    INFO_LOG(m_logger) << "Insert telId=" << a_broadcastOnlyTelegram->getTelID()
                        << " as broadcastonly telegram with BC=" << broadcastIndex;
     a_broadcastOnlyTelegram->setBroadcastOnly();
     m_BroadcastMap.insert(std::make_pair(broadcastIndex, a_broadcastOnlyTelegram));
@@ -1542,7 +1541,7 @@ void PrtCnvBroadcastMgr::addBroadcastOnlyTelegramToMap(const std::shared_ptr<N_C
   else
   {
     
-    INFO_LOG() << "Add telId=" << a_broadcastOnlyTelegram->getTelID()
+    INFO_LOG(m_logger) << "Add telId=" << a_broadcastOnlyTelegram->getTelID()
                        << " as broadcastonly telegram to telegramm with BC=" << iter->second->getBroadcastIndex();
     iter->second->setBroadcastonlyTelegram(a_broadcastOnlyTelegram);
   }
@@ -1560,15 +1559,15 @@ void PrtCnvBroadcastMgr::detachTelegram(const std::shared_ptr<N_CoPrtCnv::CoPrtC
   {
     uint16_t broadcastIndex = a_radioTelegram->getBroadcastIndex();
     
-    INFO_LOG() << "detach bconly-telegram : telId=" << a_radioTelegram->getTelID() << " BC=" << broadcastIndex;
+    INFO_LOG(m_logger) << "detach bconly-telegram : telId=" << a_radioTelegram->getTelID() << " BC=" << broadcastIndex;
     if (broadcastOnlyTelegram->getBroadcastIndex() != broadcastIndex)
-      ERROR_LOG() << "Internal error: BC=" << broadcastOnlyTelegram->getBroadcastIndex() << " of attached telegram is not equal BC=" << broadcastIndex;
+      ERROR_LOG(m_logger) << "Internal error: BC=" << broadcastOnlyTelegram->getBroadcastIndex() << " of attached telegram is not equal BC=" << broadcastIndex;
     auto iter = m_BroadcastMap.find(broadcastIndex);
     if (iter != m_BroadcastMap.end())
-      ERROR_LOG() << "Internal error: m_BroadcastMap-entry with BC=" << broadcastIndex << " must not exists";
+      ERROR_LOG(m_logger) << "Internal error: m_BroadcastMap-entry with BC=" << broadcastIndex << " must not exists";
     else
     {
-      INFO_LOG() << "Insert broadcast-only BC=" << broadcastOnlyTelegram->getBroadcastIndex();
+      INFO_LOG(m_logger) << "Insert broadcast-only BC=" << broadcastOnlyTelegram->getBroadcastIndex();
       broadcastOnlyTelegram->setBroadcastOnly();
       m_BroadcastMap.insert(std::make_pair(broadcastIndex, broadcastOnlyTelegram));
     }
@@ -1583,7 +1582,7 @@ void PrtCnvBroadcastMgr::detachTelegram(const std::shared_ptr<N_CoPrtCnv::CoPrtC
 
 void PrtCnvBroadcastMgr::handleOverrunOfBroadcastCounter(const bool a_doRestore)
 {
-  WARNING_LOG() << "Broadcast-counter reaches maximum => reduce broadcast-list and increment reset-counter";
+  WARNING_LOG(m_logger) << "Broadcast-counter reaches maximum => reduce broadcast-list and increment reset-counter";
 
   
   
@@ -1631,7 +1630,7 @@ void PrtCnvBroadcastMgr::handleOverrunOfBroadcastCounter(const bool a_doRestore)
         }
         ++iter;
       }
-      INFO_LOG() << "New BC-index for broadcast-telegram with telId=" << radioTelegram->getTelID() << " BC=" << newBroadcastCounter;
+      INFO_LOG(m_logger) << "New BC-index for broadcast-telegram with telId=" << radioTelegram->getTelID() << " BC=" << newBroadcastCounter;
       newBroadcastMap.insert(std::make_pair(newBroadcastCounter, radioTelegram));
     }
   }
@@ -1642,7 +1641,7 @@ void PrtCnvBroadcastMgr::handleOverrunOfBroadcastCounter(const bool a_doRestore)
   cleanAndInit(false);
   if (!a_doRestore) m_DbThread->setResetCounter(m_DbThread->getResetCounter() + 1);
 
-  WARNING_LOG() << "New broadcast-counter=" << newBroadcastCounter << " new reset-counter=" << (int)m_DbThread->getResetCounter();
+  WARNING_LOG(m_logger) << "New broadcast-counter=" << newBroadcastCounter << " new reset-counter=" << (int)m_DbThread->getResetCounter();
   m_BroadcastIndex = newBroadcastCounter;
 }
 
@@ -1702,7 +1701,7 @@ void PrtCnvBroadcastMgr::incTickAndSetTrafficLoad(const bool a_isHighLoad, const
 
 bool PrtCnvBroadcastMgr::isEffectSimulationIdDeactivated(const uint16_t effectsimulationId) const
 {
-  INFO_LOG() << "Checking deactivation for Id " << effectsimulationId;
+  INFO_LOG(m_logger) << "Checking deactivation for Id " << effectsimulationId;
   return m_deactivatedAesArea2bcIndex.contains(effectsimulationId);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvInjectionSocket.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvInjectionSocket.cpp
index 9b0ae31fe..4a3b06f86 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvInjectionSocket.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvInjectionSocket.cpp
@@ -37,7 +37,7 @@ PrtCnvInjectionSocket::~PrtCnvInjectionSocket()
 
 void PrtCnvInjectionSocket::disconnectClient()
 {
-  INFO_LOG() << "A client has disconnected from the injection-server";
+  INFO_LOG(m_logger) << "A client has disconnected from the injection-server";
   emit disconnected(this);
 }
 
@@ -47,7 +47,7 @@ void PrtCnvInjectionSocket::disconnectClient()
 
 void PrtCnvInjectionSocket::processInputData()
 {
-  INFO_LOG() << "Injection-server has data received";
+  INFO_LOG(m_logger) << "Injection-server has data received";
   N_CoPrtCnv::CoPrtCnvInjectionHeader injectionHeader;
   qint64 bytesRead = m_Socket->peek((char*)&injectionHeader, sizeof(injectionHeader));
   if (sizeof(injectionHeader) == bytesRead)
@@ -58,7 +58,7 @@ void PrtCnvInjectionSocket::processInputData()
       qint64 available = m_Socket->bytesAvailable();
       if (available < (injectionHeader.m_Size+sizeof(injectionHeader)))
       {
-        INFO_LOG() << "not enough bytes available - waiting for more data: "
+        INFO_LOG(m_logger) << "not enough bytes available - waiting for more data: "
                            << "headersize=" << sizeof(injectionHeader) << " id1="
                            << injectionHeader.m_Id1 << " id2=" << injectionHeader.m_Id2
                            << " kind=" << (int)injectionHeader.m_Kind << " size="
@@ -85,26 +85,26 @@ void PrtCnvInjectionSocket::processInputData()
               if (N_CoPrtCnv::CoPrtCnvInjectionHeader::eCentral == injectionHeader.m_Kind &&
                   tele->telegramId() != TrainingAreaBase::TetraIcd::TelegramId::DATENVERKEHR_TDS_SRT)
               {
-                INFO_LOG() << "Got an injection-central-telegram with telId=" << tele->telegramId();
+                INFO_LOG(m_logger) << "Got an injection-central-telegram with telId=" << tele->telegramId();
                 m_Server->addToCentralList(tele);
               }
               else
               {
-                INFO_LOG() << "Got an injection-radio-telegram with telId=" << tele->telegramId();
+                INFO_LOG(m_logger) << "Got an injection-radio-telegram with telId=" << tele->telegramId();
                 m_Server->addToRadioList(tele);
               }
             }
             break;
 
           default:
-            ERROR_LOG() << "Unknown kind (" << injectionHeader.m_Kind << ") of injection-telegram";
+            ERROR_LOG(m_logger) << "Unknown kind (" << injectionHeader.m_Kind << ") of injection-telegram";
             break;
         }
       }
     }
     else
     {
-      ERROR_LOG() << "Corrupt injection-telegram received => reconnect";
+      ERROR_LOG(m_logger) << "Corrupt injection-telegram received => reconnect";
       m_Socket->disconnectFromHost();
     }
   }
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvRadioThread.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvRadioThread.cpp
index 3cfca6dd0..0ea4c479b 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvRadioThread.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvRadioThread.cpp
@@ -56,8 +56,7 @@ static BiteError getBiteError(const N_CoPrtCnv::CoPrtCnvRadioTelegram &a_radioTe
     return ret;
 }
 
-PrtCnvRadioThread::PrtCnvRadioThread(int exerciseId, PrtCnvThreadStarter *a_parent)
-    : PrtCnvSocketThread(a_parent, "PrtCnvRadioThread"),
+PrtCnvRadioThread::PrtCnvRadioThread(int exerciseId, PrtCnvThreadStarter *a_parent) : PrtCnvSocketThread(a_parent, "PrtCnvRadioThread"),
       m_CentralThread(nullptr),
       m_radioTrafficThread(nullptr),
       m_SendCounter(0),
@@ -90,8 +89,8 @@ PrtCnvRadioThread::PrtCnvRadioThread(int exerciseId, PrtCnvThreadStarter *a_pare
       m_ReceivedBytes(0),
       m_bUseScrambling(false),
       m_loggerStats(getLogger("PrtCnvRadioThread.statistic")),
-      m_exerciseEquipmentAssignmentMutex(QMutex::Recursive)
-{
+      m_exerciseEquipmentAssignmentMutex(QMutex::Recursive),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
     m_Name = QStringLiteral("Radio");
     for (int i = 0; i < AVERAGE_COUNT; ++i)
     {
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvThread.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvThread.cpp
index dd4f61866..ebd26852b 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvThread.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvThread.cpp
@@ -34,7 +34,7 @@ int32_t PrtCnvThread::create(NGL::Settings *settings)
   m_currentThreadId = QThread::currentThreadId();
   m_Config = settings;
 
-  INFO_LOG() << "create " << m_Name
+  INFO_LOG(m_logger) << "create " << m_Name
                      << " - current thread id is " << m_currentThreadId;
   return 0;
 }
@@ -42,14 +42,14 @@ int32_t PrtCnvThread::create(NGL::Settings *settings)
 
 int32_t PrtCnvThread::init()
 {
-  INFO_LOG() << "init " << m_Name;
+  INFO_LOG(m_logger) << "init " << m_Name;
   return 0;
 }
 
 
 int32_t PrtCnvThread::start()
 {
-  INFO_LOG() << "start " << m_Name;
+  INFO_LOG(m_logger) << "start " << m_Name;
   return 0;
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvThreadStarter.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvThreadStarter.cpp
index 30455f86c..8a0a979fd 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvThreadStarter.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvThreadStarter.cpp
@@ -34,7 +34,7 @@ PrtCnvThreadStarter::PrtCnvThreadStarter(const PrtCnv::PrtCnvApplication::E_Thre
   , m_Id(a_id)
   , m_settings(new NGL::Settings(configFileName))
 {
-  DEBUG_LOG() << "Using Config file '" << configFileName << "'";
+  DEBUG_LOG(m_logger) << "Using Config file '" << configFileName << "'";
 }
 
 
@@ -50,7 +50,7 @@ PrtCnvThreadStarter::~PrtCnvThreadStarter()
 
 void PrtCnvThreadStarter::run()
 {
-  INFO_LOG() << "Entering event loop for thread " << this << ", id: " << m_Id;
+  INFO_LOG(m_logger) << "Entering event loop for thread " << this << ", id: " << m_Id;
   
   switch (m_Id)
   {
@@ -90,7 +90,7 @@ void PrtCnvThreadStarter::run()
 
   if (!m_Thread)
   {
-    ERROR_LOG() << "Unknown threadId: " << m_Id;
+    ERROR_LOG(m_logger) << "Unknown threadId: " << m_Id;
     return;
   }
 
@@ -107,7 +107,7 @@ void PrtCnvThreadStarter::run()
 
   exec();
 
-  INFO_LOG() << "Leaving event loop for thread " << this << ", id: " << m_Id;
+  INFO_LOG(m_logger) << "Leaving event loop for thread " << this << ", id: " << m_Id;
   delete m_Thread;
   m_Thread = nullptr;
 }
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/TetraTestServer/server.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/TetraTestServer/server.cpp
index 976f92cb2..2d13a27a7 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/TetraTestServer/server.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/TetraTestServer/server.cpp
@@ -7,10 +7,9 @@
 
 #include "worker.h"
 
-TTServer::TTServer(const TTSArgs &ttsArgs)
-  : m_ttsArgs(ttsArgs)
-  .getNGLLogger("TTServer"))
-{
+TTServer::TTServer(const TTSArgs &ttsArgs) : m_ttsArgs(ttsArgs)
+  .getNGLLogger("TTServer")),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   connect(this, &TTServer::newConnection,
           this, &TTServer::onNewConnection);
 }
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/TetraTestServer/server.h b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/TetraTestServer/server.h
index f7208c829..f3cea0758 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/TetraTestServer/server.h
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/TetraTestServer/server.h
@@ -48,5 +48,7 @@ protected Q_SLOTS:
   void onDisconnect();
 
 protected:
+
+NGL::INGLLogger &m_logger;
   TTSArgs m_ttsArgs;
 };
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/TetraTestServer/worker.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/TetraTestServer/worker.cpp
index 9e3e1dbab..935645ce3 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/TetraTestServer/worker.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/TetraTestServer/worker.cpp
@@ -39,7 +39,7 @@ bool TTWorker::init()
 
   if (m_ttsArgs.movs_per_msec < 200)
   {
-    ERROR_LOG() << "Invalid value for 'movements per milliseconds'! Please choose a number greater than 200 msecs or equal. Program stopped.";
+    ERROR_LOG(m_logger) << "Invalid value for 'movements per milliseconds'! Please choose a number greater than 200 msecs or equal. Program stopped.";
     return false;
   }
   return true;
@@ -77,7 +77,7 @@ QVector<runningPattern> TTWorker::interpretPattern(QString pattern) const
 {
   if (pattern.isEmpty())
   {
-    ERROR_LOG() << "INVALID PATTERN - pattern-size < 1";
+    ERROR_LOG(m_logger) << "INVALID PATTERN - pattern-size < 1";
     exit(8);
   }
 
@@ -91,7 +91,7 @@ QVector<runningPattern> TTWorker::interpretPattern(QString pattern) const
 
     if (pattern.isEmpty()) 
     {
-      ERROR_LOG() << "INVALID PATTERN - alias '" << patternAlias << "' is not available in settings file! Program halted.";
+      ERROR_LOG(m_logger) << "INVALID PATTERN - alias '" << patternAlias << "' is not available in settings file! Program halted.";
       exit(9);
     }
   }
@@ -126,7 +126,7 @@ QVector<runningPattern> TTWorker::interpretPattern(QString pattern) const
       return newPatternList; 
   }
 
-  ERROR_LOG() << "INVALID PATTERN: '" << strings.at(i) << "'. Cannot start without correct pattern!";
+  ERROR_LOG(m_logger) << "INVALID PATTERN: '" << strings.at(i) << "'. Cannot start without correct pattern!";
 
   exit(5); 
 
@@ -137,7 +137,7 @@ void TTWorker::sendLogin(uint32_t eqId, uint32_t issi)
 {
   N_CoPrtCnv::CoPrtCnvRadioTelegram *tele = new N_CoPrtCnv::CoPrtCnvRadioTelegram(N_CoPrtCnv::CoPrtCnvRadioTelegram::e_LoginRequest, eqId, issi);
 
-  DEBUG_LOG() << "SEND LOGIN FOR ISSI=" << issi << ", eqId=" << eqId;
+  DEBUG_LOG(m_logger) << "SEND LOGIN FOR ISSI=" << issi << ", eqId=" << eqId;
   sendTelegram(tele, issi);
 }
 
@@ -147,13 +147,13 @@ void TTWorker::onReadyRead()
   qint64 bytesRead = m_socket->peek((char *)&header, sizeof(header));
   if (sizeof(header) != bytesRead)
   {
-    DEBUG_LOG() << "To few bytes to read from socket";
+    DEBUG_LOG(m_logger) << "To few bytes to read from socket";
     return;
   }
 
   if (N_CoPrtCnv::CoPrtCnvRadioTelegram::MAGIC_NUMBER != header.m_MagicNumber)
   {
-    ERROR_LOG() << "Disconnect because radio-Telegram does not begin with magic-number A5: I got "
+    ERROR_LOG(m_logger) << "Disconnect because radio-Telegram does not begin with magic-number A5: I got "
                        << header.m_MagicNumber;
     m_socket->disconnectFromHost();
     return;
@@ -161,7 +161,7 @@ void TTWorker::onReadyRead()
 
   if (!N_CoPrtCnv::CoPrtCnvRadioTelegram::isTelegramLengthOk(header.m_Length))
   {
-    WARNING_LOG() << "Radio-Telegram length to big: " << header.m_Length
+    WARNING_LOG(m_logger) << "Radio-Telegram length to big: " << header.m_Length
                          << " - but I proceed with this telegram.";
   }
 
@@ -169,7 +169,7 @@ void TTWorker::onReadyRead()
   uint16_t dataSize = header.m_Length + sizeof(header);
   if (m_socket->bytesAvailable() < dataSize)
   {
-    DEBUG_LOG() << "not enough bytes available - waiting for more data";
+    DEBUG_LOG(m_logger) << "not enough bytes available - waiting for more data";
     return;
   }
   QByteArray buf(dataSize, Qt::Uninitialized);
@@ -188,7 +188,7 @@ void TTWorker::onReadyRead()
 
 void TTWorker::handleReceivedTelegram(const QByteArray &data)
 {
-  INFO_LOG() << data.size();
+  INFO_LOG(m_logger) << data.size();
   
   switch (data.at(4))
   {
@@ -203,7 +203,7 @@ void TTWorker::handleReceivedTelegram(const QByteArray &data)
     
     break;
   default:
-    INFO_LOG() << "Radio-Telegram with PDU-Type=" << (int)data[4]
+    INFO_LOG(m_logger) << "Radio-Telegram with PDU-Type=" << (int)data[4]
                       << " not implemented!";
     break;
   }
@@ -245,7 +245,7 @@ void TTWorker::onSendDeaktivierungEinzelminen()
 {
   if (m_playerList.isEmpty())
   {
-    ERROR_LOG() << "No player for onSendDeaktivierungEinzelminen...";
+    ERROR_LOG(m_logger) << "No player for onSendDeaktivierungEinzelminen...";
     return;
   }
   Player *p = m_playerList.at(0);
@@ -334,7 +334,7 @@ void TTWorker::sendTaktischerStatus(uint32_t eqId, uint32_t issi, TrainingAreaBa
     {
       p->vbg = vbg;
       tele.vulnerabilityState = vbg;
-      DEBUG_LOG() << "Player (" << p->eqId << ") - VBG: " << int(vbg);
+      DEBUG_LOG(m_logger) << "Player (" << p->eqId << ") - VBG: " << int(vbg);
       break;
     }
   }
@@ -422,7 +422,7 @@ void TTWorker::handleDataIndReq(const QByteArray &data)
     N_CoPrtCnv::CoPrtCnvCentralTelegram *tele = N_CoPrtCnv::CoPrtCnvTelegramConverter::convertToCentral(radioTelegram.data());
     TrainingAreaBase::TetraIcd::StateChange sc = TrainingAreaBase::TetraIcd::StateChange::fromJson(tele->jsonData());
     delete tele;
-    DEBUG_LOG() << " Try to Resetnd State " << sc.header.equipmentNumber << " we got state: " << static_cast<int>(sc.vulnerabilityState) << " and this bits here: " << sc.vulnerabilityBits;
+    DEBUG_LOG(m_logger) << " Try to Resetnd State " << sc.header.equipmentNumber << " we got state: " << static_cast<int>(sc.vulnerabilityState) << " and this bits here: " << sc.vulnerabilityBits;
 
     sc.header.timeStamp = time(nullptr) * 1000;
     uint32_t issi = 0;
@@ -435,7 +435,7 @@ void TTWorker::handleDataIndReq(const QByteArray &data)
       }
     }
 
-    ERROR_LOG() << " Try to Resetnd S2tate " << sc.header.equipmentNumber << " we got state: " << static_cast<int>(sc.vulnerabilityState) << " and this bits here: " << sc.vulnerabilityBits;
+    ERROR_LOG(m_logger) << " Try to Resetnd S2tate " << sc.header.equipmentNumber << " we got state: " << static_cast<int>(sc.vulnerabilityState) << " and this bits here: " << sc.vulnerabilityBits;
     sendTelegram(sc, issi); 
     return;
   }
@@ -445,7 +445,7 @@ void TTWorker::handleDataIndReq(const QByteArray &data)
     TrainingAreaBase::TetraIcd::Sanitation sc = TrainingAreaBase::TetraIcd::Sanitation::fromJson(tele->jsonData());
     delete tele;
 
-    DEBUG_LOG() << " Try to Resetnd State " << sc.header.equipmentNumber << " we got procedure: " << sc.proceduresTaken;
+    DEBUG_LOG(m_logger) << " Try to Resetnd State " << sc.header.equipmentNumber << " we got procedure: " << sc.proceduresTaken;
 
     sc.header.timeStamp = time(nullptr) * 1000;
     uint32_t issi = 0;
@@ -458,7 +458,7 @@ void TTWorker::handleDataIndReq(const QByteArray &data)
       }
     }
 
-    ERROR_LOG() << " Try to Resetnd S2tate " << sc.header.equipmentNumber << " we got state: " << sc.proceduresTaken;
+    ERROR_LOG(m_logger) << " Try to Resetnd S2tate " << sc.header.equipmentNumber << " we got state: " << sc.proceduresTaken;
     sendTelegram(sc, issi); 
     return;
   }
@@ -521,7 +521,7 @@ void TTWorker::handleDataIndReq(const QByteArray &data)
   if (radioTelegram->isLoginTelegram())
   {
     
-    DEBUG_LOG() << "player cont: " << m_playerList.count();
+    DEBUG_LOG(m_logger) << "player cont: " << m_playerList.count();
     for (int i = 0; i < m_playerList.count(); i++) 
     {
       Player *p = m_playerList.at(i);
@@ -529,19 +529,19 @@ void TTWorker::handleDataIndReq(const QByteArray &data)
       {
         if (p->isLogin)
           return;
-        DEBUG_LOG() << "Player #" << i << " with eqId=" << p->eqId << " and issi=" << p->issi << " is now logged in.";
+        DEBUG_LOG(m_logger) << "Player #" << i << " with eqId=" << p->eqId << " and issi=" << p->issi << " is now logged in.";
         p->isLogin = true;
         sendBITE(p->eqId, p->issi); 
         return;
       }
     }
     
-    ERROR_LOG() << "Invalid player was logged in. issi: '" << radioTelegram->getDestISSI() << "'";
+    ERROR_LOG(m_logger) << "Invalid player was logged in. issi: '" << radioTelegram->getDestISSI() << "'";
     return;
   }
 
   
-  DEBUG_LOG() << "Received unused or invalid telegram with Telegram-ID: " << telID;
+  DEBUG_LOG(m_logger) << "Received unused or invalid telegram with Telegram-ID: " << telID;
 }
 
 static void fillHeader(char *data, int len)
@@ -606,7 +606,7 @@ void TTWorker::onSendPlayerPositions()
 
     if (!p->isLogin) 
     {
-      INFO_LOG() << "Player with eqId=" << p->eqId << " and issi=" << p->issi << " is not logged in.";
+      INFO_LOG(m_logger) << "Player with eqId=" << p->eqId << " and issi=" << p->issi << " is not logged in.";
       break;
     }
     playerCount++;
@@ -636,7 +636,7 @@ void TTWorker::onSendPlayerPositions()
     delete tel;
   }
   bool bFlushed = m_socket->flush();
-  INFO_LOG() << "Sent " << bytesSent << "bytes (" << playerCount << " players), bFlushed=" << bFlushed;
+  INFO_LOG(m_logger) << "Sent " << bytesSent << "bytes (" << playerCount << " players), bFlushed=" << bFlushed;
 }
 
 void TTWorker::onSocketError()
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/TetraTestServer/worker.h b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/TetraTestServer/worker.h
index b1df15bf4..6fb08e41e 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/TetraTestServer/worker.h
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/TetraTestServer/worker.h
@@ -22,6 +22,7 @@ class QTimer;
 class Player
 {
 private:
+NGL::INGLLogger &m_logger;
   void randomizeDeathTicks()
   {
     deathTicks = ((qrand() % (maximumDeathTicks - minimumDeathTicks + 1)) + minimumDeathTicks);
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/INGLLogger.h b/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/INGLLogger.h
index bbdab6277..981dcf1bb 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/INGLLogger.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/INGLLogger.h
@@ -15,7 +15,7 @@
 #include <QRect>
 #include <QRectF>
 #include <QList>
-#include "NGLLogger_export.h"
+#include "ngllogger_export.h"
 
 namespace NGL
 {
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_compress.cpp b/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_compress.cpp
index 9e5588979..9ed48ee2d 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_compress.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_compress.cpp
@@ -48,7 +48,7 @@ Compress::Compress(QObject *parent)
   , m_u2_memFiles()
   , m_aborted(0)
 {
-  DEBUG_LOG() << "c_tor";
+  DEBUG_LOG(m_logger) << "c_tor";
 
 
 
@@ -69,29 +69,29 @@ Compress::~Compress()
   qWarning() << "## COMPRESS DTOR!!!!";
 
   
-  DEBUG_LOG() << "~";
+  DEBUG_LOG(m_logger) << "~";
 
   abort();
   m_future.waitForFinished();
-  DEBUG_LOG() << "~ finished";
+  DEBUG_LOG(m_logger) << "~ finished";
 }
 
 void Compress::abort()
 {
-  DEBUG_LOG() << "ABORT";
+  DEBUG_LOG(m_logger) << "ABORT";
 
   m_aborted = 1;
   m_lastError = tr("Aborted");
 
   if (m_currentTarFilter != nullptr) 
   {
-    DEBUG_LOG() << "aborting tar";
+    DEBUG_LOG(m_logger) << "aborting tar";
     m_currentTarFilter->abort();
   }
 
   if (m_currentBzipDevice != nullptr) 
   {
-    DEBUG_LOG() << "aborting bzip";
+    DEBUG_LOG(m_logger) << "aborting bzip";
     m_currentBzipDevice->abort();
   }
 }
@@ -102,7 +102,7 @@ void Compress::compress(QIODevice *out,
                         const QVector<FileInformations> &memFiles,
                         const QString &destRootDir)
 {
-  DEBUG_LOG() << "compress #2";
+  DEBUG_LOG(m_logger) << "compress #2";
   reset();
   setupFutureWatcher(QtConcurrent::run([this, out, filesRootDir, files, memFiles, destRootDir]() {
     return this->_compress(out, filesRootDir, files, memFiles, destRootDir);
@@ -111,7 +111,7 @@ void Compress::compress(QIODevice *out,
 
 void Compress::compress(QIODevice *out, const QString &sourceDir, const QString &destRootDir)
 {
-  DEBUG_LOG() << "compress #1 source dir: " << sourceDir << ", destRootDir: " << destRootDir;
+  DEBUG_LOG(m_logger) << "compress #1 source dir: " << sourceDir << ", destRootDir: " << destRootDir;
   reset();
 
   QVector<Compress::FileInformations> inFiles = directoryFileList(sourceDir, true);
@@ -124,10 +124,10 @@ void Compress::compress(QIODevice *out, const QString &sourceDir, const QString
   {
     fi.inputFileName = fi.inputFileName.mid(len);
     fi.bAbsInputPath = false;
-    DEBUG_LOG() << "fi: ifm = " << fi.inputFileName << ", abs = " << fi.bAbsInputPath;
+    DEBUG_LOG(m_logger) << "fi: ifm = " << fi.inputFileName << ", abs = " << fi.bAbsInputPath;
   }
 
-  DEBUG_LOG() << "FI list size: " << inFiles.count();
+  DEBUG_LOG(m_logger) << "FI list size: " << inFiles.count();
 
   compress(out, sourceDir, inFiles, {}, destRootDir);
 }
@@ -140,7 +140,7 @@ bool Compress::_compress(QIODevice *output,
 {
   std::shared_ptr<int> invalidatePointersOnScopeLeave(nullptr, [this](int *)
   {
-    DEBUG_LOG() << "invalidatePointersOnScopeLeave #1";
+    DEBUG_LOG(m_logger) << "invalidatePointersOnScopeLeave #1";
     m_currentTarFilter = nullptr;
     m_currentBzipDevice = nullptr;
   });
@@ -150,7 +150,7 @@ bool Compress::_compress(QIODevice *output,
   if (!output || !output->isWritable())
   {
     m_lastError = tr("Device is not writeable");
-    ERROR_LOG() << "compress failed: " << m_lastError;;
+    ERROR_LOG(m_logger) << "compress failed: " << m_lastError;;
     
     return false;
   }
@@ -161,7 +161,7 @@ bool Compress::_compress(QIODevice *output,
   const qint64 maxCount = files.count() + memFiles.count();
   qint64 count = 0;
 
-  DEBUG_LOG() << "destRootDir = " << destRootDir << ", maxCount = " << maxCount << ", count = " << count;
+  DEBUG_LOG(m_logger) << "destRootDir = " << destRootDir << ", maxCount = " << maxCount << ", count = " << count;
 
   BZip2IODevice bzip2(output, 9);
   m_currentBzipDevice = &bzip2;
@@ -169,7 +169,7 @@ bool Compress::_compress(QIODevice *output,
   if (!bzip2.open(QIODevice::WriteOnly))
   {
     m_lastError = bzip2.errorString();
-    ERROR_LOG() << "compress failed: " << m_lastError;
+    ERROR_LOG(m_logger) << "compress failed: " << m_lastError;
     
     return false;
   }
@@ -192,7 +192,7 @@ bool Compress::_compress(QIODevice *output,
   QString currentFileName;
   auto readCallback = [this, &maxCount, &count, &currentFileSize, &currentFileName, &bytesTotal](const qint64 iSize)
   {
-    DEBUG_LOG() << "readCallback: maxCount = " << maxCount << ", count = " << count
+    DEBUG_LOG(m_logger) << "readCallback: maxCount = " << maxCount << ", count = " << count
                         << ", currentFileSize = " << currentFileSize << ", currentFileName = " << currentFileName << ", iSize = " << iSize;
     emit compressInfoEx(maxCount, count, currentFileSize, (currentFileSize - iSize), currentFileName, bytesTotal);
   };
@@ -204,10 +204,10 @@ bool Compress::_compress(QIODevice *output,
   QString curPath;
   
 
-  DEBUG_LOG() << "prepairing tar filter";
+  DEBUG_LOG(m_logger) << "prepairing tar filter";
   for (const QString &path : paths)
   {
-    DEBUG_LOG() << "path = " << path;
+    DEBUG_LOG(m_logger) << "path = " << path;
     if (m_aborted) return false;
 
     if (curPath.isEmpty())
@@ -215,14 +215,14 @@ bool Compress::_compress(QIODevice *output,
     else
       curPath += path + QLatin1Char('/');
 
-    DEBUG_LOG() << "curPath = " << curPath << ", filesRootDir.isEmpty() = " << filesRootDir.isEmpty();
+    DEBUG_LOG(m_logger) << "curPath = " << curPath << ", filesRootDir.isEmpty() = " << filesRootDir.isEmpty();
 
     if (filesRootDir.isEmpty())
     {
       if (!tf.addData(curPath, QByteArray(), true))
       {
         m_lastError = tf.lastError();
-        ERROR_LOG() << "compress failed: " << m_lastError;
+        ERROR_LOG(m_logger) << "compress failed: " << m_lastError;
         
         return false;
       }
@@ -232,7 +232,7 @@ bool Compress::_compress(QIODevice *output,
       if (!tf.addFile(filesRootDir, curPath))
       {
         m_lastError = tf.lastError();
-        ERROR_LOG() << "compress failed: " << m_lastError;
+        ERROR_LOG(m_logger) << "compress failed: " << m_lastError;
         
         return false;
       }
@@ -242,7 +242,7 @@ bool Compress::_compress(QIODevice *output,
   m_c_sizeInfo.realSize = 0;
   for (const FileInformations &file : std::as_const(files))
   {
-    DEBUG_LOG() << "file = " << file.inputFileName;
+    DEBUG_LOG(m_logger) << "file = " << file.inputFileName;
     emit compressInfo(maxCount, ++count, file.inputFileName);
     
     if (m_aborted) return false;
@@ -250,7 +250,7 @@ bool Compress::_compress(QIODevice *output,
     QString in  = file.bAbsInputPath ? file.inputFileName : filesRootDir + QLatin1Char('/') + file.inputFileName;
     QString out = destRootDir + (file.outputFileName.isEmpty() ? file.inputFileName : file.outputFileName);
 
-    DEBUG_LOG() << "in = " << in << ", out = " << out;
+    DEBUG_LOG(m_logger) << "in = " << in << ", out = " << out;
 
     QFileInfo fi(in);
 
@@ -258,12 +258,12 @@ bool Compress::_compress(QIODevice *output,
     currentFileSize = fi.size();
     m_c_sizeInfo.realSize += currentFileSize;
 
-    DEBUG_LOG() << "currentFileName = " << currentFileName << ", currentFileSize = " << currentFileSize << "m_c_sizeInfo.realSize" << m_c_sizeInfo.realSize;
+    DEBUG_LOG(m_logger) << "currentFileName = " << currentFileName << ", currentFileSize = " << currentFileSize << "m_c_sizeInfo.realSize" << m_c_sizeInfo.realSize;
 
     if (!tf.addFile(in, out))
     {
       m_lastError = tf.lastError();
-      ERROR_LOG() << "compress failed: " << m_lastError;
+      ERROR_LOG(m_logger) << "compress failed: " << m_lastError;
       
       return false;
     }
@@ -271,7 +271,7 @@ bool Compress::_compress(QIODevice *output,
 
   for (const FileInformations &file : std::as_const(memFiles))
   {
-    DEBUG_LOG() << "(mem) file = " << file.inputFileName;
+    DEBUG_LOG(m_logger) << "(mem) file = " << file.inputFileName;
     emit compressInfo(maxCount, ++count, file.inputFileName);
     
     if (m_aborted) return false;
@@ -280,48 +280,48 @@ bool Compress::_compress(QIODevice *output,
     currentFileSize = file.fileData.size();
     m_c_sizeInfo.compressedSize += currentFileSize;
 
-    DEBUG_LOG() << "(mem) currentFileName = " << currentFileName << ", currentFileSize = " << currentFileSize << "m_c_sizeInfo.realSize" << m_c_sizeInfo.realSize;
+    DEBUG_LOG(m_logger) << "(mem) currentFileName = " << currentFileName << ", currentFileSize = " << currentFileSize << "m_c_sizeInfo.realSize" << m_c_sizeInfo.realSize;
 
     if (!tf.addData(file.inputFileName, file.fileData))
     {
       m_lastError = tf.lastError();
-      ERROR_LOG() << "compress failed: " << m_lastError;
+      ERROR_LOG(m_logger) << "compress failed: " << m_lastError;
       
       return false;
     }
   }
 
 
-  DEBUG_LOG() << "writing eos";
+  DEBUG_LOG(m_logger) << "writing eos";
   tf.writeEOS();
 
-  DEBUG_LOG() << "closing bzip";
+  DEBUG_LOG(m_logger) << "closing bzip";
   bzip2.close();
 
   m_c_sizeInfo.compressedSize = output->size();
-  DEBUG_LOG() << "m_c_sizeInfo.compressedSize = " << m_c_sizeInfo.compressedSize;
+  DEBUG_LOG(m_logger) << "m_c_sizeInfo.compressedSize = " << m_c_sizeInfo.compressedSize;
 
   m_success = true;
 
-  DEBUG_LOG() << "DONE!";
+  DEBUG_LOG(m_logger) << "DONE!";
 
   return true;
 }
 
 void Compress::uncompress(QIODevice *in, const QString &outDir)
 {
-  DEBUG_LOG() << "uncompress #1";
+  DEBUG_LOG(m_logger) << "uncompress #1";
   reset();
   setupFutureWatcher(QtConcurrent::run([this, in, outDir](){ return this->_uncompressDirectory(in, outDir); }));
 }
 
 bool Compress::_uncompressDirectory(QIODevice *input, const QString &outDir)
 {
-  DEBUG_LOG() << "_uncompressDirectory";
+  DEBUG_LOG(m_logger) << "_uncompressDirectory";
 
   std::shared_ptr<int> invalidatePointersOnScopeLeave(nullptr, [this](int *)
   {
-    DEBUG_LOG() << "invalidatePointersOnScopeLeave #2";
+    DEBUG_LOG(m_logger) << "invalidatePointersOnScopeLeave #2";
     m_currentTarFilter = nullptr;
     m_currentBzipDevice = nullptr;
   });
@@ -331,7 +331,7 @@ bool Compress::_uncompressDirectory(QIODevice *input, const QString &outDir)
   if (!input || !input->isReadable())
   {
     m_lastError = tr("Device is not readable");
-    ERROR_LOG() << "compress failed: " << m_lastError;
+    ERROR_LOG(m_logger) << "compress failed: " << m_lastError;
     
     return false;
   }
@@ -341,7 +341,7 @@ bool Compress::_uncompressDirectory(QIODevice *input, const QString &outDir)
   if (!bzip2.open(QIODevice::ReadOnly))
   {
     m_lastError = bzip2.errorString();
-    ERROR_LOG() << "compress failed: " << m_lastError;
+    ERROR_LOG(m_logger) << "compress failed: " << m_lastError;
     
     return false;
   }
@@ -351,23 +351,23 @@ bool Compress::_uncompressDirectory(QIODevice *input, const QString &outDir)
   TarFilter::FileInformations tfi;
   QDir dir(outDir);
 
-  DEBUG_LOG() << "dir = " << dir.path();
+  DEBUG_LOG(m_logger) << "dir = " << dir.path();
 
   while (tf.getData(tfi))
   {
-    DEBUG_LOG() << "tfi.fileName = " << tfi.fileName;
+    DEBUG_LOG(m_logger) << "tfi.fileName = " << tfi.fileName;
     emit uncompressInfo(input->size(), input->pos(), tfi.fileName);
     if (m_aborted) return false;
 
     QString path = outDir + QLatin1Char('/') + tfi.fileName;
-    DEBUG_LOG() << "path = " << path;
+    DEBUG_LOG(m_logger) << "path = " << path;
     if (tfi.fileType == TarFilter::directory)
     {
-      DEBUG_LOG() << "tfi.fileType == TarFilter::directory";
+      DEBUG_LOG(m_logger) << "tfi.fileType == TarFilter::directory";
       if (!dir.exists(path) && !dir.mkpath(path))
       {
         m_lastError = tr("Error creating directory %1").arg(outDir);
-        ERROR_LOG() << "compress failed: " << m_lastError;
+        ERROR_LOG(m_logger) << "compress failed: " << m_lastError;
         
         return false;
       }
@@ -379,7 +379,7 @@ bool Compress::_uncompressDirectory(QIODevice *input, const QString &outDir)
       if (!dir.exists(pathName) && !dir.mkpath(pathName))
       {
         m_lastError = tr("Error creating directory %1").arg(pathName);
-        ERROR_LOG() << "compress failed: " << m_lastError;
+        ERROR_LOG(m_logger) << "compress failed: " << m_lastError;
         
         return false;
       }
@@ -387,39 +387,39 @@ bool Compress::_uncompressDirectory(QIODevice *input, const QString &outDir)
       if (!f.open(QIODevice::WriteOnly))
       {
         m_lastError = tr("Error opening %1 for writing (%2)").arg(path, f.errorString());
-        ERROR_LOG() << "compress failed: " << m_lastError;
+        ERROR_LOG(m_logger) << "compress failed: " << m_lastError;
         
         return false;
       }
       if (!tf.getData(&f))
       {
         m_lastError = tf.lastError();
-        ERROR_LOG() << "compress failed: " << m_lastError;
+        ERROR_LOG(m_logger) << "compress failed: " << m_lastError;
         
         return false;
       }
     }
   }
 
-  DEBUG_LOG() << "uncompress done!";
+  DEBUG_LOG(m_logger) << "uncompress done!";
   m_success = true;
   return true;
 }
 
 void Compress::uncompress(QIODevice *in)
 {
-  DEBUG_LOG() << "uncompress #2!";
+  DEBUG_LOG(m_logger) << "uncompress #2!";
   reset();
   setupFutureWatcher(QtConcurrent::run([this, in](){ return this->_uncompressBuffer(in); }));
 }
 
 bool Compress::_uncompressBuffer(QIODevice *input)
 {
-  DEBUG_LOG() << "uncompressBuffer";
+  DEBUG_LOG(m_logger) << "uncompressBuffer";
 
   std::shared_ptr<int> invalidatePointersOnScopeLeave(nullptr, [this](int *)
   {
-    DEBUG_LOG() << "invalidatePointersOnScopeLeave #2";
+    DEBUG_LOG(m_logger) << "invalidatePointersOnScopeLeave #2";
     m_currentTarFilter = nullptr;
     m_currentBzipDevice = nullptr;
   });
@@ -429,7 +429,7 @@ bool Compress::_uncompressBuffer(QIODevice *input)
   if (!input->isReadable())
   {
     m_lastError = tr("Device is not readable");
-    ERROR_LOG() << "compress failed: " << m_lastError;
+    ERROR_LOG(m_logger) << "compress failed: " << m_lastError;
     
     return false;
   }
@@ -439,7 +439,7 @@ bool Compress::_uncompressBuffer(QIODevice *input)
   if (!bzip2.open(QIODevice::ReadOnly))
   {
     m_lastError = bzip2.errorString();
-    ERROR_LOG() << "compress failed: " << m_lastError;
+    ERROR_LOG(m_logger) << "compress failed: " << m_lastError;
     
     return false;
   }
@@ -449,43 +449,43 @@ bool Compress::_uncompressBuffer(QIODevice *input)
   TarFilter::FileInformations tfi;
   while (tf.getData(tfi))
   {
-    DEBUG_LOG() << "tfi.fileName = " << tfi.fileName;
+    DEBUG_LOG(m_logger) << "tfi.fileName = " << tfi.fileName;
     emit uncompressInfo(input->size(), input->pos(), tfi.fileName);
     if (m_aborted) return false;
 
     FileInformations fi;
     fi.outputFileName = tfi.fileName;
 
-    DEBUG_LOG() << "fi.outputFileName = " << fi.outputFileName;
+    DEBUG_LOG(m_logger) << "fi.outputFileName = " << fi.outputFileName;
 
     if (tfi.fileType == TarFilter::directory)
     {
       fi.outputFileName += QLatin1Char('/');
-      DEBUG_LOG() << "> fi.outputFileName = " << fi.outputFileName;
+      DEBUG_LOG(m_logger) << "> fi.outputFileName = " << fi.outputFileName;
     }
     else
     {
-      DEBUG_LOG() << "stuff";
+      DEBUG_LOG(m_logger) << "stuff";
 
       QBuffer buf(&fi.fileData);
       if (!buf.open(QIODevice::WriteOnly))
       {
         m_lastError = tr("Error opening buffer for writing (%1)").arg(buf.errorString());
-        ERROR_LOG() << "compress failed: " << m_lastError;
+        ERROR_LOG(m_logger) << "compress failed: " << m_lastError;
         
         return false;
       }
       if (!tf.getData(&buf))
       {
         m_lastError = tf.lastError();
-        ERROR_LOG() << "compress failed: " << m_lastError;
+        ERROR_LOG(m_logger) << "compress failed: " << m_lastError;
         
         return false;
       }
     }
 
     fi.bAbsInputPath = fi.outputFileName.startsWith(QLatin1Char('/'));
-    DEBUG_LOG() << "added fi.bAbsInputPath = " << fi.bAbsInputPath;
+    DEBUG_LOG(m_logger) << "added fi.bAbsInputPath = " << fi.bAbsInputPath;
     m_u2_memFiles += fi;
   }
 
@@ -496,8 +496,8 @@ bool Compress::_uncompressBuffer(QIODevice *input)
 bool Compress::success() const
 {
   
-  ERROR_LOG() << "success? " << (m_future.isFinished() && !m_future.isCanceled() && m_success);
-  ERROR_LOG() << "success details: "
+  ERROR_LOG(m_logger) << "success? " << (m_future.isFinished() && !m_future.isCanceled() && m_success);
+  ERROR_LOG(m_logger) << "success details: "
                       << "success m_future.isFinished() = " << (m_future.isFinished())
                       << " !m_future.isCanceled() = " << !m_future.isCanceled()
                       << " m_success = " << m_success;
@@ -506,22 +506,22 @@ bool Compress::success() const
 
 bool Compress::waitForFinished()
 {
-  DEBUG_LOG() << "waitForFinished...";
+  DEBUG_LOG(m_logger) << "waitForFinished...";
   m_future.waitForFinished();
-  DEBUG_LOG() << "waitForFinished... done!";
+  DEBUG_LOG(m_logger) << "waitForFinished... done!";
   return success();
 }
 
 QVector<Compress::FileInformations> Compress::directoryFileList(const QString &dir, bool recursive)
 {
-  DEBUG_LOG() << "directoryFileList";
+  DEBUG_LOG(m_logger) << "directoryFileList";
 
   QVector<FileInformations> sl_absolute;
   QDir d(dir);
 
   if (d.exists())
   {
-    DEBUG_LOG() << "exists";
+    DEBUG_LOG(m_logger) << "exists";
     const auto entries = d.entryList(QDir::Files);
     sl_absolute.reserve(sl_absolute.size() + entries.size());
     for (const QString &entry : entries)
@@ -530,20 +530,20 @@ QVector<Compress::FileInformations> Compress::directoryFileList(const QString &d
 
   if (recursive)
   {
-    DEBUG_LOG() << "recursive";
+    DEBUG_LOG(m_logger) << "recursive";
     const auto entries = d.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
     sl_absolute.reserve(sl_absolute.size() + entries.size());
     for (const QString &s : entries)
       sl_absolute << directoryFileList(dir + QLatin1Char('/') + s, true);
   }
 
-  DEBUG_LOG() << "done";
+  DEBUG_LOG(m_logger) << "done";
   return sl_absolute;
 }
 
 void Compress::reset()
 {
-  DEBUG_LOG() << "reset";
+  DEBUG_LOG(m_logger) << "reset";
   m_u2_memFiles.clear();
 
   m_lastError.clear();
@@ -556,13 +556,13 @@ void Compress::reset()
 
 void Compress::setupFutureWatcher(const QFuture<bool> &future)
 {
-  DEBUG_LOG() << "setupFutureWatcher";
+  DEBUG_LOG(m_logger) << "setupFutureWatcher";
   m_future = future;
   QFutureWatcher<bool> *fw = new QFutureWatcher<bool>(this);
-  QObject::connect(fw, &QObject::destroyed, this, [this]() { DEBUG_LOG() << "Future Watcher destroyed"; });
+  QObject::connect(fw, &QObject::destroyed, this, [this]() { DEBUG_LOG(m_logger) << "Future Watcher destroyed"; });
   QObject::connect(fw, &QFutureWatcher<bool>::finished, this, &Compress::finished);
   QObject::connect(fw, &QFutureWatcher<bool>::finished, fw, &QObject::deleteLater);
-  QObject::connect(fw, &QFutureWatcher<bool>::finished, fw, [this]() { DEBUG_LOG() << "Future Watcher about to be deleted"; });
+  QObject::connect(fw, &QFutureWatcher<bool>::finished, fw, [this]() { DEBUG_LOG(m_logger) << "Future Watcher about to be deleted"; });
   fw->setFuture(m_future);
 }
 
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_compress.h b/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_compress.h
index b32a545ec..4ead64b09 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_compress.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/nglcomp_compress.h
@@ -109,6 +109,7 @@ Q_SIGNALS:
   void finished();
 private:
 
+NGL::INGLLogger &m_logger;
   bool _compress(QIODevice *output,
                  const QString &filesRootDir,
                  const QVector<FileInformations> &files,
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglmainwindow.cpp b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglmainwindow.cpp
index 1759cb967..cf6630571 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglmainwindow.cpp
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglmainwindow.cpp
@@ -12,7 +12,8 @@
 #include <QMenuBar>
 
 NGLMainWindow::NGLMainWindow(QWidget *parent)
-  : QMainWindow(parent)
+  : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
+  , QMainWindow(parent)
   , m_helpProcess(nullptr)
   , m_versionView(nullptr)
   , m_menuBar(new QMenuBar(this))
@@ -45,7 +46,7 @@ void NGLMainWindow::onHelpIndex()
 void NGLMainWindow::onInvokeHelp(const QString &helpContext)
 {
   
-  DEBUG_LOG() << "onInvokeHelp " << helpContext ;
+  DEBUG_LOG(m_logger) << "onInvokeHelp " << helpContext ;
 
   if (!m_helpProcess)
   {
@@ -60,11 +61,11 @@ void NGLMainWindow::onInvokeHelp(const QString &helpContext)
     args << QLatin1String("-collectionFile")
          << QCoreApplication::applicationDirPath() + QLatin1String("/../help/scms/") + fn
          << QLatin1String("-enableRemoteControl");
-    DEBUG_LOG() << "Attempting to invoke help at URL: " << args.join(QLatin1String(" ")) ;
+    DEBUG_LOG(m_logger) << "Attempting to invoke help at URL: " << args.join(QLatin1String(" ")) ;
     m_helpProcess->start(QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/assistant"), args);
     if (!m_helpProcess->waitForStarted())
     {
-      ERROR_LOG() << "Could not start help browser (error: "
+      ERROR_LOG(m_logger) << "Could not start help browser (error: "
                           << m_helpProcess->error()
                           << " )" ;
       delete m_helpProcess;
@@ -84,7 +85,7 @@ void NGLMainWindow::onHelpFinished(int exitCode, QProcess::ExitStatus exitStatus
 {
   if (exitStatus != QProcess::NormalExit)
   {
-    WARNING_LOG() << "help browser exited with status "
+    WARNING_LOG(m_logger) << "help browser exited with status "
                           << exitStatus << " code "
                           << exitCode << "!" ;
   }
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglmainwindow.h b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglmainwindow.h
index a36b6c12a..c424d7707 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglmainwindow.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglmainwindow.h
@@ -32,6 +32,7 @@ private:
   QProcess                  *m_helpProcess;
 
 protected:
+  NGL::INGLLogger &m_logger;
   QWidget               *m_versionView;
   QMenuBar              *m_menuBar;
   QMap<QString, QMenu *>  m_menu;
diff --git a/qt6-after/qt6-migrated-legatus/include/NGLLogger/INGLLogger.h b/qt6-after/qt6-migrated-legatus/include/NGLLogger/INGLLogger.h
index bbdab6277..981dcf1bb 100755
--- a/qt6-after/qt6-migrated-legatus/include/NGLLogger/INGLLogger.h
+++ b/qt6-after/qt6-migrated-legatus/include/NGLLogger/INGLLogger.h
@@ -15,7 +15,7 @@
 #include <QRect>
 #include <QRectF>
 #include <QList>
-#include "NGLLogger_export.h"
+#include "ngllogger_export.h"
 
 namespace NGL
 {